Changeset 1164 for trunk/common

Timestamp:

01/14/12 16:18:10 (4 months ago)

Author:

bogdan2412

Message:

Make infoarena compatible with HPHP.

• Implemented APC caching support since eaccelerator is not compatible with HPHP and although we support memcached, we do not use it on live.
• Replaced instances of create_function_cached with php anonymous functions. This bumps the PHP version requirement to 5.3, but it allows the code to work with HPHP, since dynamic function generation is replaced with staticly analyzable functions. This also removes a horrible, terrible hack in Textile.php which was storing the current instance of the Textile class being processed as a static variable so that it could be accessed by anonymous functions.
• Replaced occurrences of assert with log_assert.
• When running under HPHP, IA_HPHP_ENV is defined and is used to bypass some incompatible code (redundant ini configuration checks).
• Fixed some includes that were dependent on the working directory being www/
• Included a sample HPHP configuration file and a Makefile with compilation commands.

REVIEW URL: ​http://reviewboard.infoarena.ro/r/182/

Location:

trunk/common

Files:

• cache.php (modified) (2 diffs)
• common.php (modified) (1 diff)
• db/attachment.php (modified) (3 diffs)
• textblock.php (modified) (1 diff)

trunk/common/cache.php

@@ -144 +144 @@
 //      mem_cache_purge deletes everything from the cache. Try to avoid calling it.
 //
-// FIXME: cache is not logged. See IA_LOG_MEM_CACHE.
 if (IA_MEM_CACHE_METHOD == 'none') {
 
@@ -259 +258 @@
         }
     }
+
+} else if (IA_MEM_CACHE_METHOD == 'apc') {
+    // APC cache implementation
+    function mem_cache_get($cache_id) {
+        $res = apc_fetch($cache_id);
+        if ($res === false) {
+            if (IA_LOG_MEM_CACHE) {
+                log_print("MEM CACHE: miss on $cache_id");
+            }
+            return false;
+        } else {
+            if (IA_LOG_MEM_CACHE) {
+                log_print("MEM CACHE: hit on $cache_id");
+            }
+            return unserialize($res);
+        }
+    }
+
+    function mem_cache_set($cache_id, $object, $ttl = IA_MEM_CACHE_EXPIRATION) {
+        log_assert($object !== 'false', "Can't cache false values");
+        apc_store($cache_id, serialize($object), $ttl);
+
+        if (IA_LOG_MEM_CACHE) {
+            log_print("MEM CACHE: store $cache_id");
+        }
+        return $object;
+    }
+
+    function mem_cache_delete($cache_id) {
+        apc_delete($cache_id);
+        if (IA_LOG_MEM_CACHE) {
+            log_print("MEM CACHE: delete $cache_id");
+        }
+    }
+
+    function mem_cache_purge() {
+        if (IA_LOG_MEM_CACHE) {
+            log_print("MEM CACHE: purge");
+        }
+        apc_clear_cache();
+    }
 }
 

trunk/common/common.php

@@ -332 +332 @@
 
     // Check for retarded php.ini settings.
-    if (IA_HTTP_ENV) {
+    if (IA_HTTP_ENV && !defined('IA_HPHP_ENV')) {
         log_assert(!ini_get("session.auto_start"),
                    "Please disable session.auto_start. It kills babies!");

trunk/common/db/attachment.php

@@ -151 +151 @@
 // You may use % as a wildcard
 function attachment_get_all($page, $name='%', $start = 0, $count = 99999999) {
-    assert(is_whole_number($start));
-    assert(is_whole_number($count));
+    log_assert(is_whole_number($start));
+    log_assert(is_whole_number($count));
     $query = sprintf("SELECT ia_file.*, ia_user.username, ia_user.full_name as user_fullname
                       FROM ia_file
@@ -165 +165 @@
 // _count for the above.
 function attachment_get_count($page, $name='%', $start = 0, $count = 99999999) {
-    assert(is_whole_number($start));
-    assert(is_whole_number($count));
+    log_assert(is_whole_number($start));
+    log_assert(is_whole_number($count));
     $query = sprintf("SELECT COUNT(*)
                       FROM ia_file
@@ -184 +184 @@
 // FIXME: does this belong here?
 function attachment_get_filepath($attach) {
-    assert(is_array($attach));
+    log_assert(is_array($attach));
     return IA_ROOT_DIR.'attach/'.
             strtolower(preg_replace('/[^a-z0-9\.\-_]/i', '_', $attach['page'])) . '_' .

trunk/common/textblock.php

@@ -152 +152 @@
 function textblock_copy_replace($srcprefix, $dstprefix, $replace, $security,
         $user_id, $remote_ip_info = null) {
-    assert($srcprefix != $dstprefix);
-    assert($security === null || is_textblock_security_descriptor($security));
-    assert(is_whole_number($user_id));
+    log_assert($srcprefix != $dstprefix);
+    log_assert($security === null ||
+               is_textblock_security_descriptor($security));
+    log_assert(is_whole_number($user_id));
 
     $textblocks = textblock_get_by_prefix($srcprefix, true, false);