X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbrisk.phh;h=53512be2bf5ad895e2e9c6056dda042c6fa29492;hb=72b2f9e80768426e5b4e89be640a7ceb44a89dcc;hp=26c1452dcbd18e942729a73294adbf5d570c10ab;hpb=edeb82dc5663f68eba154735f52c68ebbbe9c25a;p=brisk.git
diff --git a/web/brisk.phh b/web/brisk.phh
index 26c1452..53512be 100644
--- a/web/brisk.phh
+++ b/web/brisk.phh
@@ -22,10 +22,12 @@
define(FTOK_PATH, "/var/lib/brisk");
define(LEGAL_PATH, "/tmp/legal_brisk");
define(PROXY_PATH, "/var/lib/brisk_proxy");
-define(TABLES_N, 8);
+define(TABLES_N, 12);
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, 6);
define(COMM_N, 12);
define(COMM_GEN_N, 50);
define(SESS_LEN, 13);
@@ -39,10 +41,12 @@ define(NICKSERV, "SERVER");
define(BRISK_DEBUG, FALSE);
// define(DEBUGGING, "local");
+$G_false = FALSE;
+
$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.3";
-$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), NOVITA\': "donate" e piccole rifiniture.',
+$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), NOVITA\': ottimizzazione della CPU e chiuso il bug di mancato cambio pagina.',
'Se vuoi iscriverti alla Mailing List, cliccala!' );
$table_wellarr = Array ( 'Benvenuto al tavolo. Se almeno tre giocatori non sbloccano l\'uscita cliccando il lucchetto, chi esce non può risedersi a un qualunque tavolo per '.floor(BAN_TIME/60).' minuti.');
@@ -54,7 +58,6 @@ Questa è un\'implementazione della briscola in cinque, così come &
Wikipedia; in breve è la variante con l\'asta prima sulla carta e poi sui punti.
Configurazione del browser.
Occorre abilitare i cookies.
-Se usate Internet Explorer dovete anche settare: strumenti->cronologia_esplorazioni->impostazioni ad \\"apertura alla pagina web\\".
Uso del sito
Potete sedervi a un tavolo o rimanere in piedi.
@@ -209,7 +212,7 @@ class Table {
for ($i = 39 ; $i >= 0 ; $i--) {
$rn = rand(0, $i);
-
+
if ($rn == 0)
log_main("RND ZERO", "");
@@ -219,7 +222,7 @@ class Table {
$this->card[$id]->assign('hand', $owner);
$rest[$rn] = $rest[$i];
- $pubbpos[$rn2] = $pubbpos[$i];
+ // $pubbpos[$rn2] = $pubbpos[$i];
}
}
@@ -241,7 +244,7 @@ class Table {
function game_init(&$userarr)
{
- log_rd2($sess,"GSTART 4");
+ log_rd2("XXX", "GSTART 4");
$this->gstart = ($this->mazzo+1) % PLAYERS_N;
$this->bunch_make();
@@ -366,10 +369,12 @@ class User {
var $exitislock; // Player can exit from the table ?
var $table; // id of the current table (if in table state)
var $table_pos; // idx on the table
+ var $the_end; // Flag to change the end of the session
- 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 +406,18 @@ 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);
- }
+
+ return (TRUE);
+ } while (0);
+
+ return (FALSE);
}
function step_inc() {
@@ -415,22 +427,47 @@ class User {
$fp = fopen(PROXY_PATH."/".$this->sess.".step", 'w');
fwrite($fp, pack("l",$this->step), 4);
fclose($fp);
+
+ return (TRUE);
}
+
+ return (FALSE);
}
}
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);
+
+ if ($fp != FALSE)
+ fclose($fp);
- // log_rd2($sess, "A0: ".$arr[0]." A1: ".$arr[1]);
- return ($arr[1]);
+ 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");
}
@@ -562,7 +599,7 @@ class brisco {
$ret .= table_content($this, $user_cur, $table_idx);
$ret .= standup_content($this, $user_cur);
- $act_content = table_act_content(FALSE, 0, $e, $user->table);
+ $act_content = table_act_content(FALSE, 0, $table_idx, $user->table);
$ret .= sprintf('$("table_act%d").innerHTML = "%s";', $table_idx, $act_content);
@@ -764,7 +801,7 @@ class brisco {
function &get_user($sess, &$idx)
{
- GLOBAL $PHP_SELF;
+ GLOBAL $PHP_SELF, $G_false;
if (validate_sess($sess)) {
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
@@ -782,7 +819,8 @@ class brisco {
else {
log_main($sess, sprintf("get_user: Wrong strlen [%s]",$sess));
}
- return (FALSE);
+
+ return ($G_false);
}
/*
@@ -796,12 +834,14 @@ class brisco {
*/
function &add_user(&$sess, &$idx, $name, $ip)
{
+ GLOBAL $G_false;
+
$idx = -1;
$idfree = -1;
if (($name_new = validate_name($name)) == FALSE) {
$idx = -2;
- return (FALSE);
+ return ($G_false);
}
log_auth("XXX", sprintf("ARRIVA: [%s]", $sess));
@@ -840,6 +880,7 @@ class brisco {
}
$this->user[$idx]->name = $name_new;
$this->user[$idx]->stat_set("room");
+ // MOP $this->user[$idx]->step_set(0);
$this->user[$idx]->subst = "standup";
$this->user[$idx]->lacc = $curtime;
$this->user[$idx]->laccwr = $curtime;
@@ -850,7 +891,7 @@ class brisco {
return ($this->user[$idx]);
}
- return (FALSE);
+ return ($G_false);
}
function standup_update(&$user)
@@ -883,77 +924,106 @@ function make_seed()
return (float) $sec + ((float) $usec * 100000);
}
+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));
+ fclose($fp);
+ }
+}
+
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);
+ }
}
@@ -967,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) {
@@ -978,14 +1050,19 @@ function lock_data()
echo "SEM_GET FAILED";
exit;
}
- if (sem_acquire($res))
+ if (sem_acquire($res)) {
+ log_only($sess, "LOCK");
return ($res);
+ }
else
- return (false);
+ return (FALSE);
}
function unlock_data($res)
{
+ GLOBAL $sess;
+
+ log_only($sess, "UNLOCK");
return (sem_release($res));
}
@@ -1003,7 +1080,7 @@ function lock_banlist()
if (sem_acquire($res))
return ($res);
else
- return (false);
+ return (FALSE);
}
function unlock_banlist($res)
@@ -1014,17 +1091,28 @@ function unlock_banlist($res)
function &load_data()
{
+ GLOBAL $G_false, $sess;
+
if (($tok = ftok(FTOK_PATH."/main", "B")) == -1) {
echo "FTOK FAILED";
exit;
}
- if ($shm = shm_attach($tok,100000 * TABLES_N)) {
- if(($bri = @shm_get_var($shm, $tok)) == false) {
- log_main("XXX", "INIT MAIN DATA");
-
+ if ($shm = shm_attach($tok, SHM_DIMS)) {
+ $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();
- shm_put_var($shm, $tok, $bri);
+ if (shm_put_var($shm, $tok, $bri) == FALSE) {
+ log_only($sess, "PUT_VAR FALLITA ".strlen(serialize($bri)));
+ log_only($sess, serialize($bri));
+ }
}
shm_detach($shm);
@@ -1033,12 +1121,14 @@ function &load_data()
return ($ret);
}
- return (NULL);
+ return ($G_false);
}
function save_data(&$bri)
{
+ GLOBAL $sess;
+
$ret = FALSE;
$shm = FALSE;
$isacq = FALSE;
@@ -1051,11 +1141,15 @@ 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)
+ log_only($sess, "PUT_VAR DI ".strlen(serialize($bri)));
+ if (shm_put_var($shm, $tok, $bri) == FALSE) {
+ 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."]");
$ret = TRUE;
} while (0);
@@ -1087,7 +1181,7 @@ function table_act_content($isstanding, $sitted, $table, $cur_table)
function table_content($bri, $user, $table_idx)
{
$content = "";
-
+ $ret = "";
// TODO
//
// Si possono usare i dati nella classe table
@@ -1107,7 +1201,7 @@ function table_content($bri, $user, $table_idx)
else
{ $hilion = ""; $hilioff = ""; }
- log_main($bri->user[$e]->name, sprintf("IN TABLE [%d]", $table_idx));
+ log_main($user_cur->name, sprintf("IN TABLE [%d]", $table_idx));
$content .= sprintf("%s%s%s
",$hilion, xcape($user_cur->name), $hilioff);
}
@@ -1232,6 +1326,7 @@ function multoval($mult)
function show_table_info(&$bri, &$table, $table_pos)
{
+ $ret = "";
$user = &$bri->user[$table->player[$table_pos]];
$pnt_min = $table->points_n - MAX_POINTS < 0 ? 0 : $table->points_n - MAX_POINTS;
@@ -1335,6 +1430,7 @@ function show_table_info(&$bri, &$table, $table_pos)
function root_wellcome($user)
{
GLOBAL $root_wellarr;
+ $ret = "";
for ($i = 0 ; $i < count($root_wellarr) ; $i++)
$ret .= sprintf('chatt_sub("ChanServ: ","%s");', str_replace('"', '\"', $root_wellarr[$i]));
@@ -1345,6 +1441,7 @@ function root_wellcome($user)
function table_wellcome($user)
{
GLOBAL $table_wellarr;
+ $ret = "";
for ($i = 0 ; $i < count($table_wellarr) ; $i++)
$ret .= sprintf('chatt_sub("ChanServ: ","%s");', str_replace('"', '\"', $table_wellarr[$i]));
@@ -1354,7 +1451,7 @@ function table_wellcome($user)
function show_room(&$bri, &$user)
{
- $ret .= sprintf('gst.st = %d;', $user->step);
+ $ret = sprintf('gst.st = %d;', $user->step);
$ret .= sprintf('stat = "%s";', $user->stat);
$ret .= root_wellcome($user);
@@ -1433,7 +1530,7 @@ function show_table(&$bri, &$user, $sendstep, $is_transition, $is_again)
break;
}
}
- log_rd($sess, "O ".$o." VAL ".$table->card[$o]->value." Owner: ".$table->card[$o]->owner);
+ log_rd($user->sess, "O ".$o." VAL ".$table->card[$o]->value." Owner: ".$table->card[$o]->owner);
$ret .= sprintf( ' card_send(%d,%d,%d,%8.2f,%d);|', ($table->gstart + $e) % PLAYERS_N,
$i, ((($e + PLAYERS_N - $table_pos + $table->gstart) % PLAYERS_N) == 0 ?