Added Thread::yield()/activeCount(). Optimize thread code

Author: matyhtf

ext-src/stubs/php_swoole_thread.stub.php

@@ -13,14 +13,16 @@ public function detach(): bool {}
         public static function getArguments(): ?array {}
         public static function getId(): int {}
         public static function getInfo(): array {}
+        public static function activeCount(): int {}
+        public static function yield(): void {}
 
         public static function setName(string $name): bool {}
         #ifdef HAVE_CPU_AFFINITY
         public static function setAffinity(array $cpu_settings): bool {}
         public static function getAffinity(): array {}
         #endif
-        public function setPriority(int $priority, int $policy = 0): bool {}
-        public function getPriority(): array {}
-        public function getNativeId(): int {}
+        public static function setPriority(int $priority, int $policy = 0): bool {}
+        public static function getPriority(): array {}
+        public static function getNativeId(): int {}
     }
 }

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: 1a0aa05d8165c567920a234da0801c3231f38588 */
+ * Stub hash: 46ec6a19af2d6a669e9c74651c12805626f832c8 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Swoole_Thread___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, script_file, IS_STRING, 0)
@@ -26,6 +26,11 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Swoole_Thread_getInfo, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
+#define arginfo_class_Swoole_Thread_activeCount arginfo_class_Swoole_Thread_getExitStatus
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Swoole_Thread_yield, 0, 0, IS_VOID, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Swoole_Thread_setName, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 ZEND_END_ARG_INFO()

ext-src/swoole_thread.cc

@@ -79,7 +79,7 @@ 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_id);
+        php_swoole_thread_join(to->thread->native_handle());
         delete to->thread;
         to->thread = nullptr;
     }
@@ -110,6 +110,8 @@ static PHP_METHOD(swoole_thread, detach);
 static PHP_METHOD(swoole_thread, getArguments);
 static PHP_METHOD(swoole_thread, getId);
 static PHP_METHOD(swoole_thread, getInfo);
+static PHP_METHOD(swoole_thread, activeCount);
+static PHP_METHOD(swoole_thread, yield);
 static PHP_METHOD(swoole_thread, setName);
 #ifdef HAVE_CPU_AFFINITY
 static PHP_METHOD(swoole_thread, setAffinity);
@@ -131,6 +133,8 @@ static const zend_function_entry swoole_thread_methods[] = {
     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, getInfo,       arginfo_class_Swoole_Thread_getInfo,       ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
+    PHP_ME(swoole_thread, activeCount,   arginfo_class_Swoole_Thread_activeCount,   ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
+    PHP_ME(swoole_thread, yield,         arginfo_class_Swoole_Thread_yield,         ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
     PHP_ME(swoole_thread, setName,       arginfo_class_Swoole_Thread_setName,       ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
 #ifdef HAVE_CPU_AFFINITY
     PHP_ME(swoole_thread, setAffinity,   arginfo_class_Swoole_Thread_setAffinity,   ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
@@ -580,6 +584,14 @@ static PHP_METHOD(swoole_thread, getInfo) {
     add_assoc_long(return_value, "thread_num", thread_num.load());
 }
 
+static PHP_METHOD(swoole_thread, activeCount) {
+    RETURN_LONG(thread_num.load());
+}
+
+static PHP_METHOD(swoole_thread, yield) {
+    std::this_thread::yield();
+}
+
 #define CAST_OBJ_TO_RESOURCE(_name, _type)                                                                             \
     else if (instanceof_function(Z_OBJCE_P(zvalue), swoole_thread_##_name##_ce)) {                                     \
         value.resource = php_swoole_thread_##_name##_cast(zvalue);                                                     \

tests/swoole_thread/thread_status.phpt

@@ -24,7 +24,7 @@ $t2->detach();
 usleep(10);
 Assert::false($t2->joinable());
 Assert::true($t2->isAlive());
-while (Thread::getInfo()['thread_num'] > 1) {
+while (Thread::activeCount() > 1) {
     usleep(10);
 }
 Assert::false($t2->isAlive());

tests/swoole_thread/yield.phpt

@@ -0,0 +1,26 @@
+
+--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');
+Assert::false($t1->isAlive());
+$t1->detach();
+Thread::yield();
+usleep(10);
+Assert::true($t1->isAlive());
+while (Thread::activeCount() > 1) {
+    usleep(10);
+}
+Assert::false($t1->isAlive());
+?>
+--EXPECT--