Update onReceive_length_check

Author: matyhtf

examples/server.php

@@ -59,12 +59,12 @@ function my_onWorkerStart($serv, $worker_id)
     echo "WorkerStart: MasterPid={$serv->master_pid}|Manager_pid={$serv->manager_pid}";
     echo "|WorkerId={$serv->worker_id}|WorkerPid={$serv->worker_pid}\n";
 
-//     if ($worker_id == 2)
-//     {
-//     	$serv->addtimer(2000); //500ms
-//     	$serv->addtimer(6000); //500ms
-//     	var_dump($serv->gettimer());
-//     }
+    if ($worker_id == 0)
+    {
+    	$serv->addtimer(2000); //500ms
+    	//$serv->addtimer(6000); //500ms
+    	//var_dump($serv->gettimer());
+    }
 }
 
 function my_onWorkerStop($serv, $worker_id)

include/Server.h

@@ -297,7 +297,7 @@ struct _swServer
     uint8_t open_tcp_nodelay;
 
     /**
-     * open tcp cork option
+     * open tcp nopush option(for sendfile)
      */
     uint8_t open_tcp_nopush;
 

src/factory/FactoryProcess.c

@@ -565,6 +565,7 @@ int swFactoryProcess_end(swFactory *factory, swDataHead *event)
     }
     return swFactoryProcess_finish(factory, &_send);
 }
+
 /**
  * worker: send to client
  */
@@ -615,7 +616,8 @@ int swFactoryProcess_finish(swFactory *factory, swSendData *resp)
     sdata._send.info.type = resp->info.type;
     swWorker *worker = swServer_get_worker(serv, SwooleWG.id);
 
-    /**
+
+	/**
      * Big response, use shared memory
      */
     if (resp->length > 0)

src/network/ReactorThread.c

@@ -427,7 +427,6 @@ int swReactorThread_onWrite(swReactor *reactor, swEvent *ev)
                 close(task->fd);
                 sw_free(task);
 
-#ifdef TCP_CORK
                 if (serv->open_tcp_nopush)
                 {
                     /**
@@ -449,7 +448,6 @@ int swReactorThread_onWrite(swReactor *reactor, swEvent *ev)
                         }
                     }
                 }
-#endif
             }
         }
         else
@@ -794,6 +792,10 @@ int swReactorThread_onReceive_buffer_check_length(swReactor *reactor, swEvent *e
                             {
                                 continue;
                             }
+                            else if (errno == EAGAIN)
+                            {
+                                break;
+                            }
                             else
                             {
                                 goto error_fd;
@@ -811,7 +813,7 @@ int swReactorThread_onReceive_buffer_check_length(swReactor *reactor, swEvent *e
                     }
 
                     tmp_ptr = recv_buf_again;
-                    tmp_n = tmp_n + n;
+                    tmp_n = tmp_n + recv_n;
 
                     goto do_parse_package;
                 }

swoole_config.h

@@ -39,16 +39,16 @@
 #define SW_CLIENT_BUFFER_SIZE      65536
 
 #ifdef SW_USE_RINGBUFFER
-#define SW_BUFFER_SIZE             65536
+#define SW_BUFFER_SIZE             65535
 #elif __MACH__
 #define SW_BUFFER_SIZE             (2048-sizeof(struct _swDataHead))
 #else
 #define SW_BUFFER_SIZE             (8192-sizeof(struct _swDataHead))
 #endif
 
-#define SW_BUFFER_SIZE_BIG         65536
+#define SW_BUFFER_SIZE_BIG         65535
+#define SW_SENDFILE_TRUNK          65536
 
-#define SW_SENDFILE_TRUNK          65535
 #define SW_SENDFILE_MAXLEN         4194304
 
 #define SW_HASHMAP_KEY_MAXLEN      256