X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbrisk.phh;h=589eed9a87386d1a29e7e11121cc2eca79e36f74;hb=6215f77e418ed06e4822895bf644b585d32ba959;hp=26c1452dcbd18e942729a73294adbf5d570c10ab;hpb=edeb82dc5663f68eba154735f52c68ebbbe9c25a;p=brisk.git

diff --git a/web/brisk.phh b/web/brisk.phh
index 26c1452..589eed9 100644
--- a/web/brisk.phh
+++ b/web/brisk.phh
@@ -25,7 +25,8 @@ define(PROXY_PATH, "/var/lib/brisk_proxy");
 define(TABLES_N, 8);
 define(PLAYERS_N, 3);
 define(MAX_POINTS, 5);
-define(MAX_PLAYERS, (PLAYERS_N * TABLES_N));
+define(MAX_PLAYERS, (20 + (PLAYERS_N * TABLES_N)));
+define(SHM_DIMS, (50000 * MAX_PLAYERS));
 define(COMM_N, 12);
 define(COMM_GEN_N, 50);
 define(SESS_LEN, 13);
@@ -40,9 +41,9 @@ define(BRISK_DEBUG, FALSE);
 // define(DEBUGGING, "local");
 
 $G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "0.7.0";
+$G_brisk_version = "0.7.2";
 
-$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: "donate" e piccole rifiniture.',
+$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!' );
 $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.');
 
@@ -54,7 +55,6 @@ Questa &egrave; un\'implementazione della briscola in cinque, cos&igrave; come &
 <a target=\\"_blank\\" href=\\"http://it.wikipedia.org/wiki/Briscola#Gioco_a_5\\">Wikipedia</a>; in breve &egrave; la variante con l\'asta prima sulla carta e poi sui punti.<br><br>
 <b>Configurazione del browser.</b><br>
 Occorre abilitare i cookies.<br>
-Se usate Internet Explorer dovete anche settare: strumenti->cronologia_esplorazioni->impostazioni ad \\"apertura alla pagina web\\".<br>
 <br>
 <b>Uso del sito</b><br>
 Potete sedervi a un tavolo o rimanere in piedi.<br>
@@ -367,9 +367,10 @@ class User {
   var $table;      // id of the current table (if in table state)
   var $table_pos;  // idx on the table
 
-  function User($name, $sess, $stat = "", $subst = "", $table = -1) {
+  function User($name, $sess, $stat = "", $subst = "", $table = -1, $ip="0.0.0.0") {
     $this->name  = $name;
     $this->sess  = $sess;
+    $this->ip    = $ip;
     $this->lacc   = time();
     $this->laccwr = time();
     $this->bantime = 0;
@@ -401,11 +402,14 @@ class User {
   function step_set($step) {
     $this->step = $step;
     
-    if (validate_sess($this->sess)) {
-      $fp = fopen(PROXY_PATH."/".$this->sess.".step", 'w');
+    do {
+      if (validate_sess($this->sess) == FALSE)
+	break;
+      if (($fp = @fopen(PROXY_PATH."/".$this->sess.".step", 'w')) == FALSE)
+	break;
       fwrite($fp, pack("l",$this->step), 4);
       fclose($fp);
-    }
+    } while (0);
   }
 
   function step_inc() {
@@ -420,17 +424,38 @@ class User {
 }
 
 function step_get($sess) {
-  $fp = fopen(PROXY_PATH."/".$sess.".step", 'r');
-  $arr = unpack('l', fread($fp, 4));
-  fclose($fp);
+  $fp = FALSE;
+  $ct = 0;
+  do {
+    if (validate_sess($sess) == FALSE)
+      break;
+  $ct = 1;
+    if (($fp = @fopen(PROXY_PATH."/".$sess.".step", 'rb')) == FALSE)
+      break;
+  $ct = 2;
+    if (($s = fread($fp, 4)) == FALSE)
+      break;
+  $ct = 3;
+    if (strlen($s) != 4)
+      break;
+  $ct = 4;
+    $arr = unpack('l', $s);
+    fclose($fp);
+
+    // log_rd2($sess, "A0: ".$arr[0]."  A1: ".$arr[1]);
+    return ($arr[1]);
+  } while (0);
 
-  // log_rd2($sess, "A0: ".$arr[0]."  A1: ".$arr[1]);
-  return ($arr[1]);
+  if ($fp != FALSE)
+    fclose($fp);
+
+  log_rd2($sess, "STEP_GET: return false ".$ct);
+  return (FALSE);
 }
 
 function step_unproxy($sess) {
   log_rd2($sess, "UNPROXY: ".PROXY_PATH."/".$sess.".step");
-  unlink(PROXY_PATH."/".$sess.".step");
+  @unlink(PROXY_PATH."/".$sess.".step");
 }
 
 
@@ -887,73 +912,91 @@ function log_main($sess, $log) {
   if (BRISK_DEBUG != TRUE)
     return;
 
-  $fp = fopen("/tmp/brisk_main.log", 'a');
-  fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
-  fclose($fp);
+  if (($fp = @fopen("/tmp/brisk_main.log", 'a')) != FALSE) {
+    fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
+    fclose($fp);
+  }
 }
 
 function log_rd($sess, $log) {
   if (BRISK_DEBUG != TRUE)
     return;
 
-  $fp = fopen("/tmp/brisk_rd.log", 'a');
-  fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
-  fclose($fp);
+  if (($fp = @fopen("/tmp/brisk_rd.log", 'a')) != FALSE) {
+    fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
+    fclose($fp);
+  }
 }
 
 function log_rd2($sess, $log) {
   if (BRISK_DEBUG != TRUE)
     return;
 
-  $fp = fopen("/tmp/brisk_rd2.log", 'a');
-  fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
-  fclose($fp);
+  if (($fp = @fopen("/tmp/brisk_rd2.log", 'a')) != FALSE) {
+    fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
+    fclose($fp);
+  }
 }
 
 function log_send($sess, $log) {
   if (BRISK_DEBUG != TRUE)
     return;
 
-  $fp = fopen("/tmp/brisk_send.log", 'a');
-  fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
-  fclose($fp);
+  if (($fp = @fopen("/tmp/brisk_send.log", 'a')) != FALSE) {
+    fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
+    fclose($fp);
+  }
 }
 
 function log_auth($sess, $log) {
   if (BRISK_DEBUG != TRUE)
     return;
 
-  $fp = fopen("/tmp/brisk_auth.log", 'a');
-  fwrite($fp, sprintf("SESS: [%d] [%s] [%s]\n", time(), $sess, $log));
-  fclose($fp);
+  if (($fp = @fopen("/tmp/brisk_auth.log", 'a')) != FALSE) {
+    fwrite($fp, sprintf("SESS: [%d] [%s] [%s]\n", time(), $sess, $log));
+    fclose($fp);
+  }
+}
+
+function log_lock($sess, $log) {
+  if (BRISK_DEBUG != TRUE)
+    return;
+
+  if (($fp = @fopen("/tmp/brisk_lock.log", 'a')) != FALSE) {
+    fwrite($fp, sprintf("SESS: [%d] [%s] [%s]\n", time(), $sess, $log));
+    fclose($fp);
+  }
 }
 
 function log_wr($sess, $log) {
   if (BRISK_DEBUG != TRUE)
     return;
 
-  $fp = fopen("/tmp/brisk_wr.log", 'a');
-  fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
-  fclose($fp);
+  if (($fp = @fopen("/tmp/brisk_wr.log", 'a')) != FALSE) {
+    fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
+    fclose($fp);
+  }
 }
 
 function log_load($sess, $log) {
   if (BRISK_DEBUG != TRUE)
     return;
 
-  $fp = fopen("/tmp/brisk_load.log", 'a');
-  fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
-  fclose($fp);
+  if (($fp = @fopen("/tmp/brisk_load.log", 'a')) != FALSE) {
+    fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
+    fclose($fp);
+  }
 }
 
 function log_legal($timecur, $sess, $name, $where, $mesg) 
 {
   GLOBAL $_SERVER;
 
-  $fp = fopen(LEGAL_PATH, 'a');
-  /* Unix time | session | nickname | IP | where was | mesg */
-  fwrite($fp, sprintf("%ld|%s|%s|%s|%s|%s|\n", $timecur, $sess, $name, $_SERVER['REMOTE_ADDR'], $where , $mesg));
-  fclose($fp);
+  if (($fp = @fopen(LEGAL_PATH, 'a')) != FALSE) {
+    /* Unix time | session | nickname | IP | where was | mesg */
+    fwrite($fp, sprintf("%ld|%s|%s|%s|%s|%s|\n", $timecur, $sess, $name, $_SERVER['REMOTE_ADDR'], $where , $mesg));
+    fclose($fp);
+  }
 }
 
 
@@ -978,14 +1021,17 @@ function lock_data()
     echo "SEM_GET FAILED";
     exit;
   }
-  if (sem_acquire($res)) 
+  if (sem_acquire($res)) {
+    log_lock($sess, "LOCK");
     return ($res);
+  }
   else
     return (false);
 }
 
 function unlock_data($res)
 {
+  log_lock($sess, "UNLOCK");
   return (sem_release($res));
 }
 
@@ -1019,7 +1065,7 @@ function &load_data()
     exit;
   }
 
-  if ($shm = shm_attach($tok,100000 * TABLES_N)) {
+  if ($shm = shm_attach($tok, SHM_DIMS)) {
     if(($bri = @shm_get_var($shm, $tok)) == false) {
       log_main("XXX", "INIT MAIN DATA");
 
@@ -1051,11 +1097,13 @@ function save_data(&$bri)
   do {
     $isacq = TRUE;
     
-    if (($shm = shm_attach($tok,100000 * TABLES_N)) == FALSE)
+    if (($shm = shm_attach($tok, SHM_DIMS)) == FALSE)
       break;
     
-    if (shm_put_var($shm, $tok, $bri) == FALSE)
+    if (shm_put_var($shm, $tok, $bri) == FALSE) {
+      echo "DANNO: ".strlen(serialize($bri));
       break;
+    }
     // log_main("XXX", "QUI CI ARRIVA [".$bri->user[0]->name."]");
     $ret = TRUE;
   } while (0);