X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex_rd.php;h=efc1dd99181848c44ee57eda94984995035f9709;hb=dcbd9de538dd8a20069475b22c5201279ac4e95b;hp=3dec5e9a619763cbaf362755c7f7d2def74e5a36;hpb=13718f9fdcadece1fc56f84743d6646595fac9b7;p=brisk.git diff --git a/web/index_rd.php b/web/index_rd.php index 3dec5e9..efc1dd9 100644 --- a/web/index_rd.php +++ b/web/index_rd.php @@ -29,10 +29,10 @@ require_once("Obj/brisk.phh"); require_once("briskin5/Obj/briskin5.phh"); $S_load_stat = array( 'U_first_loop' => 0, - 'R_garbage' => 0, - 'U_heavy' => 0, - 'R_minusone' => 0, - 'R_the_end' => 0 ); + 'U_heavy' => 0, + 'R_garbage' => 0, + 'R_minusone' => 0, + 'R_the_end' => 0 ); $mlang_indrd = array( 'btn_backtotab' => array('it' => ' torna ai tavoli ', @@ -58,19 +58,18 @@ if (DEBUGGING == "local" && $_SERVER['REMOTE_ADDR'] != '127.0.0.1') { function shutta() { - log_rd2("SHUTTA!".connection_status()); + log_rd2("SHUTTA [".connection_status()."] !"); } - register_shutdown_function(shutta); -function unrecerror() +function blocking_error($is_unrecoverable) { GLOBAL $is_page_streaming; $is_page_streaming = TRUE; - log_rd2("UNREC_ERROR:".var_export(debug_backtrace())); - return (sprintf('the_end=true; window.onunload = null; window.onbeforeunload = null; document.location.assign("index.php");')); + log_rd2("BLOCKING_ERROR UNREC: ".($is_unrecoverable ? "TRUE" : "FALSE")); + return (sprintf(($is_unrecoverable ? 'the_end=true; ' : '').'window.onbeforeunload = null; window.onunload = null; document.location.assign("index.php");')); } function page_sync($sess, $page, $table_idx, $table_token) @@ -105,22 +104,25 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su $user = FALSE; $curtime = time(); - if (($proxy_step = User::step_get($sess)) == FALSE) { + // NOTE: qui forse si potrebbe fallback-are a una User::load_data + // anche se non ce ne dovrebbe essere mai la necessità + if (($proxy_step = User::load_step($sess)) == FALSE) { log_only2("R"); - return (FALSE); + ignore_user_abort(FALSE); + return (blocking_error(TRUE)); } // log_rd2("M"); /* Sync check (read only without modifications */ ignore_user_abort(TRUE); if ($first_loop == TRUE) { - if (($sem = Room::lock_data()) != FALSE) { + if (($sem = Room::lock_data(TRUE)) != FALSE) { // Aggiorna l'expire time lato server $S_load_stat['U_first_loop']++; if (($user = User::load_data($proxy_step['i'], $sess)) == FALSE) { - Room::unlock_data(); + Room::unlock_data($sem); ignore_user_abort(FALSE); - return (unrecerror()); + return (blocking_error(TRUE)); } $user->lacc = $curtime; User::save_data($user, $user->idx); @@ -129,16 +131,20 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su log_only("F"); $S_load_stat['R_garbage']++; - if (($room = Room::load_data()) != FALSE) { - log_main("pre garbage_manager TRE"); - $room->garbage_manager(FALSE); - Room::save_data($room); + if (($room = Room::load_data()) == FALSE) { + Room::unlock_data($sem); + ignore_user_abort(FALSE); + return (blocking_error(TRUE)); } + log_main("pre garbage_manager TRE"); + $room->garbage_manager(FALSE); + Room::save_data($room); + unset($room); } - log_lock("U"); + log_main("infolock: U"); Room::unlock_data($sem); ignore_user_abort(FALSE); - } // if (($sem = Room::lock_data()) != FALSE) { + } // if (($sem = Room::lock_data(TRUE)) != FALSE) { else { // wait 20 secs, then restart the xhr ignore_user_abort(FALSE); @@ -149,7 +155,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su } // if ($first_loop == TRUE) { if ($cur_step == $proxy_step['s']) { - log_lock("P"); + log_main("infolock: P"); return (FALSE); } else { @@ -157,34 +163,31 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su } - if (1 == 1) { // C'è veramente qualche caso in cui serve questo step ?? - if ($user == FALSE) { - do { - ignore_user_abort(TRUE); - if (($sem = Room::lock_data()) == FALSE) - break; - - log_lock("P"); - $S_load_stat['U_heavy']++; - if (($user = User::load_data($proxy_step['i'], $sess)) == FALSE) { - break; - } - } while (0); - - if ($sem != FALSE) - Room::unlock_data($sem); + if ($user == FALSE) { + do { + ignore_user_abort(TRUE); + if (($sem = Room::lock_data(TRUE)) == FALSE) + break; - ignore_user_abort(FALSE); - if ($user == FALSE) { - return (unrecerror()); + log_main("infolock: P"); + $S_load_stat['U_heavy']++; + if (($user = User::load_data($proxy_step['i'], $sess)) == FALSE) { + break; } - } + } while (0); - /* Nothing changed, return. */ - if ($cur_step == $user->step) - return (FALSE); - } // if (0 == 1) { xx C'è veramente qualche caso in cui serve questo step ?? - + if ($sem != FALSE) + Room::unlock_data($sem); + + ignore_user_abort(FALSE); + if ($user == FALSE) { + return (blocking_error(TRUE)); + } + } + + /* Nothing changed, return. */ + if ($cur_step == $user->step) + return (FALSE); log_rd2("do other cur_stat[".$cur_stat."] user->stat[".$user->stat."] cur_step[".$cur_step."] user_step[".$user->step."]"); @@ -192,17 +195,23 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su /* * if $cur_step == -1 load the current state from the main struct */ + + /* unset the $user var to reload it from main structure */ + unset($user); + ignore_user_abort(TRUE); - $sem = Room::lock_data(); - $room = Room::load_data(); + $sem = Room::lock_data(TRUE); + if (($room = Room::load_data()) == FALSE) { + Room::unlock_data($sem); + ignore_user_abort(FALSE); + return (blocking_error(TRUE)); + } $S_load_stat['R_minusone']++; - /* unset the $user var to reload it from main structure */ - unset($user); if (($user = $room->get_user($sess, $idx)) == FALSE) { Room::unlock_data($sem); ignore_user_abort(FALSE); - return (unrecerror()); + return (blocking_error(TRUE)); } if ($user->the_end) { @@ -255,7 +264,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su ($is_super ? 0 : $G_splash_timeout)); $ret .= sprintf('|createCookie("CO_splashdate%d", %d, 24*365, cookiepath);', $G_splash_idx, $curtime); } - $ret .= $room->show_room($user->step, &$user); + $ret .= $room->show_room($user->step, $user); // TODO uncomment and test /* NOTE the sets went common */ @@ -277,12 +286,12 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su else { // TODO: verify if we can use only $user struct ignore_user_abort(TRUE); - $sem = Room::lock_data(); + $sem = Room::lock_data(TRUE); $S_load_stat['U_heavy']++; if (($user = User::load_data($proxy_step['i'], $sess)) == FALSE) { - Room::unlock_data(); + Room::unlock_data($sem); ignore_user_abort(FALSE); - return (unrecerror()); + return (blocking_error(TRUE)); } if ($cur_step < $user->step) { @@ -300,8 +309,9 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su break; } for ($i = $cur_step ; $i < $user->step ; $i++) { - log_rd2("ADDED TO THE STREAM: ".$user->comm[$i % COMM_N]); - $ret .= $user->comm[$i % COMM_N]; + $ii = $i % COMM_N; + log_rd2("ADDED TO THE STREAM: ".$user->comm[$ii]); + $ret .= $user->comm[$ii]; } $new_stat = $user->stat; $new_subst = $user->subst; @@ -310,39 +320,45 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su log_mop($user->step, 'index_rd.php: after ret set'); - if ($user->the_end == TRUE) { - log_rd2("LOGOUT BYE BYE!!"); - log_auth($user->sess, "Explicit logout."); - - $S_load_stat['R_the_end']++; - $room = &Room::load_data(); - unset($user); - if (($user = &$room->get_user($sess, $idx)) == FALSE) { - Room::unlock_data($sem); - ignore_user_abort(FALSE); - return (unrecerror()); - } - $user->reset(); - - if ($user->subst == 'sitdown') { - log_load("ROOM WAKEUP"); - $room->room_wakeup($user); - } - else if ($user->subst == 'standup') - $room->room_outstandup(&$user); - else - log_rd2("LOGOUT FROM WHAT ???"); - - Room::save_data($room); - } - } - - Room::unlock_data($sem); - ignore_user_abort(FALSE); - } - - - return ($ret); + if ($user->the_end == TRUE) { + log_rd2("LOGOUT BYE BYE!!"); + log_auth($user->sess, "Explicit logout."); + + unset($user); + + $S_load_stat['R_the_end']++; + if (($room = Room::load_data()) == FALSE) { + Room::unlock_data($sem); + ignore_user_abort(FALSE); + return (blocking_error(TRUE)); + } + + if (($user = $room->get_user($sess, $idx)) == FALSE) { + Room::unlock_data($sem); + ignore_user_abort(FALSE); + return (blocking_error(TRUE)); + } + $user->reset(); + + if ($user->subst == 'sitdown') { + log_load("ROOM WAKEUP"); + $room->room_wakeup($user); + } + else if ($user->subst == 'standup') + $room->room_outstandup($user); + else + log_rd2("LOGOUT FROM WHAT ???"); + + Room::save_data($room); + } + } + + Room::unlock_data($sem); + ignore_user_abort(FALSE); + } + + + return ($ret); } /* @@ -361,8 +377,6 @@ $is_page_streaming = (stristr($HTTP_USER_AGENT, "MSIE") || stristr($HTTP_USER_A header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1 header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); // Date in the past header('Content-type: application/xml; charset="utf-8"',true); -// header('Content-type: text/plain; charset="utf-8"',true); -// header('Content-type: text/html; charset="utf-8"',true); if (!isset($myfrom)) $myfrom = ""; @@ -406,7 +420,7 @@ $s = "[".$sess."] index_rd.php stats: "; foreach ($S_load_stat as $key => $value) { $s .= sprintf("%s: %d - ", $key, $value); } -error_log($s, 0); +log_crit($s); ?>