Ticket #1237: ticket_1237.diff

lib/jelix/utils/jCache.class.php

@@ -163 +163 @@
         if($drv->enabled){
 
             $key = md5(serialize($fn).serialize($fnargs));
+            $lockKey = $key.'_callLock';
+
+            //wait lock to be realesed (if a lock exists)
+            $lockTests=0;
+            while( $drv->get($lockKey) ) {
+                usleep(100000);
+                if( ($lockTests++)%10 == 0 ) { //every second, first shot is on first call
+                    //automatic cleaning cache
+                    if($drv->automatic_cleaning_factor > 0 &&  rand(1, $drv->automatic_cleaning_factor) == 1){
+                        $drv->garbage();
+                    }
+                }
+            }
 
             if (!($data = $drv->get($key))) {
 
+                $lockTtl = get_cfg_var('max_execution_time');
+                if( !$lockTtl ) {
+                    $lockTtl = $drv->ttl;
+                }
+                $lockTtl = max( 30, min( $lockTtl, $drv->ttl ) ); //prevent lock ttl from being more than drv's ttl and from being eternal
+                $drv->set($lockKey,true,$lockTtl);
+
                 $data = self::_doFunctionCall($fn,$fnargs);
 
                 if (!is_resource($data)) {
@@ -184 +204 @@
                         $drv->set($key,$data,$ttl);
                     }
                 }
+                $drv->delete($lockKey);
             }
 
             return $data;