X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2Findex_rd.php;h=3e7aa04e786c698b2fbb00d8a57fd300661d6cf1;hb=43cab39ea58529cd2442c28f4157bb7efc97856f;hp=db5b65a53227098c9010bf15d656838e409a97f7;hpb=46c25abf38a8b51b4493421c1e13a00735274d75;p=brisk.git

diff --git a/web/briskin5/index_rd.php b/web/briskin5/index_rd.php
index db5b65a..3e7aa04 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,
@@ -64,7 +64,7 @@ function blocking_error($is_unrecoverable)
 
   $is_page_streaming = TRUE;
   log_rd2("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");'));
+  return (sprintf(($is_unrecoverable ? 'hstm.stop(); ' : '').'window.onbeforeunload = null; window.onunload = null; document.location.assign("../index.php");'));
 }
 
 function page_sync($sess, $page)
@@ -73,7 +73,7 @@ function page_sync($sess, $page)
 
   $is_page_streaming = TRUE;
   log_rd2("PAGE_SYNC");
-  return (sprintf('the_end=true; window.onbeforeunload = null; window.onunload = null; document.location.assign("%s");', $page));
+  return (sprintf('hstm.stop(); 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)
@@ -100,7 +100,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
     if (($sem = Bin5::lock_data(FALSE, $table_idx)) == FALSE) { 
         // wait 20 secs, then restart the xhr 
         ignore_user_abort(FALSE);
-        return ("sleep(gst,20000);|xhr_rd_abort(xhr_rd);");
+        return ("sleep(gst,20000);|hstm.xhr_abort();");
     }
 
     if (($user = Bin5_user::load_data($table_idx, $proxy_step['i'], $sess)) == FALSE) {
@@ -119,9 +119,9 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
         if (($sem = Bin5::lock_data(TRUE, $table_idx)) == FALSE) { 
             // wait 20 secs, then restart the xhr 
             ignore_user_abort(FALSE);
-            return ("sleep(gst,20000);|xhr_rd_abort(xhr_rd);");
+            return ("sleep(gst,20000);|hstm.xhr_abort();");
         }
-        $S_load_stat['wL_laccgarb']++;
+        $S_load_stat['lL_laccgarb']++;
 
         unset($user);
         // load again the user data after new lock
@@ -196,7 +196,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
 //         else {
 //             ignore_user_abort(FALSE);
             
-//             return ("sleep(gst,20000);|xhr_rd_abort(xhr_rd);");
+//             return ("sleep(gst,20000);|hstm.xhr_abort();");
 //         }
         
 //         $first_loop = FALSE;
@@ -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;
             }
@@ -259,7 +259,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
             ignore_user_abort(FALSE);
             return (blocking_error(TRUE));
         }
-        if ($user->the_end) {
+        if ($user->the_end == TRUE) {
             log_rd2("main_check: the end".var_export(debug_backtrace()));
             $is_page_streaming = TRUE;
         }
@@ -337,7 +337,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
                 $new_step =  $user->step;
             } while (0);
             
-            log_mop($user->step, 'bin::index_rd.php: after ret set');
+            log_rd2($user->step, 'bin::index_rd.php: after ret set');
             
             if ($user->the_end == TRUE) {
                 log_rd2("LOGOUT BYE BYE!!");
@@ -394,7 +394,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
    step
 */
 
-$is_page_streaming =  (webservers_exceeded() || stristr($HTTP_USER_AGENT, "MSIE") || stristr($HTTP_USER_AGENT, "CHROME") ? TRUE : FALSE);
+$is_page_streaming =  (webservers_exceeded() || stristr($HTTP_USER_AGENT, "Mozilla/5.0 (Windows NT 6.1; rv:5.0)") || stristr($HTTP_USER_AGENT, "MSIE") || stristr($HTTP_USER_AGENT, "CHROME") ? TRUE : FALSE);
 
 header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
 header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); // Date in the past
@@ -402,11 +402,11 @@ header('Content-type: application/xml; charset="utf-8"',true);
 // header('Content-type: text/plain; charset="utf-8"',true);
 // header('Content-type: text/html; charset="utf-8"',true);
 
-if (!isset($myfrom))
-     $myfrom = "";
+if (!isset($from))
+     $from = "";
 if (!isset($subst))
      $subst = "";
-log_rd2("FROM OUTSIDE - STAT: ".$stat." SUBST: ".$subst." STEP: ".$step." MYFROM: ".$myfrom. "IS_PAGE:" . $is_page_streaming."USER_AGENT:".$HTTP_USER_AGENT."  TABLE:".$table_idx);
+log_rd2("FROM OUTSIDE - STAT: ".$stat." SUBST: ".$subst." STEP: ".$step." FROM: ".$from. "IS_PAGE:" . $is_page_streaming."USER_AGENT:".$HTTP_USER_AGENT."  TABLE:".$table_idx);
 
 
 $endtime = time() + STREAM_TIMEOUT;
@@ -423,8 +423,8 @@ for ($i = 0 ; time() < $endtime ; $i++) {
     echo "$ret";
     echo ' @END@'; 
     log_send("EXT_STEP: ".$ext_step." ENDTIME: [".$endtime."] ".$ret);
-    flush();
-    log_mop(0, 'bin::index_rd.php: after flush (begin: '.sprintf("%f", $pre_main).')');
+    mop_flush();
+    log_rd2(0, 'bin::index_rd.php: after mop_flush (begin: '.sprintf("%f", $pre_main).')');
     if ($is_page_streaming)
       break;
   }
@@ -436,7 +436,7 @@ for ($i = 0 ; time() < $endtime ; $i++) {
   if (($i % 10) == 0) {
     // log_rd2("TIME: ".time());
     echo '_';
-    flush();
+    mop_flush();
   }
  }
 
@@ -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);