Trace is optionally now, Vect class added, lock-meter added in log file.

[brisk.git] / web / Obj / brisk.phh

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index ca9a140..50bc009 100644 (file)
--- 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.5.0";
+$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>: seconda 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>: second 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;
@@ -814,6 +831,19 @@ 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;
@@ -823,7 +853,7 @@ class User {
               break;
           fwrite($fp, pack("LL",$this->step, $this->idx));
           fclose($fp);
-
+          
           log_main("step_set [".$this->sess. "] [".$this->step."]"); 
           
           return (TRUE);
@@ -832,27 +862,7 @@ 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)) {
-          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));
-          fclose($fp);
-
-          log_main("step_inc [".$this->sess. "] [".$this->step."]"); 
-          
-          return (TRUE);
-      }
-      
-      return (FALSE);
-  }
-
-  static function step_get($sess)
+  static function load_step($sess) 
   {
       $fp = FALSE;
       do {
@@ -865,7 +875,7 @@ class User {
               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);
@@ -938,7 +948,20 @@ class 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);
@@ -973,6 +996,8 @@ class User {
           // 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);
           }
@@ -1003,6 +1028,8 @@ function step_unproxy($sess) {
 
 
 class Room {
+    static $delta_t;
+
   var $user;
   var $table;
   var $comm; // commands for many people
@@ -2383,8 +2410,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
@@ -2395,7 +2424,7 @@ class Room {
   {
     GLOBAL $sess; 
     
-    log_lock("UNLOCK room");
+    log_lock("UNLOCK room         [".(microtime(TRUE) - (self::$delta_t))."]");
 
     return (sem_release($res));
   }
@@ -2486,7 +2515,7 @@ class Room {
               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)
@@ -2558,7 +2587,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);
@@ -2581,7 +2613,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);
@@ -2603,7 +2638,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);
@@ -2625,7 +2663,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);
@@ -2647,7 +2688,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);
@@ -2668,8 +2712,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);
@@ -2691,7 +2738,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));
@@ -2714,7 +2764,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);
@@ -2736,7 +2789,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);
@@ -2758,7 +2814,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);
@@ -2780,7 +2839,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);
@@ -2797,7 +2859,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);
@@ -2819,28 +2884,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 = "";
@@ -2960,6 +3003,8 @@ function sharedmem_sz($tok)
 }    
 
 class Warrant {
+    static $delta_t;
+
   function lock_data()
   {
     GLOBAL $sess; 
@@ -2972,7 +3017,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
@@ -2983,13 +3029,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; 
@@ -3001,9 +3049,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);
@@ -3013,7 +3063,7 @@ class Poll {
   {
     GLOBAL $sess; 
     
-    log_lock("UNLOCK poll");
+    log_lock("UNLOCK poll         [".(microtime(TRUE) - (self::$delta_t))."]");
     
     return (sem_release($res));
   }