X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=8663ca29a59a01101a9fee7758b51e039807fc56;hb=dcbd9de538dd8a20069475b22c5201279ac4e95b;hp=2ba7c1a642443da84aa819e89d4bab5231f8db89;hpb=e47ddcae6cc33ed9d2471a54936db7d8efd5d46a;p=brisk.git
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 2ba7c1a..8663ca2 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,6 +72,7 @@ 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);
@@ -134,10 +136,10 @@ $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.5.5";
/* 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\': quinta 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: third test version for the new volatile data management, ticker management refactored.',
'If you want to subscribe our Mailing List, click it!' ) );
@@ -892,13 +894,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;
@@ -945,6 +954,7 @@ class User {
log_only("PUT_VAR FALLITA ".strlen(serialize($user)));
log_only(serialize($user));
}
+ log_shme("User::save_data2");
}
else {
if ($sess != FALSE) {
@@ -989,10 +999,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);
}
@@ -1014,13 +1027,6 @@ class User {
} // 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;
@@ -1074,7 +1080,9 @@ 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);
+ }
// FIXME BRISK4: include for each kind of table
require_once("${G_base}briskin5/Obj/briskin5.phh");
@@ -1087,7 +1095,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;
@@ -1138,7 +1146,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");
@@ -1226,7 +1235,6 @@ class Room {
// externalized $this->garbage_timeout = time() + GARBAGE_TIMEOUT;
Room::garbage_time_expire_set($curtime + GARBAGE_TIMEOUT);
$ismod = TRUE;
- }
return ($ismod);
}
@@ -1926,7 +1934,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;
@@ -2105,7 +2113,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();
@@ -2280,6 +2288,8 @@ class Room {
$room = Room::create();
+ log_shme("Room::create");
+
if (Room::save_data($room) == FALSE)
return FALSE;
@@ -2326,7 +2336,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);
}
@@ -2368,7 +2378,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;
}
@@ -2393,7 +2404,7 @@ class Room {
return ($ret);
}
- static function lock_data()
+ static function lock_data($is_exclusive)
{
GLOBAL $sess;
@@ -2403,7 +2414,7 @@ class Room {
return (FALSE);
}
// echo "FTOK ".$tok."
";
- if (($res = sem_get($tok)) == FALSE) {
+ if (($res = sem_get($tok, ($is_exclusive ? 1 : LOCK_SHARE_MAX) )) == FALSE) {
return (FALSE);
}
if (sem_acquire($res)) {
@@ -2568,6 +2579,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;
@@ -2865,6 +2886,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 & 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)
@@ -3001,7 +3048,7 @@ function sharedmem_sz($tok)
class Warrant {
static $delta_t;
- function lock_data()
+ static function lock_data($is_exclusive)
{
GLOBAL $sess;
@@ -3009,7 +3056,7 @@ class Warrant {
return (FALSE);
}
// echo "FTOK ".$tok."
";
- if (($res = sem_get($tok)) == FALSE) {
+ if (($res = sem_get($tok, ($is_exclusive ? 1 : LOCK_SHARE_MAX) )) == FALSE) {
return (FALSE);
}
if (sem_acquire($res)) {
@@ -3021,7 +3068,7 @@ class Warrant {
return (FALSE);
}
- function unlock_data($res)
+ static function unlock_data($res)
{
GLOBAL $sess;
@@ -3034,7 +3081,7 @@ class Warrant {
class Poll {
static $delta_t;
- function lock_data()
+ static function lock_data($is_exclusive)
{
GLOBAL $sess;
@@ -3042,7 +3089,7 @@ class Poll {
return (FALSE);
}
// echo "FTOK ".$tok."
";
- if (($res = sem_get($tok)) == FALSE) {
+ if (($res = sem_get($tok, ($is_exclusive ? 1 : LOCK_SHARE_MAX) )) == FALSE) {
return (FALSE);
}
if (sem_acquire($res)) {
@@ -3055,7 +3102,7 @@ class Poll {
return (FALSE);
}
- function unlock_data($res)
+ static function unlock_data($res)
{
GLOBAL $sess;