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

diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh
index 718fabd..3da1545 100644
--- a/web/briskin5/Obj/briskin5.phh
+++ b/web/briskin5/Obj/briskin5.phh
@@ -528,7 +528,7 @@ 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)
@@ -575,11 +575,9 @@ class Bin5_user extends User {
     {
         log_main("Bin5_user::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;
             }
             
@@ -594,7 +592,6 @@ 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"));
@@ -634,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);
     }
@@ -679,6 +675,8 @@ class Bin5_user extends User {
 
 
 class Bin5 {
+    static $delta_t = array();
+
   var $user;
   var $table;
   var $comm; // commands for many people
@@ -807,7 +805,6 @@ class Bin5 {
   // Bin5::load_data
   static function load_data($table_idx, $table_token = "") 
   {
-    $doexit = FALSE;
     $shm = FALSE;
 
     log_wr("TABLE_FTOK ".FTOK_PATH."/bin5/table".$table_idx."/table");
@@ -815,7 +812,6 @@ class Bin5 {
     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));
   }
@@ -1153,7 +1158,7 @@ class Bin5 {
       $fp = FALSE;
       do {
           if (file_exists(BIN5_PROXY_PATH) == FALSE)
-              mkdir(BIN5_PROXY_PATH);
+              mkdir(BIN5_PROXY_PATH, 0775, TRUE);
           if (($fp = @fopen(BIN5_PROXY_PATH."/garbage_time.expired", 'rb')) == FALSE)
               break;
           if (($s = fread($fp, 4)) == FALSE)
@@ -1177,7 +1182,7 @@ class Bin5 {
   {
       do {
           if (file_exists(BIN5_PROXY_PATH) == FALSE)
-              mkdir(BIN5_PROXY_PATH);
+              mkdir(BIN5_PROXY_PATH, 0775, TRUE);
           if (($fp = @fopen(BIN5_PROXY_PATH."/garbage_time.expired", 'wb')) == FALSE)
               break;
           fwrite($fp, pack("L",$tm));