Support macos, add tests

dixyes · Dec 13, 2023 · 207fb2a · 207fb2a
1 parent 133db4c
commit 207fb2a
Show file tree

Hide file tree

Showing 9 changed files with 525 additions and 33 deletions.
diff --git a/ext/config.m4 b/ext/config.m4
@@ -386,6 +386,7 @@ EOF
     swow_signal.c \
     swow_watchdog.c \
     swow_closure.c \
+    swow_siritz.c \
     swow_ipaddress.c \
     swow_http.c \
     swow_websocket.c \
@@ -402,6 +403,11 @@ EOF
     SWOW_ADD_SOURCES(src, swow_weak_symbol.c, SWOW_INCLUDES, SWOW_CFLAGS)
   fi
 
+  dnl check if pthread have pthread_timedjoin_np
+  AC_CHECK_FUNCS([pthread_timedjoin_np], [
+    AC_DEFINE([HAVE_PTHREAD_TIMEDJOIN_NP], 1, [Have pthread_timedjoin_np])
+  ])
+
   dnl TODO: may use separate libcat
   if test "libcat" != ""; then
 

diff --git a/ext/include/swow_siritz.h b/ext/include/swow_siritz.h
@@ -5,13 +5,23 @@
 
 #include "swow.h"
 
+/* globals */
+
+CAT_GLOBALS_STRUCT_BEGIN(swow_siritz) {
+    HashTable threads; // sub-threads for this thread
+} CAT_GLOBALS_STRUCT_END(swow_siritz);
+
+#define SWOW_SIRITZ_G(x) CAT_GLOBALS_GET(swow_siritz, x)
+
+/* Siritz object */
 typedef struct swow_siritz_s {
     smart_str callable;
     smart_str args;
     uv_thread_t thread;
     zend_object std;
 } swow_siritz_t;
 
+/* Siritz run struct */
 typedef struct swow_siritz_run_s {
     smart_str callable;
     smart_str args;
@@ -26,4 +36,7 @@ static zend_always_inline swow_siritz_t *swow_siritz_get_from_object(zend_object
 zend_result swow_siritz_module_init(INIT_FUNC_ARGS);
 zend_result swow_siritz_module_shutdown(INIT_FUNC_ARGS);
 
+zend_result swow_siritz_runtime_init(INIT_FUNC_ARGS);
+zend_result swow_siritz_runtime_shutdown(INIT_FUNC_ARGS);
+
 #endif // _SWOW_SIRITZ_H
diff --git a/ext/src/swow_main.c b/ext/src/swow_main.c
@@ -328,6 +328,7 @@ PHP_RINIT_FUNCTION(swow)
         swow_dns_runtime_init,
         swow_stream_runtime_init,
         swow_watchdog_runtime_init,
+        swow_siritz_runtime_init,
 #ifdef CAT_OS_WAIT
         swow_proc_open_runtime_init,
 #endif
@@ -369,6 +370,7 @@ PHP_RSHUTDOWN_FUNCTION(swow)
 #ifdef CAT_OS_WAIT
         swow_proc_open_runtime_shutdown,
 #endif
+        swow_siritz_runtime_shutdown,
         swow_watchdog_runtime_shutdown,
         swow_stream_runtime_shutdown,
         swow_event_runtime_shutdown,