optimize code[2]

swoole · Mar 27, 2024 · b01b79f · b01b79f
1 parent ebdf41e
commit b01b79f
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 26 deletions.
diff --git a/ext-src/swoole_thread.cc b/ext-src/swoole_thread.cc
@@ -821,6 +821,8 @@ void php_swoole_thread_start(zend_string *file, zend_string *argv) {
 #endif
     zend_file_handle file_handle{};
 
+    swoole_thread_init();
+
     if (php_request_startup() != SUCCESS) {
         EG(exit_status) = 1;
         goto _startup_error;

diff --git a/include/swoole.h b/include/swoole.h
@@ -574,6 +574,7 @@ void swoole_init(void);
 void swoole_clean(void);
 pid_t swoole_fork(int flags);
 pid_t swoole_fork_exec(const std::function<void(void)> &child_fn);
+void swoole_thread_init(void);
 void swoole_redirect_stdout(int new_fd);
 int swoole_shell_exec(const char *command, pid_t *pid, bool get_error_stream);
 int swoole_daemon(int nochdir, int noclose);

diff --git a/src/core/base.cc b/src/core/base.cc
@@ -154,15 +154,6 @@ static void bug_report_message_init() {
 
 void swoole_init(void) {
     if (SwooleG.init) {
-#ifdef SW_THREAD
-        SwooleTG.buffer_stack = new swoole::String(SW_STACK_BUFFER_SIZE);
-        g_logger_instance = new swoole::Logger;
-#ifdef SW_DEBUG
-        sw_logger()->set_level(0);
-#else
-        sw_logger()->set_level(SW_LOG_INFO);
-#endif
-#endif
         return;
     }
 
@@ -440,6 +431,15 @@ pid_t swoole_fork(int flags) {
     return pid;
 }
 
+void swoole_thread_init(void) {
+    SwooleTG.buffer_stack = new String(SW_STACK_BUFFER_SIZE);
+    ON_SCOPE_EXIT {
+        delete SwooleTG.buffer_stack;
+        SwooleTG.buffer_stack = nullptr;
+    };
+    swoole_signal_block_all();
+}
+
 void swoole_dump_ascii(const char *data, size_t size) {
     for (size_t i = 0; i < size; i++) {
         printf("%u ", (unsigned) data[i]);

diff --git a/src/os/async_thread.cc b/src/os/async_thread.cc
@@ -225,13 +225,7 @@ void ThreadPool::create_thread(const bool is_core_worker) {
     try {
         std::thread *_thread = new std::thread([this, is_core_worker]() {
             bool exit_flag = false;
-            SwooleTG.buffer_stack = new String(SW_STACK_BUFFER_SIZE);
-            ON_SCOPE_EXIT {
-                delete SwooleTG.buffer_stack;
-                SwooleTG.buffer_stack = nullptr;
-            };
-
-            swoole_signal_block_all();
+            swoole_thread_init();
 
             while (running) {
                 event_mutex.lock();

diff --git a/src/server/master.cc b/src/server/master.cc
@@ -720,8 +720,6 @@ int Server::start() {
  * initializing server config, set default
  */
 Server::Server(enum Mode _mode) {
-    swoole_init();
-
     reactor_num = SW_CPU_NUM > SW_REACTOR_MAX_THREAD ? SW_REACTOR_MAX_THREAD : SW_CPU_NUM;
     worker_num = SW_CPU_NUM;
     max_connection = SW_MIN(SW_MAX_CONNECTION, SwooleG.max_sockets);

diff --git a/src/server/reactor_thread.cc b/src/server/reactor_thread.cc
@@ -797,12 +797,7 @@ int ReactorThread::init(Server *serv, Reactor *reactor, uint16_t reactor_id) {
 static void ReactorThread_loop(Server *serv, int reactor_id) {
     SwooleTG.id = reactor_id;
     SwooleTG.type = Server::THREAD_REACTOR;
-
-    SwooleTG.buffer_stack = new String(SW_STACK_BUFFER_SIZE);
-    ON_SCOPE_EXIT {
-        delete SwooleTG.buffer_stack;
-        SwooleTG.buffer_stack = nullptr;
-    };
+    swoole_thread_init();
 
     if (swoole_event_init(0) < 0) {
         return;
@@ -830,8 +825,6 @@ static void ReactorThread_loop(Server *serv, int reactor_id) {
     }
 #endif
 
-    swoole_signal_block_all();
-
     if (thread->init(serv, reactor, reactor_id) < 0) {
         return;
     }