X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex_rd.php;h=d7348bb8c53ef35b03b2939cb3cfeda829c541eb;hb=43cab39ea58529cd2442c28f4157bb7efc97856f;hp=d5c5d87cd5cbc0b1f8db6d7abcb8e0cc596554da;hpb=4a8c25612482bb427a327e0f69fc3603a37d709a;p=brisk.git

diff --git a/web/index_rd.php b/web/index_rd.php
index d5c5d87..d7348bb 100644
--- a/web/index_rd.php
+++ b/web/index_rd.php
@@ -28,11 +28,12 @@ require_once("Obj/brisk.phh");
 // require_once("Obj/proxyscan.phh");
 require_once("briskin5/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 );
 
 $mlang_indrd = array( 
                      'btn_backtotab'  => array('it' => ' torna ai tavoli ',
@@ -48,7 +49,7 @@ $mlang_indrd = array(
 //}
 log_load("index_rd.php");
 
-$first_loop = TRUE;
+// $first_loop = TRUE;
 $the_end = FALSE;
 
 if (DEBUGGING == "local" && $_SERVER['REMOTE_ADDR'] != '127.0.0.1') {
@@ -63,13 +64,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:".var_export(debug_backtrace()));
-  return (sprintf('the_end=true; window.onunload = null; window.onbeforeunload = null; document.location.assign("index.php");'));
+  log_crit("BLOCKING_ERROR UNREC: ".($is_unrecoverable ? "TRUE" : "FALSE"));
+  return (sprintf(($is_unrecoverable ? 'hstm.stop(); ' : '').'window.onbeforeunload = null; window.onunload = null; document.location.assign("index.php");'));
 }
 
 function page_sync($sess, $page, $table_idx, $table_token)
@@ -81,7 +82,7 @@ function page_sync($sess, $page, $table_idx, $table_token)
   $is_page_streaming = TRUE;
 
   log_rd2("PAGE_SYNC");
-  return (sprintf('createCookie("table_idx", %d, 24*365, cookiepath); createCookie("table_token", "%s", 24*365, cookiepath); the_end=true; window.onunload = null; window.onbeforeunload = null; document.location.assign("%s");', $table_idx, $table_token, $page));
+  return (sprintf('createCookie("table_idx", %d, 24*365, cookiepath); createCookie("table_token", "%s", 24*365, cookiepath); hstm.stop(); window.onunload = null; window.onbeforeunload = null; document.location.assign("%s");', $table_idx, $table_token, $page));
 }
 
 
@@ -89,7 +90,8 @@ function page_sync($sess, $page, $table_idx, $table_token)
 
 function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_subst, &$new_step)
 {
-    GLOBAL $G_lang, $mlang_indrd, $is_page_streaming, $first_loop;
+    GLOBAL $G_lang, $mlang_indrd, $is_page_streaming;
+    // GLOBAL $first_loop;
     GLOBAL $G_with_splash, $G_splash_content, $G_splash_interval, $G_splash_idx;
     GLOBAL $G_splash_w, $G_splash_h, $G_splash_timeout;
     $CO_splashdate = "CO_splashdate".$G_splash_idx;
@@ -108,50 +110,116 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
     //       anche se non ce ne dovrebbe essere mai la necessità
     if (($proxy_step = User::load_step($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 = Room::lock_data()) != FALSE) { 
-            // Aggiorna l'expire time lato server
-            $S_load_stat['U_first_loop']++;
-            if (($user = User::load_data($proxy_step['i'], $sess)) == FALSE) {
+
+
+    /* shared locking to load info */
+    if (($sem = Room::lock_data(FALSE)) == FALSE) { 
+        // wait 20 secs, then restart the xhr 
+        ignore_user_abort(FALSE);
+        return ("sleep(gst,20000);|hstm.xhr_abort();");
+    }
+    
+    // Verifica l'expire time lato server
+    if (($user = User::load_data($proxy_step['i'], $sess)) == FALSE) {
+        Room::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) || Room::garbage_time_is_expired($curtime)) {
+        /* there is some info that require to change data, switch to exclusive locking */
+        Room::unlock_data($sem);
+        if (($sem = Room::lock_data(TRUE)) == FALSE) { 
+            // wait 20 secs, then restart the xhr 
+            ignore_user_abort(FALSE);
+            return ("sleep(gst,20000);|hstm.xhr_abort();");
+        }
+        $S_load_stat['lL_laccgarb']++;
+
+        // load again the data after locking
+        unset($user);
+        // Verifica l'expire time lato server
+        if (($user = User::load_data($proxy_step['i'], $sess)) == FALSE) {
+            Room::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
+            User::save_data($user, $user->idx);
+        }
+        
+        if (Room::garbage_time_is_expired($curtime)) {
+            log_only("F");
+            
+            $S_load_stat['wR_garbage']++;
+            if (($room = Room::load_data()) == FALSE) {
                 Room::unlock_data($sem);
                 ignore_user_abort(FALSE);
-                return (unrecerror());
+                return (blocking_error(TRUE));
             }
-            $user->lacc = $curtime;
-            User::save_data($user, $user->idx);
+            log_main("pre garbage_manager TRE");
+            $room->garbage_manager(FALSE);
+            Room::save_data($room);
+            unset($room);
+        }
+    }
+    log_main("infolock: U");
+    Room::unlock_data($sem);
+    ignore_user_abort(FALSE);
+
+    
+    
+//     if  ($first_loop == TRUE) {
+//         if (($sem = Room::lock_data(TRUE)) != FALSE) { 
+//             // Aggiorna l'expire time lato server
+//             $S_load_stat['U_first_loop']++;
+//             if (($user = User::load_data($proxy_step['i'], $sess)) == FALSE) {
+//                 Room::unlock_data($sem);
+//                 ignore_user_abort(FALSE);
+//                 return (blocking_error(TRUE));
+//             }
+//             $user->lacc = $curtime;
+//             // lacc field updated
+//             User::save_data($user, $user->idx);
             
-            if (Room::garbage_time_is_expired($curtime)) {
-                log_only("F");
+//             if (Room::garbage_time_is_expired($curtime)) {
+//                 log_only("F");
                 
-                $S_load_stat['R_garbage']++;
-                if (($room = Room::load_data()) == FALSE) {
-                    Room::unlock_data($sem);
-                    ignore_user_abort(FALSE);
-                    return (unrecerror());
-                }
-                log_main("pre garbage_manager TRE");
-                $room->garbage_manager(FALSE);
-                Room::save_data($room);
-                unset($room);
-            }
-            log_main("infolock: U");
-            Room::unlock_data($sem);
-            ignore_user_abort(FALSE);
-        } // if (($sem = Room::lock_data()) != FALSE) { 
-        else {
-            // wait 20 secs, then restart the xhr 
-            ignore_user_abort(FALSE);
+//                 $S_load_stat['R_garbage']++;
+//                 if (($room = Room::load_data()) == FALSE) {
+//                     Room::unlock_data($sem);
+//                     ignore_user_abort(FALSE);
+//                     return (blocking_error(TRUE));
+//                 }
+//                 log_main("pre garbage_manager TRE");
+//                 $room->garbage_manager(FALSE);
+//                 Room::save_data($room);
+//                 unset($room);
+//             }
+//             log_main("infolock: U");
+//             Room::unlock_data($sem);
+//             ignore_user_abort(FALSE);
+//         } // if (($sem = Room::lock_data(TRUE)) != FALSE) { 
+//         else {
+//             // wait 20 secs, then restart the xhr 
+//             ignore_user_abort(FALSE);
             
-            return ("sleep(gst,20000);|xhr_rd_abort(xhr_rd);");
-        }
-        $first_loop = FALSE;
-    } // if  ($first_loop == TRUE) {
+//             return ("sleep(gst,20000);|hstm.xhr_abort();");
+//         }
+//         $first_loop = FALSE;
+//     } // if  ($first_loop == TRUE) {
     
     if ($cur_step == $proxy_step['s']) {
         log_main("infolock: P");
@@ -160,16 +228,15 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
     else {
         log_only2("R");
     }
-    
 
+    $S_load_stat['rU_heavy']++;
     if ($user == FALSE) {
         do {
             ignore_user_abort(TRUE);
-            if (($sem = Room::lock_data()) == FALSE) 
+            if (($sem = Room::lock_data(FALSE)) == FALSE) 
                 break;
             
             log_main("infolock: P");
-            $S_load_stat['U_heavy']++;
             if (($user = User::load_data($proxy_step['i'], $sess)) == FALSE) {
                 break;
             }
@@ -180,7 +247,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));
         }
     }
     
@@ -194,20 +261,26 @@ 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
          */
-        ignore_user_abort(TRUE);
-        $sem = Room::lock_data();
-        $room = Room::load_data();
-        $S_load_stat['R_minusone']++;
-        
+
         /* unset the $user var to reload it from main structure */
         unset($user);
+
+        ignore_user_abort(TRUE);
+        $sem = Room::lock_data(TRUE);
+        if (($room = Room::load_data()) == FALSE) {
+            Room::unlock_data($sem);
+            ignore_user_abort(FALSE);
+            return (blocking_error(TRUE));
+        }
+        $S_load_stat['wR_minusone']++;
+        
         if (($user = $room->get_user($sess, $idx)) == FALSE) {
             Room::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;
         }
@@ -275,16 +348,15 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
             return (page_sync($user->sess, "briskin5/index.php", $user->table, $user->table_token));
         }
         log_rd2("NEWSTAT: ".$user->stat);
-    }
+    } /* if ($cur_step == -1) { */
     else {
-        // TODO: verify if we can use only $user struct 
         ignore_user_abort(TRUE);
-        $sem = Room::lock_data();
-        $S_load_stat['U_heavy']++;
+        $sem = Room::lock_data(FALSE);
+        $S_load_stat['rU_heavy']++;
         if (($user = User::load_data($proxy_step['i'], $sess)) == FALSE) {
             Room::unlock_data($sem);
             ignore_user_abort(FALSE);
-            return (unrecerror());
+            return (blocking_error(TRUE));
         }
         
         if ($cur_step < $user->step) {
@@ -311,38 +383,52 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
                 $new_step =  $user->step;
             } while (0);
             
-            log_mop($user->step, 'index_rd.php: after ret set');
+            log_rd2($user->step, 'index_rd.php: after ret set');
             
             if ($user->the_end == TRUE) {
-                log_rd2("LOGOUT BYE BYE!!");
-                log_auth($user->sess, "Explicit logout.");
+                Room::unlock_data($sem);
                 
-                $S_load_stat['R_the_end']++;
-                $room = Room::load_data();
+                /* Switch to exclusive locking */
+                $sem = Room::lock_data(TRUE);
+
                 unset($user);
+
+                $S_load_stat['wR_the_end']++;
+                if (($room = Room::load_data()) == FALSE) {
+                    Room::unlock_data($sem);
+                    ignore_user_abort(FALSE);
+                    return (blocking_error(TRUE));
+                }
+
                 if (($user = $room->get_user($sess, $idx)) == FALSE) {
                     Room::unlock_data($sem);
                     ignore_user_abort(FALSE);
-                    return (unrecerror());
+                    return (blocking_error(TRUE));
                 }              
-                $user->reset();
-                
-                if ($user->subst == 'sitdown') {
-                    log_load("ROOM WAKEUP");
-                    $room->room_wakeup($user);
-                }
-                else if ($user->subst == 'standup')
-                    $room->room_outstandup($user);
-                else
-                    log_rd2("LOGOUT FROM WHAT ???");
+
+                log_rd2("LOGOUT BYE BYE!!");
+                log_auth($user->sess, "Explicit logout.");
                 
-                Room::save_data($room);
-            }
-        }
+                if ($user->the_end == TRUE) {
+                    $user->reset();
+                    
+                    if ($user->subst == 'sitdown') {
+                        log_load("ROOM WAKEUP");
+                        $room->room_wakeup($user);
+                    }
+                    else if ($user->subst == 'standup')
+                        $room->room_outstandup($user);
+                    else
+                        log_rd2("LOGOUT FROM WHAT ???");
+                    
+                    Room::save_data($room);
+                } /* if ($user->the_end == TRUE) { ... */
+            } /* if ($user->the_end == TRUE) { ... */
+        } /* if ($cur_step < $user->step) { */
         
         Room::unlock_data($sem);
         ignore_user_abort(FALSE);
-    }
+    }  /* else of if ($cur_step == -1) { */
     
     
     return ($ret);
@@ -359,17 +445,17 @@ 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
 header('Content-type: application/xml; 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);
+log_rd2("FROM OUTSIDE - STAT: ".$stat." SUBST: ".$subst." STEP: ".$step." FROM: ".$from. "IS_PAGE:" . $is_page_streaming);
 
 
 $endtime = time() + STREAM_TIMEOUT;
@@ -386,10 +472,10 @@ for ($i = 0 ; time() < $endtime ; $i++) {
     echo "$ret";
     echo ' @END@'; 
     log_send("IS_PAGE: ".($is_page_streaming == TRUE ? "TRUE" : "FALSE")."EXT_STEP: ".$ext_step." ENDTIME: [".$endtime."] ".$ret);
-    flush();
-    log_mop(0, 'index_rd.php: after flush (begin: '.sprintf("%f", $pre_main).')');
-    if ($is_page_streaming)
-      break;
+    mop_flush();
+    log_rd2(0, 'index_rd.php: after mop_flush (begin: '.sprintf("%f", $pre_main).')');
+    if ($is_page_streaming) 
+        break;
   }
   $old_stat =  $stat;
   $old_subst = $subst;
@@ -399,15 +485,21 @@ for ($i = 0 ; time() < $endtime ; $i++) {
   if (($i % 10) == 0) {
     // log_rd2("TIME: ".time());
     echo '_';
-    flush();
+    mop_flush();
+    log_crit("flush");
   }
  }
 
-$s = "[".$sess."] 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("index_rd.php stats:  R: %d W: %d - %s", $tr, $tw, $s);
 log_crit($s);
-
-
 ?>