From e8dc1380509c5fe947b8be3ad44afc671515f871 Mon Sep 17 00:00:00 2001 From: "Matteo Nastasi (mop)" Date: Thu, 20 Mar 2008 06:36:45 +0000 Subject: [PATCH] minor --- web/briskin5/Obj/briskin5.phh | 45 ++++------------------------------- web/index_rd.php | 12 +++++----- 2 files changed, 11 insertions(+), 46 deletions(-) diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh index 024e8cd..1ad1937 100644 --- a/web/briskin5/Obj/briskin5.phh +++ b/web/briskin5/Obj/briskin5.phh @@ -2,9 +2,9 @@ define(BRISKIN5_PLAYERS_N, 3); define(BRISKIN5_MAX_PLAYERS, BRISKIN5_PLAYERS_N); // define(BRISKIN5_SHM_MIN, (50000 * BRISKIN5_MAX_PLAYERS)); -define(BRISKIN5_SHM_MIN, 10000); +define(BRISKIN5_SHM_MIN, 32768); define(BRISKIN5_SHM_MAX, (BRISKIN5_SHM_MIN + 1048576)); -define(BRISKIN5_SHM_DLT, 65536); +define(BRISKIN5_SHM_DLT, 32768); class Briskin5 { var $user; @@ -191,7 +191,6 @@ class Briskin5 { if (($shm = shm_attach($bri->tok, $bri->shm_sz)) == FALSE) break; - // log_only("PUT_VAR DI ".strlen(serialize($room))); if (@shm_put_var($shm, $bri->tok, $bri) != FALSE) { shm_detach($shm); return (TRUE); @@ -204,6 +203,8 @@ class Briskin5 { $bri->shm_sz += BRISKIN5_SHM_DLT; } + log_crit("save data failed!"); + if ($shm) shm_detach($shm); @@ -212,42 +213,6 @@ class Briskin5 { - function save_data_orig(&$bri) - { - GLOBAL $sess; - - $ret = FALSE; - $shm = FALSE; - $isacq = FALSE; - - log_main("SAVE BRISKIN5 DATA"); - // var_dump($bri); - - if (!isset($bri->tok)) - return (FALSE); - - do { - $isacq = TRUE; - - if (($shm = shm_attach($bri->tok, BRISKIN5_SHM_DIMS)) == FALSE) - break; - - // log_only("PUT_VAR DI ".strlen(serialize($bri))); - if (shm_put_var($shm, $bri->tok, $bri) == FALSE) { - log_only("PUT_VAR FALLITA ".strlen(serialize($bri))); - log_only(serialize($bri)); - break; - } - // log_main("QUI CI ARRIVA [".$bri->user[0]->name."]"); - $ret = TRUE; - } while (0); - - if ($shm) - shm_detach($shm); - - return ($ret); - } - function destroy_data($table_idx) { GLOBAL $sess; @@ -495,4 +460,4 @@ function locshm_exists($tok) } -?> \ No newline at end of file +?> diff --git a/web/index_rd.php b/web/index_rd.php index 3f57f2d..6c636b8 100644 --- a/web/index_rd.php +++ b/web/index_rd.php @@ -175,13 +175,13 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su } else { log_rd2("TRANS NON ATTIVATO, clean del comm array"); - while (($el = array_pop($user->comm)) != NULL) { - log_rd2("clean element [".$el."]"); + while (($el = array_pop($user->comm)) != NULL) { + log_rd2("clean element [".$el."]"); } - // $user->step_inc(COMM_N + 1); - Room::save_data($room); - // $new_step = $user->step; - + // $user->step_inc(COMM_N + 1); + Room::save_data($room); + // $new_step = $user->step; + Room::unlock_data($sem); ignore_user_abort(FALSE); } -- 2.17.1