optimize code

Author: matyhtf

ext-src/swoole_server.cc

@@ -3191,8 +3191,8 @@ static PHP_METHOD(swoole_server, taskWaitMulti) {
     buf.info.ext_flags |= SW_TASK_WAITALL;
     dst_worker_id = -1;
     sw_atomic_fetch_add(&serv->gs->tasking_num, 1);
-    if (serv->gs->task_workers.dispatch_blocking(&buf, &dst_worker_id) < 0) {
-        php_swoole_sys_error(E_WARNING, "taskwait failed");
+    if (!serv->task(&buf, &dst_worker_id, true)) {
+        php_swoole_sys_error(E_WARNING, "failed to dispatch task");
         task_id = -1;
     _fail:
         add_index_bool(return_value, i, 0);

include/swoole_process_pool.h

@@ -327,10 +327,10 @@ struct ProcessPool {
     bool reload();
     pid_t spawn(Worker *worker);
     void stop(Worker *worker);
-    int dispatch(EventData *data, int *worker_id);
+    swResultCode dispatch(EventData *data, int *worker_id);
     int response(const char *data, int length);
-    int dispatch_blocking(EventData *data, int *dst_worker_id);
-    int dispatch_blocking(const char *data, uint32_t len);
+    swResultCode dispatch_blocking(EventData *data, int *dst_worker_id);
+    swResultCode dispatch_blocking(const char *data, uint32_t len);
     void add_worker(Worker *worker);
     int del_worker(Worker *worker);
     void destroy();

src/os/process_pool.cc

@@ -328,10 +328,7 @@ int ProcessPool::pop_message(void *data, size_t size) {
     return message_box->pop(data, size);
 }
 
-/**
- * dispatch data to worker
- */
-int ProcessPool::dispatch(EventData *data, int *dst_worker_id) {
+swResultCode ProcessPool::dispatch(EventData *data, int *dst_worker_id) {
     Worker *worker;
 
     if (use_socket) {
@@ -363,7 +360,7 @@ int ProcessPool::dispatch(EventData *data, int *dst_worker_id) {
     return SW_OK;
 }
 
-int ProcessPool::dispatch_blocking(const char *data, uint32_t len) {
+swResultCode ProcessPool::dispatch_blocking(const char *data, uint32_t len) {
     assert(use_socket);
 
     network::Client _socket(stream_info_->socket->socket_type, false);
@@ -384,11 +381,7 @@ int ProcessPool::dispatch_blocking(const char *data, uint32_t len) {
     return SW_OK;
 }
 
-/**
- * dispatch data to worker
- * @return SW_OK/SW_ERR
- */
-int ProcessPool::dispatch_blocking(EventData *data, int *dst_worker_id) {
+swResultCode ProcessPool::dispatch_blocking(EventData *data, int *dst_worker_id) {
     if (use_socket) {
         return dispatch_blocking((char *) data, data->size());
     }

src/server/master.cc

@@ -1176,7 +1176,7 @@ bool Server::command(WorkerId process_id,
         buf.info.fd = request_id;
         buf.info.server_fd = command_id;
         int _dst_worker_id = process_id;
-        if (gs->task_workers.dispatch(&buf, &_dst_worker_id) == SW_ERR) {
+        if (!this->task(&buf, &_dst_worker_id)) {
             goto _fail;
         }
         return true;

src/server/task_worker.cc

@@ -142,7 +142,7 @@ bool Server::task_pack(EventData *task, const void *_data, size_t _length) {
 bool Server::task(EventData *_task, int *dst_worker_id, bool blocking) {
     sw_atomic_fetch_add(&gs->tasking_num, 1);
 
-    int retval;
+    swResultCode retval;
     if (blocking) {
         retval = gs->task_workers.dispatch_blocking(_task, dst_worker_id);
     } else {