remove thread::exec()

matyhtf · matyhtf · commit 2129b1b73bfb · 2024-06-11T19:08:56.000+08:00
diff --git a/examples/thread/aio.php b/examples/thread/aio.php
@@ -12,7 +12,7 @@
     $threads = [];
     $atomic = new Swoole\Thread\Atomic();
     for ($i = 0; $i < $c; $i++) {
-        $threads[] = Thread::exec(__FILE__, $i, $atomic);
+        $threads[] = new Thread(__FILE__, $i, $atomic);
     }
     for ($i = 0; $i < $c; $i++) {
         $threads[$i]->join();
diff --git a/examples/thread/argv.php b/examples/thread/argv.php
@@ -8,7 +8,7 @@
     var_dump($GLOBALS['argv']);
     $n = 2;
     while ($n--) {
-        $thread = Thread::exec(__FILE__, 'thread-' . $n, $argc, $argv);
+        $thread = new Thread(__FILE__, 'thread-' . $n, $argc, $argv);
         $thread->join();
     }
 } else {
diff --git a/examples/thread/atomic.php b/examples/thread/atomic.php
@@ -13,7 +13,7 @@
     $a1 = new Atomic;
     $a2 = new Long;
     for ($i = 0; $i < $c; $i++) {
-        $threads[] = Thread::exec(__FILE__, $i, $a1, $a2);
+        $threads[] = new Thread(__FILE__, $i, $a1, $a2);
     }
     for ($i = 0; $i < $c; $i++) {
         $threads[$i]->join();
diff --git a/examples/thread/co.php b/examples/thread/co.php
@@ -8,8 +8,8 @@
 $list[1] = uniqid();
 var_dump(count($list));
 
-$t1 = Swoole\Thread::exec('mt.php', 'thread-1', PHP_OS, $map, $list);
-$t2 = Swoole\Thread::exec('mt.php', 'thread-2', PHP_OS, $map, $list);
+$t1 = new Swoole\Thread('mt.php', 'thread-1', PHP_OS, $map, $list);
+$t2 = new Swoole\Thread('mt.php', 'thread-2', PHP_OS, $map, $list);
 
 //var_dump($t1->id);
 //var_dump($t2->id);
diff --git a/examples/thread/lock.php b/examples/thread/lock.php
@@ -8,7 +8,7 @@
 if (empty($args)) {
     $lock = new Lock;
     $lock->lock();
-    $thread = Thread::exec(__FILE__, $lock);
+    $thread = new Thread(__FILE__, $lock);
     $lock->lock();
     echo "main thread\n";
     $thread->join();
diff --git a/examples/thread/mt.php b/examples/thread/mt.php
@@ -19,7 +19,7 @@
 var_dump(count($list));
 
 //if ($args[0] == 'thread-2') {
-//    $t3 = Swoole\Thread::exec('mt.php', 'thread-3', PHP_OS);
+//    $t3 = new Swoole\Thread('mt.php', 'thread-3', PHP_OS);
 //    $t3->join();
 //}
 
diff --git a/examples/thread/pipe.php b/examples/thread/pipe.php
@@ -7,7 +7,7 @@
 if (empty($args)) {
     Co\run(function () {
         $sockets = swoole_coroutine_socketpair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, STREAM_IPPROTO_IP);
-        $thread = Thread::exec(__FILE__, $sockets);
+        $thread = new Thread(__FILE__, $sockets);
         echo $sockets[0]->recv(8192), PHP_EOL;
         $thread->join();
     });
diff --git a/examples/thread/run_test.php b/examples/thread/run_test.php
@@ -7,7 +7,7 @@
 $threads = [];
 
 for ($i = 0; $i < $c; $i++) {
-    $threads[] = Swoole\Thread::exec('benchmark.php', 'thread-' . ($i + 1), $map);
+    $threads[] = new Swoole\Thread('benchmark.php', 'thread-' . ($i + 1), $map);
 }
 
 for ($i = 0; $i < $c; $i++) {
diff --git a/examples/thread/server.php b/examples/thread/server.php
@@ -11,7 +11,7 @@
     $threads = [];
     $queue = new Queue;
     for ($i = 0; $i < $c; $i++) {
-        $threads[] = Thread::exec(__FILE__, $i, $queue);
+        $threads[] = new Thread(__FILE__, $i, $queue);
     }
     for ($i = 0; $i < $c; $i++) {
         $threads[$i]->join();
diff --git a/examples/thread/signal.php b/examples/thread/signal.php
@@ -9,7 +9,7 @@
     Co\run(function () {
         echo "main thread\n";
         $sockets = swoole_coroutine_socketpair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, STREAM_IPPROTO_IP);
-        $thread = Thread::exec(__FILE__, $sockets);
+        $thread = new Thread(__FILE__, $sockets);
         $parent_pipe = $sockets[1];
         // 收到信号之后向子线程发送指令让子线程退出
         if (System::waitSignal(SIGTERM)) {
diff --git a/examples/thread/thread_pool.php b/examples/thread/thread_pool.php
@@ -11,7 +11,7 @@
     $threads = [];
     $queue = new Queue;
     for ($i = 0; $i < $c; $i++) {
-        $threads[] = Thread::exec(__FILE__, $i, $queue);
+        $threads[] = new Thread(__FILE__, $i, $queue);
     }
     while ($n--) {
         $queue->push(base64_encode(random_bytes(16)), Queue::NOTIFY_ONE);
diff --git a/ext-src/stubs/php_swoole_thread.stub.php b/ext-src/stubs/php_swoole_thread.stub.php
@@ -8,7 +8,6 @@ public function join(): bool {}
         public function joinable(): bool {}
         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 {}
diff --git a/tests/swoole_thread/async-io.phpt b/tests/swoole_thread/async-io.phpt
@@ -24,7 +24,7 @@ if (empty($args)) {
     $atomic = new Swoole\Thread\Atomic();
     $atomicLong = new Swoole\Thread\Atomic\Long();
     for ($i = 0; $i < C; $i++) {
-        $threads[] = Thread::exec(__FILE__, $i, $atomic, $atomicLong);
+        $threads[] = new Thread(__FILE__, $i, $atomic, $atomicLong);
     }
     for ($i = 0; $i < C; $i++) {
         $threads[$i]->join();
diff --git a/tests/swoole_thread/atomic_ctor.phpt b/tests/swoole_thread/atomic_ctor.phpt
@@ -22,7 +22,7 @@ $tm->parentFunc = function () {
     $num2 = random_int(1 << 31, PHP_INT_MAX);
     $atomic1 = new Swoole\Thread\Atomic($num1);
     $atomic2 = new Swoole\Thread\Atomic\Long($num2);
-    $thread = Thread::exec(__FILE__, $lock, $atomic1, $atomic2, $num1, $num2);
+    $thread = new Thread(__FILE__, $lock, $atomic1, $atomic2, $num1, $num2);
     $lock->lock();
     echo "main thread\n";
     $thread->join();
diff --git a/tests/swoole_thread/fatal_error_1.phpt b/tests/swoole_thread/fatal_error_1.phpt
@@ -15,7 +15,7 @@ $pm = ProcessManager::exec(function () {
     $args = Thread::getArguments();
     if (empty($args)) {
         echo "start child thread\n";
-        $threads[] = Thread::exec(__FILE__, 'error');
+        $threads[] = new Thread(__FILE__, 'error');
         $threads[0]->join();
         echo "stop thread exited\n";
     } else {
diff --git a/tests/swoole_thread/fatal_error_2.phpt b/tests/swoole_thread/fatal_error_2.phpt
@@ -14,7 +14,7 @@ $pm = ProcessManager::exec(function () {
     $args = Thread::getArguments();
     if (empty($args)) {
         echo "start child thread\n";
-        $threads[] = Thread::exec(__FILE__, 'error');
+        $threads[] = new Thread(__FILE__, 'error');
         $threads[0]->join();
         echo "stop thread exited\n";
     } else {
diff --git a/tests/swoole_thread/info.phpt b/tests/swoole_thread/info.phpt
@@ -14,7 +14,7 @@ use Swoole\Thread;
 $tm = new \SwooleTest\ThreadManager();
 
 $tm->parentFunc = function () {
-    $thread = Thread::exec(__FILE__, 'child');
+    $thread = new Thread(__FILE__, 'child');
     $info = Thread::getTsrmInfo();
     Assert::true($info['is_main_thread']);
     Assert::eq($info['api_name'], 'POSIX Threads');
diff --git a/tests/swoole_thread/lock.phpt b/tests/swoole_thread/lock.phpt
@@ -17,7 +17,7 @@ $tm = new \SwooleTest\ThreadManager();
 $tm->parentFunc = function () {
     $lock = new Lock;
     $lock->lock();
-    $thread = Thread::exec(__FILE__, $lock);
+    $thread = new Thread(__FILE__, $lock);
     $lock->lock();
     echo "main thread\n";
     $thread->join();
diff --git a/tests/swoole_thread/pipe.phpt b/tests/swoole_thread/pipe.phpt
@@ -17,7 +17,7 @@ if (empty($args)) {
     $rdata = random_bytes(random_int(1024, 2048));
     Co\run(function () use ($rdata) {
         $sockets = swoole_coroutine_socketpair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, STREAM_IPPROTO_IP);
-        $thread = Thread::exec(__FILE__, $sockets[1], $rdata);
+        $thread = new Thread(__FILE__, $sockets[1], $rdata);
         Assert::eq($sockets[0]->recv(8192), $rdata);
         $thread->join();
         echo "DONE\n";
diff --git a/tests/swoole_thread/queue.phpt b/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__, $i, $queue, $map);
+        $threads[] = new Thread(__FILE__, $i, $queue, $map);
     }
     $n = N;
     while ($n--) {
diff --git a/tests/swoole_thread/server/base.phpt b/tests/swoole_thread/server/base.phpt
@@ -20,7 +20,7 @@ $tm->initFreePorts(increment: crc32(__FILE__) % 1000);
 $tm->parentFunc = function () use ($tm) {
     $queue = new Swoole\Thread\Queue();
     $atomic = new Swoole\Thread\Atomic(1);
-    $thread = Thread::exec(__FILE__, $queue, $atomic);
+    $thread = new Thread(__FILE__, $queue, $atomic);
     echo $queue->pop(-1);
     Co\run(function () use ($tm) {
         $cli = new Co\Client(SWOOLE_SOCK_TCP);
diff --git a/tests/swoole_thread/server/send_large_packet.phpt b/tests/swoole_thread/server/send_large_packet.phpt
@@ -20,7 +20,7 @@ $tm->initFreePorts(increment: crc32(__FILE__) % 1000);
 $tm->parentFunc = function () use ($tm) {
     $queue = new Swoole\Thread\Queue();
     $atomic = new Swoole\Thread\Atomic(1);
-    $thread = Thread::exec(__FILE__, $queue, $atomic);
+    $thread = new Thread(__FILE__, $queue, $atomic);
     echo $queue->pop(-1);
 
     $c = MAX_CONCURRENCY_LOW;
diff --git a/tests/swoole_thread/signal.phpt b/tests/swoole_thread/signal.phpt
@@ -19,7 +19,7 @@ $args = Thread::getArguments();
 if (empty($args)) {
     Co\run(function () {
         $sockets = swoole_coroutine_socketpair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, STREAM_IPPROTO_IP);
-        $thread = Thread::exec(__FILE__, $sockets[0]);
+        $thread = new Thread(__FILE__, $sockets[0]);
         $parent_pipe = $sockets[1];
         Timer::after(500, function () {
             echo "timer\n";
diff --git a/tests/swoole_thread/stdio.phpt b/tests/swoole_thread/stdio.phpt
@@ -17,7 +17,7 @@ $tm = new \SwooleTest\ThreadManager();
 $tm->parentFunc = function () {
     $lock = new Lock;
     $lock->lock();
-    $thread = Thread::exec(__FILE__, $lock);
+    $thread = new Thread(__FILE__, $lock);
     $lock->lock();
     $thread->join();
     echo "main thread\n";

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`$threads = [];`
`13`	`13`	`$atomic = new Swoole\Thread\Atomic();`
`14`	`14`	`for ($i = 0; $i < $c; $i++) {`
`15`		`- $threads[] = Thread::exec(__FILE__, $i, $atomic);`
	`15`	`+ $threads[] = new Thread(__FILE__, $i, $atomic);`
`16`	`16`	`}`
`17`	`17`	`for ($i = 0; $i < $c; $i++) {`
`18`	`18`	`$threads[$i]->join();`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`var_dump($GLOBALS['argv']);`
`9`	`9`	`$n = 2;`
`10`	`10`	`while ($n--) {`
`11`		`- $thread = Thread::exec(__FILE__, 'thread-' . $n, $argc, $argv);`
	`11`	`+ $thread = new Thread(__FILE__, 'thread-' . $n, $argc, $argv);`
`12`	`12`	`$thread->join();`
`13`	`13`	`}`
`14`	`14`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`$a1 = new Atomic;`
`14`	`14`	`$a2 = new Long;`
`15`	`15`	`for ($i = 0; $i < $c; $i++) {`
`16`		`- $threads[] = Thread::exec(__FILE__, $i, $a1, $a2);`
	`16`	`+ $threads[] = new Thread(__FILE__, $i, $a1, $a2);`
`17`	`17`	`}`
`18`	`18`	`for ($i = 0; $i < $c; $i++) {`
`19`	`19`	`$threads[$i]->join();`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`$threads = [];`
`8`	`8`
`9`	`9`	`for ($i = 0; $i < $c; $i++) {`
`10`		`- $threads[] = Swoole\Thread::exec('benchmark.php', 'thread-' . ($i + 1), $map);`
	`10`	`+ $threads[] = new Swoole\Thread('benchmark.php', 'thread-' . ($i + 1), $map);`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`for ($i = 0; $i < $c; $i++) {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`$threads = [];`
`12`	`12`	`$queue = new Queue;`
`13`	`13`	`for ($i = 0; $i < $c; $i++) {`
`14`		`- $threads[] = Thread::exec(__FILE__, $i, $queue);`
	`14`	`+ $threads[] = new Thread(__FILE__, $i, $queue);`
`15`	`15`	`}`
`16`	`16`	`for ($i = 0; $i < $c; $i++) {`
`17`	`17`	`$threads[$i]->join();`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ if (empty($args)) {`
`24`	`24`	`$atomic = new Swoole\Thread\Atomic();`
`25`	`25`	`$atomicLong = new Swoole\Thread\Atomic\Long();`
`26`	`26`	`for ($i = 0; $i < C; $i++) {`
`27`		`- $threads[] = Thread::exec(__FILE__, $i, $atomic, $atomicLong);`
	`27`	`+ $threads[] = new Thread(__FILE__, $i, $atomic, $atomicLong);`
`28`	`28`	`}`
`29`	`29`	`for ($i = 0; $i < C; $i++) {`
`30`	`30`	`$threads[$i]->join();`