X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2FObj%2Fbriskin5.phh;h=3da15451732e63b85bf1304502167c5f396f7144;hb=8fe1e432c4661ebf186026f920d778d37dbe0953;hp=d9427fae2df6dcfefdd0236e03d01d7f707e20ce;hpb=b69edecb81b57155e62fb35ff594873a43560bda;p=brisk.git

diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh
index d9427fa..3da1545 100644
--- a/web/briskin5/Obj/briskin5.phh
+++ b/web/briskin5/Obj/briskin5.phh
@@ -509,22 +509,7 @@ class Bin5_user extends User {
     {
         $this->step = $step & 0x7fffffff;
         
-        do {
-            if (validate_sess($this->sess) == FALSE)
-                break;
-            if (file_exists(BIN5_PROXY_PATH) == FALSE)
-                mkdir(BIN5_PROXY_PATH, 0775, TRUE);
-            if (($fp = @fopen(BIN5_PROXY_PATH."/".$this->sess.".step", 'w')) == FALSE)
-                break;
-            fwrite($fp, pack("LL",$this->step, $this->idx));
-            fclose($fp);
-            
-            log_main("step_set [".$this->sess. "] [".$this->step."]"); 
-            
-            return (TRUE);
-        } while (0);
-        
-        return (FALSE);
+        return TRUE;
     }
     
     function step_inc($delta = 1) {
@@ -532,22 +517,10 @@ class Bin5_user extends User {
         /* modularization because unpack() not manage unsigned 32bit int correctly */
         $this->step &= 0x7fffffff;
         
-        if (validate_sess($this->sess)) {
-            if (file_exists(BIN5_PROXY_PATH) == FALSE)
-                mkdir(BIN5_PROXY_PATH);
-            $fp = fopen(BIN5_PROXY_PATH."/".$this->sess.".step", 'w');
-            fwrite($fp, pack("LL", $this->step, $this->idx));
-            fclose($fp);
-            
-            log_main("step_inc [".$this->sess. "] [".$this->step."]"); 
-            
-            return (TRUE);
-        }
-        
-        return (FALSE);
+        return (TRUE);
     }
-    
-    static function step_get($sess)
+
+    static function load_step($sess)
     {
         $fp = FALSE;
         do {
@@ -555,12 +528,12 @@ class Bin5_user extends User {
                 break;
             
             if (file_exists(BIN5_PROXY_PATH) == FALSE)
-                mkdir(BIN5_PROXY_PATH);
+                mkdir(BIN5_PROXY_PATH, 0775, TRUE);
             if (($fp = @fopen(BIN5_PROXY_PATH."/".$sess.".step", 'rb')) == FALSE)
                 break;
             if (($s = fread($fp, 8)) == FALSE)
                 break;
-            if (strlen($s) != 8)
+            if (mb_strlen($s, "ASCII") != 8)
                 break;
             $arr = unpack('Ls/Li', $s);
             fclose($fp);
@@ -576,19 +549,35 @@ class Bin5_user extends User {
         
         return (FALSE);
     }
+
+    function save_step() 
+    {
+        do {
+            if (validate_sess($this->sess) == FALSE)
+                break;
+            if (file_exists(BIN5_PROXY_PATH) == FALSE)
+                mkdir(BIN5_PROXY_PATH, 0775, TRUE);
+            if (($fp = @fopen(BIN5_PROXY_PATH."/".$this->sess.".step", 'w')) == FALSE)
+                break;
+            fwrite($fp, pack("LL",$this->step, $this->idx));
+            fclose($fp);
+            
+            log_main("step_set [".$this->sess. "] [".$this->step."]"); 
+            
+            return (TRUE);
+        } while (0);
+        
+        return (FALSE);
+    }
+    
     
     static function load_data($tab_id, $id, $sess) 
     {
-        // error_log("Bin5_user::load_data BEGIN", 0);
-        error_log("Bin5_user::load_data BEGIN id [".$id."]", 0);
+        log_main("Bin5_user::load_data: tab_id [".$tab_id."] id [".$id."] sess [".($sess == FALSE ? "FALSE" : $sess)."] ");
         
-        log_main("load_data: tab_id [".$tab_id."] id [".$id."] sess [".($sess == FALSE ? "FALSE" : $sess)."] ");
-        
-        $doexit = FALSE;
         do {
             if (($tok = @ftok(FTOK_PATH."/bin5/table".$tab_id."/user".$id, "B")) == -1) {
                 log_main("ftok failed");
-                $doexit = TRUE;
                 break;
             }
             
@@ -603,12 +592,9 @@ class Bin5_user extends User {
                 $user = @shm_get_var($shm, $tok);
                 
                 if ($sess != FALSE && $user->sess != $sess) {
-                    $doexit = TRUE;
                     break;
                 }
                 log_only("user ==  ".($user == FALSE ?   "FALSE" : "TRUE")."  user ===  ".($user === FALSE ? "FALSE" : "TRUE")."  user isset ".(isset($user) ?   "TRUE" : "FALSE"));
-                if (isset($user)) 
-                    log_only("bri count ".count($user));
                 
                 if ($user == FALSE) {
                     log_only("INIT MAIN DATA");
@@ -620,6 +606,19 @@ class Bin5_user extends User {
                         log_only(serialize($user));
                     }
                 }
+                else {
+                    if ($sess != FALSE) {
+                        // This part isn't strictly required but is good to verify
+                        // the coerence of cached and User class saved value of step field.
+                        $old_step = $user->step;
+                        $arr = Bin5_user::load_step($sess);
+                        $user->step = $arr['s'];
+                        if ($old_step != $user->step) {
+                            log_crit("Bin5:: steps are diffetents User->step ".$user->step." Old_step: ".$old_step);
+                        }
+
+                    }
+                }
                 
                 $user->shm_sz = $shm_sz;
                 
@@ -632,8 +631,7 @@ class Bin5_user extends User {
             return ($user);
         } while (0);
         
-        if ($doexit)
-            exit();
+        log_crit("Bin5_user::load_data:ret FALSE");
         
         return (FALSE);
     }
@@ -644,9 +642,6 @@ class Bin5_user extends User {
       
       $shm =   FALSE;
       
-      // var_dump($user);
-      error_log("Bin5_user::save_data BEGIN id [".$id."]", 0);
-      
       if (($tok = @ftok(FTOK_PATH."/bin5/table".$tab_id."/user".$id, "B")) == -1) {
           return (FALSE);
       }
@@ -657,6 +652,7 @@ class Bin5_user extends User {
           // log_only("PUT_VAR DI ".strlen(serialize($user)));
           if (shm_put_var($shm, $tok, $user) != FALSE) {
               shm_detach($shm);
+              $user->save_step();
               log_main("User[".$id."] saved.");
               return (TRUE);
           }
@@ -679,11 +675,13 @@ class Bin5_user extends User {
 
 
 class Bin5 {
+    static $delta_t = array();
+
   var $user;
   var $table;
   var $comm; // commands for many people
   var $step; // current step of the comm array
-  var $garbage_timeout;
+  // externalized var $garbage_timeout;
   var $shm_sz;
 
   var $table_idx;
@@ -807,15 +805,13 @@ class Bin5 {
   // Bin5::load_data
   static function load_data($table_idx, $table_token = "") 
   {
-    $doexit = FALSE;
     $shm = FALSE;
 
-    log_wr("TABLE_IDX ".FTOK_PATH."/bin5/table".$table_idx."/table");
+    log_wr("TABLE_FTOK ".FTOK_PATH."/bin5/table".$table_idx."/table");
     
     do {
       if (($tok = @ftok(FTOK_PATH."/bin5/table".$table_idx."/table", "B")) == -1) {
 	log_main("ftok failed");
-	$doexit = TRUE;
 	break;
       }
 
@@ -839,7 +835,13 @@ class Bin5 {
       shm_detach($shm);
       
       for ($i = 0 ; $i < BIN5_MAX_PLAYERS ; $i++) {
-          $bri->user[$i] = Bin5_user::load_data($table_idx, $i, FALSE);
+          if (($bri->user[$i] = Bin5_user::load_data($table_idx, $i, FALSE)) == FALSE) {
+              log_crit("Bin5_user::load_data failed");
+              break;
+          }
+      }
+      if ($i < BIN5_MAX_PLAYERS) {
+          break;
       }
       
       return ($bri); 
@@ -849,8 +851,6 @@ class Bin5 {
       shm_detach($shm);
 
     log_wr("briskin5 load_data failed");
-    if ($doexit)
-        exit();
     
     return (FALSE);
   }
@@ -945,7 +945,7 @@ class Bin5 {
   {
     GLOBAL $sess; 
     
-    log_lock("LOCK_DATA ".FTOK_PATH."/bin5/table".$table_idx."/table");
+    log_main("lockinfo: DATA ".FTOK_PATH."/bin5/table".$table_idx."/table");
     //  echo "LOCK: ".FTOK_PATH."/main";
     //  exit;
     // WARNING monitor this step
@@ -957,20 +957,25 @@ class Bin5 {
       return (FALSE);
     }
     if (sem_acquire($res)) {   
-      log_lock("LOCK table ".$table_idx."[res: ".$res."]");
-      return ($res);
+        self::$delta_t[$table_idx] = microtime(TRUE);
+        log_lock("LOCK   table [".$table_idx."]         [".self::$delta_t[$table_idx]."]");
+
+        return (new Vect(array('res' => $res, 'tab' => $table_idx)));
     }
     else {
-      log_lock("LOCK table ".$table_idx.":FAILED");
-      return (FALSE);
+        log_lock("LOCK table ".$table_idx.":FAILED");
+        return (FALSE);
     }
   }
   
-  function unlock_data($res)
+  function unlock_data($res_vect)
   {
     GLOBAL $sess; 
-    
-    log_lock("UNLOCK table [res: ".$res."]");
+
+    $res = $res_vect->getbyid('res');
+    $tab = $res_vect->getbyid('tab');
+
+    log_lock("UNLOCK table [".$tab."]         [".(microtime(TRUE) - (self::$delta_t[$tab]))."]");
 
     return (sem_release($res));
   }
@@ -1145,7 +1150,51 @@ class Bin5 {
 
     return ($is_ab);
   }
-} // end class Briskin5
+
+
+  static function garbage_time_is_expired($tm) 
+  {
+      $ret = TRUE;
+      $fp = FALSE;
+      do {
+          if (file_exists(BIN5_PROXY_PATH) == FALSE)
+              mkdir(BIN5_PROXY_PATH, 0775, TRUE);
+          if (($fp = @fopen(BIN5_PROXY_PATH."/garbage_time.expired", 'rb')) == FALSE)
+              break;
+          if (($s = fread($fp, 4)) == FALSE)
+              break;
+          if (mb_strlen($s, "ASCII") != 4)
+              break;
+          $arr = unpack('Le', $s);
+          if ($arr['e'] > $tm)
+              $ret = FALSE;
+      } while (0);
+      
+      if ($fp != FALSE)
+          fclose($fp);
+      
+      log_rd2("END: return ".($ret ? "TRUE" : "FALSE"));
+      
+      return ($ret);
+  }
+
+  static function garbage_time_expire_set($tm) 
+  {
+      do {
+          if (file_exists(BIN5_PROXY_PATH) == FALSE)
+              mkdir(BIN5_PROXY_PATH, 0775, TRUE);
+          if (($fp = @fopen(BIN5_PROXY_PATH."/garbage_time.expired", 'wb')) == FALSE)
+              break;
+          fwrite($fp, pack("L",$tm));
+          fclose($fp);
+          
+          return (TRUE);
+      } while (0);
+      
+      return (FALSE);
+  }
+
+} // end class Bin5
 
 function locshm_exists($tok)
 {