X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbrisk.phh;h=1fe3f1295eabb20243aebc1c589c5f5cee9a7530;hb=c0e10f57f23510ffcfaf403adff20e18dc46e5b4;hp=96adf7a3d3f0ccb246dbeefbe4bf8188c8c4585f;hpb=bb4bd80920fcff2ce4fe07aef2faaa3f739b9d58;p=brisk.git
diff --git a/web/brisk.phh b/web/brisk.phh
index 96adf7a..1fe3f12 100644
--- a/web/brisk.phh
+++ b/web/brisk.phh
@@ -22,11 +22,11 @@
define(FTOK_PATH, "/var/lib/brisk");
define(LEGAL_PATH, "/tmp/legal_brisk");
define(PROXY_PATH, "/var/lib/brisk_proxy");
-define(TABLES_N, 8);
+define(TABLES_N, 12);
define(PLAYERS_N, 3);
define(MAX_POINTS, 5);
define(MAX_PLAYERS, (20 + (PLAYERS_N * TABLES_N)));
-define(SHM_DIMS, (80000 * MAX_PLAYERS));
+define(SHM_DIMS, (50000 * MAX_PLAYERS));
// define(COMM_N, 6);
define(COMM_N, 12);
define(COMM_GEN_N, 50);
@@ -44,9 +44,9 @@ define(BRISK_DEBUG, FALSE);
$G_false = FALSE;
$G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "0.7.2";
+$G_brisk_version = "0.8.2";
-$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), NOVITA\': ottimizzazione della CPU e chiuso il bug di mancato cambio pagina.',
+$root_wellarr = Array ( 'Benvenuto in brisk (Ver. '.$G_brisk_version.'), NOVITA\': nuovo layout che permette più tavoli, più tavoli.',
'Se vuoi iscriverti alla Mailing List, cliccala!' );
$table_wellarr = Array ( 'Benvenuto al tavolo. Se almeno tre giocatori non sbloccano l\'uscita cliccando il lucchetto, chi esce non può risedersi a un qualunque tavolo per '.floor(BAN_TIME/60).' minuti.');
@@ -764,7 +764,7 @@ class brisco {
$table = &$this->table[$user->table];
$user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ";
- $user_cur->comm[$user_cur->step % COMM_N] = sprintf('set_names(" %s", " %s", " %s", " %s", " %s"); ',
+ $user_cur->comm[$user_cur->step % COMM_N] .= sprintf('set_names(" %s", " %s", " %s", " %s", " %s"); ',
xcape($this->user[$table->player[($user_cur->table_pos)%PLAYERS_N]]->name),
xcape($this->user[$table->player[($user_cur->table_pos+1)%PLAYERS_N]]->name),
xcape($this->user[$table->player[($user_cur->table_pos+2)%PLAYERS_N]]->name),
@@ -924,11 +924,21 @@ function make_seed()
return (float) $sec + ((float) $usec * 100000);
}
+function log_only2($sess, $log) {
+ if (BRISK_DEBUG != TRUE)
+ return;
+
+
+ if (($fp = @fopen("/tmp/brisk_only2.log", 'a')) != FALSE) {
+ fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
+ fclose($fp);
+ }
+}
+
function log_only($sess, $log) {
- /*
if (BRISK_DEBUG != TRUE)
return;
- */
+
if (($fp = @fopen("/tmp/brisk_only.log", 'a')) != FALSE) {
fwrite($fp, sprintf("SESS: [%s] [%s]\n", $sess, $log));
@@ -1038,6 +1048,8 @@ function init_data()
function lock_data()
{
+ GLOBAL $sess;
+
// echo "LOCK: ".FTOK_PATH."/main";
// exit;
if (($tok = ftok(FTOK_PATH."/main", "B")) == -1) {
@@ -1050,7 +1062,7 @@ function lock_data()
exit;
}
if (sem_acquire($res)) {
- log_lock("XXX", "LOCK");
+ log_only($sess, "LOCK");
return ($res);
}
else
@@ -1059,7 +1071,9 @@ function lock_data()
function unlock_data($res)
{
- log_lock("XXX", "UNLOCK");
+ GLOBAL $sess;
+
+ log_only($sess, "UNLOCK");
return (sem_release($res));
}
@@ -1088,7 +1102,7 @@ function unlock_banlist($res)
function &load_data()
{
- GLOBAL $G_false;
+ GLOBAL $G_false, $sess;
if (($tok = ftok(FTOK_PATH."/main", "B")) == -1) {
echo "FTOK FAILED";
@@ -1096,13 +1110,19 @@ function &load_data()
}
if ($shm = shm_attach($tok, SHM_DIMS)) {
- if(($bri = @shm_get_var($shm, $tok)) == FALSE) {
- log_only("XXX", "INIT MAIN DATA");
-
+ $bri = @shm_get_var($shm, $tok);
+
+ log_only($sess, "bri == ".($bri == FALSE ? "FALSE" : "TRUE")." bri === ".($bri === FALSE ? "FALSE" : "TRUE")." bri isset ".(isset($bri) ? "TRUE" : "FALSE"));
+ if (isset($bri))
+ log_only($sess, "bri count ".count($bri));
+
+ if ($bri == FALSE) {
+ log_only($sess, "INIT MAIN DATA");
+
$bri = init_data();
if (shm_put_var($shm, $tok, $bri) == FALSE) {
- log_only("XX2", "PUT_VAR FALLITA ".strlen(serialize($bri)));
- log_only("XX2", serialize($bri));
+ log_only($sess, "PUT_VAR FALLITA ".strlen(serialize($bri)));
+ log_only($sess, serialize($bri));
}
}
@@ -1118,6 +1138,8 @@ function &load_data()
function save_data(&$bri)
{
+ GLOBAL $sess;
+
$ret = FALSE;
$shm = FALSE;
$isacq = FALSE;
@@ -1133,9 +1155,10 @@ function save_data(&$bri)
if (($shm = shm_attach($tok, SHM_DIMS)) == FALSE)
break;
+ // log_only($sess, "PUT_VAR DI ".strlen(serialize($bri)));
if (shm_put_var($shm, $tok, $bri) == FALSE) {
- log_only("XXX", "PUT_VAR FALLITA ".strlen(serialize($bri)));
- log_only("XXX", serialize($bri));
+ log_only($sess, "PUT_VAR FALLITA ".strlen(serialize($bri)));
+ log_only($sess, serialize($bri));
break;
}
// log_main("XXX", "QUI CI ARRIVA [".$bri->user[0]->name."]");