Fix PHP execution limit timer error.

Author: matyhtf

ext-src/php_swoole.cc

@@ -18,13 +18,13 @@
 #include "php_swoole_process.h"
 #include "php_swoole_thread.h"
 
-#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
-#include "ext/pcre/php_pcre.h"
-#endif
+BEGIN_EXTERN_C()
 #include "zend_exceptions.h"
 #include "zend_extensions.h"
 
-BEGIN_EXTERN_C()
+#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
+#include "ext/pcre/php_pcre.h"
+#endif
 #include "ext/json/php_json.h"
 
 #include "stubs/php_swoole_arginfo.h"
@@ -1031,6 +1031,19 @@ const swoole::Allocator *sw_zend_string_allocator() {
     return &zend_string_allocator;
 }
 
+void sw_php_exit(int status) {
+    EG(exit_status) = status;
+#ifdef SW_THREAD
+    php_swoole_thread_bailout();
+#else
+    zend_bailout();
+#endif
+}
+
+static void sw_after_fork(void *args) {
+    zend_max_execution_timer_init();
+}
+
 PHP_RINIT_FUNCTION(swoole) {
     if (!SWOOLE_G(cli)) {
         return SUCCESS;
@@ -1071,6 +1084,8 @@ PHP_RINIT_FUNCTION(swoole) {
     SIGG(check) = 0;
 #endif
 
+    swoole_add_hook(SW_GLOBAL_HOOK_AFTER_FORK, sw_after_fork, 0);
+
     php_swoole_http_server_rinit();
     php_swoole_websocket_server_rinit();
     php_swoole_coroutine_rinit();
@@ -1517,12 +1532,7 @@ static PHP_FUNCTION(swoole_implicit_fn) {
         swoole_fatal_error(SW_ERROR_FOR_TEST, "test");
         php_printf("never be executed here\n");
     } else if (SW_STRCASEEQ(fn, l_fn, "bailout")) {
-        EG(exit_status) = zargs ? zval_get_long(zargs) : 95;
-#ifdef SW_THREAD
-        php_swoole_thread_bailout();
-#else
-        zend_bailout();
-#endif
+        sw_php_exit(zargs ? zval_get_long(zargs) : 95);
     } else if (SW_STRCASEEQ(fn, l_fn, "abort")) {
         abort();
     } else {

include/swoole_c_api.h

@@ -39,6 +39,7 @@ enum swGlobalHookType {
     SW_GLOBAL_HOOK_ON_REACTOR_DESTROY,
     SW_GLOBAL_HOOK_BEFORE_SERVER_CREATE,
     SW_GLOBAL_HOOK_AFTER_SERVER_CREATE,
+    SW_GLOBAL_HOOK_AFTER_FORK,
     SW_GLOBAL_HOOK_USER = 24,
     SW_GLOBAL_HOOK_END = SW_MAX_HOOK_TYPE - 1,
 };

php_swoole.h

@@ -17,6 +17,10 @@
 #ifndef PHP_SWOOLE_H
 #define PHP_SWOOLE_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "php.h"
 #include "php_ini.h"
 #include "php_globals.h"
@@ -37,6 +41,10 @@
 #include "config.h"
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 extern zend_module_entry swoole_module_entry;
 #define phpext_swoole_ptr &swoole_module_entry
 

src/core/base.cc

@@ -397,6 +397,10 @@ pid_t swoole_fork(int flags) {
          * reset signal handler
          */
         swoole_signal_clear();
+
+        if (swoole_isset_hook(SW_GLOBAL_HOOK_AFTER_FORK)) {
+            swoole_call_hook(SW_GLOBAL_HOOK_AFTER_FORK, nullptr);
+        }
     }
 
     return pid;