X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=fa53c6291a1a8ea790f64c60754ce7d593225343;hb=e4bf569ad33ddc0459769eb1fa1e0113bb83899d;hp=0129fdefbc086bb12b4fccf43d29b6de03a50441;hpb=4a722187cb50054e4f912c06af078dd2171a1b85;p=brisk.git
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 0129fde..fa53c62 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -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.2";
+$G_brisk_version = "3.5.1";
/* 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.',
+$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.',
+ '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' => '
@@ -385,7 +385,7 @@ class Table {
function create($idx)
{
- if (($thiz =& new Table()) == FALSE)
+ if (($thiz = new Table()) == FALSE)
return (FALSE);
$thiz->idx = $idx;
@@ -429,7 +429,7 @@ class Table {
function myclone($from)
{
- if (($thiz =& new Table()) == FALSE)
+ if (($thiz = new Table()) == FALSE)
return (FALSE);
$this->copy($from);
@@ -439,7 +439,7 @@ class Table {
function spawn($from)
{
- if (($thiz =& new Table()) == FALSE)
+ if (($thiz = new Table()) == FALSE)
return (FALSE);
$thiz->idx = $from->idx;
@@ -499,7 +499,7 @@ class Table {
return ($this->player_n - 1);
}
- function user_rem(&$room, &$user)
+ function user_rem($room, $user)
{
$tabpos = $user->table_pos;
@@ -509,7 +509,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 +525,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');
@@ -599,7 +599,8 @@ define(USER_FLAG_TY_SUSPEND, 0x400000); // done
define(USER_FLAG_TY_DISABLE, 0x800000); // done
class User {
- var $idx; // index in the users array
+ var $idx; // index in the users array when you are in game
+ var $idx_orig; // index in the users array when you aren't in game
var $code; // authentication code
var $name; // name of the user
var $sess; // session of the user
@@ -619,8 +620,8 @@ class User {
// FIXME: the table_orig field must be removed after table field verify of index management (in spawned table
// it is allways ZERO
- var $table_orig; // id of the current table (if in table state)
- var $table; // id of the current table (if in table state)
+ var $table; // id of the current table when you are in game
+ var $table_orig; // id of the current table when you aren't in game
var $table_pos; // idx on the table
var $table_token;// token that identify a game on a table
var $flags; // Bitfield with: AUTHENTICATE: 0x02
@@ -637,41 +638,40 @@ 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;
- $thiz->code = -1;
- $thiz->name = $name;
- $thiz->sess = $sess;
- $thiz->ip = $ip;
- $thiz->lacc = time();
- $thiz->laccwr = time();
- $thiz->bantime = 0;
- $thiz->stat = $stat;
- $thiz->subst = $subst;
- $thiz->step = 1;
- $thiz->trans_step = -1;
- $thiz->comm = array();
- $thiz->asta_card = -2;
- $thiz->asta_pnt = -1;
- $thiz->handpt = -1;
+ $thiz->idx = $idx;
+ $thiz->idx_orig = $idx;
+ $thiz->code = -1;
+ $thiz->name = $name;
+ $thiz->sess = $sess;
+ $thiz->ip = $ip;
+ $thiz->lacc = time();
+ $thiz->laccwr = time();
+ $thiz->bantime = 0;
+ $thiz->stat = $stat;
+ $thiz->subst = $subst;
+ $thiz->step = 1;
+ $thiz->trans_step = -1;
+ $thiz->comm = array();
+ $thiz->asta_card = -2;
+ $thiz->asta_pnt = -1;
+ $thiz->handpt = -1;
$thiz->exitislock = TRUE;
- $thiz->flags = 0x00;
+ $thiz->flags = 0x00;
- $thiz->chattime = array_fill(0, CHAT_N, 0);
- $thiz->chat_cur = 0;
- $thiz->chat_lst = "";
- $thiz->chat_ban = 0;
- $thiz->chat_dlt = 0;
+ $thiz->chattime = array_fill(0, CHAT_N, 0);
+ $thiz->chat_cur = 0;
+ $thiz->chat_lst = "";
+ $thiz->chat_ban = 0;
+ $thiz->chat_dlt = 0;
$thiz->table_orig = $table;
$thiz->table = $table;
- $thiz->table_pos = -1;
- $thiz->table_token = "";
+ $thiz->table_pos = -1;
+ $thiz->table_token= "";
$thiz->shm_sz = SHM_DIMS_U_MIN;
return ($thiz);
}
@@ -679,6 +679,7 @@ class User {
function copy($from)
{
$this->idx = $from->idx;
+ $this->idx_orig = $from->idx;
$this->code = $from->code;
$this->name = $from->name;
$this->sess = $from->sess;
@@ -704,15 +705,15 @@ class User {
$this->handpt = $from->handpt;
$this->exitislock = $from->exitislock;
- $this->flags = $from->flags;
+ $this->flags = $from->flags;
- $this->chattime = array();
+ $this->chattime = array();
for ($i = 0 ; $i < CHAT_N ; $i++)
$this->chattime[$i] = $from->chattime[$i];
- $this->chat_cur = $from->chat_cur;
- $this->chat_lst = $from->chat_lst;
- $this->chat_ban = $from->chat_ban;
- $this->chat_dlt = $from->chat_dlt;
+ $this->chat_cur = $from->chat_cur;
+ $this->chat_lst = $from->chat_lst;
+ $this->chat_ban = $from->chat_ban;
+ $this->chat_dlt = $from->chat_dlt;
$this->table_orig = $from->table_orig;
$this->table = $from->table;
@@ -726,7 +727,7 @@ class User {
function myclone($from)
{
- if (($thiz =& new User()) == FALSE)
+ if (($thiz = new User()) == FALSE)
return (FALSE);
$thiz->copy($from);
@@ -736,10 +737,11 @@ class User {
function spawn($from, $table, $table_pos)
{
- if (($thiz =& new User()) == FALSE)
+ if (($thiz = new User()) == FALSE)
return (FALSE);
$thiz->idx = $from->idx;
+ $thiz->idx_orig = $from->idx;
$thiz->code = $from->code;
$thiz->name = $from->name;
$thiz->sess = $from->sess;
@@ -808,39 +810,69 @@ class User {
*/
}
- function step_set($step) {
- $this->step = $step;
-
- do {
- if (validate_sess($this->sess) == FALSE)
- break;
- if (file_exists(PROXY_PATH) == FALSE)
- mkdir(PROXY_PATH);
- if (($fp = @fopen(PROXY_PATH."/".$this->sess.".step", 'w')) == FALSE)
- break;
- fwrite($fp, pack("LL",$this->step, $this->idx));
- fclose($fp);
-
+ function step_set($step)
+ {
+ $this->step = $step & 0x7fffffff;
+
return (TRUE);
- } while (0);
-
- return (FALSE);
}
function step_inc($delta = 1) {
- $this->step += $delta;
-
- if (validate_sess($this->sess)) {
- 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));
- fclose($fp);
+ $this->step += $delta;
+ /* modularization because unpack() not manage unsigned 32bit int correctly */
+ $this->step &= 0x7fffffff;
+
+ return TRUE;
+ }
- return (TRUE);
- }
-
- return (FALSE);
+ function save_step()
+ {
+ do {
+ if (validate_sess($this->sess) == FALSE)
+ break;
+ if (file_exists(PROXY_PATH) == FALSE)
+ mkdir(PROXY_PATH);
+ 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);
+ } while (0);
+
+ return (FALSE);
+ }
+
+ static function load_step($sess)
+ {
+ $fp = FALSE;
+ do {
+ if (validate_sess($sess) == 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 (mb_strlen($s, "ASCII") != 8)
+ 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);
+
+ log_rd2("STEP_GET [".$sess."]: return false ");
+
+ return (FALSE);
}
function reset() {
@@ -861,135 +893,115 @@ class User {
$this->the_end = FALSE;
}
-
-
- // SHSPLIT save and load function for the User class.
- function load_data($id)
+ static function load_data($id, $sess)
{
- GLOBAL $sess;
-
- // error_log("User::load_data BEGIN", 0);
-
- $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);
-
- log_only("bri == ".($user == FALSE ? "FALSE" : "TRUE")." bri === ".($user === FALSE ? "FALSE" : "TRUE")." bri 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);
+ $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 ($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);
+
+ if ($doexit)
+ exit();
+
+ 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);
- 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);
+ while ($user->shm_sz < SHM_DIMS_U_MAX) {
+ if (($shm = shm_attach($tok, $user->shm_sz)) == FALSE)
+ break;
+
+ // 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;
+ }
+ shm_detach($shm);
+ $user->shm_sz += SHM_DIMS_U_DLT;
+ }
+
+ if ($shm)
+ shm_detach($shm);
+
+ return (FALSE);
}
-
} // end class User
-function step_get($sess) {
- $fp = FALSE;
- do {
- if (validate_sess($sess) == 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)
- 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);
-
- log_rd2("STEP_GET: return false ");
-
- return (FALSE);
-}
-
function step_unproxy($sess) {
log_rd2("UNPROXY: ".PROXY_PATH."/".$sess.".step");
if (file_exists(PROXY_PATH) == FALSE)
@@ -1003,7 +1015,7 @@ class Room {
var $table;
var $comm; // commands for many people
var $step; // current step of the comm array
- var $garbage_timeout;
+ // externalized var $garbage_timeout;
var $shm_sz;
function Room () {
@@ -1011,11 +1023,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 );
@@ -1031,7 +1043,8 @@ class Room {
else
$this->table[$i]->auth_only = FALSE;
}
- $this->garbage_timeout = 0;
+ // externalized $this->garbage_timeout = 0;
+ Room::garbage_time_expire_set(0);
$this->shm_sz = SHM_DIMS_MIN;
}
@@ -1045,24 +1058,26 @@ class Room {
/* Garbage collector degli utenti in timeout */
$curtime = time();
- if ($force || $this->garbage_timeout < $curtime) {
+
+ // externalized if ($force || $this->garbage_timeout < $curtime) {
+ if ($force || Room::garbage_time_is_expired($curtime)) {
// FIXME BRISK4: include for each kind of table
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);
log_main("ERROR: not matching table_start. Room: ".$table_cur->table_start." Table: ".$bri->table_start);
@@ -1078,7 +1093,7 @@ 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) {
@@ -1094,8 +1109,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;
@@ -1106,10 +1121,10 @@ 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;
- Briskin5::destroy_data($table_idx);
+ Bin5::destroy_data($table_idx);
}
else {
log_main("gm:: save_data");
@@ -1118,14 +1133,14 @@ class Room {
$this->user[$table_cur->player[$i]]->lacc = $bri->user[$i]->lacc;
}
- Briskin5::save_data(&$bri);
+ Bin5::save_data($bri);
}
- } // else if (($bri = &Briskin5::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();
@@ -1144,11 +1159,11 @@ 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 = "";
}
- Briskin5::unlock_data($sem);
+ Bin5::unlock_data($sem);
} // bri::lock_data
} // if ($table_cur->player_n == PLAYERS_N) {
} // for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) {
@@ -1156,7 +1171,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);
@@ -1176,7 +1191,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 ???");
}
@@ -1194,14 +1209,15 @@ class Room {
}
log_rd2("GARBAGE UPDATED!");
- $this->garbage_timeout = time() + GARBAGE_TIMEOUT;
+ // externalized $this->garbage_timeout = 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);
@@ -1255,7 +1271,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);
@@ -1266,7 +1282,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]) {
@@ -1296,7 +1312,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];
@@ -1344,10 +1360,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);
@@ -1359,7 +1375,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) {
@@ -1374,7 +1390,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]) {
@@ -1387,13 +1403,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;
@@ -1429,7 +1445,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);
@@ -1450,23 +1466,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;
@@ -1509,7 +1525,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;
@@ -1572,7 +1588,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.
@@ -1695,7 +1711,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;
@@ -1890,17 +1906,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;
@@ -1908,10 +1924,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;
@@ -1920,9 +1936,9 @@ class Room {
$bri_user->comm[$bri_user->step % COMM_N] .= $to_tabl;
$bri_user->step_inc();
}
- Briskin5::save_data(&$bri);
+ Bin5::save_data($bri);
}
- Briskin5::unlock_data($sem);
+ Bin5::unlock_data($sem);
} // bri::lock_data
} // if ($table_cur->player_n == PLAYERS_N) {
} // for ($table_idx = 0 ; $table_idx < TABLES_N ; $table_idx++) {
@@ -1930,11 +1946,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 ...
@@ -1951,7 +1967,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);
}
}
@@ -2013,7 +2029,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 {
@@ -2060,7 +2075,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 == "") {
@@ -2076,15 +2091,15 @@ class Room {
if ($ghost_user->stat == "table" && $this->table[$table_idx]->player_n == PLAYERS_N) {
// FIXME BRISK4: include for each kind of table
require_once("${G_base}briskin5/Obj/briskin5.phh");
- if (($brisem = Briskin5::lock_data($table_idx)) != FALSE) {
- if (($bri = &Briskin5::load_data($table_idx)) != FALSE) {
+ if (($brisem = Bin5::lock_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;
- Briskin5::save_data(&$bri);
+ Bin5::save_data($bri);
}
}
- Briskin5::unlock_data($brisem);
+ Bin5::unlock_data($brisem);
}
}
@@ -2138,7 +2153,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++) {
@@ -2159,11 +2174,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
@@ -2226,8 +2241,6 @@ class Room {
GLOBAL $sess;
$doexit = FALSE;
- // error_log("Room::load_data BEGIN", 0);
-
do {
if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) {
log_main("ftok failed");
@@ -2253,8 +2266,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)
@@ -2267,7 +2278,7 @@ class Room {
shm_detach($shm);
for ($i = 0 ; $i < MAX_PLAYERS ; $i++) {
- $room->user[$i] = User::load_data($i);
+ $room->user[$i] = User::load_data($i, FALSE);
}
}
@@ -2284,7 +2295,7 @@ class Room {
}
- function save_data_orig(&$room)
+ function save_data_orig($room)
{
GLOBAL $sess;
@@ -2319,16 +2330,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);
@@ -2365,32 +2373,33 @@ class Room {
User::save_data($user_park[$i], $i);
$room->user[$i] = $user_park[$i];
}
+ log_load("FINISH: ".($ret == TRUE ? "TRUE" : "FALSE"));
return ($ret);
}
- function lock_data()
+ static function lock_data()
{
- GLOBAL $sess;
-
- // echo "LOCK: ".FTOK_PATH."/main";
- // exit;
- if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) {
- return (FALSE);
- }
- // echo "FTOK ".$tok."
";
- if (($res = sem_get($tok)) == FALSE) {
- return (FALSE);
- }
- if (sem_acquire($res)) {
- log_lock("LOCK room");
- return ($res);
- }
- else
- return (FALSE);
+ GLOBAL $sess;
+
+ // echo "LOCK: ".FTOK_PATH."/main";
+ // exit;
+ if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) {
+ return (FALSE);
+ }
+ // echo "FTOK ".$tok."
";
+ if (($res = sem_get($tok)) == FALSE) {
+ return (FALSE);
+ }
+ if (sem_acquire($res)) {
+ log_lock("LOCK room");
+ return ($res);
+ }
+ else
+ return (FALSE);
}
- function unlock_data($res)
+ static function unlock_data($res)
{
GLOBAL $sess;
@@ -2448,14 +2457,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;
@@ -2474,6 +2483,49 @@ class Room {
return ($ret);
}
+ static function garbage_time_is_expired($tm)
+ {
+ $ret = TRUE;
+ $fp = FALSE;
+ do {
+ if (file_exists(PROXY_PATH) == FALSE)
+ mkdir(PROXY_PATH);
+ if (($fp = @fopen(PROXY_PATH."/garbage_time.expired", 'rb')) == FALSE)
+ break;
+ if (($s = fread($fp, 4)) == FALSE)
+ break;
+ if (mb_strlen($s, "ASCII") != 4)
+ break;
+ $arr = unpack('Le', $s);
+ if ($arr['e'] > $tm)
+ $ret = FALSE;
+ } while (0);
+
+ if ($fp != FALSE)
+ fclose($fp);
+
+ log_rd2("END: return ".($ret ? "TRUE" : "FALSE"));
+
+ return ($ret);
+ }
+
+ static function garbage_time_expire_set($tm)
+ {
+ do {
+ if (file_exists(PROXY_PATH) == FALSE)
+ mkdir(PROXY_PATH);
+ if (($fp = @fopen(PROXY_PATH."/garbage_time.expired", 'wb')) == FALSE)
+ break;
+ fwrite($fp, pack("L",$tm));
+ fclose($fp);
+
+ return (TRUE);
+ } while (0);
+
+ return (FALSE);
+ }
+
+
} // end class Room
function make_seed()
@@ -2482,245 +2534,287 @@ function make_seed()
return (float) $sec + ((float) $usec * 100000);
}
+function btrace_line($ar)
+{
+ GLOBAL $G_btrace_pref_sub;
-function log_mop($step, $log) {
- GLOBAL $sess, $PHP_SELF;
-
- if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LMOP) == 0)
- return;
-
- if (isset($sess) == FALSE)
- $ssess = "XXXX";
- else
- $ssess = $sess;
-
- if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LMOP) == 0)
- return;
-
- if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
- fwrite($fp, sprintf("LMOP: [%f] [%05d] [%s] [%s]\n", gettimeofday(TRUE), $step, $PHP_SELF, $log));
- fclose($fp);
- }
+ $ret = "";
+ for ($i = 0 ; $i < count($ar) ; $i++) {
+ $with_class = isset($ar[$i]['class']);
+ $with_file = isset($ar[$i]['file']);
+ $ret .= sprintf("%s%s%s (%s:%d)", ($i == 0 ? "" : ", "),
+ ($with_class ? $ar[$i]['class'].$ar[$i]['type'] : ""),
+ $ar[$i]['function'], ($with_file ? str_replace($G_btrace_pref_sub, "", $ar[$i]['file']) : ""),
+ ($with_file ? $ar[$i]['line'] : ""));
+ }
+
+ return ($ret);
}
-
-function log_only2($log) {
- GLOBAL $sess, $PHP_SELF;
-
- 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] [%s]\n", $ssess, $PHP_SELF, $log));
- fclose($fp);
- }
+function log_mop($step, $log)
+{
+ GLOBAL $sess, $PHP_SELF;
+
+ if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LMOP) == 0)
+ return;
+
+ if (isset($sess) == FALSE)
+ $ssess = "XXXX";
+ else
+ $ssess = $sess;
+
+ if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LMOP) == 0)
+ return;
+
+ $btrace = btrace_line(debug_backtrace());
+ 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);
+ }
}
-function log_crit($log) {
- GLOBAL $sess, $PHP_SELF;
-
- 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] [%s]\n", $ssess, $PHP_SELF, $log));
- fclose($fp);
- }
+function log_only2($log)
+{
+ GLOBAL $sess, $PHP_SELF;
+
+ 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;
+
+ $btrace = btrace_line(debug_backtrace());
+ if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
+ fwrite($fp, sprintf("ONL2: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
+ fclose($fp);
+ }
}
-function log_only($log) {
- GLOBAL $sess, $PHP_SELF;
-
- 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] [%s]\n", $ssess, $PHP_SELF, $log));
- fclose($fp);
- }
+function log_crit($log)
+{
+ GLOBAL $sess, $PHP_SELF;
+
+ 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;
+
+ $btrace = btrace_line(debug_backtrace());
+ if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
+ fwrite($fp, sprintf("CRIT: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
+ fclose($fp);
+ }
}
-function log_main($log) {
+function log_only($log)
+{
GLOBAL $sess, $PHP_SELF;
-
- 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] [%s]\n", $ssess, $PHP_SELF, $log));
- fclose($fp);
- }
+
+ 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;
+
+ $btrace = btrace_line(debug_backtrace());
+ if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
+ fwrite($fp, sprintf("ONLY: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
+ fclose($fp);
+ }
}
-function log_rd($log) {
- GLOBAL $sess, $PHP_SELF;
-
- 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] [%s]\n", $ssess, $PHP_SELF, $log));
- fclose($fp);
- }
+function log_main($log)
+{
+ GLOBAL $sess, $PHP_SELF;
+
+ 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;
+
+ $btrace = btrace_line(debug_backtrace());
+ if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
+ fwrite($fp, sprintf("MAIN: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
+ fclose($fp);
+ }
}
-function log_rd2($log) {
- GLOBAL $sess, $PHP_SELF;
-
- 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] [%s]\n", $ssess, $PHP_SELF, $log));
- fclose($fp);
- }
+function log_rd($log)
+{
+ GLOBAL $sess, $PHP_SELF;
+
+ 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;
+
+ $btrace = btrace_line(debug_backtrace());
+ if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
+ fwrite($fp, sprintf("READ: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
+ fclose($fp);
+ }
}
-function log_send($log) {
- GLOBAL $sess, $PHP_SELF;
-
- 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] [%s]\n", $ssess, $PHP_SELF, $log));
- fclose($fp);
- }
+function log_rd2($log)
+{
+ GLOBAL $sess, $PHP_SELF;
+
+ 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;
+
+ $btrace = btrace_line(debug_backtrace());
+
+ if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
+ fwrite($fp, sprintf("REA2: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
+ fclose($fp);
+ }
}
-function log_lock($log) {
- GLOBAL $sess, $PHP_SELF;
-
- 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] [%s]\n", $ssess, $PHP_SELF, $log));
- fclose($fp);
- }
+function log_send($log)
+{
+ GLOBAL $sess, $PHP_SELF;
+
+ 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;
+
+ $btrace = btrace_line(debug_backtrace());
+ if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
+ fwrite($fp, sprintf("SEND: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
+ fclose($fp);
+ }
}
-function log_wr($log) {
- GLOBAL $sess, $PHP_SELF;
-
- 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] [%s]\n", $ssess, $PHP_SELF, $log));
- fclose($fp);
- }
+function log_lock($log)
+{
+ GLOBAL $sess, $PHP_SELF;
+
+ 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;
+
+ $btrace = btrace_line(debug_backtrace());
+ if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
+ fwrite($fp, sprintf("LOCK: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
+ fclose($fp);
+ }
}
-function log_load($log) {
- GLOBAL $sess, $PHP_SELF;
-
- if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_LOAD) == 0)
- return;
-
- if (isset($sess) == FALSE)
- $ssess = "XXXX";
- else
- $ssess = $sess;
+function log_wr($log)
+{
+ GLOBAL $sess, $PHP_SELF;
+
+ 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;
+
+ $btrace = btrace_line(debug_backtrace());
+ if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
+ fwrite($fp, sprintf("WRIT: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
+ fclose($fp);
+ }
+}
- 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] [%s]\n", $ssess, $PHP_SELF, $log));
- fclose($fp);
- }
+function log_load($log)
+{
+ GLOBAL $sess, $PHP_SELF;
+
+ 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;
+
+ $btrace = btrace_line(debug_backtrace());
+ if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
+ fwrite($fp, sprintf("LOAD: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
+ fclose($fp);
+ }
}
-function log_auth($sess, $log) {
+function log_auth($sess, $log)
+{
GLOBAL $PHP_SELF;
- 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) {
- fwrite($fp, sprintf("AUTH: [%s] [%d] [%s] [%s]\n", $sess, time(), $PHP_SELF, $log));
- fclose($fp);
- }
+ 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;
+
+ $btrace = btrace_line(debug_backtrace());
+ if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
+ fwrite($fp, sprintf("LOAD: [%s] [%d] [%s] [%s]\n", $sess, time(), $log, $btrace));
+ fclose($fp);
+ }
}
// 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,6 +2933,8 @@ function secstoword($secs)
{
GLOBAL $G_lang;
+ $ret = "";
+
$mins = floor($secs / 60);
$secs = $secs % 60;
if ($G_lang == 'en') {