X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2FObj%2Fbrisk.phh;h=486fc28b31a65dce8deaca6cf2fd054965f87952;hb=46c25abf38a8b51b4493421c1e13a00735274d75;hp=c829980df8aa68b6507aa7697e667a3b50a2ad28;hpb=8e74a78fab641d685d534a821f114eda7c2cdd78;p=brisk.git
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index c829980..486fc28 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);
@@ -135,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!' ) );
@@ -283,6 +284,61 @@ Copyright 2006-2009 Matteo Nasta
version '.$G_brisk_version.'
Copyright 2006-2009 Matteo Nastasi (aka mop)
');
+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;
+
+ $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);
+}
+
$escinp_from = array( "\"" );
$escinp_to = array( """ );
@@ -1083,6 +1139,7 @@ class Room {
return ($ismod);
}
+ webservers_check();
// FIXME BRISK4: include for each kind of table
require_once("${G_base}briskin5/Obj/briskin5.phh");
@@ -1094,7 +1151,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;
@@ -1933,7 +1990,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;
@@ -2112,7 +2169,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();
@@ -2403,27 +2460,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)
@@ -2432,7 +2478,7 @@ class Room {
log_lock("UNLOCK room [".(microtime(TRUE) - (self::$delta_t))."]");
- return (sem_release($res));
+ file_unlock($res);
}
@@ -2578,6 +2624,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;
@@ -3037,67 +3093,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);
}
}