Optimize Worker::init() & Worker::set_max_request()

Author: matyhtf

core-tests/src/os/process_pool.cpp

@@ -24,7 +24,6 @@ static void test_func(ProcessPool &pool) {
 
     pool.running = true;
     pool.ptr = &rmem;
-    SwooleWG.run_always = true;
     pool.main_loop(&pool, pool.get_worker(0));
     pool.destroy();
 }

core-tests/src/server/server.cpp

@@ -558,7 +558,6 @@ TEST(server, task_worker) {
     ASSERT_EQ(serv.create_task_workers(), SW_OK);
 
     thread t1([&serv]() {
-    	SwooleWG.run_always = true;
         serv.gs->task_workers.running = 1;
         serv.gs->task_workers.main_loop(&serv.gs->task_workers, &serv.gs->task_workers.workers[0]);
         EXPECT_EQ(serv.get_tasking_num(), 0);

include/swoole_process_pool.h

@@ -103,7 +103,6 @@ struct ProcessPool;
 struct Worker;
 
 struct WorkerGlobal {
-    bool run_always;
     bool shutdown;
     bool running;
     uint32_t max_request;
@@ -163,7 +162,11 @@ struct Worker {
     bool has_exceeded_max_request();
     void set_max_request(uint32_t max_request, uint32_t max_request_grace);
     void report_error(const ExitStatus &exit_status);
-    void start();
+    /**
+     * Init global state for worker process.
+     * Must be called after the process is spawned and before the main loop is executed.
+     */
+    void init();
     void shutdown();
     bool is_shutdown();
     bool is_running();

src/os/process_pool.cc

@@ -452,11 +452,11 @@ pid_t ProcessPool::spawn(Worker *worker) {
     switch (pid) {
     // child
     case 0:
+        worker->init();
         worker->pid = SwooleG.pid;
         swoole_set_process_type(SW_PROCESS_WORKER);
         swoole_set_process_id(worker->id);
         SwooleWG.worker = worker;
-        SwooleWG.run_always = true;
         if (async) {
             if (swoole_event_init(SW_EVENTLOOP_WAIT_EXIT) < 0) {
                 exit(254);
@@ -987,11 +987,7 @@ void ProcessPool::destroy() {
     sw_mem_pool()->free(workers);
 }
 
-bool Worker::has_exceeded_max_request() {
-    return !SwooleWG.run_always && request_count >= SwooleWG.max_request;
-}
-
-void Worker::start() {
+void Worker::init() {
     start_time = ::time(nullptr);
     request_count = 0;
     set_status_to_idle();
@@ -1000,15 +996,14 @@ void Worker::start() {
 }
 
 void Worker::set_max_request(uint32_t max_request, uint32_t max_request_grace) {
-    if (max_request < 1) {
-        SwooleWG.run_always = true;
-    } else {
-        SwooleWG.run_always = false;
-        SwooleWG.max_request = max_request;
-        if (max_request_grace > 0) {
-            SwooleWG.max_request += swoole_system_random(1, max_request_grace);
-        }
+    if (max_request > 0 && max_request_grace > 0) {
+        max_request += swoole_system_random(1, max_request_grace);
     }
+    SwooleWG.max_request = max_request;
+}
+
+bool Worker::has_exceeded_max_request() {
+    return SwooleWG.max_request > 0 && request_count >= SwooleWG.max_request;
 }
 
 void Worker::shutdown() {

src/server/master.cc

@@ -593,7 +593,7 @@ void Server::destroy_worker(Worker *worker) {
  * [Worker]
  */
 void Server::init_event_worker(Worker *worker) {
-    worker->start();
+    worker->init();
     worker->set_max_request(max_request, max_request_grace);
 }
 

src/server/task_worker.cc

@@ -259,7 +259,7 @@ static void TaskWorker_onStart(ProcessPool *pool, Worker *worker) {
     TaskWorker_signal_init(pool);
     serv->worker_start_callback(worker);
 
-    worker->start();
+    worker->init();
     worker->set_max_request(pool->max_request, pool->max_request_grace);
 }