X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=2a2d9eb6ce32740184cab74a74641d463cd18603;hb=8fe1e432c4661ebf186026f920d778d37dbe0953;hp=8de27bd345684ac29442babce8864d9b89405231;hpb=93809fbf156343b87f540d7eb2d20506a51ee365;p=brisk.git
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 8de27bd..2a2d9eb 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -70,7 +70,7 @@ define(DBG_LOAD, 0x0100);
define(DBG_AUTH, 0x0200);
define(DBG_CRIT, 0x0400);
define(DBG_LMOP, 0x0800);
-
+define(DBG_TRAC, 0x1000);
// NOTE: BRISK DEBUG must be a numerical constant, not the result of operations on symbols
define(BRISK_DEBUG, 0xffffffbf);
@@ -134,12 +134,12 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi',
$G_lng = langtolng($G_lang);
$G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "3.4.3";
+$G_brisk_version = "3.5.3";
/* MLANG: ALL THE INFO STRINGS IN brisk.phh */
-$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': versione di test per la nuova gestione dei dati volatili, rivista gestione del ticker.',
+$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': terza versione di test per la nuova gestione dei dati volatili, rivista gestione del ticker.',
'Se vuoi iscriverti alla Mailing List, cliccala!' ),
- 'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: test version for the new volatile data management, ticker management refactored.',
+ 'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: third test version for the new volatile data management, ticker management refactored.',
'If you want to subscribe our Mailing List, click it!' ) );
$G_room_help = array( 'it' => '
@@ -363,6 +363,23 @@ function xcapemesg($s)
}
+class Vect {
+ function Vect($a)
+ {
+ $this->el = $a;
+ }
+
+ function getbyid($idx)
+ {
+ return ($this->el[$idx]);
+ }
+
+ function setbyid($idx, $v)
+ {
+ $this->el[$idx] = $v;
+ }
+}
+
class Table {
var $idx;
var $player;
@@ -385,7 +402,7 @@ class Table {
function create($idx)
{
- if (($thiz =& new Table()) == FALSE)
+ if (($thiz = new Table()) == FALSE)
return (FALSE);
$thiz->idx = $idx;
@@ -429,7 +446,7 @@ class Table {
function myclone($from)
{
- if (($thiz =& new Table()) == FALSE)
+ if (($thiz = new Table()) == FALSE)
return (FALSE);
$this->copy($from);
@@ -439,7 +456,7 @@ class Table {
function spawn($from)
{
- if (($thiz =& new Table()) == FALSE)
+ if (($thiz = new Table()) == FALSE)
return (FALSE);
$thiz->idx = $from->idx;
@@ -499,7 +516,7 @@ class Table {
return ($this->player_n - 1);
}
- function user_rem(&$room, &$user)
+ function user_rem($room, $user)
{
$tabpos = $user->table_pos;
@@ -509,7 +526,7 @@ class Table {
/* aggiorna l'array dei giocatori al tavolo. */
for ($i = $tabpos ; $i < $this->player_n-1 ; $i++) {
$this->player[$i] = $this->player[$i+1];
- $user_cur = &$room->user[$this->player[$i]];
+ $user_cur = $room->user[$this->player[$i]];
$user_cur->table_pos = $i;
}
$this->player_n--;
@@ -525,7 +542,7 @@ class Table {
// ($this->table[$i]->auth_only == FALSE ? TRUE : $user->flags & USER_FLAG_AUTH));
// function act_content($isstanding, $sitted, $table, $cur_table, $allowed)
- function act_content(&$user)
+ function act_content($user)
{
$ret = "";
$isstanding = ($user->subst == 'standup');
@@ -638,9 +655,7 @@ class User {
}
function create($idx, $name, $sess, $stat = "", $subst = "", $table = -1, $ip="0.0.0.0") {
- // error_log("User::create BEGIN", 0);
-
- if (($thiz =& new User()) == FALSE)
+ if (($thiz = new User()) == FALSE)
return (FALSE);
$thiz->idx = $idx;
@@ -729,7 +744,7 @@ class User {
function myclone($from)
{
- if (($thiz =& new User()) == FALSE)
+ if (($thiz = new User()) == FALSE)
return (FALSE);
$thiz->copy($from);
@@ -739,7 +754,7 @@ class User {
function spawn($from, $table, $table_pos)
{
- if (($thiz =& new User()) == FALSE)
+ if (($thiz = new User()) == FALSE)
return (FALSE);
$thiz->idx = $from->idx;
@@ -804,7 +819,7 @@ class User {
/*
if (validate_sess($this->sess)) {
if (file_exists(PROXY_PATH) == FALSE)
- mkdir(PROXY_PATH);
+ mkdir(PROXY_PATH, 0775, TRUE);
$fp = fopen(PROXY_PATH."/".$this->sess.".stat", 'w');
fwrite($fp, sprintf("%s\n",$this->stat));
fclose($fp);
@@ -816,16 +831,29 @@ class User {
{
$this->step = $step & 0x7fffffff;
+ return (TRUE);
+ }
+
+ function step_inc($delta = 1) {
+ $this->step += $delta;
+ /* modularization because unpack() not manage unsigned 32bit int correctly */
+ $this->step &= 0x7fffffff;
+
+ return TRUE;
+ }
+
+ function save_step()
+ {
do {
if (validate_sess($this->sess) == FALSE)
break;
if (file_exists(PROXY_PATH) == FALSE)
- mkdir(PROXY_PATH);
+ mkdir(PROXY_PATH, 0775, TRUE);
if (($fp = @fopen(PROXY_PATH."/".$this->sess.".step", 'w')) == FALSE)
break;
fwrite($fp, pack("LL",$this->step, $this->idx));
fclose($fp);
-
+
log_main("step_set [".$this->sess. "] [".$this->step."]");
return (TRUE);
@@ -834,22 +862,32 @@ class User {
return (FALSE);
}
- function step_inc($delta = 1) {
- $this->step += $delta;
- /* modularization because unpack() not manage unsigned 32bit int correctly */
- $this->step &= 0x7fffffff;
-
- if (validate_sess($this->sess)) {
+ static function load_step($sess)
+ {
+ $fp = FALSE;
+ do {
+ if (validate_sess($sess) == FALSE)
+ break;
+
if (file_exists(PROXY_PATH) == FALSE)
- mkdir(PROXY_PATH);
- $fp = fopen(PROXY_PATH."/".$this->sess.".step", 'w');
- fwrite($fp, pack("LL", $this->step, $this->idx));
+ mkdir(PROXY_PATH, 0775, TRUE);
+ if (($fp = @fopen(PROXY_PATH."/".$sess.".step", 'rb')) == FALSE)
+ break;
+ if (($s = fread($fp, 8)) == FALSE)
+ break;
+ if (mb_strlen($s, "ASCII") != 8)
+ break;
+ $arr = unpack('Ls/Li', $s);
fclose($fp);
-
- log_main("step_inc [".$this->sess. "] [".$this->step."]");
- return (TRUE);
- }
+ // log_rd2("A0: ".$arr[0]." A1: ".$arr[1]);
+ return ($arr);
+ } while (0);
+
+ if ($fp != FALSE)
+ fclose($fp);
+
+ log_rd2("STEP_GET [".$sess."]: return false ");
return (FALSE);
}
@@ -872,137 +910,106 @@ class User {
$this->the_end = FALSE;
}
-
-
- // SHSPLIT save and load function for the User class.
static function load_data($id, $sess)
{
- // error_log("User::load_data BEGIN", 0);
-
- log_main("load_data: id [".$id."] sess [".($sess == FALSE ? "FALSE" : $sess)."] ");
-
- $doexit = FALSE;
- do {
- if (($tok = @ftok(FTOK_PATH."/user".$id, "B")) == -1) {
- log_main("ftok failed");
- $doexit = TRUE;
- break;
- }
-
- if (($shm_sz = sharedmem_sz($tok)) == -1) {
- log_main("shmop_open failed");
- }
-
- if ($shm_sz == -1)
- $shm_sz = SHM_DIMS_U_MIN;
-
- if ($shm = shm_attach($tok, $shm_sz)) {
- $user = @shm_get_var($shm, $tok);
-
- if ($sess != FALSE && $user->sess != $sess) {
- $doexit = TRUE;
- break;
- }
- log_only("user == ".($user == FALSE ? "FALSE" : "TRUE")." user === ".($user === FALSE ? "FALSE" : "TRUE")." user isset ".(isset($user) ? "TRUE" : "FALSE"));
- if (isset($user))
- log_only("bri count ".count($user));
-
- if ($user == FALSE) {
- log_only("INIT MAIN DATA");
-
- // SHSPLIT FIXME: init_data for User class ??
- $user = User::create($id, "", "");
- if (@shm_put_var($shm, $tok, $user) == FALSE) {
- log_only("PUT_VAR FALLITA ".strlen(serialize($user)));
- log_only(serialize($user));
- }
- }
-
- $user->shm_sz = $shm_sz;
-
- shm_detach($shm);
- }
+ log_main("load_data: id [".$id."] sess [".($sess == FALSE ? "FALSE" : $sess)."] ");
- //
- // SHSPLIT: load users from the shared memory
- //
- return ($user);
- } while (0);
-
- if ($doexit)
- exit();
-
- return (FALSE);
+ do {
+ if (($tok = @ftok(FTOK_PATH."/user".$id, "B")) == -1) {
+ log_main("ftok failed");
+ break;
+ }
+
+ if (($shm_sz = sharedmem_sz($tok)) == -1) {
+ log_main("shmop_open failed");
+ }
+
+ if ($shm_sz == -1)
+ $shm_sz = SHM_DIMS_U_MIN;
+
+ if ($shm = shm_attach($tok, $shm_sz)) {
+ $user = @shm_get_var($shm, $tok);
+
+ if ($sess != FALSE && $user->sess != $sess) {
+ break;
+ }
+ log_only("user == ".($user == FALSE ? "FALSE" : "TRUE")." user === ".($user === FALSE ? "FALSE" : "TRUE")." user isset ".(isset($user) ? "TRUE" : "FALSE"));
+
+ if ($user == FALSE) {
+ log_only("INIT MAIN DATA");
+
+ // SHSPLIT FIXME: init_data for User class ??
+ $user = User::create($id, "", "");
+ if (@shm_put_var($shm, $tok, $user) == FALSE) {
+ log_only("PUT_VAR FALLITA ".strlen(serialize($user)));
+ log_only(serialize($user));
+ }
+ }
+ else {
+ if ($sess != FALSE) {
+ /*
+ * NOTE: this part is for check only, theoretically
+ * user->step anch proxy_step are set allways at the same value
+ */
+ $old_step = $user->step;
+ $arr = User::load_step($sess);
+ $user->step = $arr['s'];
+ if ($old_step != $user->step) {
+ log_crit("steps are diffetents User->step ".$user->step." Old_step: ".$old_step);
+ }
+ }
+ }
+ $user->shm_sz = $shm_sz;
+
+ shm_detach($shm);
+ }
+
+ //
+ // SHSPLIT: load users from the shared memory
+ //
+ return ($user);
+ } while (0);
+
+ return (FALSE);
}
- function save_data($user, $id)
+ static function save_data($user, $id)
{
- GLOBAL $sess;
-
- $shm = FALSE;
-
- // var_dump($user);
- // error_log("User::save_data BEGIN", 0);
-
- if (($tok = @ftok(FTOK_PATH."/user".$id, "B")) == -1) {
- return (FALSE);
- }
- while ($user->shm_sz < SHM_DIMS_U_MAX) {
- if (($shm = shm_attach($tok, $user->shm_sz)) == FALSE)
- break;
+ GLOBAL $sess;
- // log_only("PUT_VAR DI ".strlen(serialize($user)));
- if (shm_put_var($shm, $tok, $user) != FALSE) {
- shm_detach($shm);
- log_main("User[".$id."] saved.");
- return (TRUE);
- }
- if (shm_remove($shm) === FALSE) {
- log_only("REMOVE FALLITA");
- break;
+ $shm = FALSE;
+
+ if (($tok = @ftok(FTOK_PATH."/user".$id, "B")) == -1) {
+ return (FALSE);
}
- shm_detach($shm);
- $user->shm_sz += SHM_DIMS_U_DLT;
- }
-
- if ($shm)
- shm_detach($shm);
-
- return (FALSE);
- }
-
-
- static function step_get($sess)
- {
- $fp = FALSE;
- do {
- if (validate_sess($sess) == FALSE)
+ while ($user->shm_sz < SHM_DIMS_U_MAX) {
+ if (($shm = shm_attach($tok, $user->shm_sz)) == FALSE)
break;
- if (file_exists(PROXY_PATH) == FALSE)
- mkdir(PROXY_PATH);
- if (($fp = @fopen(PROXY_PATH."/".$sess.".step", 'rb')) == FALSE)
- break;
- if (($s = fread($fp, 8)) == FALSE)
- break;
- if (strlen($s) != 8)
+ // log_only("PUT_VAR DI ".strlen(serialize($user)));
+ if (shm_put_var($shm, $tok, $user) != FALSE) {
+ shm_detach($shm);
+ if ($user->sess != "")
+ $user->save_step();
+ log_main("User[".$id."] saved.");
+ return (TRUE);
+ }
+ if (shm_remove($shm) === FALSE) {
+ log_only("REMOVE FALLITA");
break;
- $arr = unpack('Ls/Li', $s);
- fclose($fp);
-
- // log_rd2("A0: ".$arr[0]." A1: ".$arr[1]);
- return ($arr);
- } while (0);
-
- if ($fp != FALSE)
- fclose($fp);
+ }
+ shm_detach($shm);
+ $user->shm_sz += SHM_DIMS_U_DLT;
+ }
- log_rd2("STEP_GET [".$sess."]: return false ");
+ if ($shm)
+ shm_detach($shm);
return (FALSE);
}
+
} // end class User
@@ -1015,6 +1022,8 @@ function step_unproxy($sess) {
class Room {
+ static $delta_t;
+
var $user;
var $table;
var $comm; // commands for many people
@@ -1027,11 +1036,11 @@ class Room {
$this->table = array();
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
- $this->user[$i] =& User::create($i, "", "");
+ $this->user[$i] = User::create($i, "", "");
}
for ($i = 0 ; $i < TABLES_N ; $i++) {
- $this->table[$i] =& Table::create($i);
+ $this->table[$i] = Table::create($i);
/* OLD METHOD
if ($i < 12) {
$row = ( (((int)($i / 4)) % 2) == 0 );
@@ -1071,7 +1080,7 @@ class Room {
// Before all align times with table timeout
for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) {
- $table_cur =& $this->table[$table_idx];
+ $table_cur = $this->table[$table_idx];
// if the table is complete and exists its shared mem we get the info about users lacc
if ($table_cur->player_n == PLAYERS_N) {
@@ -1097,11 +1106,11 @@ class Room {
log_main("garbage_manager: bri loaded successfully.");
$bri->garbage_manager(TRUE);
- $bri_table = &$bri->table[0];
+ $bri_table = $bri->table[0];
// is the end of the table
if ($bri->the_end == TRUE) {
- /*
+ /*
* DESTROY OF FINISHED TABLE && MOVE PLAYER TO ROOM AGAIN
*/
log_main("garbage_manager: INSIDE THE END.");
@@ -1113,8 +1122,8 @@ class Room {
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 = $this->user[$table_cur->player[$i]];
+ $bri_user = $bri->user[$i];
$user_cur->subst = $bri_user->subst;
$user_cur->step = $bri_user->step;
@@ -1125,7 +1134,7 @@ class Room {
log_legal($curtime, $user_cur, "STAT:DESTROY_GAME", $plist);
- $this->room_join_wakeup(&$user_cur, FALSE, 0);
+ $this->room_join_wakeup($user_cur, FALSE, 0);
$table_cur->table_token = "";
$table_cur->wakeup_time = $curtime + WAKEUP_TIME;
Bin5::destroy_data($table_idx);
@@ -1137,14 +1146,14 @@ class Room {
$this->user[$table_cur->player[$i]]->lacc = $bri->user[$i]->lacc;
}
- Bin5::save_data(&$bri);
+ Bin5::save_data($bri);
}
- } // else if (($bri = &Bin5::load_data($table_idx)) != FALSE) {
+ } // else if (($bri = Bin5::load_data($table_idx)) != FALSE) {
else if ($no_recovery == FALSE) {
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 = $this->user[$table_cur->player[$i]];
$user_cur->subst = "shutdowner";
$user_cur->step_inc();
@@ -1163,7 +1172,7 @@ class Room {
}
log_legal($curtime, $user_cur, "STAT:DESTROY_GAME(RECOVERY)", $plist);
- $this->room_join_wakeup(&$user_cur, TRUE, -2);
+ $this->room_join_wakeup($user_cur, TRUE, -2);
$table_cur->table_token = "";
}
@@ -1175,7 +1184,7 @@ class Room {
log_rd2("out new loop.");
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
- $user_cur = &$this->user[$i];
+ $user_cur = $this->user[$i];
log_rd2("User: ".$user_cur->name." stat: ".$user_cur->stat." subst: ".$user_cur->subst);
@@ -1195,7 +1204,7 @@ class Room {
if ($user_cur->subst == 'sitdown' || $user_cur->stat == 'table')
$this->room_wakeup($user_cur);
else if ($user_cur->subst == 'standup')
- $this->room_outstandup(&$user_cur);
+ $this->room_outstandup($user_cur);
else
log_rd2("LOGOUT FROM WHAT ???");
}
@@ -1214,14 +1223,14 @@ class Room {
log_rd2("GARBAGE UPDATED!");
// externalized $this->garbage_timeout = time() + GARBAGE_TIMEOUT;
- Room::garbage_time_expire_set(time() + GARBAGE_TIMEOUT);
+ Room::garbage_time_expire_set($curtime + GARBAGE_TIMEOUT);
$ismod = TRUE;
}
return ($ismod);
}
- function show_room($user_step, &$user)
+ function show_room($user_step, $user)
{
GLOBAL $G_lang, $mlang_brisk;
log_main("show_room: username: ".$user->name);
@@ -1275,7 +1284,7 @@ class Room {
function room_wakeup($user)
{
$table_idx = $user->table;
- $table = &$this->table[$table_idx];
+ $table = $this->table[$table_idx];
log_main("WAKEUP: begin function table:".$table_idx." stat: ".$user->stat." subst: ".$user->subst);
@@ -1286,7 +1295,7 @@ class Room {
log_main("WAKEUP: from table [".$user->table."] nplayers_n: ".$this->table[$user->table]->player_n);
for ($i = 0 ; $i < $table->player_n ; $i++) {
- $user_cur = &$this->user[$table->player[$i]];
+ $user_cur = $this->user[$table->player[$i]];
log_main("PREIMPOST: INLOOP name: ".$user_cur->name);
if ($user->idx_get() != $table->player[$i]) {
@@ -1316,7 +1325,7 @@ class Room {
/* aggiorna l'array dei giocatori al tavolo. */
- $table->user_rem(&$this, &$user);
+ $table->user_rem($this, $user);
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
$user_cur = $this->user[$i];
@@ -1364,10 +1373,10 @@ class Room {
}
}
- function room_join_wakeup(&$user, $update_lacc = FALSE, $trans_delta)
+ function room_join_wakeup($user, $update_lacc = FALSE, $trans_delta)
{
$table_idx = $user->table;
- $table = &$this->table[$table_idx];
+ $table = $this->table[$table_idx];
log_main("JOIN_WAKEUP: begin function table:".$table_idx." stat: ".$user->stat." subst: ".$user->subst);
@@ -1379,7 +1388,7 @@ class Room {
log_main("JOIN WAKEUP: from table [".$user->table."] nplayers_n: ".$this->table[$user->table]->player_n);
for ($i = 0 ; $i < $table->player_n ; $i++) {
- $user_cur = &$this->user[$table->player[$i]];
+ $user_cur = $this->user[$table->player[$i]];
log_main("PREIMPOST INLOOP name: ".$user_cur->name);
if ($user_cur->sess != "") {
if ($update_lacc == TRUE) {
@@ -1394,7 +1403,7 @@ class Room {
$user_cur->stat_set("room");
$user_cur->subst = "standup";
$user_cur->table = -1;
- $user_wup[$user_wup_n++] = &$user_cur;
+ $user_wup[$user_wup_n++] = $user_cur;
$remove_wagon = FALSE;
if($table->wag_own == $table->player[$i]) {
@@ -1407,13 +1416,13 @@ class Room {
}
for ($wup_idx = 0 ; $wup_idx < $user_wup_n ; $wup_idx++)
- $table->user_rem(&$this, &$user_wup[$wup_idx]);
+ $table->user_rem($this, $user_wup[$wup_idx]);
/* aggiorna l'array dei giocatori al tavolo. */
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
log_main("START LOOP");
- $user_cur = &$this->user[$i];
+ $user_cur = $this->user[$i];
if ($user_cur->sess == '' || $user_cur->stat != 'room') {
log_main("name: ".$user_cur->name."skip subst: ".$user_cur->subst);
continue;
@@ -1449,7 +1458,7 @@ class Room {
$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] = $this->show_room(($user_cur->step + 1), &$user_cur);
+ $user_cur->comm[$user_cur->step % COMM_N] = $this->show_room(($user_cur->step + 1), $user_cur);
$user_cur->step_inc();
log_main("POST show_room username: ".$user_cur->name." STEP: ".$user_cur->step);
@@ -1470,23 +1479,23 @@ class Room {
}
}
- function room_outstandup(&$user)
+ function room_outstandup($user)
{
- $this->room_sitdown(&$user, -1);
+ $this->room_sitdown($user, -1);
}
- function table_update(&$user)
+ function table_update($user)
{
log_main("table_update: pre - USER: ".$user->name);
$table_idx = $user->table;
if ($table_idx > -1)
- $table = &$this->table[$table_idx];
+ $table = $this->table[$table_idx];
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
$ret = "";
- $user_cur = &$this->user[$i];
+ $user_cur = $this->user[$i];
if ($user_cur->sess == '' || $user_cur->stat != 'room')
continue;
@@ -1529,7 +1538,7 @@ class Room {
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
$ret = "";
- $user_cur = &$this->user[$i];
+ $user_cur = $this->user[$i];
if ($user_cur->sess == '' || $user_cur->stat != 'room')
continue;
@@ -1592,7 +1601,7 @@ class Room {
break;
}
- $table = &$this->table[$user->table];
+ $table = $this->table[$user->table];
if ($table->wag_own != -1) {
// MLANG
Il messaggio di segnalazione del tavolo è già attivato.
@@ -1715,7 +1724,7 @@ class Room {
$msg = "COMMAND ".$msg;
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
- $user_cur = &$this->user[$i];
+ $user_cur = $this->user[$i];
if ($user_cur->sess == '')
continue;
@@ -1910,17 +1919,17 @@ class Room {
require_once("${G_base}briskin5/Obj/briskin5.phh");
// Before all align times with table timeout
for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) {
- $table_cur =& $this->table[$table_idx];
+ $table_cur = $this->table[$table_idx];
// if the table is complete and exists its shared mem we get the info about users lacc
if ($table_cur->player_n == PLAYERS_N) {
log_main("PLAYERS == N TABLE ".$table_idx);
- if (($sem = Briskin5::lock_data($table_idx)) != FALSE) {
+ if (($sem = Bin5::lock_data($table_idx)) != FALSE) {
log_main("bin5 lock data success");
$no_recovery = FALSE;
- if (($bri = &Briskin5::load_data($table_idx)) != FALSE) {
+ if (($bri = Bin5::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);
$bri = FALSE;
@@ -1928,10 +1937,10 @@ class Room {
}
if ($bri != FALSE) {
- $bri_table = &$bri->table[0];
+ $bri_table = $bri->table[0];
for ($i = 0 ; $i < $bri_table->player_n ; $i++) {
// stat must be "table" by definition
- $bri_user =& $bri->user[$i];
+ $bri_user = $bri->user[$i];
if ($target != "" && $bri_user->name != $target)
continue;
@@ -1940,7 +1949,7 @@ class Room {
$bri_user->comm[$bri_user->step % COMM_N] .= $to_tabl;
$bri_user->step_inc();
}
- Bin5::save_data(&$bri);
+ Bin5::save_data($bri);
}
Bin5::unlock_data($sem);
} // bri::lock_data
@@ -1950,11 +1959,11 @@ class Room {
if ($update_room) {
if ($user->stat == 'room' && $user->subst == 'standup') {
- $this->standup_update(&$user);
+ $this->standup_update($user);
}
else if ($user->stat == 'room' && $user->subst == 'sitdown') {
log_main("chatt_send pre table update");
- $this->table_update(&$user);
+ $this->table_update($user);
log_main("chatt_send post table update");
}
} // if ($update_room ...
@@ -1971,7 +1980,7 @@ class Room {
if (strcmp($sess, $this->user[$i]->sess) == 0) {
// find it
$idx = $i;
- $ret = &$this->user[$i];
+ $ret = $this->user[$i];
return ($ret);
}
}
@@ -2033,7 +2042,6 @@ class Room {
log_auth("XXX", "authenticate: ".($authenticate != FALSE ? "TRUE" : "FALSE"));
if ($authenticate != FALSE) {
- // error_log(print_r(&$authenticate, TRUE),0);
$user_type = $authenticate->type_get();
}
else {
@@ -2080,7 +2088,7 @@ class Room {
if ($ghost > -1 && $ghost_auth && ($authenticate != FALSE)) {
/* swap session */
- $ghost_user =& $this->user[$ghost];
+ $ghost_user = $this->user[$ghost];
$curtime = time();
$ghost_user->step_inc();
if ($sess == "") {
@@ -2097,11 +2105,11 @@ class Room {
// FIXME BRISK4: include for each kind of table
require_once("${G_base}briskin5/Obj/briskin5.phh");
if (($brisem = Bin5::lock_data($table_idx)) != FALSE) {
- if (($bri = &Bin5::load_data($table_idx)) != FALSE) {
+ if (($bri = Bin5::load_data($table_idx)) != FALSE) {
if ($bri->the_end != TRUE) {
$bri->user[$ghost_user->table_pos]->step_inc();
$bri->user[$ghost_user->table_pos]->sess = $sess;
- Bin5::save_data(&$bri);
+ Bin5::save_data($bri);
}
}
Bin5::unlock_data($brisem);
@@ -2158,7 +2166,7 @@ class Room {
if ($ghost > -1) {
log_main("ghost: rename!");
- $ghost_user =& $this->user[$ghost];
+ $ghost_user = $this->user[$ghost];
if ($ghost_auth == FALSE) {
for ($sfx = 1 ; $sfx <= MAX_PLAYERS ; $sfx++) {
@@ -2179,11 +2187,11 @@ class Room {
$ghost_user->name = $ghostname;
if ($ghost_user->stat == 'room' && $ghost_user->subst == 'standup') {
- $this->standup_update(&$ghost_user);
+ $this->standup_update($ghost_user);
}
else {
log_main("chatt_send pre table update");
- $this->table_update(&$ghost_user);
+ $this->table_update($ghost_user);
log_main("chatt_send post table update");
}
} // if ($ghost_auth == FALSE
@@ -2244,14 +2252,10 @@ class Room {
function load_data()
{
GLOBAL $sess;
- $doexit = FALSE;
-
- // error_log("Room::load_data BEGIN", 0);
do {
if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) {
log_main("ftok failed");
- $doexit = TRUE;
break;
}
@@ -2273,8 +2277,6 @@ class Room {
log_only("INIT MAIN DATA");
shm_detach($shm);
- // error_log("DE CHE", 0);
-
$room = Room::create();
if (Room::save_data($room) == FALSE)
@@ -2287,7 +2289,13 @@ class Room {
shm_detach($shm);
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
- $room->user[$i] = User::load_data($i, FALSE);
+ if (($room->user[$i] = User::load_data($i, FALSE)) == FALSE) {
+ log_crit("Bin5_user::load_data failed");
+ break;
+ }
+ }
+ if ($i < MAX_PLAYERS) {
+ break;
}
}
@@ -2297,14 +2305,11 @@ class Room {
return ($room);
} while (0);
- if ($doexit)
- exit();
-
return (FALSE);
}
- function save_data_orig(&$room)
+ function save_data_orig($room)
{
GLOBAL $sess;
@@ -2339,16 +2344,13 @@ class Room {
}
- function save_data(&$room)
+ function save_data($room)
{
GLOBAL $sess;
$ret = FALSE;
$shm = FALSE;
- // var_dump($room);
- // error_log("Room::save_data BEGIN", 0);
-
if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1)
return (FALSE);
@@ -2403,8 +2405,10 @@ class Room {
if (($res = sem_get($tok)) == FALSE) {
return (FALSE);
}
- if (sem_acquire($res)) {
- log_lock("LOCK room");
+ if (sem_acquire($res)) {
+ self::$delta_t = microtime(TRUE);
+ log_lock("LOCK room [".self::$delta_t."]");
+
return ($res);
}
else
@@ -2415,7 +2419,7 @@ class Room {
{
GLOBAL $sess;
- log_lock("UNLOCK room");
+ log_lock("UNLOCK room [".(microtime(TRUE) - (self::$delta_t))."]");
return (sem_release($res));
}
@@ -2469,14 +2473,14 @@ class Room {
//
$sess = $user->sess;
- $table = &$this->table[$table_idx];
+ $table = $this->table[$table_idx];
if ($user->stat != 'room')
return;
$content = "[ ";
for ($i = 0 ; $i < $table->player_n ; $i++) {
- $user_cur = &$this->user[$table->player[$i]];
+ $user_cur = $this->user[$table->player[$i]];
$flags = $user_cur->flags;
@@ -2501,12 +2505,12 @@ class Room {
$fp = FALSE;
do {
if (file_exists(PROXY_PATH) == FALSE)
- mkdir(PROXY_PATH);
- if (($fp = @fopen(PROXY_PATH."/room_garbage_time.expired", 'rb')) == FALSE)
+ mkdir(PROXY_PATH, 0775, TRUE);
+ if (($fp = @fopen(PROXY_PATH."/garbage_time.expired", 'rb')) == FALSE)
break;
if (($s = fread($fp, 4)) == FALSE)
break;
- if (strlen($s) != 4)
+ if (mb_strlen($s, "ASCII") != 4)
break;
$arr = unpack('Le', $s);
if ($arr['e'] > $tm)
@@ -2525,8 +2529,8 @@ class Room {
{
do {
if (file_exists(PROXY_PATH) == FALSE)
- mkdir(PROXY_PATH);
- if (($fp = @fopen(PROXY_PATH."/room_garbage_time.expired", 'wb')) == FALSE)
+ mkdir(PROXY_PATH, 0775, TRUE);
+ if (($fp = @fopen(PROXY_PATH."/garbage_time.expired", 'wb')) == FALSE)
break;
fwrite($fp, pack("L",$tm));
fclose($fp);
@@ -2578,7 +2582,10 @@ function log_mop($step, $log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LMOP) == 0)
return;
- $btrace = btrace_line(debug_backtrace());
+ if (BRISK_DEBUG & DBG_TRAC)
+ $btrace = btrace_line(debug_backtrace());
+ else
+ $btrace = "";
if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
fwrite($fp, sprintf("LMOP: [%f] [%05d] [%s] [%s]\n", gettimeofday(TRUE), $step, $log, $btrace));
fclose($fp);
@@ -2601,7 +2608,10 @@ function log_only2($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_ONL2) == 0)
return;
- $btrace = btrace_line(debug_backtrace());
+ if (BRISK_DEBUG & DBG_TRAC)
+ $btrace = btrace_line(debug_backtrace());
+ else
+ $btrace = "";
if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
fwrite($fp, sprintf("ONL2: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
fclose($fp);
@@ -2623,7 +2633,10 @@ function log_crit($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_CRIT) == 0)
return;
- $btrace = btrace_line(debug_backtrace());
+ if (BRISK_DEBUG & DBG_TRAC)
+ $btrace = btrace_line(debug_backtrace());
+ else
+ $btrace = "";
if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
fwrite($fp, sprintf("CRIT: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
fclose($fp);
@@ -2645,7 +2658,10 @@ function log_only($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_ONLY) == 0)
return;
- $btrace = btrace_line(debug_backtrace());
+ if (BRISK_DEBUG & DBG_TRAC)
+ $btrace = btrace_line(debug_backtrace());
+ else
+ $btrace = "";
if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
fwrite($fp, sprintf("ONLY: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
fclose($fp);
@@ -2667,7 +2683,10 @@ function log_main($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_MAIN) == 0)
return;
- $btrace = btrace_line(debug_backtrace());
+ if (BRISK_DEBUG & DBG_TRAC)
+ $btrace = btrace_line(debug_backtrace());
+ else
+ $btrace = "";
if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
fwrite($fp, sprintf("MAIN: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
fclose($fp);
@@ -2688,8 +2707,11 @@ function log_rd($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_READ) == 0)
return;
-
- $btrace = btrace_line(debug_backtrace());
+
+ if (BRISK_DEBUG & DBG_TRAC)
+ $btrace = btrace_line(debug_backtrace());
+ else
+ $btrace = "";
if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
fwrite($fp, sprintf("READ: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
fclose($fp);
@@ -2711,7 +2733,10 @@ function log_rd2($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_REA2) == 0)
return;
- $btrace = btrace_line(debug_backtrace());
+ if (BRISK_DEBUG & DBG_TRAC)
+ $btrace = btrace_line(debug_backtrace());
+ else
+ $btrace = "";
if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
fwrite($fp, sprintf("REA2: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
@@ -2734,7 +2759,10 @@ function log_send($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_SEND) == 0)
return;
- $btrace = btrace_line(debug_backtrace());
+ if (BRISK_DEBUG & DBG_TRAC)
+ $btrace = btrace_line(debug_backtrace());
+ else
+ $btrace = "";
if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
fwrite($fp, sprintf("SEND: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
fclose($fp);
@@ -2756,7 +2784,10 @@ function log_lock($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LOCK) == 0)
return;
- $btrace = btrace_line(debug_backtrace());
+ if (BRISK_DEBUG & DBG_TRAC)
+ $btrace = btrace_line(debug_backtrace());
+ else
+ $btrace = "";
if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
fwrite($fp, sprintf("LOCK: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
fclose($fp);
@@ -2778,7 +2809,10 @@ function log_wr($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_WRIT) == 0)
return;
- $btrace = btrace_line(debug_backtrace());
+ if (BRISK_DEBUG & DBG_TRAC)
+ $btrace = btrace_line(debug_backtrace());
+ else
+ $btrace = "";
if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
fwrite($fp, sprintf("WRIT: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
fclose($fp);
@@ -2800,7 +2834,10 @@ function log_load($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LOAD) == 0)
return;
- $btrace = btrace_line(debug_backtrace());
+ if (BRISK_DEBUG & DBG_TRAC)
+ $btrace = btrace_line(debug_backtrace());
+ else
+ $btrace = "";
if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
fwrite($fp, sprintf("LOAD: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
fclose($fp);
@@ -2817,7 +2854,10 @@ function log_auth($sess, $log)
if (( (BRISK_DEBUG | ($sess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_AUTH) == 0)
return;
- $btrace = btrace_line(debug_backtrace());
+ if (BRISK_DEBUG & DBG_TRAC)
+ $btrace = btrace_line(debug_backtrace());
+ else
+ $btrace = "";
if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
fwrite($fp, sprintf("LOAD: [%s] [%d] [%s] [%s]\n", $sess, time(), $log, $btrace));
fclose($fp);
@@ -2826,7 +2866,7 @@ function log_auth($sess, $log)
// function log_legal($curtime, $sess, $name, $where, $mesg)
-function log_legal($curtime, &$user, $where, $mesg)
+function log_legal($curtime, $user, $where, $mesg)
{
GLOBAL $_SERVER;
@@ -2839,28 +2879,6 @@ function log_legal($curtime, &$user, $where, $mesg)
}
}
-
-function lock_banlist()
-{
- if (($tok = @ftok(FTOK_PATH."/main", "L")) == -1) {
- echo "FTOK FAILED";
- exit;
- }
- if (($res = sem_get($tok)) == FALSE) {
- echo "SEM_GET FAILED";
- exit;
- }
- if (sem_acquire($res))
- return ($res);
- else
- return (FALSE);
-}
-
-function unlock_banlist($res)
-{
- return (sem_release($res));
-}
-
function table_act_content($isstanding, $sitted, $table, $cur_table, $allowed)
{
$ret = "";
@@ -2945,6 +2963,8 @@ function secstoword($secs)
{
GLOBAL $G_lang;
+ $ret = "";
+
$mins = floor($secs / 60);
$secs = $secs % 60;
if ($G_lang == 'en') {
@@ -2978,6 +2998,8 @@ function sharedmem_sz($tok)
}
class Warrant {
+ static $delta_t;
+
function lock_data()
{
GLOBAL $sess;
@@ -2990,7 +3012,8 @@ class Warrant {
return (FALSE);
}
if (sem_acquire($res)) {
- log_lock("LOCK warrant");
+ self::$delta_t = microtime(TRUE);
+ log_lock("LOCK warrant [".self::$delta_t."]");
return ($res);
}
else
@@ -3001,13 +3024,15 @@ class Warrant {
{
GLOBAL $sess;
- log_lock("UNLOCK warrant");
-
+ log_lock("UNLOCK warrant [".(microtime(TRUE) - (self::$delta_t))."]");
+
return (sem_release($res));
}
}
class Poll {
+ static $delta_t;
+
function lock_data()
{
GLOBAL $sess;
@@ -3019,9 +3044,11 @@ class Poll {
if (($res = sem_get($tok)) == FALSE) {
return (FALSE);
}
- if (sem_acquire($res)) {
- log_lock("LOCK poll");
- return ($res);
+ if (sem_acquire($res)) {
+ self::$delta_t = microtime(TRUE);
+ log_lock("LOCK poll [".self::$delta_t."]");
+
+ return ($res);
}
else
return (FALSE);
@@ -3031,7 +3058,7 @@ class Poll {
{
GLOBAL $sess;
- log_lock("UNLOCK poll");
+ log_lock("UNLOCK poll [".(microtime(TRUE) - (self::$delta_t))."]");
return (sem_release($res));
}