some log_lock to log_main to clean log_lock entries and SHUTTA log more understandable

[brisk.git] / web / briskin5 / index_rd.php

diff --git a/web/briskin5/index_rd.php b/web/briskin5/index_rd.php
index 6da2eb0..115f9b5 100644 (file)
--- a/web/briskin5/index_rd.php
+++ b/web/briskin5/index_rd.php
@@ -52,10 +52,9 @@ if (DEBUGGING == "local" && $_SERVER['REMOTE_ADDR'] != '127.0.0.1') {
 
 function shutta()
 {
-  log_rd2("bin5 SHUTTA!".connection_status());
+  log_rd2("bin5 SHUTTA [".connection_status()."] !");
 }
 
-
 register_shutdown_function(shutta);
 
 function unrecerror()
@@ -76,9 +75,6 @@ function page_sync($sess, $page)
   return (sprintf('the_end=true; window.onbeforeunload = null; window.onunload = null; document.location.assign("%s");', $page));
 }
 
-
-
-
 function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_subst, &$new_step, $table_idx, $table_token)
 {
     GLOBAL $is_page_streaming, $first_loop, $S_load_stat;
@@ -88,13 +84,11 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
     $user = FALSE;
     $curtime = time();
     
-    if (($proxy_step = Bin5_user::step_get($sess)) == FALSE) {
+    if (($proxy_step = Bin5_user::load_step($sess)) == FALSE) {
         log_only2("R");
         return (FALSE);
     }
     
-    error_log("maincheck: step di i [".$proxy_step['i']."]", 0);
-
     // log_rd2("M");
     /* Sync check (read only without modifications */
     ignore_user_abort(TRUE);
@@ -102,13 +96,15 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
         if (($sem = Bin5::lock_data($table_idx)) != FALSE) { 
             // Aggiorna l'expire time lato server
             $S_load_stat['U_first_loop']++;
+
             if (($user = Bin5_user::load_data($table_idx, $proxy_step['i'], $sess)) == FALSE) {
                 Bin5::unlock_data();
                 ignore_user_abort(FALSE);
                 return (unrecerror());
             }
             $user->lacc = $curtime;
-            Bin5_user::save_data($user, $proxy_step['i'], $user->idx);
+
+            Bin5_user::save_data($user, $table_idx, $user->idx);
             
             if (Bin5::garbage_time_is_expired($curtime)) {
                 log_only("F");
@@ -125,7 +121,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
                 Bin5::save_data($bri);
                 unset($bri);
             }
-            log_lock("U");
+            log_main("infolock: U");
             Bin5::unlock_data($sem);
             ignore_user_abort(FALSE);
         } // if (($sem = Bin5::lock_data($table ...
@@ -139,7 +135,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
     } // if  ($first_loop == TRUE) {
     
     if ($cur_step == $proxy_step['s']) {
-        log_lock("P");
+        log_main("infolock: P");
         return (FALSE);
     }
     else {
@@ -152,10 +148,8 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
             if (($sem = Bin5::lock_data($table_idx)) == FALSE) 
                 break;
             
-            log_lock("P");
+            log_main("infolock: P");
             $S_load_stat['U_heavy']++;
-            // if (($bri = &Bin5::load_data($table_idx, $table_token)) == FALSE) 
-            // if (($user = Bin5_user::load_data($table_idx, $table_token)) == FALSE) 
             if (($user = Bin5_user::load_data($table_idx, $proxy_step['i'], $sess)) == FALSE) {
                 break;
             }
@@ -364,6 +358,12 @@ for ($i = 0 ; time() < $endtime ; $i++) {
     echo '_';
     flush();
   }
+ }
+
+$s = "[".$sess."] briskin5/index_rd.php stats: ";
+foreach ($S_load_stat as $key => $value) {
+    $s .= sprintf("%s: %d - ", $key, $value);
 }
+log_crit($s);
 
 ?>