X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=50bc00953f9980f5c705241e9765c18bb43008c1;hb=0ae3af3bb3899d630685f1b8b5c2172d5f7e91c6;hp=ecee1afb97a81bd6b63f85fc2f53ffbc0d61defb;hpb=e85c7217ac848be97c48bb14ddc2858289fbf34a;p=brisk.git
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index ecee1af..50bc009 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.5.0";
+$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\': seconda 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: second 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;
@@ -858,7 +875,7 @@ class User {
break;
if (($s = fread($fp, 8)) == FALSE)
break;
- if (strlen($s) != 8)
+ if (mb_strlen($s, "ASCII") != 8)
break;
$arr = unpack('Ls/Li', $s);
fclose($fp);
@@ -979,6 +996,8 @@ class User {
// 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);
}
@@ -1009,6 +1028,8 @@ function step_unproxy($sess) {
class Room {
+ static $delta_t;
+
var $user;
var $table;
var $comm; // commands for many people
@@ -2389,8 +2410,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
@@ -2401,7 +2424,7 @@ class Room {
{
GLOBAL $sess;
- log_lock("UNLOCK room");
+ log_lock("UNLOCK room [".(microtime(TRUE) - (self::$delta_t))."]");
return (sem_release($res));
}
@@ -2492,7 +2515,7 @@ class Room {
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)
@@ -2564,7 +2587,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);
@@ -2587,7 +2613,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);
@@ -2609,7 +2638,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);
@@ -2631,7 +2663,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);
@@ -2653,7 +2688,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);
@@ -2674,8 +2712,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);
@@ -2697,7 +2738,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));
@@ -2720,7 +2764,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);
@@ -2742,7 +2789,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);
@@ -2764,7 +2814,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);
@@ -2786,7 +2839,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);
@@ -2803,7 +2859,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);
@@ -2825,28 +2884,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 = "";
@@ -2966,6 +3003,8 @@ function sharedmem_sz($tok)
}
class Warrant {
+ static $delta_t;
+
function lock_data()
{
GLOBAL $sess;
@@ -2978,7 +3017,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
@@ -2989,13 +3029,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;
@@ -3007,9 +3049,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);
@@ -3019,7 +3063,7 @@ class Poll {
{
GLOBAL $sess;
- log_lock("UNLOCK poll");
+ log_lock("UNLOCK poll [".(microtime(TRUE) - (self::$delta_t))."]");
return (sem_release($res));
}