Added Thread::isAlive()

Author: matyhtf

ext-src/stubs/php_swoole_thread.stub.php

@@ -7,6 +7,7 @@ public function __construct(string $script_file, mixed ...$args) {}
         public function join(): bool {}
         public function joinable(): bool {}
         public function getExitStatus(): int {}
+        public function isAlive(): bool {}
         public function detach(): bool {}
 
         public static function getArguments(): ?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: d1d1e5d35cfda110527408faf9376dda24680c7f */
+ * Stub hash: 1a0aa05d8165c567920a234da0801c3231f38588 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Swoole_Thread___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, script_file, IS_STRING, 0)
@@ -14,6 +14,8 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Swoole_Thread_getExitStatus, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
+#define arginfo_class_Swoole_Thread_isAlive arginfo_class_Swoole_Thread_join
+
 #define arginfo_class_Swoole_Thread_detach arginfo_class_Swoole_Thread_join
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Swoole_Thread_getArguments, 0, 0, IS_ARRAY, 1)

ext-src/swoole_thread.cc

@@ -49,6 +49,7 @@ typedef std::thread Thread;
 
 struct ThreadObject {
     Thread *thread;
+    pthread_t thread_id;
     zend_object std;
 };
 
@@ -58,6 +59,7 @@ static thread_local zval thread_argv = {};
 static thread_local JMP_BUF *thread_bailout = nullptr;
 static std::atomic<size_t> thread_num(1);
 static zend::ConcurrencyHashMap<pthread_t, int> thread_exit_status(-1);
+static zend::ConcurrencyHashMap<pthread_t, bool> thread_living(false);
 
 static sw_inline ThreadObject *thread_fetch_object(zend_object *obj) {
     return (ThreadObject *) ((char *) obj - swoole_thread_handlers.offset);
@@ -77,14 +79,16 @@ static void thread_join(zend_object *object) {
     ThreadObject *to = thread_fetch_object(object);
     if (to->thread && to->thread->joinable()) {
         to->thread->join();
-        php_swoole_thread_join(to->thread->native_handle());
+        php_swoole_thread_join(to->thread_id);
         delete to->thread;
         to->thread = nullptr;
     }
 }
 
 static void thread_free_object(zend_object *object) {
+    ThreadObject *to = thread_fetch_object(object);
     thread_join(object);
+    thread_living.del(to->thread_id);
     zend_object_std_dtor(object);
 }
 
@@ -98,6 +102,7 @@ static zend_object *thread_create_object(zend_class_entry *ce) {
 
 SW_EXTERN_C_BEGIN
 static PHP_METHOD(swoole_thread, __construct);
+static PHP_METHOD(swoole_thread, isAlive);
 static PHP_METHOD(swoole_thread, join);
 static PHP_METHOD(swoole_thread, joinable);
 static PHP_METHOD(swoole_thread, getExitStatus);
@@ -118,6 +123,7 @@ SW_EXTERN_C_END
 // clang-format off
 static const zend_function_entry swoole_thread_methods[] = {
     PHP_ME(swoole_thread, __construct,   arginfo_class_Swoole_Thread___construct,   ZEND_ACC_PUBLIC)
+    PHP_ME(swoole_thread, isAlive,       arginfo_class_Swoole_Thread_isAlive,       ZEND_ACC_PUBLIC)
     PHP_ME(swoole_thread, join,          arginfo_class_Swoole_Thread_join,          ZEND_ACC_PUBLIC)
     PHP_ME(swoole_thread, joinable,      arginfo_class_Swoole_Thread_joinable,      ZEND_ACC_PUBLIC)
     PHP_ME(swoole_thread, getExitStatus, arginfo_class_Swoole_Thread_getExitStatus, ZEND_ACC_PUBLIC)
@@ -202,8 +208,14 @@ static PHP_METHOD(swoole_thread, __construct) {
         zend_throw_exception(swoole_exception_ce, e.what(), SW_ERROR_SYSTEM_CALL_FAIL);
         return;
     }
-    zend_update_property_long(
-        swoole_thread_ce, SW_Z8_OBJ_P(ZEND_THIS), ZEND_STRL("id"), (zend_long) to->thread->native_handle());
+
+    to->thread_id = to->thread->native_handle();
+    zend::object_set(ZEND_THIS, ZEND_STRL("id"), (zend_long) to->thread_id);
+}
+
+static PHP_METHOD(swoole_thread, isAlive) {
+    ThreadObject *to = thread_fetch_object(Z_OBJ_P(ZEND_THIS));
+    RETURN_BOOL(thread_living.get(to->thread_id));
 }
 
 static PHP_METHOD(swoole_thread, join) {
@@ -403,6 +415,7 @@ static void thread_register_stdio_file_handles(bool no_close) {
 
 void php_swoole_thread_start(zend_string *file, ZendArray *argv) {
     thread_num.fetch_add(1);
+    thread_living.set(pthread_self(), true);
     ts_resource(0);
 #if defined(COMPILE_DL_SWOOLE) && defined(ZTS)
     ZEND_TSRMLS_CACHE_UPDATE();
@@ -463,6 +476,7 @@ void php_swoole_thread_start(zend_string *file, ZendArray *argv) {
     zend_string_release(file);
     ts_free_thread();
     swoole_thread_clean();
+    thread_living.set(pthread_self(), false);
     thread_num.fetch_sub(1);
 }
 

tests/include/api/swoole_thread/sleep.php

@@ -0,0 +1,3 @@
+<?php
+$us = random_int(100, 200000);
+usleep($us);

tests/swoole_thread/thread_status.phpt

@@ -0,0 +1,32 @@
+--TEST--
+swoole_thread: thread status
+--SKIPIF--
+<?php
+require __DIR__ . '/../include/skipif.inc';
+skip_if_nts();
+?>
+--FILE--
+<?php
+require __DIR__ . '/../include/bootstrap.php';
+
+use Swoole\Thread;
+
+$t1 = new Thread(TESTS_API_PATH . '/swoole_thread/sleep.php');
+usleep(10);
+Assert::true($t1->joinable());
+Assert::true($t1->isAlive());
+Assert::true($t1->join());
+Assert::false($t1->joinable());
+Assert::false($t1->isAlive());
+
+$t2 = new Thread(TESTS_API_PATH . '/swoole_thread/sleep.php');
+$t2->detach();
+usleep(10);
+Assert::false($t2->joinable());
+Assert::true($t2->isAlive());
+while (Thread::getInfo()['thread_num'] > 1) {
+    usleep(10);
+}
+Assert::false($t2->isAlive());
+?>
+--EXPECT--