X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fspush%2Fbrisk-spush.php;h=d39ba04e5236b6600b8e3bb8ec3a5449da3f0428;hb=192dfc6558fbebf34ebda89218ca1418c1858f00;hp=068d46c0dc31c5d5cc41ff520c36b444ea7e3357;hpb=a83f493a328cfcb04ab53c5e5f08a530a9b5f290;p=brisk.git diff --git a/web/spush/brisk-spush.php b/web/spush/brisk-spush.php index 068d46c..d39ba04 100755 --- a/web/spush/brisk-spush.php +++ b/web/spush/brisk-spush.php @@ -22,16 +22,30 @@ * Suite 330, Boston, MA 02111-1307, USA. * * TODO - * index_wr.php::chat - * index_wr.php::reload - * index_wr.php::exit * - * setcookie (for tables only) - * keepalive - * chunked - * BUG - after restart index_rd.php receive from prev clients a lot of req + * - BUG: logout failed + * - BUG: fast loop on stream index_rd_ifra page + * + * - garbage management + * - log_legal address fix + * - from room to table + * - from table to room + * - fwrite other issues + * - manage and test cross forwarder between table and room + * - setcookie (for tables only) + * - keepalive management + * - chunked + * * DONE/FROZEN - problema con getpeer (HOSTADDR) * + * DONE - bug: read from a not resource handle (already closed because a new socket substitute it) + * DONE - partial write for normal page management + * DONE - index_rd_ifra: last_clean issue + * DONE - fwrite failed error management (select, buffer where store unsent data, and fwrite check and retry) + * ABRT - index_wr.php::reload - reload is js-only function + * DONE - bug: after restart index_rd.php receive from prev clients a lot of req + * DONE - index_wr.php::chat + * DONE - index_wr.php::exit * DONE - index_rd.php porting * DONE - generic var management from internet * DONE - index.php auth part @@ -113,6 +127,7 @@ function main() } $s2u = array(); + $pages_flush = array(); $rndstr = ""; for ($i = 0 ; $i < 4096 ; $i++) { @@ -137,7 +152,7 @@ function main() while ($main_loop) { $curtime = time(); - printf("IN LOOP: Current opened: %d\n", count($socks)); + printf("IN LOOP: Current opened: %d pages_flush: %d\n", count($socks), count($pages_flush)); /* Prepare the read array */ if ($shutdown) @@ -163,6 +178,11 @@ function main() } /* At least at one of the sockets something interesting happened */ foreach ($read as $i => $sock) { + /* is_resource check is required because there is the possibility that + during new request an old connection is closed */ + if (!is_resource($sock)) { + continue; + } if ($sock === $list) { printf("NUOVA CONNEX\n"); $new_unix = stream_socket_accept($list); @@ -195,34 +215,42 @@ function main() index_main($room, $header_out, $addr, $get, $post, $cookie); $content = ob_get_contents(); ob_end_clean(); - // printf("OUT: [%s]\n", $G_content); - fwrite($new_socket, headers_render($header_out).$content); - fclose($new_socket); + + $pgflush = new PageFlush($new_socket, $curtime, 20, $header_out, $content); + + if ($pgflush->try_flush($curtime) == FALSE) { + // Add $pgflush to the pgflush array + array_push($pages_flush, $pgflush); + } + break; case SITE_PREFIX."index_wr.php": $header_out = array(); - $addr = ""; - // $ret = socket_getpeername($new_socket, $addr); - printf("RET: %s\n", $addr); - // exit(123); ob_start(); index_wr_main($room, $addr, $get, $post, $cookie); $content = ob_get_contents(); ob_end_clean(); - - // printf("OUT: [%s]\n", $G_content); - fwrite($new_socket, headers_render($header_out).$content); - fclose($new_socket); + + $pgflush = new PageFlush($new_socket, $curtime, 20, $header_out, $content); + + if ($pgflush->try_flush($curtime) == FALSE) { + // Add $pgflush to the pgflush array + array_push($pages_flush, $pgflush); + } break; case SITE_PREFIX."index_rd_ifra.php": do { $header_out = array(); if (!isset($cookie['sess']) || (($user = $room->get_user($cookie['sess'], $idx)) == FALSE)) { - $body = index_rd_ifra_fini(TRUE); - fwrite($new_socket, headers_render($header_out).$body); - fflush($new_socket); - fclose($new_socket); + $content = index_rd_ifra_fini(TRUE); + + $pgflush = new PageFlush($new_socket, $curtime, 20, $header_out, $content); + + if ($pgflush->try_flush($curtime) == FALSE) { + // Add $pgflush to the pgflush array + array_push($pages_flush, $pgflush); + } break; } // close a previous opened index_read_ifra socket, if exists @@ -234,9 +262,18 @@ function main() $user->rd_socket_set(NULL); } - $body = ""; - index_rd_ifra_init($room, $user, $header_out, $body, $get, $post, $cookie); - fwrite($new_socket, headers_render($header_out).$body); + $content = ""; + index_rd_ifra_init($room, $user, $header_out, $content, $get, $post, $cookie); + $content_l = mb_strlen($content, "ASCII"); + + $wret = @fwrite($new_socket, headers_render($header_out).$content); + if ($wret < $content_l) { + printf("TROUBLES WITH FWRITE: %d\n", $ret); + $user->rd_cache_set(mb_substr($content, $ret, $content_l - $ret, "ASCII")); + } + else { + $user->rd_cache_set(""); + } fflush($new_socket); $s2u[intval($new_socket)] = $idx; @@ -297,24 +334,31 @@ function main() } } + + foreach ($pages_flush as $k => $pgflush) { + if ($pgflush->try_flush($curtime) == TRUE) { + unset($pages_flush[$k]); + } + } + foreach ($socks as $k => $sock) { if (isset($s2u[intval($sock)])) { $user = $room->user[$s2u[intval($sock)]]; - $body = $user->rd_cache_get(); - if ($body == "") - index_rd_ifra_main($room, $user, $body); + $content = $user->rd_cache_get(); + if ($content == "") + index_rd_ifra_main($room, $user, $content); - if ($body == "" && $user->rd_kalive_is_expired($curtime)) { - $body = index_rd_ifra_keepalive($user); + if ($content == "" && $user->rd_kalive_is_expired($curtime)) { + $content = index_rd_ifra_keepalive($user); } - if ($body != "") { - echo "SPIA: [".substr($body, 0, 60)."...]\n"; - $body_l = mb_strlen($body, "LATIN1"); - $ret = @fwrite($sock, $body); - if ($ret < $body_l) { - printf("TROUBLE WITH FWRITE: %d\n", $ret); - $user->rd_cache_set(mb_substr($body, $ret, $body_l - $ret, "LATIN1")); + if ($content != "") { + echo "SPIA: [".substr($content, 0, 60)."...]\n"; + $content_l = mb_strlen($content, "ASCII"); + $wret = @fwrite($sock, $content); + if ($wret < $content_l) { + printf("TROUBLE WITH FWRITE: %d\n", $wret); + $user->rd_cache_set(mb_substr($content, $wret, $content_l - $wret, "ASCII")); } else { $user->rd_cache_set("");