From cb1194a384bfab6cd9b0056b96cd57d828bca054 Mon Sep 17 00:00:00 2001
From: "Matteo Nastasi (mop)" <nastasi@alternativeoutput.it>
Date: Sun, 2 Sep 2007 11:37:46 +0000
Subject: [PATCH] corretta serializzazione all'accesso della shmem

---
 web/brisk.phh    | 40 ++++++++++++++++++++++++++--------------
 web/index_rd.php | 28 ++++++++++++++++++++--------
 2 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/web/brisk.phh b/web/brisk.phh
index 96adf7a..8822edc 100644
--- a/web/brisk.phh
+++ b/web/brisk.phh
@@ -26,7 +26,7 @@ define(TABLES_N, 8);
 define(PLAYERS_N, 3);
 define(MAX_POINTS, 5);
 define(MAX_PLAYERS, (20 + (PLAYERS_N * TABLES_N)));
-define(SHM_DIMS, (80000 * MAX_PLAYERS));
+define(SHM_DIMS, (50000 * MAX_PLAYERS));
 // define(COMM_N, 6);
 define(COMM_N, 12);
 define(COMM_GEN_N, 50);
@@ -44,7 +44,7 @@ define(BRISK_DEBUG, FALSE);
 $G_false = FALSE;
 
 $G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "0.7.2";
+$G_brisk_version = "0.7.3";
 
 $root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: ottimizzazione della CPU e chiuso il bug di mancato cambio pagina.',
                         'Se vuoi iscriverti alla <a target="_blank" href="http://www.milug.org/cgi-bin/mailman/listinfo/ml-briscola">Mailing List</a>, cliccala!' );
@@ -925,10 +925,9 @@ function make_seed()
 }
 
 function log_only($sess, $log) {
-  /*
   if (BRISK_DEBUG != TRUE)
     return;
-  */
+  
 
   if (($fp = @fopen("/tmp/brisk_only.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
@@ -1038,6 +1037,8 @@ function init_data()
 
 function lock_data()
 {
+  GLOBAL $sess; 
+
 	//  echo "LOCK: ".FTOK_PATH."/main";
 	//  exit;
   if (($tok = ftok(FTOK_PATH."/main", "B")) == -1) {
@@ -1050,7 +1051,7 @@ function lock_data()
     exit;
   }
   if (sem_acquire($res)) {   
-    log_lock("XXX", "LOCK");
+    log_only($sess, "LOCK");
     return ($res);
   }
   else
@@ -1059,7 +1060,9 @@ function lock_data()
 
 function unlock_data($res)
 {
-  log_lock("XXX", "UNLOCK");
+  GLOBAL $sess; 
+
+  log_only($sess, "UNLOCK");
   return (sem_release($res));
 }
 
@@ -1088,7 +1091,7 @@ function unlock_banlist($res)
 
 function &load_data() 
 {
-  GLOBAL $G_false;
+  GLOBAL $G_false, $sess;
 
   if (($tok = ftok(FTOK_PATH."/main", "B")) == -1) {
     echo "FTOK FAILED";
@@ -1096,13 +1099,19 @@ function &load_data()
   }
 
   if ($shm = shm_attach($tok, SHM_DIMS)) {
-    if(($bri = @shm_get_var($shm, $tok)) == FALSE) {
-      log_only("XXX", "INIT MAIN DATA");
-
+    $bri = @shm_get_var($shm, $tok);
+    
+    log_only($sess, "bri ==  ".($bri == FALSE ?   "FALSE" : "TRUE")."  bri ===  ".($bri === FALSE ? "FALSE" : "TRUE")."  bri isset ".(isset($bri) ?   "TRUE" : "FALSE"));
+    if (isset($bri)) 
+      log_only($sess, "bri count ".count($bri));
+    
+    if ($bri == FALSE) {
+      log_only($sess, "INIT MAIN DATA");
+      
       $bri = init_data();
       if (shm_put_var($shm, $tok, $bri) == FALSE) {
-	log_only("XX2", "PUT_VAR FALLITA ".strlen(serialize($bri)));
-	log_only("XX2", serialize($bri));
+	log_only($sess, "PUT_VAR FALLITA ".strlen(serialize($bri)));
+	log_only($sess, serialize($bri));
       }
     }
     
@@ -1118,6 +1127,8 @@ function &load_data()
 
 function save_data(&$bri) 
 {
+  GLOBAL $sess;
+
   $ret =   FALSE;
   $shm =   FALSE;
   $isacq = FALSE;
@@ -1133,9 +1144,10 @@ function save_data(&$bri)
     if (($shm = shm_attach($tok, SHM_DIMS)) == FALSE)
       break;
     
+    log_only($sess, "PUT_VAR DI ".strlen(serialize($bri)));
     if (shm_put_var($shm, $tok, $bri) == FALSE) {
-      log_only("XXX", "PUT_VAR FALLITA ".strlen(serialize($bri)));
-      log_only("XXX", serialize($bri));
+      log_only($sess, "PUT_VAR FALLITA ".strlen(serialize($bri)));
+      log_only($sess, serialize($bri));
       break;
     }
     // log_main("XXX", "QUI CI ARRIVA [".$bri->user[0]->name."]");
diff --git a/web/index_rd.php b/web/index_rd.php
index f1af84d..ec0f47c 100644
--- a/web/index_rd.php
+++ b/web/index_rd.php
@@ -50,12 +50,12 @@ function unrecerror()
   return (sprintf('the_end=true; window.onunload = null; document.location.assign("index.php");'));
 }
 
-function page_sync($page)
+function page_sync($sess, $page)
 {
   GLOBAL $is_page_streaming;
 
   $is_page_streaming = TRUE;
-  // log_rd2("PAGE_SYNC");
+  log_rd2($sess, "PAGE_SYNC");
   return (sprintf('the_end=true; window.onunload = null; document.location.assign("%s");', $page));
 }
 
@@ -75,7 +75,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
   if (($sem = lock_data()) != FALSE) { 
     // Aggiorna l'expire time lato server
     if  ($first_loop == TRUE) {
-      log_rd2($sess, "F");
+      log_only($sess, "F");
       $bri = &load_data();
       if (($user = &$bri->get_user($sess, $idx)) == FALSE) {
 	unlock_data($sem);
@@ -90,6 +90,8 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
       save_data($bri);
       $first_loop = FALSE;
     }
+
+    log_only($sess, "U");
     unlock_data($sem);
     ignore_user_abort(FALSE);
   }
@@ -102,13 +104,23 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
 
     if ($cur_step == $proxy_step) {
       log_rd2($sess, "P");
-      return;
+      return (FALSE);
     }
   }
 
-  if ($bri == FALSE)
-    $bri = &load_data();
-
+  if ($bri == FALSE) {
+    ignore_user_abort(TRUE);
+    if (($sem = lock_data()) != FALSE) { 
+      log_only($sess, "P");
+      $bri = &load_data();
+      unlock_data($sem);
+      ignore_user_abort(FALSE);
+    }
+    else {
+      return (FALSE);
+    }
+  }
+  
   if (($user = &$bri->get_user($sess, $idx)) == FALSE) {
     return (unrecerror());
   }
@@ -189,7 +201,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
 	    $to_stat = $user->stat;
 	    unlock_data($sem);
 	    ignore_user_abort(FALSE);
-	    return (page_sync($to_stat == "table" ? "table.php" : "index.php"));
+	    return (page_sync($user->sess, $to_stat == "table" ? "table.php" : "index.php"));
 	  }
 	  log_rd2($sess, "lost history, refresh from scratch");
 	  $new_step = -1;
-- 
2.17.1