speed doubled in index_rd.php and flush of command when the table start

[brisk.git] / web / index_rd.php

diff --git a/web/index_rd.php b/web/index_rd.php
index 4e03b74..288415c 100644 (file)
--- a/web/index_rd.php
+++ b/web/index_rd.php
@@ -96,7 +96,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
       $first_loop = FALSE;
     }
 
-    log_only("U");
+    log_lock("U");
     Room::unlock_data($sem);
     ignore_user_abort(FALSE);
   }
@@ -108,7 +108,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
     // log_rd2("Postget".$proxy_step."zizi");
 
     if ($cur_step == $proxy_step) {
-      log_only2("P");
+      log_lock("P");
       return (FALSE);
     }
     else {
@@ -125,7 +125,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
       if (($sem = Room::lock_data()) == FALSE) 
        break;
       
-      log_only("P");
+      log_lock("P");
       if (($room = &Room::load_data()) == FALSE) 
        break;
     } while (0);
@@ -174,9 +174,18 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
       ignore_user_abort(FALSE);
     }
     else {
-      log_rd2("TRANS NON ATTIVATO");
-      Room::unlock_data($sem);
-      ignore_user_abort(FALSE);
+       log_rd2("TRANS NON ATTIVATO");
+//        ARRAY_POP DISABLED
+//        log_rd2("TRANS NON ATTIVATO, clean del comm array");
+//        while (($el = array_pop($user->comm)) != NULL) { 
+//          log_rd2("clean element [".$el."]");
+//        }
+//        //        $user->step_inc(COMM_N + 1);
+//        Room::save_data($room);
+//        //        $new_step = $user->step;
+        
+       Room::unlock_data($sem);
+       ignore_user_abort(FALSE);
     }
   }
       
@@ -187,6 +196,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
       log_rd("roomma ".$user->step);
       $ret .= show_room(&$room, $user->step, &$user);
 
+      // TODO uncomment and test
       /* NOTE the sets went common */
       $new_stat =  $user->stat;
       $new_subst = $user->subst;
@@ -223,7 +233,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
            return (page_sync($user->sess, ($to_stat == "table" ? "briskin5/index.php" : "index.php"), $user->table, $user->table_token));
          }
          log_rd2("lost history, refresh from scratch");
-         $new_step = -1;
+          $new_step = -1;
          break;
        } 
        for ($i = $cur_step ; $i < $user->step ; $i++) {
@@ -312,8 +322,8 @@ for ($i = 0 ; time() < $endtime ; $i++) {
   $old_subst = $subst;
   $old_step =  $step;
   // log_rd("POST MAIN ".$step);;
-  usleep(400000);
-  if (($i % 5) == 0) {
+  usleep(200000);
+  if (($i % 10) == 0) {
     // log_rd2("TIME: ".time());
     echo '_';
     flush();