Exit the process directly when a fatal error occurs (#4053)

* Exit the process directly when a fatal error occurs * use zend_try * fix tests * fix tests [2]
swoole · Feb 9, 2021 · 62fd459 · 62fd459
1 parent b41cdea
commit 62fd459
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/ext-src/php_swoole.cc b/ext-src/php_swoole.cc
@@ -397,15 +397,15 @@ SW_API bool php_swoole_is_enable_coroutine() {
 
 static void fatal_error(int code, const char *format, ...) {
     va_list args;
-    zend_object *exception;
-    if (sw_reactor()) {
-        sw_reactor()->bailout = true;
-    }
     va_start(args, format);
-    exception = zend_throw_exception(swoole_error_ce, swoole::std_string::vformat(format, args).c_str(), code);
+    zend_object *exception = zend_throw_exception(swoole_error_ce, swoole::std_string::vformat(format, args).c_str(), code);
     va_end(args);
-    zend_exception_error(exception, E_ERROR);
-    exit(255);
+
+    zend_try {
+        zend_exception_error(exception, E_ERROR);
+    } zend_catch {
+        exit(255);
+    } zend_end_try();
 }
 
 /* {{{ PHP_MINIT_FUNCTION

diff --git a/ext-src/php_swoole.h b/ext-src/php_swoole.h
@@ -174,6 +174,7 @@ extern zend_class_entry *swoole_websocket_frame_ce;
 extern zend_class_entry *swoole_server_port_ce;
 extern zend_class_entry *swoole_exception_ce;
 extern zend_object_handlers swoole_exception_handlers;
+extern zend_class_entry *swoole_error_ce;;
 
 PHP_MINIT_FUNCTION(swoole);
 PHP_MSHUTDOWN_FUNCTION(swoole);

diff --git a/ext-src/swoole_coroutine.cc b/ext-src/swoole_coroutine.cc
@@ -325,6 +325,13 @@ void PHPCoroutine::activate() {
                 sw_reactor()->running = false;
                 sw_reactor()->bailout = true;
             }
+#ifdef SW_EXIT_WHEN_OCCURS_FATAL_ERROR
+            zend_try {
+                orig_error_function(type, error_filename, error_lineno, ZEND_ERROR_CB_LAST_ARG_RELAY);
+            } zend_catch {
+                exit(255);
+            } zend_end_try();
+#endif
         }
         if (sw_likely(orig_error_function)) {
             orig_error_function(type, error_filename, error_lineno, ZEND_ERROR_CB_LAST_ARG_RELAY);

diff --git a/tests/swoole_mysql_coro/another_coroutine.phpt b/tests/swoole_mysql_coro/another_coroutine.phpt
@@ -63,4 +63,3 @@ Stack trace:
 #3 %s(%d): {closure}()
 #4 {main}
   thrown in %s on line %d
-DONE