X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2Findex_rd.php;h=0a66fc8cf9e5abecd8c3de77629fda995343ba41;hb=0b1e5521bd8d1c7b6f349038fe4daa819da11d0e;hp=1de3bd613d7f24e63f853d7cb6a93221290ac11d;hpb=8e6645e3502b269d768bbb43e30b70bf96a2cdaf;p=brisk.git

diff --git a/web/briskin5/index_rd.php b/web/briskin5/index_rd.php
index 1de3bd6..0a66fc8 100644
--- a/web/briskin5/index_rd.php
+++ b/web/briskin5/index_rd.php
@@ -2,7 +2,7 @@
 /*
  *  brisk - briskin5/index_rd.php
  *
- *  Copyright (C) 2006-2011 Matteo Nastasi
+ *  Copyright (C) 2006-2012 Matteo Nastasi
  *                          mailto: nastasi@alternativeoutput.it 
  *                                  matteo.nastasi@milug.org
  *                          web: http://www.alternativeoutput.it
@@ -28,11 +28,12 @@ require_once("../Obj/brisk.phh");
 // require_once("../Obj/proxyscan.phh");
 require_once("Obj/briskin5.phh");
 
-$S_load_stat = array( 'U_first_loop' => 0,
-                      'U_heavy'      => 0,
-                      'R_garbage'    => 0,
-                      'R_minusone'   => 0,
-                      'R_the_end'    => 0 );
+$S_load_stat = array( 'rU_heavy'      => 0,
+                      'lL_laccgarb'   => 0,
+                      'wU_lacc_upd'   => 0,
+                      'wR_garbage'    => 0,
+                      'wR_minusone'   => 0,
+                      'wR_the_end'    => 0 );
 
 // Use of proxies isn't allowed.
 // if (is_proxy()) {
@@ -42,7 +43,7 @@ $S_load_stat = array( 'U_first_loop' => 0,
 
 log_load("LOAD: bin5/index_rd.php ".$QUERY_STRING);
 
-$first_loop = TRUE;
+// $first_loop = TRUE;
 $the_end = FALSE;
 
 if (DEBUGGING == "local" && $_SERVER['REMOTE_ADDR'] != '127.0.0.1') {
@@ -57,13 +58,13 @@ function shutta()
 
 register_shutdown_function(shutta);
 
-function unrecerror()
+function blocking_error($is_unrecoverable)
 {
   GLOBAL $is_page_streaming;
 
   $is_page_streaming = TRUE;
-  log_rd2("UNREC_ERROR");
-  return (sprintf('the_end=true; window.onbeforeunload = null; window.onunload = null; document.location.assign("../index.php");'));
+  log_rd2("BLOCKING_ERROR UNREC: ".($is_unrecoverable ? "TRUE" : "FALSE"));
+  return (sprintf(($is_unrecoverable ? 'xstm.stop(); ' : '').'window.onbeforeunload = null; window.onunload = null; document.location.assign("../index.php");'));
 }
 
 function page_sync($sess, $page)
@@ -72,13 +73,14 @@ 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('xstm.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)
 {
-    GLOBAL $is_page_streaming, $first_loop, $S_load_stat;
-    
+    GLOBAL $is_page_streaming, $S_load_stat;
+    // GLOBAL $first_loop;
+
     $ret = FALSE;
     $bri = FALSE;
     $user = FALSE;
@@ -86,53 +88,119 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
 
     if (($proxy_step = Bin5_user::load_step($table_idx, $sess)) == FALSE) {
         log_only2("R");
-        return (FALSE);
+        ignore_user_abort(FALSE);
+        return (blocking_error(TRUE));
     }
     
     // log_rd2("M");
     /* Sync check (read only without modifications */
     ignore_user_abort(TRUE);
-    if  ($first_loop == TRUE) {
-        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) {
+    // shared locking to load info
+    if (($sem = Bin5::lock_data(FALSE, $table_idx)) == FALSE) { 
+        // wait 20 secs, then restart the xhr 
+        ignore_user_abort(FALSE);
+        return ("sleep(gst,20000);|xstm.xhr_abort();");
+    }
+
+    if (($user = Bin5_user::load_data($table_idx, $proxy_step['i'], $sess)) == FALSE) {
+        Bin5::unlock_data($sem);
+        ignore_user_abort(FALSE);
+        return (blocking_error(TRUE));
+    }
+
+    /* if lacc time great than STREAM_TIMEOUT or the room garbage_time is expired 
+        switch to exclusive locking and verify again the conditions */
+
+    if ((($curtime - $user->lacc) > STREAM_TIMEOUT) || Bin5::garbage_time_is_expired($table_idx, $curtime)) {
+        Bin5::unlock_data($sem);
+        
+        // exclusive locking to modify info
+        if (($sem = Bin5::lock_data(TRUE, $table_idx)) == FALSE) { 
+            // wait 20 secs, then restart the xhr 
+            ignore_user_abort(FALSE);
+            return ("sleep(gst,20000);|xstm.xhr_abort();");
+        }
+        $S_load_stat['lL_laccgarb']++;
+
+        unset($user);
+        // load again the user data after new lock
+        if (($user = Bin5_user::load_data($table_idx, $proxy_step['i'], $sess)) == FALSE) {
+            Bin5::unlock_data($sem);
+            ignore_user_abort(FALSE);
+            return (blocking_error(TRUE));
+        }
+
+        if (($curtime - $user->lacc) > STREAM_TIMEOUT) {
+            $S_load_stat['wU_lacc_upd']++;
+            $user->lacc = $curtime;
+            // lacc field updated
+            Bin5_user::save_data($user, $table_idx, $user->idx);            
+        }
+
+        if (Bin5::garbage_time_is_expired($table_idx, $curtime)) {
+            log_only("F");
+                
+            $S_load_stat['wR_garbage']++;
+            if (($bri = Bin5::load_data($table_idx, $table_token)) == FALSE) {
                 Bin5::unlock_data($sem);
                 ignore_user_abort(FALSE);
-                return (unrecerror());
+                return (blocking_error(TRUE));
             }
-            $user->lacc = $curtime;
+                
+            $bri->garbage_manager(FALSE);
+                
+            Bin5::save_data($bri);
+            unset($bri);
+        }
+    }
+    log_main("infolock: U");
+    Bin5::unlock_data($sem);
+    ignore_user_abort(FALSE);
+
 
-            Bin5_user::save_data($user, $table_idx, $user->idx);
+//     if  ($first_loop == TRUE) {
+
+//         if (($sem = Bin5::lock_data(TRUE, $table_idx)) != FALSE) { 
+//             // Aggiorna l'expire time lato server
+//             $S_load_stat['rU_first_loop']++;
+
+//             if (($user = Bin5_user::load_data($table_idx, $proxy_step['i'], $sess)) == FALSE) {
+//                 Bin5::unlock_data($sem);
+//                 ignore_user_abort(FALSE);
+//                 return (blocking_error(TRUE));
+//             }
+//             $user->lacc = $curtime;
+
+//             Bin5_user::save_data($user, $table_idx, $user->idx);
             
-            if (Bin5::garbage_time_is_expired($table_idx, $curtime)) {
-                log_only("F");
+//             if (Bin5::garbage_time_is_expired($table_idx, $curtime)) {
+//                 log_only("F");
                 
-                $S_load_stat['R_garbage']++;
-                if (($bri = Bin5::load_data($table_idx, $table_token)) == FALSE) {
-                    Bin5::unlock_data($sem);
-                    ignore_user_abort(FALSE);
-                    return (unrecerror());
-                }
+//                 $S_load_stat['wR_garbage']++;
+//                 if (($bri = Bin5::load_data($table_idx, $table_token)) == FALSE) {
+//                     Bin5::unlock_data($sem);
+//                     ignore_user_abort(FALSE);
+//                     return (blocking_error(TRUE));
+//                 }
                 
-                $bri->garbage_manager(FALSE);
+//                 $bri->garbage_manager(FALSE);
                 
-                Bin5::save_data($bri);
-                unset($bri);
-            }
-            log_main("infolock: U");
-            Bin5::unlock_data($sem);
-            ignore_user_abort(FALSE);
-        } // if (($sem = Bin5::lock_data($table ...
-        else {
-            ignore_user_abort(FALSE);
+//                 Bin5::save_data($bri);
+//                 unset($bri);
+//             }
+//             log_main("infolock: U");
+//             Bin5::unlock_data($sem);
+//             ignore_user_abort(FALSE);
+//         } // if (($sem = Bin5::lock_data(TRUE, $table ...
+//         else {
+//             ignore_user_abort(FALSE);
             
-            return ("sleep(gst,20000);|xhr_rd_abort(xhr_rd);");
-        }
+//             return ("sleep(gst,20000);|xstm.xhr_abort();");
+//         }
         
-        $first_loop = FALSE;
-    } // if  ($first_loop == TRUE) {
+//         $first_loop = FALSE;
+//     } // if  ($first_loop == TRUE) {
     
     if ($cur_step == $proxy_step['s']) {
         log_main("infolock: P");
@@ -142,14 +210,14 @@ 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);
-            if (($sem = Bin5::lock_data($table_idx)) == FALSE) 
+            if (($sem = Bin5::lock_data(TRUE, $table_idx)) == FALSE) 
                 break;
             
             log_main("infolock: P");
-            $S_load_stat['U_heavy']++;
             if (($user = Bin5_user::load_data($table_idx, $proxy_step['i'], $sess)) == FALSE) {
                 break;
             }
@@ -160,7 +228,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
         
         ignore_user_abort(FALSE);
         if ($user == FALSE) 
-            return (unrecerror());
+            return (blocking_error(TRUE));
     }
     
     /* Nothing changed, return. */
@@ -173,23 +241,25 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
         /*
          *  if $cur_step == -1 load the current state from the main struct
          */
+        
+        /* unset the $user var to reload it from main structure */
+        unset($user);
+
         ignore_user_abort(TRUE);
-        $sem = Bin5::lock_data($table_idx);
+        $sem = Bin5::lock_data(TRUE, $table_idx);
         if (($bri = Bin5::load_data($table_idx, $table_token)) == FALSE) {
             Bin5::unlock_data($sem);
             ignore_user_abort(FALSE);
-            return (unrecerror());
+            return (blocking_error(TRUE));
         }
-        $S_load_stat['R_minusone']++;
-        
-        /* unset the $user var to reload it from main structure */
-        unset($user);
+        $S_load_stat['wR_minusone']++;
+
         if (($user = $bri->get_user($sess, $idx)) == FALSE) {
             Bin5::unlock_data($sem);
             ignore_user_abort(FALSE);
-            return (unrecerror());
+            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;
         }
@@ -237,12 +307,12 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
     }
     else {
         ignore_user_abort(TRUE);
-        $sem = Bin5::lock_data($table_idx);
+        $sem = Bin5::lock_data(TRUE, $table_idx);
         // if (($user = &$bri->get_user($sess, $idx)) == FALSE) {
         if (($user = Bin5_user::load_data($table_idx, $proxy_step['i'], $sess)) == FALSE) {
             Bin5::unlock_data($sem);
             ignore_user_abort(FALSE);
-            return (unrecerror());
+            return (blocking_error(TRUE));
         }
         if ($cur_step < $user->step) {
             do {
@@ -267,23 +337,24 @@ 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!!");
                 log_auth($user->sess, "Explicit logout.");
+
+                unset($user);
                 
-                $S_load_stat['R_the_end']++;
+                $S_load_stat['wR_the_end']++;
                 if (($bri = Bin5::load_data($table_idx, $table_token)) == FALSE) {
                     Bin5::unlock_data($sem);
                     ignore_user_abort(FALSE);
-                    return (unrecerror());
+                    return (blocking_error(TRUE));
                 }
-                unset($user);
                 if (($user = $bri->get_user($sess, $idx)) == FALSE) {
                     Bin5::unlock_data($sem);
                     ignore_user_abort(FALSE);
-                    return (unrecerror());
+                    return (blocking_error(TRUE));
                 }
                 
                 $tmp_sess = $user->sess;
@@ -292,13 +363,14 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
                 $user->name = "";
                 $user->the_end = FALSE;
                 
+                /* FIXME - and now ?? 
                 if ($user->subst == 'sitdown')
                     $bri->room_wakeup($user);
                 else if ($user->subst == 'standup')
                     $bri->room_outstandup($user);
                 else
                     log_rd2("LOGOUT FROM WHAT ???");
-                
+                */
                 Bin5::save_data($bri);
             }
         }
@@ -322,7 +394,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
    step
 */
 
-$is_page_streaming =  (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
@@ -330,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;
@@ -351,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;
   }
@@ -364,14 +436,21 @@ for ($i = 0 ; time() < $endtime ; $i++) {
   if (($i % 10) == 0) {
     // log_rd2("TIME: ".time());
     echo '_';
-    flush();
+    mop_flush();
   }
  }
 
-$s = "[".$sess."] briskin5/index_rd.php stats: ";
+$s = ""; 
+$tr = 0;
+$tw = 0;
 foreach ($S_load_stat as $key => $value) {
     $s .= sprintf("%s: %d - ", $key, $value);
+    if (substr($key, 0, 1) == "w")
+        $tw += $value;
+    else if (substr($key, 0, 1) == "r")
+        $tr += $value;
 }
+$s = sprintf("briskin5/index_rd.php stats:  R: %d W: %d - %s", $tr, $tw, $s);
 log_crit($s);
 
 ?>