From cd878766217f91ca79892cc434a41acbae002552 Mon Sep 17 00:00:00 2001
From: "Matteo Nastasi (mop)" <nastasi@alternativeoutput.it>
Date: Mon, 23 May 2011 15:07:31 +0200
Subject: [PATCH] S_load_stat managed to avoid double count and remove an
 element from the sum

---
 web/briskin5/index_rd.php |  8 ++++----
 web/index_rd.php          | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/web/briskin5/index_rd.php b/web/briskin5/index_rd.php
index db5b65a..300b85c 100644
--- a/web/briskin5/index_rd.php
+++ b/web/briskin5/index_rd.php
@@ -29,7 +29,7 @@ require_once("../Obj/brisk.phh");
 require_once("Obj/briskin5.phh");
 
 $S_load_stat = array( 'rU_heavy'      => 0,
-                      'wL_laccgarb'   => 0,
+                      'lL_laccgarb'   => 0,
                       'wU_lacc_upd'   => 0,
                       'wR_garbage'    => 0,
                       'wR_minusone'   => 0,
@@ -121,7 +121,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
             ignore_user_abort(FALSE);
             return ("sleep(gst,20000);|xhr_rd_abort(xhr_rd);");
         }
-        $S_load_stat['wL_laccgarb']++;
+        $S_load_stat['lL_laccgarb']++;
 
         unset($user);
         // load again the user data after new lock
@@ -210,6 +210,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
         log_only2("R");
     }
     
+    $S_load_stat['rU_heavy']++;
     if ($user == FALSE) {
         do {
             ignore_user_abort(TRUE);
@@ -217,7 +218,6 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
                 break;
             
             log_main("infolock: P");
-            $S_load_stat['rU_heavy']++;
             if (($user = Bin5_user::load_data($table_idx, $proxy_step['i'], $sess)) == FALSE) {
                 break;
             }
@@ -447,7 +447,7 @@ foreach ($S_load_stat as $key => $value) {
     $s .= sprintf("%s: %d - ", $key, $value);
     if (substr($key, 0, 1) == "w")
         $tw += $value;
-    else
+    else if (substr($key, 0, 1) == "r")
         $tr += $value;
 }
 $s = sprintf("briskin5/index_rd.php stats:  R: %d W: %d - %s", $tr, $tw, $s);
diff --git a/web/index_rd.php b/web/index_rd.php
index 8edbe79..40a057c 100644
--- a/web/index_rd.php
+++ b/web/index_rd.php
@@ -29,7 +29,7 @@ require_once("Obj/brisk.phh");
 require_once("briskin5/Obj/briskin5.phh");
 
 $S_load_stat = array( 'rU_heavy'      => 0,
-                      'wL_laccgarb'   => 0,
+                      'lL_laccgarb'   => 0,
                       'wU_lacc_upd'   => 0,
                       'wR_garbage'    => 0,
                       'wR_minusone'   => 0,
@@ -69,7 +69,7 @@ function blocking_error($is_unrecoverable)
   GLOBAL $is_page_streaming;
 
   $is_page_streaming = TRUE;
-  log_rd2("BLOCKING_ERROR UNREC: ".($is_unrecoverable ? "TRUE" : "FALSE"));
+  log_crit("BLOCKING_ERROR UNREC: ".($is_unrecoverable ? "TRUE" : "FALSE"));
   return (sprintf(($is_unrecoverable ? 'the_end=true; ' : '').'window.onbeforeunload = null; window.onunload = null; document.location.assign("index.php");'));
 }
 
@@ -142,7 +142,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
             ignore_user_abort(FALSE);
             return ("sleep(gst,20000);|xhr_rd_abort(xhr_rd);");
         }
-        $S_load_stat['wL_laccgarb']++;
+        $S_load_stat['lL_laccgarb']++;
 
         // load again the data after locking
         unset($user);
@@ -229,6 +229,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
         log_only2("R");
     }
 
+    $S_load_stat['rU_heavy']++;
     if ($user == FALSE) {
         do {
             ignore_user_abort(TRUE);
@@ -236,7 +237,6 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
                 break;
             
             log_main("infolock: P");
-            $S_load_stat['rU_heavy']++;
             if (($user = User::load_data($proxy_step['i'], $sess)) == FALSE) {
                 break;
             }
@@ -496,7 +496,7 @@ foreach ($S_load_stat as $key => $value) {
     $s .= sprintf("%s: %d - ", $key, $value);
     if (substr($key, 0, 1) == "w")
         $tw += $value;
-    else
+    else if (substr($key, 0, 1) == "r")
         $tr += $value;
 }
 $s = sprintf("index_rd.php stats:  R: %d W: %d - %s", $tr, $tw, $s);
-- 
2.17.1