Refactor

Author: matyhtf

examples/thread/aio.php

@@ -10,7 +10,7 @@
 
 if (empty($args)) {
     $threads = [];
-    $atomic = new Swoole\Atomic();
+    $atomic = new Swoole\Thread\Atomic();
     for ($i = 0; $i < $c; $i++) {
         $threads[] = Thread::exec(__FILE__, $i, $atomic);
     }

examples/thread/atomic.php

@@ -1,8 +1,8 @@
 <?php
 
 use Swoole\Thread;
-use Swoole\Atomic;
-use Swoole\Atomic\Long;
+use Swoole\Thread\Atomic;
+use Swoole\Thread\Atomic\Long;
 
 $args = Thread::getArguments();
 $c = 4;

examples/thread/lock.php

@@ -1,7 +1,7 @@
 <?php
 
 use Swoole\Thread;
-use Swoole\Lock;
+use Swoole\Thread\Lock;
 
 $args = Thread::getArguments();
 

ext-src/php_swoole.cc

@@ -1033,6 +1033,9 @@ PHP_RINIT_FUNCTION(swoole) {
 #ifdef SW_USE_ORACLE
     php_swoole_oracle_rinit();
 #endif
+#ifdef SW_THREAD
+    php_swoole_thread_rinit();
+#endif
 
     SWOOLE_G(req_status) = PHP_SWOOLE_RINIT_END;
 

ext-src/php_swoole_private.h

@@ -286,6 +286,7 @@ void php_swoole_runtime_rinit();
 #ifdef SW_USE_ORACLE
 void php_swoole_oracle_rinit();
 #endif
+void php_swoole_thread_rinit();
 
 /**
  * RSHUTDOWN

ext-src/stubs/php_swoole_thread.stub.php

@@ -11,5 +11,6 @@ public function detach(): bool {}
         public static function exec(string $script_file, mixed ...$args): Thread {}
         public static function getArguments(): array {}
         public static function getId(): int {}
+        public static function getTsrmInfo(): array {}
     }
 }

ext-src/stubs/php_swoole_thread_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 47148b0067d99c44ab50739f4184b021db929a6a */
+ * Stub hash: 57a2a703c0e0a37729ab2e2df280fbb24e78404f */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Swoole_Thread___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -21,3 +21,5 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Swoole_Thread_getId, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
+
+#define arginfo_class_Swoole_Thread_getTsrmInfo arginfo_class_Swoole_Thread_getArguments

ext-src/swoole_server.cc

@@ -1905,13 +1905,8 @@ static PHP_METHOD(swoole_server, __construct) {
     size_t host_len = 0;
     zend_long sock_type = SW_SOCK_TCP;
     zend_long serv_port = 0;
-#ifdef SW_THREAD
-    zend_long serv_mode = Server::MODE_THREAD;
-#else
     zend_long serv_mode = Server::MODE_BASE;
-#endif
 
-    // only cli env
     if (!SWOOLE_G(cli)) {
         zend_throw_exception_ex(
             swoole_exception_ce, -1, "%s can only be used in CLI mode", SW_Z_OBJCE_NAME_VAL_P(zserv));
@@ -1983,7 +1978,8 @@ static PHP_METHOD(swoole_server, set) {
     ServerObject *server_object = server_fetch_object(Z_OBJ_P(ZEND_THIS));
     Server *serv = php_swoole_server_get_and_check_server(ZEND_THIS);
     if (serv->is_worker_thread()) {
-        return;
+        swoole_set_last_error(SW_ERROR_OPERATION_NOT_SUPPORT);
+        RETURN_FALSE;
     }
     if (serv->is_started()) {
         php_swoole_fatal_error(

ext-src/swoole_thread.cc

@@ -23,6 +23,7 @@
 #include <sys/resource.h>
 
 #include <thread>
+#include <unordered_map>
 
 #include "swoole_lock.h"
 
@@ -33,6 +34,12 @@ END_EXTERN_C()
 zend_class_entry *swoole_thread_ce;
 static zend_object_handlers swoole_thread_handlers;
 
+static struct {
+    char *path_translated;
+    zend_string *argv_serialized;
+    int argc;
+} request_info;
+
 TSRMLS_CACHE_DEFINE();
 
 typedef std::thread Thread;
@@ -110,6 +117,7 @@ static PHP_METHOD(swoole_thread, detach);
 static PHP_METHOD(swoole_thread, exec);
 static PHP_METHOD(swoole_thread, getArguments);
 static PHP_METHOD(swoole_thread, getId);
+static PHP_METHOD(swoole_thread, getTsrmInfo);
 SW_EXTERN_C_END
 
 // clang-format off
@@ -121,6 +129,7 @@ static const zend_function_entry swoole_thread_methods[] = {
     PHP_ME(swoole_thread, exec,         arginfo_class_Swoole_Thread_exec,         ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
     PHP_ME(swoole_thread, getArguments, arginfo_class_Swoole_Thread_getArguments, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
     PHP_ME(swoole_thread, getId,        arginfo_class_Swoole_Thread_getId,        ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
+    PHP_ME(swoole_thread, getTsrmInfo,  arginfo_class_Swoole_Thread_getTsrmInfo,  ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
     PHP_FE_END
 };
 // clang-format on
@@ -215,14 +224,37 @@ bool php_swoole_thread_unserialize(zend_string *data, zval *zv) {
     return unserialized;
 }
 
+void php_swoole_thread_rinit() {
+    if (tsrm_is_main_thread()) {
+        if (SG(request_info).path_translated) {
+            request_info.path_translated = strdup(SG(request_info).path_translated);
+        }
+        // Return reference
+        zval *global_argv = zend_hash_find_ind(&EG(symbol_table), ZSTR_KNOWN(ZEND_STR_ARGV));
+        request_info.argv_serialized = php_swoole_thread_serialize(global_argv);
+        request_info.argc = SG(request_info).argc;
+    }
+}
+
 void php_swoole_thread_rshutdown() {
     zval_dtor(&thread_argv);
+    if (tsrm_is_main_thread()) {
+        if (request_info.path_translated) {
+            free((void *) request_info.path_translated);
+            request_info.path_translated = nullptr;
+        }
+        if (request_info.argv_serialized) {
+            zend_string_release(request_info.argv_serialized);
+            request_info.argv_serialized = nullptr;
+        }
+    }
 }
 
-void php_swoole_thread_start(zend_string *file, zend_string *argv) {
+void php_swoole_thread_start(zend_string *file, zend_string *argv_serialized) {
     ts_resource(0);
     TSRMLS_CACHE_UPDATE();
     zend_file_handle file_handle{};
+    zval global_argc, global_argv;
 
     PG(expose_php) = 0;
     PG(auto_globals_jit) = 1;
@@ -243,15 +275,23 @@ void php_swoole_thread_start(zend_string *file, zend_string *argv) {
     SG(sapi_started) = 0;
     SG(headers_sent) = 1;
     SG(request_info).no_headers = 1;
+    SG(request_info).path_translated = request_info.path_translated;
+    SG(request_info).argc = request_info.argc;
 
     zend_stream_init_filename(&file_handle, ZSTR_VAL(file));
     file_handle.primary_script = 1;
 
     zend_first_try {
-        if (argv == nullptr || ZSTR_LEN(argv) == 0) {
+        if (argv_serialized == nullptr || ZSTR_LEN(argv_serialized) == 0) {
             array_init(&thread_argv);
         } else {
-            php_swoole_thread_unserialize(argv, &thread_argv);
+            php_swoole_thread_unserialize(argv_serialized, &thread_argv);
+        }
+        if (request_info.argv_serialized) {
+            php_swoole_thread_unserialize(request_info.argv_serialized, &global_argv);
+            ZVAL_LONG(&global_argc, request_info.argc);
+            zend_hash_update(&EG(symbol_table), ZSTR_KNOWN(ZEND_STR_ARGV), &global_argv);
+            zend_hash_update(&EG(symbol_table), ZSTR_KNOWN(ZEND_STR_ARGC), &global_argc);
         }
         php_execute_script(&file_handle);
     }
@@ -263,7 +303,7 @@ void php_swoole_thread_start(zend_string *file, zend_string *argv) {
 
 _startup_error:
     zend_string_release(file);
-    zend_string_release(argv);
+    zend_string_release(argv_serialized);
     ts_free_thread();
     swoole_thread_clean();
 }
@@ -306,4 +346,11 @@ static PHP_METHOD(swoole_thread, exec) {
         swoole_thread_ce, SW_Z8_OBJ_P(return_value), ZEND_STRL("id"), to->thread->native_handle());
 }
 
+static PHP_METHOD(swoole_thread, getTsrmInfo) {
+    array_init(return_value);
+    add_assoc_bool(return_value, "is_main_thread", tsrm_is_main_thread());
+    add_assoc_bool(return_value, "is_shutdown", tsrm_is_shutdown());
+    add_assoc_string(return_value, "api_name", tsrm_api_name());
+}
+
 #endif

tests/include/lib/src/ThreadManager.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace SwooleTest;
+
+use Swoole\Thread;
+
+class ThreadManager extends ProcessManager
+{
+    public $useConstantPorts = true;
+
+    function run($redirectStdout = false): void
+    {
+        $args = Thread::getArguments();
+        if (empty($args)) {
+            ($this->parentFunc)();
+        } else {
+            ($this->childFunc)(...$args);
+            exit(0);
+        }
+    }
+}

tests/include/skipif.inc

@@ -26,12 +26,6 @@ skip(
 (function () {
     global $argv;
     skip_if_php_version_lower_than('7.0');
-    if (defined('SWOOLE_THREAD')) {
-        $targs = Swoole\Thread::getArguments();
-        if ($targs) {
-            $argv = $targs[0];
-        }
-    }
     if (!getenv('PHPT') && substr($argv[0], -4) === '.php') {
         skip('please read ' . dirname(dirname(__FILE__)) . '/README.md and try again');
     }

tests/swoole_thread/async-io.phpt

@@ -24,16 +24,17 @@ if (empty($args)) {
     $atomic = new Swoole\Thread\Atomic();
     $atomicLong = new Swoole\Thread\Atomic\Long();
     for ($i = 0; $i < C; $i++) {
-        $threads[] = Thread::exec(__FILE__, $argv, $i, $atomic, $atomicLong);
+        $threads[] = Thread::exec(__FILE__, $i, $atomic, $atomicLong);
     }
     for ($i = 0; $i < C; $i++) {
         $threads[$i]->join();
     }
     Assert::eq($atomic->get(), C * N);
     Assert::eq($atomicLong->get(), C * N * M);
 } else {
-    $atomic = $args[2];
-    $atomicLong = $args[3];
+    $id = $args[0];
+    $atomic = $args[1];
+    $atomicLong = $args[2];
     Co\run(function () use ($atomic, $atomicLong, $md5) {
         $n = N;
         while ($n--) {

tests/swoole_thread/info.phpt

@@ -0,0 +1,33 @@
+--TEST--
+swoole_thread: info
+--SKIPIF--
+<?php
+require __DIR__ . '/../include/skipif.inc';
+skip_if_nts();
+?>
+--FILE--
+<?php
+require __DIR__ . '/../include/bootstrap.php';
+
+use Swoole\Thread;
+
+$tm = new \SwooleTest\ThreadManager();
+
+$tm->parentFunc = function () {
+    $thread = Thread::exec(__FILE__, 'child');
+    $info = Thread::getTsrmInfo();
+    Assert::true($info['is_main_thread']);
+    Assert::eq($info['api_name'], 'POSIX Threads');
+    $thread->join();
+};
+
+$tm->childFunc = function () {
+    $info = Thread::getTsrmInfo();
+    Assert::false($info['is_main_thread']);
+    Assert::eq($info['api_name'], 'POSIX Threads');
+};
+
+$tm->run();
+?>
+--EXPECTF--
+

tests/swoole_thread/lock.phpt

@@ -12,23 +12,25 @@ require __DIR__ . '/../include/bootstrap.php';
 use Swoole\Thread;
 use Swoole\Thread\Lock;
 
-$args = Thread::getArguments();
+$tm = new \SwooleTest\ThreadManager();
 
-if (empty($args)) {
-    global $argv;
+$tm->parentFunc = function () {
     $lock = new Lock;
     $lock->lock();
-    $thread = Thread::exec(__FILE__, $argv, $lock);
+    $thread = Thread::exec(__FILE__, $lock);
     $lock->lock();
     echo "main thread\n";
     $thread->join();
-} else {
+};
+
+$tm->childFunc = function ($lock) {
     echo "child thread\n";
-    $lock = $args[1];
     usleep(200_000);
     $lock->unlock();
     exit(0);
-}
+};
+
+$tm->run();
 ?>
 --EXPECTF--
 child thread

tests/swoole_thread/pipe.phpt

@@ -16,17 +16,15 @@ $args = Thread::getArguments();
 if (empty($args)) {
     $rdata = random_bytes(random_int(1024, 2048));
     Co\run(function () use ($rdata) {
-        global $argv;
         $sockets = swoole_coroutine_socketpair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, STREAM_IPPROTO_IP);
-        $thread = Thread::exec(__FILE__, $argv, $sockets, $rdata);
+        $thread = Thread::exec(__FILE__, $sockets, $rdata);
         Assert::eq($sockets[0]->recv(8192), $rdata);
         $thread->join();
         echo "DONE\n";
     });
 } else {
-    $argv = $args[0];
-    $sockets = $args[1];
-    $rdata = $args[2];
+    $sockets = $args[0];
+    $rdata = $args[1];
     // Child threads are not allowed to modify hook flags
     Assert::false(Swoole\Runtime::enableCoroutine(SWOOLE_HOOK_ALL));
     Co\run(function () use ($sockets, $rdata, $argv) {

tests/swoole_thread/queue.phpt

@@ -24,7 +24,7 @@ if (empty($args)) {
     $queue = new Queue;
     $map = new Thread\Map();
     for ($i = 0; $i < C; $i++) {
-        $threads[] = Thread::exec(__FILE__, $argv, $i, $queue, $map);
+        $threads[] = Thread::exec(__FILE__, $i, $queue, $map);
     }
     $n = N;
     while ($n--) {
@@ -44,9 +44,9 @@ if (empty($args)) {
     Assert::eq($queue->count(), 0);
     Assert::eq($total_parent, $total_child);
 } else {
-    $i = $args[1];
-    $queue = $args[2];
-    $map = $args[3];
+    $i = $args[0];
+    $queue = $args[1];
+    $map = $args[2];
     $map[$i] = 0;
     while (1) {
         $job = $queue->pop(-1);