X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=a5bec276d13ecb9383ac991c12b105c4e2427932;hb=ff3c49ff3cbad45961f1a8d5264f587598134556;hp=4abdd86693f724d1606de5875f48aa741be97832;hpb=e71902002186de31f72f2ceed43f90dfc2efd19e;p=brisk.git

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 4abdd86..a5bec27 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -1079,7 +1079,9 @@ class Room {
     $curtime = time();
 
     // externalized if ($force || $this->garbage_timeout < $curtime) {
-    if ($force || Room::garbage_time_is_expired($curtime)) {
+    if (!$force && !Room::garbage_time_is_expired($curtime)) {
+        return ($ismod);
+    }
       
       // FIXME BRISK4: include for each kind of table
       require_once("${G_base}briskin5/Obj/briskin5.phh");
@@ -1143,7 +1145,8 @@ class Room {
 		$this->room_join_wakeup($user_cur, FALSE, 0); 
 		$table_cur->table_token = "";
                 $table_cur->wakeup_time = $curtime + WAKEUP_TIME;
-		Bin5::destroy_data($table_idx);
+                        
+                        $bri->destroy_data($table_idx);
 	      }
 	      else {
 		log_main("gm:: save_data");
@@ -1231,7 +1234,6 @@ class Room {
       // externalized $this->garbage_timeout = time() + GARBAGE_TIMEOUT;
       Room::garbage_time_expire_set($curtime + GARBAGE_TIMEOUT);
       $ismod = TRUE;
-    }
 
     return ($ismod);
   }
@@ -2576,6 +2578,16 @@ function btrace_line($ar)
     return ($ret);
 }
 
+function trace_ftok($id, $add)
+{
+    // NOTE: without space to use sed to substitute "= @ftok("  with "= @ftok("
+    $tok=@ftok($id, $add);
+
+    log_shme($tok.": ".$id." + ".$add);
+
+    return ($tok);
+}
+
 function log_mop($step, $log)
 {
     GLOBAL $sess, $PHP_SELF;