Merge branch 'locshunt' into 0.9.x

[quix0rs-gnu-social.git] / classes / Memcached_DataObject.php

diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index d8b0db5a69b7e1363a5487e6272050175d57f97d..be8137573d31530862a1e63f05bd63d605c89902 100644 (file)
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -37,6 +37,15 @@ class Memcached_DataObject extends DB_DataObject
         }
     }
 
+    /**
+     * Wrapper for DB_DataObject's static lookup using memcached
+     * as backing instead of an in-process cache array.
+     *
+     * @param string $cls classname of object type to load
+     * @param mixed $k key field name, or value for primary key
+     * @param mixed $v key field value, or leave out for primary key lookup
+     * @return mixed Memcached_DataObject subtype or false
+     */
     function &staticGet($cls, $k, $v=null)
     {
         if (is_null($v)) {
@@ -53,6 +62,13 @@ class Memcached_DataObject extends DB_DataObject
         } else {
             $i = DB_DataObject::staticGet($cls, $k, $v);
             if ($i) {
+                // DB_DataObject's in-process lookup cache interferes with GC
+                // to cause massive memory leaks in long-running processes.
+                if (php_sapi_name() == 'cli') {
+                    $i->_clear_cache();
+                }
+                
+                // Now store it into the shared memcached, if present...
                 $i->encache();
             }
             return $i;