X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2FObj%2Fbriskin5.phh;h=7b26f010fdfd57b7490612a43c08726922e15268;hb=e71902002186de31f72f2ceed43f90dfc2efd19e;hp=164fb50af7135ee02e192b4ab51cf50c63f25c2e;hpb=e47ddcae6cc33ed9d2471a54936db7d8efd5d46a;p=brisk.git

diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh
index 164fb50..7b26f01 100644
--- a/web/briskin5/Obj/briskin5.phh
+++ b/web/briskin5/Obj/briskin5.phh
@@ -570,6 +570,14 @@ class Bin5_user extends User {
         return (FALSE);
     }
     
+    static function unproxy_step($tab_id, $sess)
+    {
+        log_rd2("UNPROXY: ".BIN5_PROXY_PATH."/table".$tab_id."/".$sess.".step");
+        if (file_exists(BIN5_PROXY_PATH."/table".$tab_id) == FALSE)
+            return;
+
+        @unlink(BIN5_PROXY_PATH."/table".$tab_id."/".$sess.".step");
+    }
     
     static function load_data($tab_id, $id, $sess) 
     {
@@ -604,6 +612,8 @@ class Bin5_user extends User {
                     // SHSPLIT FIXME: init_data for User class ??
                     $user = User::create($id, "", "");
                     if (@shm_put_var($shm, $tok, $user) == FALSE) {
+                        log_shme("Bin5_user::save_data2");
+
                         log_only("PUT_VAR FALLITA ".strlen(serialize($user)));
                         log_only(serialize($user));
                     }
@@ -652,10 +662,13 @@ class Bin5_user extends User {
               break;
           
           // log_only("PUT_VAR DI ".strlen(serialize($user)));
-          if (shm_put_var($shm, $tok, $user) != FALSE) {
+          if (@shm_put_var($shm, $tok, $user) != FALSE) {
               shm_detach($shm);
               $user->save_step();
               log_main("User[".$id."] saved.");
+
+              log_shme("Bin5_user::save_data");
+
               return (TRUE);
           }
           if (shm_remove($shm) === FALSE) {
@@ -774,7 +787,7 @@ class Bin5 {
 
 	    $tmp_sess = $user_cur->sess;
 	    $user_cur->sess = "";
-	    step_unproxy($tmp_sess);
+	    Bin5_user::step_unproxy($tmp_sess);
 	    $user_cur->name = "";
 	    $user_cur->the_end = FALSE;
 	    
@@ -882,6 +895,9 @@ class Bin5 {
               break;
           
           if (@shm_put_var($shm, $bri->tok, $bri) != FALSE) {
+
+              log_shme("Bin5::save_data");
+
               $ret = TRUE;
               break;
           }
@@ -917,9 +933,12 @@ class Bin5 {
     log_main("DESTROY BRISKIN5 DATA");
     
     do {
-      log_main("DESTROY2 BRISKIN5 DATA");
-
-      if (($tok = @ftok(FTOK_PATH."/bin5/table".$table_idx."/table", "B")) == -1) 
+      log_main("DESTROY2 BRISKIN5 DATA [".$this->table_idx."]");
+      for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
+          $this->user[$i]->destroy_data($this->table_idx);
+          Bin5_user::unproxy_step($this->table_idx, $this->user[$i]->sess);
+      }
+      if (($tok = @ftok(FTOK_PATH."/bin5/table".$this->table_idx."/table", "B")) == -1) 
 	break;
 
       if (($shm = @shmop_open($tok, 'a', 0, 0)) == FALSE)