111

http-server/ServerCommand.php

@@ -15,6 +15,7 @@ use Server\Events\OnWorkerStart;
 use Server\Worker\OnServerWorker;
 use Server\Worker\OnWorkerStart as WorkerDispatch;
 use Server\Worker\OnTaskerStart as TaskerDispatch;
+use Swoole\Coroutine;
 use Swoole\Runtime;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -72,10 +73,6 @@ class ServerCommand extends Command
             if ($input->getArgument('action') == 'stop') {
                 throw new Exception('shutdown success');
             }
-			$enable_coroutine = Config::get('servers.settings.enable_coroutine', false);
-			if ($enable_coroutine === true) {
-				Runtime::enableCoroutine(true, SWOOLE_HOOK_ALL ^ SWOOLE_HOOK_BLOCKING_FUNCTION);
-			}
             $this->generate_runtime_builder($manager);
         } catch (\Throwable $throwable) {
             $output->write($throwable->getMessage());
@@ -85,11 +82,29 @@ class ServerCommand extends Command
     }
 
 
+    private function configure_set()
+    {
+        $enable_coroutine = Config::get('servers.settings.enable_coroutine', false);
+        if ($enable_coroutine == true) {
+            return;
+        }
+        Coroutine::set([
+            'hook_flags'            => SWOOLE_HOOK_ALL ^ SWOOLE_HOOK_BLOCKING_FUNCTION,
+            'enable_deadlock_check' => false,
+            'exit_condition'        => function () {
+                return Coroutine::stats()['coroutine_num'] === 0;
+            }
+        ]);
+    }
+
+
     /**
      * @param $manager
      */
     private function generate_runtime_builder($manager): void
     {
+        $this->configure_set();
+
         exec(PHP_BINARY . ' ' . APP_PATH . 'kiri.php runtime:builder');
 
         $this->eventProvider->on(OnBeforeWorkerStart::class, [di(OnServerWorker::class), 'setConfigure']);

http-server/Worker/OnTaskerStart.php

@@ -2,7 +2,6 @@
 
 namespace Server\Worker;
 
-use Kiri\Abstracts\Config;
 use Kiri\Kiri;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Server\ServerManager;
@@ -17,8 +16,6 @@ class OnTaskerStart extends WorkerStart implements EventDispatcherInterface
      */
     public function dispatch(object $event)
     {
-        $isWorker = $event->workerId < $event->server->setting['worker_num'];
-
         $time = microtime(true);
 
         ServerManager::setEnv('environmental', Kiri::TASK);
@@ -26,7 +23,7 @@ class OnTaskerStart extends WorkerStart implements EventDispatcherInterface
             $this->interpretDirectory();
         }
 
-        $this->mixed($event, $isWorker, $time);
+        $this->mixed($event, false, $time);
     }
 
 

http-server/Worker/OnWorkerStart.php

@@ -27,8 +27,6 @@ class OnWorkerStart extends WorkerStart implements EventDispatcherInterface
      */
     public function dispatch(object $event)
     {
-        $isWorker = $event->workerId < $event->server->setting['worker_num'];
-
         $time = microtime(true);
 
         ServerManager::setEnv('environmental', Kiri::WORKER);
@@ -36,7 +34,7 @@ class OnWorkerStart extends WorkerStart implements EventDispatcherInterface
             $this->router->read_files();
             $this->interpretDirectory();
         }
-        $this->mixed($event, $isWorker, $time);
+        $this->mixed($event, true, $time);
     }
 
 }