X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=inline;f=web%2FObj%2Fbrisk.phh;h=19e8cb0752216821c7e376ebd60ebd0fbb8e5e2c;hb=34ccc0593731592021bee6ab1661f8eb5ab5b1a4;hp=50bc00953f9980f5c705241e9765c18bb43008c1;hpb=0ae3af3bb3899d630685f1b8b5c2172d5f7e91c6;p=brisk.git
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 50bc009..19e8cb0 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -57,6 +57,7 @@ define(BAN_TIME, 3600);
define(GARBAGE_TIMEOUT, 10);
define(NICKSERV, "BriskServ");
+define(LOCK_SHARE_MAX, 10000);
define(DBG_ONL2, 0x0001);
define(DBG_ONLY, 0x0002);
@@ -71,8 +72,9 @@ define(DBG_AUTH, 0x0200);
define(DBG_CRIT, 0x0400);
define(DBG_LMOP, 0x0800);
define(DBG_TRAC, 0x1000);
+define(DBG_SHME, 0x2000);
// NOTE: BRISK DEBUG must be a numerical constant, not the result of operations on symbols
-define(BRISK_DEBUG, 0xffffffbf);
+define(BRISK_DEBUG, 0x0800);
define(BRISK_SINGLE_DEBUG,0);
define(BRISK_SINGLE_SESS, "");
@@ -134,12 +136,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.5.3";
+$G_brisk_version = "3.6.3";
/* MLANG: ALL THE INFO STRINGS IN brisk.phh */
-$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.',
+$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NOVITA\': nuovo sistema di evidenziazione degli utenti registrati.',
'Se vuoi iscriverti alla Mailing List, cliccala!' ),
- 'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: third test version for the new volatile data management, ticker management refactored.',
+ 'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), NEWS: usage of reader/writer locking instead of generic exclusive locking.',
'If you want to subscribe our Mailing List, click it!' ) );
$G_room_help = array( 'it' => '
@@ -282,6 +284,79 @@ Copyright 2006-2009 Matteo Nasta
version '.$G_brisk_version.'
Copyright 2006-2009 Matteo Nastasi (aka mop)
');
+function mop_flush()
+{
+ ob_flush();
+ flush();
+}
+
+function file_lock($fname, $is_exclusive)
+{
+ if (($res = @fopen($fname, "r+")) == FALSE) {
+ return (FALSE);
+ }
+
+ if (flock($res, ($is_exclusive ? LOCK_EX : LOCK_SH)) == FALSE) {
+ fclose($res);
+ return (FALSE);
+ }
+
+ return ($res);
+}
+
+function file_unlock($res)
+{
+ if ($res != FALSE) {
+ flock($res, LOCK_UN);
+ fclose($res);
+ }
+}
+
+function webservers_exceeded()
+{
+ return(file_exists(PROXY_PATH."/webservers_exceded.flag"));
+}
+
+function webservers_check()
+{
+ GLOBAL $G_webserver_max;
+
+ /* FIXME: check all procs expirations */
+ return (10);
+
+ $ct = 0;
+
+ $dh = opendir('/proc');
+ while (($file = readdir($dh)) !== false) {
+ if (preg_match('/[0-9]+/', $file)) {
+ $cmdline = explode("\0", file_get_contents('/proc/'.$file.'/cmdline'));
+ // echo "xxx".$cmdline[0].$n;
+ if (strstr('/usr/sbin/apache2', $cmdline[0]) != FALSE) {
+ // echo "yyy".$cmdline[0].$n;
+ $ct++;
+ }
+ }
+ }
+ closedir($dh);
+
+ if ($ct >= $G_webserver_max) {
+ touch(PROXY_PATH."/webservers_exceded.flag");
+ }
+ else {
+ unlink(PROXY_PATH."/webservers_exceded.flag");
+ }
+ return ($ct);
+}
+
+$escpush_from = array("\\", "\"");
+$escpush_to = array("\\\\", "\\\"");
+function escpush($s)
+{
+ GLOBAL $escpush_from, $escpush_to;
+
+ return str_replace($escpush_from, $escpush_to, $s);
+}
+
$escinp_from = array( "\"" );
$escinp_to = array( """ );
@@ -819,8 +894,8 @@ class User {
/*
if (validate_sess($this->sess)) {
if (file_exists(PROXY_PATH) == FALSE)
- mkdir(PROXY_PATH);
- $fp = fopen(PROXY_PATH."/".$this->sess.".stat", 'w');
+ mkdir(PROXY_PATH, 0775, TRUE);
+ $fp = @fopen(PROXY_PATH."/".$this->sess.".stat", 'w');
fwrite($fp, sprintf("%s\n",$this->stat));
fclose($fp);
}
@@ -848,7 +923,7 @@ class User {
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));
@@ -870,7 +945,7 @@ class User {
break;
if (file_exists(PROXY_PATH) == FALSE)
- mkdir(PROXY_PATH);
+ mkdir(PROXY_PATH, 0775, TRUE);
if (($fp = @fopen(PROXY_PATH."/".$sess.".step", 'rb')) == FALSE)
break;
if (($s = fread($fp, 8)) == FALSE)
@@ -892,13 +967,20 @@ class User {
return (FALSE);
}
+ static function unproxy_step($sess) {
+ log_rd2("UNPROXY: ".PROXY_PATH."/".$sess.".step");
+ if (file_exists(PROXY_PATH) == FALSE)
+ return;
+ @unlink(PROXY_PATH."/".$sess.".step");
+ }
+
function reset() {
$curtime = time();
log_legal($curtime, $this, "STAT:LOGOUT", '');
$tmp_sess = $this->sess;
$this->sess = "";
- step_unproxy($tmp_sess);
+ self::unproxy_step($tmp_sess);
$this->name = ""; // OK here
while (array_pop($this->comm) != NULL);
$this->step = 0;
@@ -914,11 +996,9 @@ class User {
{
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;
}
@@ -930,10 +1010,10 @@ class User {
$shm_sz = SHM_DIMS_U_MIN;
if ($shm = shm_attach($tok, $shm_sz)) {
- $user = @shm_get_var($shm, $tok);
-
+ if (($user = @shm_get_var($shm, $tok)) == FALSE) {
+ break;
+ }
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"));
@@ -947,6 +1027,7 @@ class User {
log_only("PUT_VAR FALLITA ".strlen(serialize($user)));
log_only(serialize($user));
}
+ log_shme("User::save_data2");
}
else {
if ($sess != FALSE) {
@@ -973,9 +1054,6 @@ class User {
return ($user);
} while (0);
- if ($doexit)
- exit();
-
return (FALSE);
}
@@ -994,10 +1072,13 @@ class User {
break;
// log_only("PUT_VAR DI ".strlen(serialize($user)));
- if (shm_put_var($shm, $tok, $user) != FALSE) {
+ if (@shm_put_var($shm, $tok, $user) != FALSE) {
shm_detach($shm);
if ($user->sess != "")
$user->save_step();
+
+ log_shme("User::save_data");
+
log_main("User[".$id."] saved.");
return (TRUE);
}
@@ -1015,17 +1096,17 @@ class User {
return (FALSE);
}
+ function myname_innerHTML()
+ {
+ $class_id = ($this->flags & USER_FLAG_AUTH) + 1;
+
+ return (sprintf('$("myname").innerHTML = "%s";', $class_id,
+ xcape($this->name,ENT_COMPAT,"UTF-8")));
+ }
} // end class User
-function step_unproxy($sess) {
- log_rd2("UNPROXY: ".PROXY_PATH."/".$sess.".step");
- if (file_exists(PROXY_PATH) == FALSE)
- mkdir(PROXY_PATH);
- @unlink(PROXY_PATH."/".$sess.".step");
-}
-
class Room {
static $delta_t;
@@ -1079,8 +1160,11 @@ class Room {
$curtime = time();
// externalized if ($force || $this->garbage_timeout < $curtime) {
- if ($force || Room::garbage_time_is_expired($curtime)) {
+ if (!$force && !Room::garbage_time_is_expired($curtime)) {
+ return ($ismod);
+ }
+ webservers_check();
// FIXME BRISK4: include for each kind of table
require_once("${G_base}briskin5/Obj/briskin5.phh");
@@ -1092,7 +1176,7 @@ class Room {
if ($table_cur->player_n == PLAYERS_N) {
log_main("PLAYERS == N TABLE ".$table_idx);
- if (($sem = Bin5::lock_data($table_idx)) != FALSE) {
+ if (($sem = Bin5::lock_data(TRUE, $table_idx)) != FALSE) {
log_main("bin5 lock data success");
$no_recovery = FALSE;
@@ -1116,7 +1200,7 @@ class Room {
// 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.");
@@ -1143,7 +1227,8 @@ class Room {
$this->room_join_wakeup($user_cur, FALSE, 0);
$table_cur->table_token = "";
$table_cur->wakeup_time = $curtime + WAKEUP_TIME;
- Bin5::destroy_data($table_idx);
+
+ $bri->destroy_data($table_idx);
}
else {
log_main("gm:: save_data");
@@ -1231,7 +1316,6 @@ class Room {
// externalized $this->garbage_timeout = time() + GARBAGE_TIMEOUT;
Room::garbage_time_expire_set($curtime + GARBAGE_TIMEOUT);
$ismod = TRUE;
- }
return ($ismod);
}
@@ -1267,9 +1351,8 @@ class Room {
}
$ret .= sprintf('subst = "%s";', $user->subst);
- $itin = ($user->flags & USER_FLAG_AUTH ? "" : "");
- $itou = ($user->flags & USER_FLAG_AUTH ? "" : "");
- $ret .= sprintf('$("myname").innerHTML = "%s%s%s";', $itin, xcape($user->name), $itou);
+ $ret .= $user->myname_innerHTML();
+
for ($i = 0 ; $i < TABLES_N ; $i++) {
$ret .= $this->table_content($user, $i);
@@ -1342,7 +1425,7 @@ class Room {
$ret = "gst.st = ".($user_cur->step+1)."; ".($remove_wagon ? sprintf("tra.rem(%d);",$table_idx) : "");
if ($from_table && ($user_cur->table == $table_idx || $user->idx_get() == $i)) {
- $ret .= 'gst.st_loc++; the_end=true; window.onunload = null; window.onbeforeunload = null; document.location.assign("index.php");|';
+ $ret .= 'gst.st_loc++; hstm.stop(); window.onunload = null; window.onbeforeunload = null; document.location.assign("index.php");|';
// $ret .= 'gst.st_loc++; document.location.assign("index.php");|';
log_main("DOCUMENT.index.php: from table");
}
@@ -1510,9 +1593,7 @@ class Room {
$ret .= $this->table_content($user_cur, $table_idx);
if ($user->idx_get() == $i) {
- $itin = ($user->flags & USER_FLAG_AUTH ? "" : "");
- $itou = ($user->flags & USER_FLAG_AUTH ? "" : "");
- $ret .= sprintf('$("myname").innerHTML = "%s%s%s: ";', $itin, xcape($user->name), $itou);
+ $ret .= $user->myname_innerHTML();
}
$user_cur->comm[$user_cur->step % COMM_N] = $ret;
$user_cur->step_inc();
@@ -1734,7 +1815,7 @@ class Room {
if ($user_cur->sess == '')
continue;
- if ($user_cur->name == $name_new)
+ if (strcasecmp($user_cur->name,$name_new) == 0)
break;
}
if ($i < MAX_PLAYERS) {
@@ -1931,7 +2012,7 @@ class Room {
if ($table_cur->player_n == PLAYERS_N) {
log_main("PLAYERS == N TABLE ".$table_idx);
- if (($sem = Bin5::lock_data($table_idx)) != FALSE) {
+ if (($sem = Bin5::lock_data(TRUE, $table_idx)) != FALSE) {
log_main("bin5 lock data success");
$no_recovery = FALSE;
@@ -2089,7 +2170,7 @@ class Room {
log_auth("XXX", sprintf("TROVATO A QUESTO PUNTO [%d] sess [%s] name [%s]", $idx, $sess, $name_new));
- /* there is another user logged with your account and you and him have authenticated => che new user
+ /* there is another user logged with your account and you and him have authenticated => new user
get the session of the old user */
if ($ghost > -1 && $ghost_auth && ($authenticate != FALSE)) {
/* swap session */
@@ -2110,7 +2191,7 @@ 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 = Bin5::lock_data($table_idx)) != FALSE) {
+ if (($brisem = Bin5::lock_data(TRUE, $table_idx)) != FALSE) {
if (($bri = Bin5::load_data($table_idx)) != FALSE) {
if ($bri->the_end != TRUE) {
$bri->user[$ghost_user->table_pos]->step_inc();
@@ -2181,7 +2262,7 @@ class Room {
if (strcmp("", $this->user[$i]->sess) == 0)
continue;
- if (strcmp($this->user[$i]->name, $ghostname) == 0) {
+ if (strcasecmp($this->user[$i]->name, $ghostname) == 0) {
$ghostname = '';
break;
}
@@ -2233,11 +2314,7 @@ class Room {
if ($user_cur->stat == 'room') {
$user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ".$this->standup_content($user_cur);
if ($user->idx_get() == $i) {
- $itin = ($user->flags & USER_FLAG_AUTH ? "" : "");
- $itou = ($user->flags & USER_FLAG_AUTH ? "" : "");
-
- $user_cur->comm[$user_cur->step % COMM_N] .= sprintf('$("myname").innerHTML = "%s%s%s: ";',
- $itin, xcape($user->name), $itou);
+ $user_cur->comm[$user_cur->step % COMM_N] .= $user->myname_innerHTML();
}
log_main("FROM STANDUP: NAME: ".$user_cur->name." SENDED: ".$user_cur->comm[$user_cur->step % COMM_N]);
@@ -2258,12 +2335,10 @@ class Room {
function load_data()
{
GLOBAL $sess;
- $doexit = FALSE;
do {
if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) {
log_main("ftok failed");
- $doexit = TRUE;
break;
}
@@ -2275,7 +2350,7 @@ class Room {
$shm_sz = SHM_DIMS_MIN;
if ($shm = shm_attach($tok, $shm_sz)) {
- $room = @shm_get_var($shm, $tok);
+ $room = @shm_get_var($shm, $tok); // CHECKED BELOW
log_only("bri == ".($room == FALSE ? "FALSE" : "TRUE")." bri === ".($room === FALSE ? "FALSE" : "TRUE")." bri isset ".(isset($room) ? "TRUE" : "FALSE"));
if (isset($room))
@@ -2287,6 +2362,8 @@ class Room {
$room = Room::create();
+ log_shme("Room::create");
+
if (Room::save_data($room) == FALSE)
return FALSE;
@@ -2297,7 +2374,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("User::load_data failed");
+ break;
+ }
+ }
+ if ($i < MAX_PLAYERS) {
+ break;
}
}
@@ -2307,9 +2390,6 @@ class Room {
return ($room);
} while (0);
- if ($doexit)
- exit();
-
return (FALSE);
}
@@ -2330,7 +2410,7 @@ class Room {
break;
// log_only("PUT_VAR DI ".strlen(serialize($room)));
- if (shm_put_var($shm, $tok, $room) != FALSE) {
+ if (@shm_put_var($shm, $tok, $room) != FALSE) {
shm_detach($shm);
return (TRUE);
}
@@ -2372,7 +2452,8 @@ class Room {
break;
// log_only("PUT_VAR DI ".strlen(serialize($room)));
- if (shm_put_var($shm, $tok, $room) != FALSE) {
+ if (@shm_put_var($shm, $tok, $room) != FALSE) {
+ log_shme("Room::save_data");
$ret = TRUE;
break;
}
@@ -2397,27 +2478,16 @@ class Room {
return ($ret);
}
- static function lock_data()
+ static function lock_data($is_exclusive)
{
- 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)) {
+ if (($res = file_lock(FTOK_PATH."/main", $is_exclusive)) != FALSE) {
self::$delta_t = microtime(TRUE);
log_lock("LOCK room [".self::$delta_t."]");
-
+
return ($res);
}
- else
- return (FALSE);
+
+ return (FALSE);
}
static function unlock_data($res)
@@ -2426,7 +2496,7 @@ class Room {
log_lock("UNLOCK room [".(microtime(TRUE) - (self::$delta_t))."]");
- return (sem_release($res));
+ file_unlock($res);
}
@@ -2510,7 +2580,7 @@ class Room {
$fp = FALSE;
do {
if (file_exists(PROXY_PATH) == FALSE)
- mkdir(PROXY_PATH);
+ mkdir(PROXY_PATH, 0775, TRUE);
if (($fp = @fopen(PROXY_PATH."/garbage_time.expired", 'rb')) == FALSE)
break;
if (($s = fread($fp, 4)) == FALSE)
@@ -2534,7 +2604,7 @@ class Room {
{
do {
if (file_exists(PROXY_PATH) == FALSE)
- mkdir(PROXY_PATH);
+ mkdir(PROXY_PATH, 0775, TRUE);
if (($fp = @fopen(PROXY_PATH."/garbage_time.expired", 'wb')) == FALSE)
break;
fwrite($fp, pack("L",$tm));
@@ -2572,6 +2642,16 @@ function btrace_line($ar)
return ($ret);
}
+function trace_ftok($id, $add)
+{
+ // NOTE: without space to use sed to substitute "= @ftok(" with "= @ftok("
+ $tok=@ftok($id, $add);
+
+ log_shme($tok.": ".$id." + ".$add);
+
+ return ($tok);
+}
+
function log_mop($step, $log)
{
GLOBAL $sess, $PHP_SELF;
@@ -2587,7 +2667,7 @@ function log_mop($step, $log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LMOP) == 0)
return;
- if (BRISK_DEBUG & DBG_TRAC)
+ if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@ -2613,7 +2693,7 @@ function log_only2($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_ONL2) == 0)
return;
- if (BRISK_DEBUG & DBG_TRAC)
+ if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@ -2638,7 +2718,7 @@ function log_crit($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_CRIT) == 0)
return;
- if (BRISK_DEBUG & DBG_TRAC)
+ if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@ -2663,7 +2743,7 @@ function log_only($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_ONLY) == 0)
return;
- if (BRISK_DEBUG & DBG_TRAC)
+ if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@ -2688,7 +2768,7 @@ function log_main($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_MAIN) == 0)
return;
- if (BRISK_DEBUG & DBG_TRAC)
+ if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@ -2713,7 +2793,7 @@ function log_rd($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_READ) == 0)
return;
- if (BRISK_DEBUG & DBG_TRAC)
+ if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@ -2738,7 +2818,7 @@ function log_rd2($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_REA2) == 0)
return;
- if (BRISK_DEBUG & DBG_TRAC)
+ if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@ -2763,8 +2843,8 @@ function log_send($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_SEND) == 0)
return;
-
- if (BRISK_DEBUG & DBG_TRAC)
+
+ if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@ -2789,7 +2869,7 @@ function log_lock($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LOCK) == 0)
return;
- if (BRISK_DEBUG & DBG_TRAC)
+ if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@ -2814,7 +2894,7 @@ function log_wr($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_WRIT) == 0)
return;
- if (BRISK_DEBUG & DBG_TRAC)
+ if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@ -2839,7 +2919,7 @@ function log_load($log)
if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_LOAD) == 0)
return;
- if (BRISK_DEBUG & DBG_TRAC)
+ if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@ -2859,7 +2939,7 @@ function log_auth($sess, $log)
if (( (BRISK_DEBUG | ($sess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_AUTH) == 0)
return;
- if (BRISK_DEBUG & DBG_TRAC)
+ if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
$btrace = btrace_line(debug_backtrace());
else
$btrace = "";
@@ -2869,6 +2949,32 @@ function log_auth($sess, $log)
}
}
+function log_shme($log)
+{
+ GLOBAL $sess, $PHP_SELF;
+
+ if (BRISK_SINGLE_SESS == "" && (BRISK_DEBUG & DBG_SHME) == 0)
+ return;
+
+ if (isset($sess) == FALSE)
+ $ssess = "XXXX";
+ else
+ $ssess = $sess;
+
+ if (( (BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_SHME) == 0)
+ return;
+
+ if ((BRISK_DEBUG | ($ssess == BRISK_SINGLE_SESS ? BRISK_SINGLE_DEBUG : 0) ) & DBG_TRAC)
+ $btrace = btrace_line(debug_backtrace());
+ else
+ $btrace = "";
+ if (($fp = @fopen(LEGAL_PATH."/brisk.log", 'a')) != FALSE) {
+ fwrite($fp, sprintf("SHME: [%s] [%s] [%s]\n", $ssess, $log, $btrace));
+ fclose($fp);
+ }
+}
+
+
// function log_legal($curtime, $sess, $name, $where, $mesg)
function log_legal($curtime, $user, $where, $mesg)
@@ -3005,67 +3111,50 @@ function sharedmem_sz($tok)
class Warrant {
static $delta_t;
- function lock_data()
+ static function lock_data($is_exclusive)
{
- GLOBAL $sess;
-
- if (($tok = @ftok(FTOK_PATH."/warrant", "B")) == -1) {
- return (FALSE);
- }
- // echo "FTOK ".$tok."
";
- if (($res = sem_get($tok)) == FALSE) {
- return (FALSE);
- }
- if (sem_acquire($res)) {
- self::$delta_t = microtime(TRUE);
- log_lock("LOCK warrant [".self::$delta_t."]");
- return ($res);
- }
- else
+ if (($res = file_lock(FTOK_PATH."/warrant", $is_exclusive)) != FALSE) {
+ self::$delta_t = microtime(TRUE);
+ log_lock("LOCK warrant [".self::$delta_t."]");
+
+ return ($res);
+ }
+
return (FALSE);
}
- function unlock_data($res)
+ static function unlock_data($res)
{
GLOBAL $sess;
log_lock("UNLOCK warrant [".(microtime(TRUE) - (self::$delta_t))."]");
- return (sem_release($res));
+ file_unlock($res);
}
}
class Poll {
static $delta_t;
- function lock_data()
+ static function lock_data($is_exclusive)
{
- GLOBAL $sess;
-
- if (($tok = @ftok(FTOK_PATH."/poll", "B")) == -1) {
- return (FALSE);
- }
- // echo "FTOK ".$tok."
";
- if (($res = sem_get($tok)) == FALSE) {
- return (FALSE);
- }
- if (sem_acquire($res)) {
- self::$delta_t = microtime(TRUE);
- log_lock("LOCK poll [".self::$delta_t."]");
-
- return ($res);
- }
- else
+ if (($res = file_lock(FTOK_PATH."/poll", $is_exclusive)) != FALSE) {
+ self::$delta_t = microtime(TRUE);
+ log_lock("LOCK poll [".self::$delta_t."]");
+
+ return ($res);
+ }
+
return (FALSE);
}
- function unlock_data($res)
+ static function unlock_data($res)
{
GLOBAL $sess;
log_lock("UNLOCK poll [".(microtime(TRUE) - (self::$delta_t))."]");
- return (sem_release($res));
+ file_unlock($res);
}
}