'G_PG_vow_n', 'G_poll_entries', 'G_poll_name', 'G_poll_title',
'G_provider_proxy', 'G_proxy_white_list', 'G_room_about', 'G_room_help',
'G_room_passwdhowto', 'G_room_roadmap',
-'G_selfreg_mask', 'G_selfreg_tout', 'G_shutdown', 'G_sidebanner',
+'G_selfreg_mask', 'G_selfreg_tout', 'G_shutdown', 'G_profile', 'G_sidebanner',
'G_sidebanner_idx', 'G_splash_content', 'G_splash_contents',
'G_splash_cont_idx', 'G_splash_h', 'G_splash_idx', 'G_splash_interval',
'G_splash_timeout', 'G_splash_w', 'G_topbanner', 'G_tos_dthard',
GLOBAL $G_alarm_passwd, $G_ban_list, $G_black_list, $G_btrace_pref_sub, $G_dbauth;
GLOBAL $G_dbpfx, $G_donors_all, $G_donors_cur, $G_is_local, $G_lang;
GLOBAL $G_poll_entries, $G_poll_name, $G_poll_title, $G_proxy_white_list;
- GLOBAL $G_room_roadmap, $G_shutdown;
+ GLOBAL $G_room_roadmap, $G_shutdown, $G_profile;
GLOBAL $G_splash_content, $G_splash_contents, $G_splash_cont_idx;
GLOBAL $G_splash_h, $G_splash_idx, $G_splash_interval, $G_splash_timeout;
GLOBAL $G_splash_w, $G_topbanner, $G_with_donors, $G_with_poll;
fprintf(STDERR, "G_proxy_white_list = [%s]\n", print_r($G_proxy_white_list, TRUE));
fprintf(STDERR, "G_room_roadmap = [%s]\n", print_r($G_room_roadmap, TRUE));
fprintf(STDERR, "G_shutdown = [%s]\n", print_r($G_shutdown, TRUE));
+ fprintf(STDERR, "G_profile = [%s]\n", print_r($G_profile, TRUE));
fprintf(STDERR, "G_splash_content = [%s]\n", print_r($G_splash_content, TRUE));
fprintf(STDERR, "G_splash_contents = [%s]\n", print_r($G_splash_contents, TRUE));
fprintf(STDERR, "G_splash_cont_idx = [%s]\n", print_r($G_splash_cont_idx, TRUE));
var $socks;
var $s2u; // user associated with input socket
var $s2p; // pending page associated with input socket
+ var $s2c; // ws sockets in closing phase
var $pending_pages;
var $is_daemon;
$thiz->socks = array();
$thiz->s2u = array();
$thiz->s2p = array();
+ $thiz->s2c = array();
$thiz->pending_pages = array();
$thiz->is_daemon = FALSE;
return ($thiz);
}
- function socks_set($sock, $user, $pendpage)
+ function socks_set($sock, $user, $pendpage, $postclose = NULL)
{
$id = intval($sock);
$this->socks[$id] = $sock;
if ($user != NULL)
- $this->s2u[$id] = $user;
+ $this->s2u[$id] = $user;
if ($pendpage != NULL)
- $this->s2p[$id] = $pendpage;
+ $this->s2p[$id] = $pendpage;
+ if ($postclose != NULL)
+ $this->s2c[$id] = $postclose;
}
function socks_unset($sock)
unset($this->s2u[$id]);
if (isset($this->s2p[$id]))
unset($this->s2p[$id]);
+ if (isset($this->s2c[$id]))
+ unset($this->s2c[$id]);
unset($this->socks[$id]);
}
foreach ($this->socks as $k => $sock) {
$id = intval($sock);
- if (isset($this->s2u[$id])) {
+ if (isset($this->s2c[$id])) {
+ $postclose = $this->s2c[$id];
+ if ($postclose->read('', $this->curtime) == 0) {
+ fclose($sock);
+ $this->socks_unset($sock);
+ }
+ }
+ else if (isset($this->s2u[$id])) {
$user = $this->s2u[$id];
if ($user->the_end) {
if (($user->rd_toflush == FALSE && $user->rd_step == $user->step)
GLOBAL $G_btrace_pref_sub, $G_dbauth;
GLOBAL $G_dbpfx, $G_donors_all, $G_donors_cur, $G_is_local, $G_lang;
GLOBAL $G_poll_entries, $G_poll_name, $G_poll_title, $G_proxy_white_list;
- GLOBAL $G_room_roadmap, $G_shutdown;
+ GLOBAL $G_room_roadmap, $G_shutdown, $G_profile;
GLOBAL $G_splash_content, $G_splash_contents, $G_splash_cont_idx;
GLOBAL $G_splash_h, $G_splash_idx, $G_splash_interval, $G_splash_timeout;
GLOBAL $G_splash_w, $G_topbanner, $G_with_donors, $G_with_poll;
$list_web_arr[intval($this->list_web[$i])] = $this->list_web[$i];
}
+ log_legal(time(), '127.0.0.1', FALSE, 'MAIN', 'LOG:START');
+
$lastime = 0;
$dump_users = TRUE;
$sock_shard_cur = -1;
+
+ $mtime_start = microtime(TRUE);
+ $mtsum_idle = 0.0;
+ $mtsum_read = 0.0;
+ $mtsum_garb = 0.0;
+ $mtsum_unfi = 0.0;
+ $mtsum_mana = 0.0;
+
while ($this->main_loop) {
+ $mtime_begin = microtime(TRUE);
$sock_shard_cur = ($sock_shard_cur + 1) % SOCK_SHARD_N;
$this->app->sess_cur_set(FALSE);
$this->curtime = time();
if ($lastime != ($this->curtime >> 2)) {
+ if ($G_profile == TRUE) {
+ $mtime_finish = microtime(TRUE);
+ $mtime_diff = ($mtime_finish - $mtime_start);
+ $mtime_idle = 100.0 * $mtsum_idle / $mtime_diff;
+ $mtime_read = 100.0 * $mtsum_read / $mtime_diff;
+ $mtime_garb = 100.0 * $mtsum_garb / $mtime_diff;
+ $mtime_unfi = 100.0 * $mtsum_unfi / $mtime_diff;
+ $mtime_mana = 100.0 * $mtsum_mana / $mtime_diff;
+
+ log_legal(time(), '127.0.0.1', FALSE, 'MAIN',
+ sprintf('LOG:PROF: tot(%.3f) idle: %.2f read: %.2f garb: %.2f unfi: %.2f mana: %.2f',
+ $mtime_diff, $mtime_idle, $mtime_read, $mtime_garb, $mtime_unfi, $mtime_mana
+ ));
+ $mtsum_idle = 0.0;
+ $mtsum_read = 0.0;
+ $mtsum_garb = 0.0;
+ $mtsum_unfi = 0.0;
+ $mtsum_mana = 0.0;
+ $mtime_start = $mtime_finish;
+ }
fprintf(STDERR, "\nIN LOOP: Current opened: %d pending_pages: %d\n", count($this->socks), count($this->pending_pages));
}
$except = NULL;
$num_changed_sockets = @stream_select($read, $write, $except, 0, 500000);
+ if ($G_profile) {
+ $mtime_idle = microtime(TRUE);
+ $mtsum_idle += $mtime_idle - $mtime_begin;
+ }
if ($num_changed_sockets == 0) {
// printf(" no data in 5 secs, splash [%d]\n", $G_with_splash);
;
else if ($id % SOCK_SHARD_N == $sock_shard_cur) { // already opened socket
$buf = fread($sock, 4096);
// if socket is closed
- if ($buf == FALSE || feof($sock)) {
+ if ($buf == FALSE || mb_strlen($buf, "ASCII") == 0 || feof($sock)) {
+ $postclose = NULL;
// close socket case
if ($buf == FALSE) {
// printf("INFO: read return false\n");
if ($this->s2u[$id]->rd_socket_get() != NULL) {
// try to send close frame (for websocket)
$clo = $this->s2u[$id]->stream_close();
+ $postclose = $user->stream_postclose_get($sock, $this->curtime);
$clo_l = mb_strlen($clo, "ASCII");
@fwrite($sock, $clo, $clo_l);
$this->s2u[$id]->rd_socket_set(NULL);
unset($this->s2u[$id]);
}
}
- fclose($sock);
+ if ($postclose != NULL) {
+ // print("POSTCLOSE found!");
+ $this->socks_set($sock, NULL, NULL, $postclose);
+ }
+ else {
+ fclose($sock);
+ }
// printf("CLOSE ON READ\n");
if ($this->debug > 1) {
// fprintf(STDERR, 'POST USER');
if ($user && $user->rd_transp && strpos($user->rd_transp->type, "websocket") !== FALSE) {
- $clie_cmd = $user->rd_transp->unchunk($buf);
+ $clie_cmd = $user->rd_transp->unchunk($buf, $sock);
$clie_cmd = json_decode($clie_cmd, TRUE);
// fprintf(STDERR, "HERE WE ARE INCOMING DATA [%s]\n", print_r($clie_cmd, TRUE));
ob_end_clean();
}
}
+ else {
+ fprintf(STDERR, "Unknown page [%s]\n", $wr_addr);
+ }
/*
briskin5/index_wr.php
$manage_page = TRUE;
}
}
+
+ // postclose case
+ if (isset($this->s2c[$id])) {
+ $postclose = $this->s2c[$id];
+ // printf("POSTCLOSE: found pc in s2c list\n");
+ if ($postclose->read($buf, $this->curtime) == 0) {
+ printf("POSTCLOSE: received end opcode, close\n");
+ fclose($sock);
+ $this->socks_unset($sock);
+ }
+ }
}
}
}
}
if ($rret == FALSE) {
// FIXME: manage 404 !!!
- printf("TODO: fix unknown page\n");
+ printf("TODO: fix unknown page: %s\n", $path);
fclose($new_socket);
}
}
}
}
+ if ($G_profile) {
+ $mtime_read = microtime(TRUE);
+ $mtsum_read += $mtime_read - $mtime_idle;
+ }
$this->garbage_manager(FALSE);
+ if ($G_profile) {
+ $mtime_garb = microtime(TRUE);
+ $mtsum_garb += $mtime_garb - $mtime_read;
+ }
+
/* manage unfinished pages */
foreach ($this->pending_pages as $k => $pendpage) {
// TODO: try_flush if exists in the class
}
}
+ if ($G_profile) {
+ $mtime_unfi = microtime(TRUE);
+ $mtsum_unfi += $mtime_unfi - $mtime_garb;
+ }
+
/*
$response: raw stream data not sent
$content: html consistent data (<script bla bla>)
// close socket after a while to prevent client memory consumption
if ($user->rd_endtime_is_expired($this->curtime)) {
- if ($this->s2u[$id]->rd_socket_get() != NULL) {
- $this->s2u[$id]->rd_socket_set(NULL);
+ $postclose = $user->stream_postclose_get($sock, $this->curtime);
+ if ($user->rd_socket_get() != NULL) {
+ $user->rd_socket_set(NULL);
}
unset($this->socks[$id]);
unset($this->s2u[$id]);
$clo = $user->stream_close();
$clo_l = mb_strlen($clo, "ASCII");
@fwrite($sock, $clo, $clo_l);
- fclose($sock);
+ if ($postclose) {
+ $this->socks_set($sock, NULL, NULL, $postclose);
+ }
+ else {
+ fclose($sock);
+ }
// printf("CLOSE ON LOOP\n");
}
} // if (isset($this->s2u[$id]...
} // foreach ($this->socks...
+ if ($G_profile) {
+ $mtime_mana = microtime(TRUE);
+ $mtsum_mana += $mtime_mana - $mtime_unfi;
+ }
$dump_users = FALSE;
printf("#");
if (defined('CURL_DE_SAC_VERS')) {
projects / brisk.git / blobdiff