X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=2a2d9eb6ce32740184cab74a74641d463cd18603;hb=8fe1e432c4661ebf186026f920d778d37dbe0953;hp=09b1da8481e77cefe9dc96301132c4c4d82ba2d1;hpb=1ccc2ec3beebfc0939ce8558a15f23e99b29dcaa;p=brisk.git

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 09b1da8..2a2d9eb 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -70,7 +70,7 @@ define(DBG_LOAD, 0x0100);
 define(DBG_AUTH, 0x0200);
 define(DBG_CRIT, 0x0400);
 define(DBG_LMOP, 0x0800);
-
+define(DBG_TRAC, 0x1000);
 // NOTE: BRISK DEBUG must be a numerical constant, not the result of operations on symbols 
 define(BRISK_DEBUG, 0xffffffbf);
 
@@ -134,12 +134,12 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi',
 $G_lng = langtolng($G_lang);
 
 $G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "3.4.3";
+$G_brisk_version = "3.5.3";
 
 /* MLANG: ALL THE INFO STRINGS IN brisk.phh */
-$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: versione di test per la nuova gestione dei dati volatili, rivista gestione del ticker.',
+$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: terza versione di test per la nuova gestione dei dati volatili, rivista gestione del ticker.',
                                        'Se vuoi iscriverti alla <a target="_blank" href="mailto:ml-briscola+subscribe@milug.org">Mailing List</a>, cliccala!' ),
-                       'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NEWS</b>: test version for the new volatile data management, ticker management refactored.',
+                       'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NEWS</b>: third test version for the new volatile data management, ticker management refactored.',
                                        'If you want to subscribe our <a target="_blank" href="ml-briscola+subscribe@milug.org">Mailing List</a>, click it!' ) );
 
 $G_room_help = array( 'it' => '
@@ -363,6 +363,23 @@ function xcapemesg($s)
 }
 
 
+class Vect {
+    function Vect($a)
+    {
+        $this->el = $a;
+    }
+    
+    function getbyid($idx)
+    {
+        return ($this->el[$idx]);
+    }
+    
+    function setbyid($idx, $v)
+    {
+        $this->el[$idx] = $v;
+    }
+}
+
 class Table {
   var $idx;
   var $player;
@@ -638,8 +655,6 @@ class User {
   }
 
   function create($idx, $name, $sess, $stat = "", $subst = "", $table = -1, $ip="0.0.0.0") {
-    // error_log("User::create BEGIN", 0);
-
     if (($thiz = new User()) == FALSE)
       return (FALSE);
 
@@ -804,7 +819,7 @@ class User {
     /*
     if (validate_sess($this->sess)) {
       if (file_exists(PROXY_PATH) == FALSE)
-        mkdir(PROXY_PATH);
+        mkdir(PROXY_PATH, 0775, TRUE);
       $fp = fopen(PROXY_PATH."/".$this->sess.".stat", 'w');
       fwrite($fp, sprintf("%s\n",$this->stat));
       fclose($fp);
@@ -816,16 +831,29 @@ class User {
   {
       $this->step = $step & 0x7fffffff;
       
+      return (TRUE);
+  }
+
+  function step_inc($delta = 1) {
+      $this->step += $delta;
+      /* modularization because unpack() not manage unsigned 32bit int correctly */
+      $this->step &= 0x7fffffff;
+      
+      return TRUE;
+  }
+
+  function save_step() 
+  {
       do {
           if (validate_sess($this->sess) == FALSE)
               break;
           if (file_exists(PROXY_PATH) == FALSE)
-              mkdir(PROXY_PATH);
+              mkdir(PROXY_PATH, 0775, TRUE);
           if (($fp = @fopen(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);
@@ -834,22 +862,32 @@ class User {
       return (FALSE);
   }
   
-  function step_inc($delta = 1) {
-      $this->step += $delta;
-      /* modularization because unpack() not manage unsigned 32bit int correctly */
-      $this->step &= 0x7fffffff;
-      
-      if (validate_sess($this->sess)) {
+  static function load_step($sess) 
+  {
+      $fp = FALSE;
+      do {
+          if (validate_sess($sess) == FALSE)
+              break;
+          
           if (file_exists(PROXY_PATH) == FALSE)
-              mkdir(PROXY_PATH);
-          $fp = fopen(PROXY_PATH."/".$this->sess.".step", 'w');
-          fwrite($fp, pack("LL", $this->step, $this->idx));
+              mkdir(PROXY_PATH, 0775, TRUE);
+          if (($fp = @fopen(PROXY_PATH."/".$sess.".step", 'rb')) == FALSE)
+              break;
+          if (($s = fread($fp, 8)) == FALSE)
+              break;
+          if (mb_strlen($s, "ASCII") != 8)
+              break;
+          $arr = unpack('Ls/Li', $s);
           fclose($fp);
-
-          log_main("step_inc [".$this->sess. "] [".$this->step."]"); 
           
-          return (TRUE);
-      }
+          // log_rd2("A0: ".$arr[0]."  A1: ".$arr[1]);
+          return ($arr);
+      } while (0);
+      
+      if ($fp != FALSE)
+          fclose($fp);
+      
+      log_rd2("STEP_GET [".$sess."]: return false ");
       
       return (FALSE);
   }
@@ -872,137 +910,106 @@ class User {
     $this->the_end = FALSE;
   }
 
-
-
-  // SHSPLIT save and load function for the User class.
   static function load_data($id, $sess) 
   {
-    // error_log("User::load_data BEGIN", 0);
-
-    log_main("load_data: id [".$id."] sess [".($sess == FALSE ? "FALSE" : $sess)."] ");
-
-    $doexit = FALSE;
-    do {
-      if (($tok = @ftok(FTOK_PATH."/user".$id, "B")) == -1) {
-	log_main("ftok failed");
-	$doexit = TRUE;
-	break;
-      }
-    
-      if (($shm_sz = sharedmem_sz($tok)) == -1) {
-	log_main("shmop_open failed");
-      }
-	
-      if ($shm_sz == -1)
-	$shm_sz = SHM_DIMS_U_MIN;
-
-      if ($shm = shm_attach($tok, $shm_sz)) {
-	$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");
-	  
-          // SHSPLIT FIXME: init_data for User class ??
-	  $user = User::create($id, "", "");
-	  if (@shm_put_var($shm, $tok, $user) == FALSE) {
-              log_only("PUT_VAR FALLITA ".strlen(serialize($user)));
-              log_only(serialize($user));
-	  }
-	}
-
-	$user->shm_sz = $shm_sz;
-	
-	shm_detach($shm);
-      }
+      log_main("load_data: id [".$id."] sess [".($sess == FALSE ? "FALSE" : $sess)."] ");
       
-      //  
-      // SHSPLIT: load users from the shared memory
-      //
-      return ($user);
-    } while (0);
-    
-    if ($doexit)
-      exit();
-    
-    return (FALSE);
+      do {
+          if (($tok = @ftok(FTOK_PATH."/user".$id, "B")) == -1) {
+              log_main("ftok failed");
+              break;
+          }
+          
+          if (($shm_sz = sharedmem_sz($tok)) == -1) {
+              log_main("shmop_open failed");
+          }
+          
+          if ($shm_sz == -1)
+              $shm_sz = SHM_DIMS_U_MIN;
+          
+          if ($shm = shm_attach($tok, $shm_sz)) {
+              $user = @shm_get_var($shm, $tok);
+              
+              if ($sess != FALSE && $user->sess != $sess) {
+                  break;
+              }
+              log_only("user ==  ".($user == FALSE ?   "FALSE" : "TRUE")."  user ===  ".($user === FALSE ? "FALSE" : "TRUE")."  user isset ".(isset($user) ?   "TRUE" : "FALSE"));
+              
+              if ($user == FALSE) {
+                  log_only("INIT MAIN DATA");
+                  
+                  // SHSPLIT FIXME: init_data for User class ??
+                  $user = User::create($id, "", "");
+                  if (@shm_put_var($shm, $tok, $user) == FALSE) {
+                      log_only("PUT_VAR FALLITA ".strlen(serialize($user)));
+                      log_only(serialize($user));
+                  }
+              }
+              else {
+                  if ($sess != FALSE) {
+                      /*
+                       *  NOTE:  this part is for check only, theoretically 
+                       *         user->step anch proxy_step are set allways at the same value
+                       */
+                      $old_step = $user->step;
+                      $arr = User::load_step($sess);
+                      $user->step = $arr['s'];
+                      if ($old_step != $user->step) {
+                          log_crit("steps are diffetents User->step ".$user->step." Old_step: ".$old_step);
+                      }
+                  }
+              }
+              $user->shm_sz = $shm_sz;
+              
+              shm_detach($shm);
+          }
+          
+          //  
+          // SHSPLIT: load users from the shared memory
+          //
+          return ($user);
+      } while (0);
+      
+      return (FALSE);
   }
   
 
-  function save_data($user, $id) 
+  static function save_data($user, $id) 
   {
-    GLOBAL $sess;
-    
-    $shm =   FALSE;
-    
-    // var_dump($user);
-    // error_log("User::save_data BEGIN", 0);
-
-    if (($tok = @ftok(FTOK_PATH."/user".$id, "B")) == -1) {
-      return (FALSE);
-    }
-    while ($user->shm_sz < SHM_DIMS_U_MAX) {
-      if (($shm = shm_attach($tok, $user->shm_sz)) == FALSE)
-	break;
+      GLOBAL $sess;
       
-      // log_only("PUT_VAR DI ".strlen(serialize($user)));
-      if (shm_put_var($shm, $tok, $user) != FALSE) {
-	shm_detach($shm);
-	log_main("User[".$id."] saved.");
-	return (TRUE);
-      }
-      if (shm_remove($shm) === FALSE) {
-	log_only("REMOVE FALLITA");
-	break;
+      $shm =   FALSE;
+      
+      if (($tok = @ftok(FTOK_PATH."/user".$id, "B")) == -1) {
+          return (FALSE);
       }
-      shm_detach($shm);
-      $user->shm_sz += SHM_DIMS_U_DLT;
-    } 
-
-    if ($shm)
-      shm_detach($shm);
-    
-    return (FALSE);
-  }
-
-
-  static function step_get($sess)
-  {
-      $fp = FALSE;
-      do {
-          if (validate_sess($sess) == FALSE)
+      while ($user->shm_sz < SHM_DIMS_U_MAX) {
+          if (($shm = shm_attach($tok, $user->shm_sz)) == FALSE)
               break;
           
-          if (file_exists(PROXY_PATH) == FALSE)
-              mkdir(PROXY_PATH);
-          if (($fp = @fopen(PROXY_PATH."/".$sess.".step", 'rb')) == FALSE)
-              break;
-          if (($s = fread($fp, 8)) == FALSE)
-              break;
-          if (strlen($s) != 8)
+          // log_only("PUT_VAR DI ".strlen(serialize($user)));
+          if (shm_put_var($shm, $tok, $user) != FALSE) {
+              shm_detach($shm);
+              if ($user->sess != "")
+                  $user->save_step();
+              log_main("User[".$id."] saved.");
+              return (TRUE);
+          }
+          if (shm_remove($shm) === FALSE) {
+              log_only("REMOVE FALLITA");
               break;
-          $arr = unpack('Ls/Li', $s);
-          fclose($fp);
-          
-          // log_rd2("A0: ".$arr[0]."  A1: ".$arr[1]);
-          return ($arr);
-      } while (0);
-      
-      if ($fp != FALSE)
-          fclose($fp);
+          }
+          shm_detach($shm);
+          $user->shm_sz += SHM_DIMS_U_DLT;
+      } 
       
-      log_rd2("STEP_GET [".$sess."]: return false ");
+      if ($shm)
+          shm_detach($shm);
       
       return (FALSE);
   }
 
+
 } // end class User
 
 
@@ -1015,6 +1022,8 @@ function step_unproxy($sess) {
 
 
 class Room {
+    static $delta_t;
+
   var $user;
   var $table;
   var $comm; // commands for many people
@@ -1101,7 +1110,7 @@ class Room {
 
 	      // is the end of the table
 	      if ($bri->the_end == TRUE) {
-		/*
+                  /*
 		 *  DESTROY OF FINISHED TABLE && MOVE PLAYER TO ROOM AGAIN
 		 */
 		log_main("garbage_manager: INSIDE THE END.");
@@ -2033,7 +2042,6 @@ class Room {
             log_auth("XXX", "authenticate: ".($authenticate != FALSE ? "TRUE" : "FALSE"));
             
             if ($authenticate != FALSE) {
-                // error_log(print_r(&$authenticate, TRUE),0);
                 $user_type = $authenticate->type_get();
             }
             else {
@@ -2244,14 +2252,10 @@ class Room {
   function load_data() 
   {
     GLOBAL $sess;
-    $doexit = FALSE;
-
-    // error_log("Room::load_data BEGIN", 0);
 
     do {
       if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) {
 	log_main("ftok failed");
-	$doexit = TRUE;
 	break;
       }
     
@@ -2273,8 +2277,6 @@ class Room {
               log_only("INIT MAIN DATA");
               shm_detach($shm);
               
-              // error_log("DE CHE", 0);
-
               $room = Room::create();
               
               if (Room::save_data($room) == FALSE)
@@ -2287,7 +2289,13 @@ class Room {
           shm_detach($shm);
 
           for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
-              $room->user[$i] = User::load_data($i, FALSE);
+              if (($room->user[$i] = User::load_data($i, FALSE)) == FALSE) {
+                  log_crit("Bin5_user::load_data failed");
+                  break;
+              }
+          }
+          if ($i < MAX_PLAYERS) {
+              break;
           }
       }
       
@@ -2297,9 +2305,6 @@ class Room {
       return ($room);
     } while (0);
     
-    if ($doexit)
-      exit();
-    
     return (FALSE);
   }
   
@@ -2346,9 +2351,6 @@ class Room {
       $ret =   FALSE;
       $shm =   FALSE;
     
-      // var_dump($room);
-      // error_log("Room::save_data BEGIN", 0);
-    
       if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) 
           return (FALSE);
     
@@ -2403,8 +2405,10 @@ class Room {
       if (($res = sem_get($tok)) == FALSE) {
           return (FALSE);
       }
-      if (sem_acquire($res)) {   
-          log_lock("LOCK room");
+      if (sem_acquire($res)) {
+          self::$delta_t = microtime(TRUE);
+          log_lock("LOCK   room         [".self::$delta_t."]");
+
           return ($res);
       }
       else
@@ -2415,7 +2419,7 @@ class Room {
   {
     GLOBAL $sess; 
     
-    log_lock("UNLOCK room");
+    log_lock("UNLOCK room         [".(microtime(TRUE) - (self::$delta_t))."]");
 
     return (sem_release($res));
   }
@@ -2501,12 +2505,12 @@ class Room {
       $fp = FALSE;
       do {
           if (file_exists(PROXY_PATH) == FALSE)
-              mkdir(PROXY_PATH);
-          if (($fp = @fopen(PROXY_PATH."/room_garbage_time.expired", 'rb')) == FALSE)
+              mkdir(PROXY_PATH, 0775, TRUE);
+          if (($fp = @fopen(PROXY_PATH."/garbage_time.expired", 'rb')) == FALSE)
               break;
           if (($s = fread($fp, 4)) == FALSE)
               break;
-          if (strlen($s) != 4)
+          if (mb_strlen($s, "ASCII") != 4)
               break;
           $arr = unpack('Le', $s);
           if ($arr['e'] > $tm)
@@ -2525,8 +2529,8 @@ class Room {
   {
       do {
           if (file_exists(PROXY_PATH) == FALSE)
-              mkdir(PROXY_PATH);
-          if (($fp = @fopen(PROXY_PATH."/room_garbage_time.expired", 'wb')) == FALSE)
+              mkdir(PROXY_PATH, 0775, TRUE);
+          if (($fp = @fopen(PROXY_PATH."/garbage_time.expired", 'wb')) == FALSE)
               break;
           fwrite($fp, pack("L",$tm));
           fclose($fp);
@@ -2578,7 +2582,10 @@ function log_mop($step, $log)
     if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LMOP) == 0)
         return;
     
-    $btrace = btrace_line(debug_backtrace());
+    if (BRISK_DEBUG & DBG_TRAC) 
+        $btrace = btrace_line(debug_backtrace());
+    else
+        $btrace = "";
     if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
         fwrite($fp, sprintf("LMOP: [%f] [%05d] [%s] [%s]\n", gettimeofday(TRUE), $step, $log, $btrace));
         fclose($fp);
@@ -2601,7 +2608,10 @@ function log_only2($log)
     if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_ONL2) == 0)
         return;
     
-    $btrace = btrace_line(debug_backtrace());
+    if (BRISK_DEBUG & DBG_TRAC) 
+        $btrace = btrace_line(debug_backtrace());
+    else
+        $btrace = "";
     if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
         fwrite($fp, sprintf("ONL2: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
         fclose($fp);
@@ -2623,7 +2633,10 @@ function log_crit($log)
     if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_CRIT) == 0)
         return;
     
-    $btrace = btrace_line(debug_backtrace());
+    if (BRISK_DEBUG & DBG_TRAC) 
+        $btrace = btrace_line(debug_backtrace());
+    else
+        $btrace = "";
     if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
         fwrite($fp, sprintf("CRIT: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
         fclose($fp);
@@ -2645,7 +2658,10 @@ function log_only($log)
     if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_ONLY) == 0)
         return;
     
-    $btrace = btrace_line(debug_backtrace());
+    if (BRISK_DEBUG & DBG_TRAC) 
+        $btrace = btrace_line(debug_backtrace());
+    else
+        $btrace = "";
     if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
         fwrite($fp, sprintf("ONLY: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
         fclose($fp);
@@ -2667,7 +2683,10 @@ function log_main($log)
     if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_MAIN) == 0)
         return;
     
-    $btrace = btrace_line(debug_backtrace());
+    if (BRISK_DEBUG & DBG_TRAC) 
+        $btrace = btrace_line(debug_backtrace());
+    else
+        $btrace = "";
     if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
         fwrite($fp, sprintf("MAIN: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
         fclose($fp);
@@ -2688,8 +2707,11 @@ function log_rd($log)
     
     if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_READ) == 0)
         return;
-    
-    $btrace = btrace_line(debug_backtrace());
+
+    if (BRISK_DEBUG & DBG_TRAC) 
+        $btrace = btrace_line(debug_backtrace());
+    else
+        $btrace = "";    
     if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
         fwrite($fp, sprintf("READ: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
         fclose($fp);
@@ -2711,7 +2733,10 @@ function log_rd2($log)
     if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_REA2) == 0)
         return;
     
-    $btrace = btrace_line(debug_backtrace());
+    if (BRISK_DEBUG & DBG_TRAC) 
+        $btrace = btrace_line(debug_backtrace());
+    else
+        $btrace = "";
     
     if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
         fwrite($fp, sprintf("REA2: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
@@ -2734,7 +2759,10 @@ function log_send($log)
     if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_SEND) == 0)
         return;
     
-    $btrace = btrace_line(debug_backtrace());
+    if (BRISK_DEBUG & DBG_TRAC) 
+        $btrace = btrace_line(debug_backtrace());
+    else
+        $btrace = "";
     if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
         fwrite($fp, sprintf("SEND: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
         fclose($fp);
@@ -2756,7 +2784,10 @@ function log_lock($log)
     if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LOCK) == 0)
         return;
     
-    $btrace = btrace_line(debug_backtrace());
+    if (BRISK_DEBUG & DBG_TRAC) 
+        $btrace = btrace_line(debug_backtrace());
+    else
+        $btrace = "";
     if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
         fwrite($fp, sprintf("LOCK: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
         fclose($fp);
@@ -2778,7 +2809,10 @@ function log_wr($log)
     if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_WRIT) == 0)
         return;
     
-    $btrace = btrace_line(debug_backtrace());
+    if (BRISK_DEBUG & DBG_TRAC) 
+        $btrace = btrace_line(debug_backtrace());
+    else
+        $btrace = "";
     if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
         fwrite($fp, sprintf("WRIT: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
         fclose($fp);
@@ -2800,7 +2834,10 @@ function log_load($log)
     if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LOAD) == 0)
         return;
     
-    $btrace = btrace_line(debug_backtrace());
+    if (BRISK_DEBUG & DBG_TRAC) 
+        $btrace = btrace_line(debug_backtrace());
+    else
+        $btrace = "";
     if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
         fwrite($fp, sprintf("LOAD: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
         fclose($fp);
@@ -2817,7 +2854,10 @@ function log_auth($sess, $log)
     if (( (BRISK_DEBUG | ($sess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_AUTH) == 0)
         return;
     
-    $btrace = btrace_line(debug_backtrace());
+    if (BRISK_DEBUG & DBG_TRAC) 
+        $btrace = btrace_line(debug_backtrace());
+    else
+        $btrace = "";
     if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
         fwrite($fp, sprintf("LOAD: [%s] [%d] [%s] [%s]\n", $sess, time(), $log, $btrace));
         fclose($fp);
@@ -2839,28 +2879,6 @@ function log_legal($curtime, $user, $where, $mesg)
   }
 }
 
-
-function lock_banlist()
-{
-  if (($tok = @ftok(FTOK_PATH."/main", "L")) == -1) {
-    echo "FTOK FAILED";
-    exit;
-  }
-  if (($res = sem_get($tok)) == FALSE) {
-    echo "SEM_GET FAILED";
-    exit;
-  }
-  if (sem_acquire($res)) 
-    return ($res);
-  else
-    return (FALSE);
-}
-
-function unlock_banlist($res)
-{
-  return (sem_release($res));
-}
-
 function table_act_content($isstanding, $sitted, $table, $cur_table, $allowed)
 {
   $ret = "";
@@ -2945,6 +2963,8 @@ function secstoword($secs)
 {
   GLOBAL $G_lang;
 
+  $ret = "";
+
   $mins = floor($secs / 60);
   $secs = $secs % 60;
   if ($G_lang == 'en') {
@@ -2978,6 +2998,8 @@ function sharedmem_sz($tok)
 }    
 
 class Warrant {
+    static $delta_t;
+
   function lock_data()
   {
     GLOBAL $sess; 
@@ -2990,7 +3012,8 @@ class Warrant {
       return (FALSE);
     }
     if (sem_acquire($res)) {   
-      log_lock("LOCK warrant");
+        self::$delta_t = microtime(TRUE);
+        log_lock("LOCK   warrant      [".self::$delta_t."]");
       return ($res);
     }
     else
@@ -3001,13 +3024,15 @@ class Warrant {
   {
     GLOBAL $sess; 
     
-    log_lock("UNLOCK warrant");
-    
+    log_lock("UNLOCK warrant      [".(microtime(TRUE) - (self::$delta_t))."]");
+
     return (sem_release($res));
   }
 }
 
 class Poll {
+    static $delta_t;
+
   function lock_data()
   {
     GLOBAL $sess; 
@@ -3019,9 +3044,11 @@ class Poll {
     if (($res = sem_get($tok)) == FALSE) {
       return (FALSE);
     }
-    if (sem_acquire($res)) {   
-      log_lock("LOCK poll");
-      return ($res);
+    if (sem_acquire($res)) {
+        self::$delta_t = microtime(TRUE);
+        log_lock("LOCK   poll         [".self::$delta_t."]");
+      
+        return ($res);
     }
     else
       return (FALSE);
@@ -3031,7 +3058,7 @@ class Poll {
   {
     GLOBAL $sess; 
     
-    log_lock("UNLOCK poll");
+    log_lock("UNLOCK poll         [".(microtime(TRUE) - (self::$delta_t))."]");
     
     return (sem_release($res));
   }