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

diff --git a/web/briskin5/index_rd.php b/web/briskin5/index_rd.php
index 1de3bd6..75081a7 100644
--- a/web/briskin5/index_rd.php
+++ b/web/briskin5/index_rd.php
@@ -57,13 +57,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 ? 'the_end=true; ' : '').'window.onbeforeunload = null; window.onunload = null; document.location.assign("../index.php");'));
 }
 
 function page_sync($sess, $page)
@@ -86,21 +86,23 @@ 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) { 
+
+        if (($sem = Bin5::lock_data(TRUE, $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($sem);
                 ignore_user_abort(FALSE);
-                return (unrecerror());
+                return (blocking_error(TRUE));
             }
             $user->lacc = $curtime;
 
@@ -113,7 +115,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
                 if (($bri = Bin5::load_data($table_idx, $table_token)) == FALSE) {
                     Bin5::unlock_data($sem);
                     ignore_user_abort(FALSE);
-                    return (unrecerror());
+                    return (blocking_error(TRUE));
                 }
                 
                 $bri->garbage_manager(FALSE);
@@ -124,7 +126,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
             log_main("infolock: U");
             Bin5::unlock_data($sem);
             ignore_user_abort(FALSE);
-        } // if (($sem = Bin5::lock_data($table ...
+        } // if (($sem = Bin5::lock_data(TRUE, $table ...
         else {
             ignore_user_abort(FALSE);
             
@@ -145,7 +147,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
     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");
@@ -160,7 +162,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,21 +175,23 @@ 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);
+
         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) {
             log_rd2("main_check: the end".var_export(debug_backtrace()));
@@ -237,12 +241,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 {
@@ -272,18 +276,19 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
             if ($user->the_end == TRUE) {
                 log_rd2("LOGOUT BYE BYE!!");
                 log_auth($user->sess, "Explicit logout.");
+
+                unset($user);
                 
                 $S_load_stat['R_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 +297,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 +328,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, "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