X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=04d6483985fe232811ae41642d84367b2d499ba9;hb=64c7d34242c417a2a430534717ad2b3850e27602;hp=13118f26f0dd6d11183ad99d931d6aa5676978ad;hpb=c76e1c2a8590457cedbe40f335e577e9e1c4f335;p=brisk.git

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 13118f2..04d6483 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -2,7 +2,7 @@
 /*
  *  brisk - brisk.phh
  *
- *  Copyright (C) 2006-2007 matteo.nastasi@milug.org
+ *  Copyright (C) 2006-2008 matteo.nastasi@milug.org
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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);
@@ -48,16 +51,20 @@ define(DBG_LOCK, 0x0040);
 define(DBG_WRIT, 0x0080);
 define(DBG_LOAD, 0x0100);
 define(DBG_AUTH, 0x0200);
+define(DBG_CRIT, 0x0400);
 
 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.10.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 +579,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 +630,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 +688,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();
@@ -769,14 +778,14 @@ class Room {
 	      }
 	    } // else if (($bri = &Briskin5::load_data($table_idx)) != FALSE) {
 	    else if ($no_recovery == FALSE) {
-	      log_main("ERROR: table ".$table_idx." unrecoverable join");
+	      log_crit("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 = sprintf('stat = "%s"; subst = "%s";',  $user_cur->stat, $user_cur->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;
@@ -995,6 +1004,11 @@ class Room {
 	// for users that wakeup the room will be reconstructed by index_rd.php
 	if ($tab_idx < $user_tab_n) {
 	  log_main("PRE show_room username: ".$user_cur->name."  STEP: ".$user_cur->step);
+
+//        ARRAY_POP DISABLED
+// 	  if ($trans_delta == 0)
+// 	    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();
@@ -1319,34 +1333,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);
+	
+	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));
 	
-	$room =& Room::init_data();
-	if (shm_put_var($shm, $tok, $room) == FALSE) {
-	  log_only("PUT_VAR FALLITA ".strlen(serialize($room)));
-	  log_only(serialize($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);
   }
@@ -1358,29 +1385,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);
     
@@ -1393,7 +1420,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;
     }
@@ -1428,33 +1455,59 @@ 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);
   }
 }
 
-function log_only($log) {
-  if ((BRISK_DEBUG & DBG_ONLY) == 0)
+function log_crit($log) {
+  GLOBAL $sess;
+
+  if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_CRIT) == 0)
     return;
-  
+
+  if (isset($sess) == FALSE)
+    $ssess = "XXXX";
+  else
+    $ssess = $sess;
+
+  if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_CRIT) == 0)
+    return;
+
+  if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
+    fwrite($fp, sprintf("CRIT: [%s] [%s]\n", $ssess, $log));
+    fclose($fp);
+  }
+}
+
+function log_only($log) {
   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);
@@ -1462,16 +1515,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);
@@ -1479,16 +1535,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);
@@ -1496,16 +1555,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));
@@ -1514,16 +1575,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);
@@ -1531,16 +1595,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);
@@ -1548,16 +1615,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);
@@ -1565,15 +1635,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));
@@ -1582,7 +1655,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) {
@@ -1608,7 +1684,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;
   }
@@ -2267,4 +2343,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);
+}    
+
+
 ?>