Fix thread tests, optimize swoole_implicit_fn --filter=[thread][compile]

matyhtf · matyhtf · commit d77eb74a5fcf · 2024-10-17T14:27:17.000+08:00
diff --git a/ext-src/php_swoole.cc b/ext-src/php_swoole.cc
@@ -1525,5 +1525,7 @@ static PHP_FUNCTION(swoole_implicit_fn) {
 #endif
     } else if (SW_STRCASEEQ(fn, l_fn, "abort")) {
         abort();
+    } else {
+        zend_throw_exception_ex(swoole_exception_ce, SW_ERROR_INVALID_PARAMS, "unknown fn '%s'", fn);
     }
 }
diff --git a/tests/swoole_thread/server/exit.phpt b/tests/swoole_thread/server/exit.phpt
@@ -46,7 +46,7 @@ $serv->on('WorkerStop', function (Server $serv, $workerId) {
 });
 $serv->on('Request', function ($req, $resp) use ($serv) {
     if ($req->server['request_uri'] == '/exit') {
-        swoole_implicit_fn('exit', CODE);
+        swoole_implicit_fn('bailout', CODE);
     }
 });
 $serv->on('shutdown', function () {

Original file line number	Diff line number	Diff line change
`@@ -1525,5 +1525,7 @@ static PHP_FUNCTION(swoole_implicit_fn) {`
`1525`	`1525`	`#endif`
`1526`	`1526`	`} else if (SW_STRCASEEQ(fn, l_fn, "abort")) {`
`1527`	`1527`	`abort();`
	`1528`	`+ } else {`
	`1529`	`+ zend_throw_exception_ex(swoole_exception_ce, SW_ERROR_INVALID_PARAMS, "unknown fn '%s'", fn);`
`1528`	`1530`	`}`
`1529`	`1531`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ $serv->on('WorkerStop', function (Server $serv, $workerId) {`
`46`	`46`	`});`
`47`	`47`	`$serv->on('Request', function ($req, $resp) use ($serv) {`
`48`	`48`	`if ($req->server['request_uri'] == '/exit') {`
`49`		`- swoole_implicit_fn('exit', CODE);`
	`49`	`+ swoole_implicit_fn('bailout', CODE);`
`50`	`50`	`}`
`51`	`51`	`});`
`52`	`52`	`$serv->on('shutdown', function () {`