projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
is_page_streaming verify enhanced
[brisk.git]
/
web
/
index_rd.php
diff --git
a/web/index_rd.php
b/web/index_rd.php
index
8edbe79
..
4f06af3
100644
(file)
--- a/
web/index_rd.php
+++ b/
web/index_rd.php
@@
-29,7
+29,7
@@
require_once("Obj/brisk.phh");
require_once("briskin5/Obj/briskin5.phh");
$S_load_stat = array( 'rU_heavy' => 0,
require_once("briskin5/Obj/briskin5.phh");
$S_load_stat = array( 'rU_heavy' => 0,
- '
w
L_laccgarb' => 0,
+ '
l
L_laccgarb' => 0,
'wU_lacc_upd' => 0,
'wR_garbage' => 0,
'wR_minusone' => 0,
'wU_lacc_upd' => 0,
'wR_garbage' => 0,
'wR_minusone' => 0,
@@
-69,7
+69,7
@@
function blocking_error($is_unrecoverable)
GLOBAL $is_page_streaming;
$is_page_streaming = TRUE;
GLOBAL $is_page_streaming;
$is_page_streaming = TRUE;
- log_
rd2
("BLOCKING_ERROR UNREC: ".($is_unrecoverable ? "TRUE" : "FALSE"));
+ log_
crit
("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");'));
}
return (sprintf(($is_unrecoverable ? 'the_end=true; ' : '').'window.onbeforeunload = null; window.onunload = null; document.location.assign("index.php");'));
}
@@
-142,7
+142,7
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
ignore_user_abort(FALSE);
return ("sleep(gst,20000);|xhr_rd_abort(xhr_rd);");
}
ignore_user_abort(FALSE);
return ("sleep(gst,20000);|xhr_rd_abort(xhr_rd);");
}
- $S_load_stat['
w
L_laccgarb']++;
+ $S_load_stat['
l
L_laccgarb']++;
// load again the data after locking
unset($user);
// load again the data after locking
unset($user);
@@
-229,6
+229,7
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
log_only2("R");
}
log_only2("R");
}
+ $S_load_stat['rU_heavy']++;
if ($user == FALSE) {
do {
ignore_user_abort(TRUE);
if ($user == FALSE) {
do {
ignore_user_abort(TRUE);
@@
-236,7
+237,6
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
break;
log_main("infolock: P");
break;
log_main("infolock: P");
- $S_load_stat['rU_heavy']++;
if (($user = User::load_data($proxy_step['i'], $sess)) == FALSE) {
break;
}
if (($user = User::load_data($proxy_step['i'], $sess)) == FALSE) {
break;
}
@@
-280,7
+280,7
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
return (blocking_error(TRUE));
}
return (blocking_error(TRUE));
}
- if ($user->the_end) {
+ if ($user->the_end
== TRUE
) {
log_rd2("main_check: the end".var_export(debug_backtrace()));
$is_page_streaming = TRUE;
}
log_rd2("main_check: the end".var_export(debug_backtrace()));
$is_page_streaming = TRUE;
}
@@
-348,7
+348,7
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
return (page_sync($user->sess, "briskin5/index.php", $user->table, $user->table_token));
}
log_rd2("NEWSTAT: ".$user->stat);
return (page_sync($user->sess, "briskin5/index.php", $user->table, $user->table_token));
}
log_rd2("NEWSTAT: ".$user->stat);
- }
+ }
/* if ($cur_step == -1) { */
else {
ignore_user_abort(TRUE);
$sem = Room::lock_data(FALSE);
else {
ignore_user_abort(TRUE);
$sem = Room::lock_data(FALSE);
@@
-422,13
+422,13
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
log_rd2("LOGOUT FROM WHAT ???");
Room::save_data($room);
log_rd2("LOGOUT FROM WHAT ???");
Room::save_data($room);
- }
- }
- }
+ }
/* if ($user->the_end == TRUE) { ... */
+ }
/* if ($user->the_end == TRUE) { ... */
+ }
/* if ($cur_step < $user->step) { */
Room::unlock_data($sem);
ignore_user_abort(FALSE);
Room::unlock_data($sem);
ignore_user_abort(FALSE);
- }
+ }
/* else of if ($cur_step == -1) { */
return ($ret);
return ($ret);
@@
-445,7
+445,7
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
step
*/
step
*/
-$is_page_streaming = (webservers_exceeded() || stristr($HTTP_USER_AGENT, "MSIE") || stristr($HTTP_USER_AGENT, "CHROME") ? TRUE : FALSE);
+$is_page_streaming = (webservers_exceeded() || stristr($HTTP_USER_AGENT, "M
ozilla/5.0 (Windows NT 6.1; rv:5.0)") || stristr($HTTP_USER_AGENT, "M
SIE") || 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
header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); // Date in the past
@@
-472,10
+472,10
@@
for ($i = 0 ; time() < $endtime ; $i++) {
echo "$ret";
echo ' @END@';
log_send("IS_PAGE: ".($is_page_streaming == TRUE ? "TRUE" : "FALSE")."EXT_STEP: ".$ext_step." ENDTIME: [".$endtime."] ".$ret);
echo "$ret";
echo ' @END@';
log_send("IS_PAGE: ".($is_page_streaming == TRUE ? "TRUE" : "FALSE")."EXT_STEP: ".$ext_step." ENDTIME: [".$endtime."] ".$ret);
- flush();
- log_mop(0, 'index_rd.php: after flush (begin: '.sprintf("%f", $pre_main).')');
- if ($is_page_streaming)
- break;
+
mop_
flush();
+ log_mop(0, 'index_rd.php: after
mop_
flush (begin: '.sprintf("%f", $pre_main).')');
+ if ($is_page_streaming)
+
break;
}
$old_stat = $stat;
$old_subst = $subst;
}
$old_stat = $stat;
$old_subst = $subst;
@@
-485,7
+485,8
@@
for ($i = 0 ; time() < $endtime ; $i++) {
if (($i % 10) == 0) {
// log_rd2("TIME: ".time());
echo '_';
if (($i % 10) == 0) {
// log_rd2("TIME: ".time());
echo '_';
- flush();
+ mop_flush();
+ log_crit("flush");
}
}
}
}
@@
-496,10
+497,9
@@
foreach ($S_load_stat as $key => $value) {
$s .= sprintf("%s: %d - ", $key, $value);
if (substr($key, 0, 1) == "w")
$tw += $value;
$s .= sprintf("%s: %d - ", $key, $value);
if (substr($key, 0, 1) == "w")
$tw += $value;
- else
+ else
if (substr($key, 0, 1) == "r")
$tr += $value;
}
$s = sprintf("index_rd.php stats: R: %d W: %d - %s", $tr, $tw, $s);
log_crit($s);
$tr += $value;
}
$s = sprintf("index_rd.php stats: R: %d W: %d - %s", $tr, $tw, $s);
log_crit($s);
-
?>
?>