X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex_rd.php;h=2283ec5ec41d81aa358d74030bc1bb6e8aa5dc6d;hb=d9d7c36af2f5ec4c0688e77e58d3d0b930cd2658;hp=c775dc138cac463f09206b468753d8c75fa362a9;hpb=fd592d661d4bc7b852240ad59ebfb8b88f3bdc87;p=brisk.git diff --git a/web/index_rd.php b/web/index_rd.php index c775dc1..2283ec5 100644 --- a/web/index_rd.php +++ b/web/index_rd.php @@ -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,24 +104,28 @@ 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; + // lacc field updated User::save_data($user, $user->idx); if (Room::garbage_time_is_expired($curtime)) { @@ -130,19 +133,19 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su $S_load_stat['R_garbage']++; if (($room = Room::load_data()) == FALSE) { - Room::unlock_data(); + Room::unlock_data($sem); ignore_user_abort(FALSE); - return (unrecerror()); + 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); @@ -153,7 +156,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 { @@ -164,10 +167,10 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su if ($user == FALSE) { do { ignore_user_abort(TRUE); - if (($sem = Room::lock_data()) == FALSE) + if (($sem = Room::lock_data(FALSE)) == FALSE) break; - log_lock("P"); + log_main("infolock: P"); $S_load_stat['U_heavy']++; if (($user = User::load_data($proxy_step['i'], $sess)) == FALSE) { break; @@ -179,7 +182,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su ignore_user_abort(FALSE); if ($user == FALSE) { - return (unrecerror()); + return (blocking_error(TRUE)); } } @@ -193,17 +196,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) { @@ -276,14 +285,13 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su log_rd2("NEWSTAT: ".$user->stat); } else { - // TODO: verify if we can use only $user struct ignore_user_abort(TRUE); - $sem = Room::lock_data(); + $sem = Room::lock_data(FALSE); $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) { @@ -313,29 +321,43 @@ 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."); + Room::unlock_data($sem); - $S_load_stat['R_the_end']++; - $room = Room::load_data(); + /* Switch to exclusive locking */ + $sem = Room::lock_data(TRUE); + 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 (unrecerror()); + return (blocking_error(TRUE)); } - $user->reset(); + + log_rd2("LOGOUT BYE BYE!!"); + log_auth($user->sess, "Explicit logout."); - if ($user->subst == 'sitdown') { - log_load("ROOM WAKEUP"); - $room->room_wakeup($user); + if ($user->the_end == 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); } - else if ($user->subst == 'standup') - $room->room_outstandup($user); - else - log_rd2("LOGOUT FROM WHAT ???"); - - Room::save_data($room); } } @@ -358,7 +380,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su step */ -$is_page_streaming = (stristr($HTTP_USER_AGENT, "MSIE") || stristr($HTTP_USER_AGENT, "CHROME") ? TRUE : FALSE); +$is_page_streaming = (webservers_exceeded() || stristr($HTTP_USER_AGENT, "MSIE") || stristr($HTTP_USER_AGENT, "CHROME") ? TRUE : FALSE); header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1 header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); // Date in the past