X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=94976009e4d5c90f0b18300d70ffca3c747dc092;hb=b804ca474cbf9e02703043b2d6e41cf52c9889ed;hp=add31a772c1c653836ff67190ab35649195fa312;hpb=1f5795fd45dcccc42e794089d14350c6b5c5fecd;p=brisk.git

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index add31a7..9497600 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -22,11 +22,14 @@
 define(FTOK_PATH, "/var/lib/brisk");
 define(LEGAL_PATH, "/tmp/legal_brisk");
 define(PROXY_PATH, "/var/lib/brisk_proxy");
-define(TABLES_N, 12);
+define(TABLES_N, 20);
 define(PLAYERS_N, 3);
 define(MAX_POINTS, 5);
 define(MAX_PLAYERS, (20 + (PLAYERS_N * TABLES_N)));
-define(SHM_DIMS, (50000 + 10000 * TABLES_N + 15000 * MAX_PLAYERS));
+define(SHM_DIMS_MIN, (50000 + 10000 * TABLES_N + 15000 * MAX_PLAYERS));
+define(SHM_DIMS_MAX, SHM_DIMS_MIN + 1048576);
+define(SHM_DIMS_DLT, 65536);
+ 
 define(COMM_N, 12);
 define(COMM_GEN_N, 50);
 define(SESS_LEN, 13);
@@ -50,14 +53,17 @@ define(DBG_LOAD, 0x0100);
 define(DBG_AUTH, 0x0200);
 
 define(BRISK_DEBUG, 0);
+
+define(BRISK_SINGLE_DEBUG,0);
+define(BRISK_SINGLE_SESS, "");
 // define(DEBUGGING, "local");
 
 $G_false = FALSE;
 
 $G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "spawn-0.0.6";
+$G_brisk_version = "spawn-0.9.3";
 
-$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: riscritta tutta l\'architettura dati del server, tutto pi&egrave; veloce e leggero.',
+$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: dimensionamento dinamico dell\'area dati e ottimizzazione della stessa, versione beta.',
                         'Se vuoi iscriverti alla <a target="_blank" href="http://www.milug.org/cgi-bin/mailman/listinfo/ml-briscola">Mailing List</a>, cliccala!' );
 $table_wellarr = Array ( 'Benvenuto al tavolo. Se almeno tre giocatori non sbloccano l\'uscita cliccando il lucchetto, chi esce non pu&ograve; risedersi a un qualunque tavolo per '.floor(BAN_TIME/60).' minuti.');
 
@@ -572,13 +578,14 @@ class User {
     $thiz->trans_step = $from->trans_step;
     $thiz->comm       = array();
 
+    /*
     $i_start = (1 > ($from->step - COMM_N) ? 1 : ($from->step - COMM_N)); 
     for ($i = $i_start ; $i < $from->step ; $i++) {
       log_wr("TRY PUSH:".$i);
       $ii = $i % COMM_N;
       $thiz->comm[$ii]   = $from->comm[$ii];
     }
-    
+    */
     $thiz->asta_card  = $from->asta_card;
     $thiz->asta_pnt   = $from->asta_pnt;
     $thiz->handpt     = $from->handpt;
@@ -622,8 +629,8 @@ class User {
     return (FALSE);
   }
 
-  function step_inc() {
-    $this->step++;
+  function step_inc($delta = 1) {
+    $this->step += $delta;
     
     if (validate_sess($this->sess)) {
       $fp = fopen(PROXY_PATH."/".$this->sess.".step", 'w');
@@ -680,6 +687,7 @@ class Room {
   var $comm; // commands for many people
   var $step; // current step of the comm array
   var $garbage_timeout;
+  var $shm_sz;
 
   function Room () {
     $this->user = array();
@@ -715,10 +723,12 @@ class Room {
 	  if (($sem = Briskin5::lock_data($table_idx)) != FALSE) { 
 	    log_main("bin5 lock data success");
 	    
+	    $no_recovery = FALSE;
 	    if (($bri = &Briskin5::load_data($table_idx)) != FALSE) {
 	      if ($table_cur->table_token != $bri->table_token) {
 		log_main("ERROR: not matching table_token. Room: ".$table_cur->table_token."  Table: ".$bri->table_token);
 		log_main("ERROR: not matching table_start. Room: ".$table_cur->table_start."  Table: ".$bri->table_start);
+		$no_recovery = TRUE;
 		$bri = FALSE;
 	      }
 	    }
@@ -737,20 +747,21 @@ class Room {
 		/*
 		 *  DESTROY OF FINISHED TABLE && MOVE PLAYER TO ROOM AGAIN
 		 */
+		log_main("garbage_manager: INSIDE THE END.");
+
 		for ($i = 0 ; $i < $bri_table->player_n ; $i++) {
 		  // stat must be "table" by definition
 		  $user_cur =& $this->user[$table_cur->player[$i]];
 		  $bri_user =& $bri->user[$i];
-
+		  
 		  $user_cur->subst      = $bri_user->subst;
 		  $user_cur->step       = $bri_user->step;
-		  $user_cur->trans_step = $bri_user->step;
 		  $user_cur->lacc       = $bri_user->lacc;
 		  $user_cur->laccwr     = $bri_user->lacc;
 		  $user_cur->bantime    = $bri_user->bantime;
 		}
 	      
-		$this->room_join_wakeup(&$user_cur); 
+		$this->room_join_wakeup(&$user_cur, FALSE, 0); 
 		$table_cur->table_token = "";
 
 		Briskin5::destroy_data($table_idx);
@@ -765,9 +776,25 @@ class Room {
 		Briskin5::save_data(&$bri);
 	      }
 	    } // else if (($bri = &Briskin5::load_data($table_idx)) != FALSE) {
-	    else {
+	    else if ($no_recovery == FALSE) {
 	      log_main("ERROR: table ".$table_idx." unrecoverable join");
+
+	      for ($i = 0 ; $i < $table_cur->player_n ; $i++) {
+		$user_cur = &$this->user[$table_cur->player[$i]];
+		$user_cur->subst = "shutdowner";
+		$user_cur->step_inc();
+		
+		$ret = sprintf('stat = "%s"; subst = "%s";',  $cur_user->stat, $cur_user->subst);
+		$ret .= "gst.st = ".($user_cur->step+1)."; ";
+		$ret .= show_notify("<br>I dati del tavolo n&deg; ".$user_cur->table." sono inconsistenti, verranno resettati.<br><br>Torni in piedi.<br><br>", 2000, "Chiudi.", 400, 110);
+		$user_cur->comm[$user_cur->step % COMM_N] = $ret;
+		$user_cur->step_inc();
+	      }
+
+	      $this->room_join_wakeup(&$user_cur, TRUE, -2); 
+	      $table_cur->table_token = "";
 	    }
+
 	    Briskin5::unlock_data($sem);
 	  } // bri::lock_data
 	} //  if ($table_cur->player_n == PLAYERS_N) {
@@ -907,7 +934,7 @@ class Room {
     }
   }
 
-  function room_join_wakeup(&$user, $update_lacc = FALSE)
+  function room_join_wakeup(&$user, $update_lacc = FALSE, $trans_delta)
   {
     $table_idx = $user->table;
     $table = &$this->table[$table_idx];
@@ -974,9 +1001,20 @@ class Room {
 	    break;
 
 	// for users that wakeup the room will be reconstructed by index_rd.php
-	if ($tab_idx < $user_tab_n) 
-	  continue;
+	if ($tab_idx < $user_tab_n) {
+	  log_main("PRE show_room username: ".$user_cur->name."  STEP: ".$user_cur->step);
+
+	  while (array_pop($user_cur->comm) != NULL);
+
+	  $user_cur->trans_step = $user_cur->step + 1 + $trans_delta;
+	  $user_cur->comm[$user_cur->step % COMM_N] = "";
+	  $user_cur->step_inc();
+	  $user_cur->comm[$user_cur->step % COMM_N] = show_room(&$this, ($user_cur->step + 1), &$user_cur);
+	  $user_cur->step_inc();
+	  log_main("POST show_room username: ".$user_cur->name."  STEP: ".$user_cur->step);
 
+	  continue;
+	}
 	log_main("JOIN_WAKEUP wup_idx ".$wup_idx."  wup_n ".$user_wup_n);
 
 	log_main("JOIN_WAKEUP more");
@@ -1244,7 +1282,8 @@ class Room {
       }
       $this->user[$idx]->name = $name_new;
       $this->user[$idx]->stat_set("room");
-      // MOP $this->user[$idx]->step_set(0);
+      $this->user[$idx]->step_set(0);
+      while (array_pop($this->user[$idx]->comm) != NULL);
       $this->user[$idx]->subst = "standup";
       $this->user[$idx]->lacc =   $curtime;
       $this->user[$idx]->laccwr = $curtime;
@@ -1291,34 +1330,47 @@ class Room {
   function &load_data() 
   {
     GLOBAL $G_false, $sess;
+    $doexit = FALSE;
+    do {
+      if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) {
+	log_main("ftok failed");
+	$doexit = TRUE;
+	break;
+      }
     
-    if (($tok = ftok(FTOK_PATH."/main", "B")) == -1) {
-      echo "FTOK FAILED";
-      exit;
-    }
-    
-    if ($shm = shm_attach($tok, SHM_DIMS)) {
-      $room = @shm_get_var($shm, $tok);
-      
-      log_only("bri ==  ".($room == FALSE ?   "FALSE" : "TRUE")."  bri ===  ".($room === FALSE ? "FALSE" : "TRUE")."  bri isset ".(isset($room) ?   "TRUE" : "FALSE"));
-      if (isset($room)) 
-	log_only("bri count ".count($room));
-      
-      if ($room == FALSE) {
-	log_only("INIT MAIN DATA");
+      if (($shm_sz = sharedmem_sz($tok)) == -1) {
+	log_main("shmop_open failed");
+      }
+	
+      if ($shm_sz == -1)
+	$shm_sz = SHM_DIMS_MIN;
+
+      if ($shm = shm_attach($tok, $shm_sz)) {
+	$room = @shm_get_var($shm, $tok);
 	
-	$room =& Room::init_data();
-	if (shm_put_var($shm, $tok, $room) == FALSE) {
-	  log_only("PUT_VAR FALLITA ".strlen(serialize($room)));
-	  log_only(serialize($room));
+	log_only("bri ==  ".($room == FALSE ?   "FALSE" : "TRUE")."  bri ===  ".($room === FALSE ? "FALSE" : "TRUE")."  bri isset ".(isset($room) ?   "TRUE" : "FALSE"));
+	if (isset($room)) 
+	  log_only("bri count ".count($room));
+	
+	if ($room == FALSE) {
+	  log_only("INIT MAIN DATA");
+	  
+	  $room =& Room::init_data();
+	  if (@shm_put_var($shm, $tok, $room) == FALSE) {
+	    log_only("PUT_VAR FALLITA ".strlen(serialize($room)));
+	    log_only(serialize($room));
+	  }
 	}
+	$room->shm_sz = $shm_sz;
+	
+	shm_detach($shm);
       }
-      
-      shm_detach($shm);
-      
       $ret = &$room;
       return ($ret);
-    }
+    } while (0);
+    
+    if ($doexit)
+      exit();
     
     return ($G_false);
   }
@@ -1330,29 +1382,29 @@ class Room {
     
     $ret =   FALSE;
     $shm =   FALSE;
-    $isacq = FALSE;
     
     // var_dump($room);
     
-    if (($tok = ftok(FTOK_PATH."/main", "B")) == -1) 
+    if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) 
       return (FALSE);
     
-    do {
-      $isacq = TRUE;
-      
-      if (($shm = shm_attach($tok, SHM_DIMS)) == FALSE)
+    while ($room->shm_sz < SHM_DIMS_MAX) {
+      if (($shm = shm_attach($tok, $room->shm_sz)) == FALSE)
 	break;
       
       // log_only("PUT_VAR DI ".strlen(serialize($room)));
-      if (shm_put_var($shm, $tok, $room) == FALSE) {
-	log_only("PUT_VAR FALLITA ".strlen(serialize($room)));
-	log_only(serialize($room));
+      if (shm_put_var($shm, $tok, $room) != FALSE) {
+	shm_detach($shm);
+	return (TRUE);
+      }
+      if (shm_remove($shm) === FALSE) {
+	log_only("REMOVE FALLITA");
 	break;
       }
-      // log_main("QUI CI ARRIVA [".$room->user[0]->name."]");
-      $ret = TRUE;
-    } while (0);
-    
+      shm_detach($shm);
+      $room->shm_sz += SHM_DIMS_DLT;
+    } 
+
     if ($shm)
       shm_detach($shm);
     
@@ -1365,7 +1417,7 @@ class Room {
     
     //  echo "LOCK: ".FTOK_PATH."/main";
     //  exit;
-    if (($tok = ftok(FTOK_PATH."/main", "B")) == -1) {
+    if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) {
       echo "FTOK FAILED";
       exit;
     }
@@ -1400,16 +1452,19 @@ function make_seed()
 
 
 function log_only2($log) {
-  if ((BRISK_DEBUG & DBG_ONL2) == 0)
-    return;
-  
   GLOBAL $sess;
 
+  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_ONL2) == 0)
+    return;
+
   if (isset($sess) == FALSE)
     $ssess = "XXXX";
   else
     $ssess = $sess;
 
+  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_ONL2) == 0)
+    return;
+
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("ONL2: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
@@ -1417,16 +1472,19 @@ function log_only2($log) {
 }
 
 function log_only($log) {
-  if ((BRISK_DEBUG & DBG_ONLY) == 0)
-    return;
-  
   GLOBAL $sess;
 
+  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_ONLY) == 0)
+    return;
+
   if (isset($sess) == FALSE)
     $ssess = "XXXX";
   else
     $ssess = $sess;
 
+  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_ONLY) == 0)
+    return;
+
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("ONLY: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
@@ -1434,16 +1492,19 @@ function log_only($log) {
 }
 
 function log_main($log) {
-  if ((BRISK_DEBUG & DBG_MAIN) == 0)
-    return;
-  
   GLOBAL $sess;
 
+  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_MAIN) == 0)
+    return;
+
   if (isset($sess) == FALSE)
     $ssess = "XXXX";
   else
     $ssess = $sess;
 
+  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_MAIN) == 0)
+    return;
+
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("MAIN: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
@@ -1451,16 +1512,19 @@ function log_main($log) {
 }
 
 function log_rd($log) {
-  if ((BRISK_DEBUG & DBG_READ) == 0)
-    return;
-  
   GLOBAL $sess;
 
+  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_READ) == 0)
+    return;
+
   if (isset($sess) == FALSE)
     $ssess = "XXXX";
   else
     $ssess = $sess;
-      
+
+  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_READ) == 0)
+    return;
+
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("READ: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
@@ -1468,16 +1532,18 @@ function log_rd($log) {
 }
 
 function log_rd2($log) {
-  if ((BRISK_DEBUG & DBG_REA2) == 0)
-    return;
-  
   GLOBAL $sess;
 
+  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_REA2) == 0)
+    return;
+
   if (isset($sess) == FALSE)
     $ssess = "XXXX";
   else
     $ssess = $sess;
       
+  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_REA2) == 0)
+    return;
 
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("REA2: [%s] [%s]\n", $ssess, $log));
@@ -1486,16 +1552,19 @@ function log_rd2($log) {
 }
 
 function log_send($log) {
-  if ((BRISK_DEBUG & DBG_SEND) == 0)
-    return;
-  
   GLOBAL $sess;
 
+  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_SEND) == 0)
+    return;
+
   if (isset($sess) == FALSE)
     $ssess = "XXXX";
   else
     $ssess = $sess;
       
+  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_SEND) == 0)
+    return;
+
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("SEND: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
@@ -1503,16 +1572,19 @@ function log_send($log) {
 }
 
 function log_lock($log) {
-  if ((BRISK_DEBUG & DBG_LOCK) == 0)
-    return;
-  
   GLOBAL $sess;
 
+  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LOCK) == 0)
+    return;
+
   if (isset($sess) == FALSE)
     $ssess = "XXXX";
   else
     $ssess = $sess;
 
+  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LOCK) == 0)
+    return;
+
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("LOCK: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
@@ -1520,16 +1592,19 @@ function log_lock($log) {
 }
 
 function log_wr($log) {
-  if ((BRISK_DEBUG & DBG_WRIT) == 0)
-    return;
-  
   GLOBAL $sess;
 
+  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_WRIT) == 0)
+    return;
+
   if (isset($sess) == FALSE)
     $ssess = "XXXX";
   else
     $ssess = $sess;
       
+  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_WRIT) == 0)
+    return;
+
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("WRIT: [%s] [%s]\n", $ssess, $log));
     fclose($fp);
@@ -1537,15 +1612,18 @@ function log_wr($log) {
 }
 
 function log_load($log) {
-  if ((BRISK_DEBUG & DBG_LOAD) == 0)
-    return;
-  
   GLOBAL $sess;
 
+  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LOAD) == 0)
+    return;
+
   if (isset($sess) == FALSE)
     $ssess = "XXXX";
   else
     $ssess = $sess;
+
+  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LOAD) == 0)
+    return;
       
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
     fwrite($fp, sprintf("LOAD: [%s] [%s]\n", $ssess, $log));
@@ -1554,7 +1632,10 @@ function log_load($log) {
 }
 
 function log_auth($sess, $log) {
-  if ((BRISK_DEBUG & DBG_AUTH) == 0)
+  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_AUTH) == 0)
+    return;
+
+  if (( (BRISK_DEBUG | ($sess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_AUTH) == 0)
     return;
 
   if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
@@ -1580,7 +1661,7 @@ function log_legal($timecur, $sess, $name, $where, $mesg)
 
 function lock_banlist()
 {
-  if (($tok = ftok(FTOK_PATH."/main", "L")) == -1) {
+  if (($tok = @ftok(FTOK_PATH."/main", "L")) == -1) {
     echo "FTOK FAILED";
     exit;
   }
@@ -1888,9 +1969,12 @@ function table_wellcome($user)
   return ($ret);
 }
 
-function show_room(&$room, &$user)
+function show_room(&$room, $user_step, &$user)
 {
-  $ret = sprintf('gst.st = %d;',  $user->step);
+  log_main("show_room: username: ".$user->name);
+
+
+  $ret = sprintf('gst.st = %d;',  $user_step);
   $ret .= sprintf('stat = "%s";',  $user->stat);
 
   $ret .= root_wellcome($user);
@@ -2236,4 +2320,18 @@ function secstoword($secs)
   return ($ret);
 }
 
+function sharedmem_sz($tok)
+{
+  if (($shm_id = @shmop_open($tok, 'a', 0, 0)) == FALSE) {
+    log_main("shmop_open failed");
+    return (-1);
+  }
+  $shm_sz = shmop_size($shm_id);
+  shmop_close($shm_id);
+  
+  log_main("shm_sz: ".$shm_sz."   SHM_DIMS: ".SHM_DIMS);
+  return ($shm_sz);
+}    
+
+
 ?>