update to v2.4.0 (build 399)

add CheckConfigCommand.php
add config update record docs
adjust swoole version to 4.5.0
fix stop and reload bugs
add $_running_annotation
add remote terminal
update global config
add timer tick exception handler
add zm_xxx global functions
add isAtMe(), splitCommand(), matchCommand() function for MessageUtil
add workerAction(), sendActionToWorker(), resumeAllWorkerCoroutines() functions for ProcessManager
optimize CQCommand match function
add custom TerminalCommand annotation
add TuringAPI
add getReloadableFiles() function for ZMUtil

src/ZM/Utils/ZMUtil.php

@@ -4,13 +4,10 @@
 namespace ZM\Utils;
 
 
-use Co;
 use Exception;
-use Swoole\Event;
-use Swoole\Timer;
+use Swoole\Process;
 use ZM\Console\Console;
-use ZM\Store\LightCache;
-use ZM\Store\LightCacheInside;
+use ZM\Framework;
 use ZM\Store\Lock\SpinLock;
 use ZM\Store\ZMAtomic;
 use ZM\Store\ZMBuf;
@@ -24,39 +21,21 @@ class ZMUtil
         if (SpinLock::tryLock("_stop_signal") === false) return;
         Console::warning(Console::setColor("Stopping server...", "red"));
         if (Console::getLevel() >= 4) Console::trace();
-        LightCache::savePersistence();
-        if (ZMBuf::$terminal !== null)
-            Event::del(ZMBuf::$terminal);
         ZMAtomic::get("stop_signal")->set(1);
-        try {
-            LightCache::set('stop', 'OK');
-        } catch (Exception $e) {
+        for ($i = 0; $i < ZM_WORKER_NUM; ++$i) {
+            if (Process::kill(zm_atomic("_#worker_" . $i)->get(), 0))
+                Process::kill(zm_atomic("_#worker_" . $i)->get(), SIGUSR1);
         }
         server()->shutdown();
         server()->stop();
     }
 
     /**
-     * @param int $delay
      * @throws Exception
      */
-    public static function reload($delay = 800) {
-        if (server()->worker_id !== -1) {
-            Console::info(server()->worker_id);
-            zm_atomic("_int_is_reload")->set(1);
-            system("kill -INT " . intval(server()->master_pid));
-            return;
-        }
-        Console::info(Console::setColor("Reloading server...", "gold"));
-        usleep($delay * 1000);
-        foreach ((LightCacheInside::get("wait_api", "wait_api") ?? []) as $k => $v) {
-            if (($v["result"] ?? false) === null && isset($v["coroutine"])) Co::resume($v["coroutine"]);
-        }
-        LightCacheInside::unset("wait_api", "wait_api");
-        LightCache::savePersistence();
-        //DataProvider::saveBuffer();
-        Timer::clearAll();
-        server()->reload();
+    public static function reload() {
+        zm_atomic("_int_is_reload")->set(1);
+        system("kill -INT " . intval(server()->master_pid));
     }
 
     public static function getModInstance($class) {
@@ -69,6 +48,22 @@ class ZMUtil
     }
 
     public static function sendActionToWorker($target_id, $action, $data) {
+        Console::verbose($action . ": " . $data);
         server()->sendMessage(json_encode(["action" => $action, "data" => $data]), $target_id);
     }
+
+    /**
+     * 在工作进程中返回可以通过reload重新加载的php文件列表
+     * @return string[]|string[][]
+     */
+    public static function getReloadableFiles() {
+        return array_map(
+            function ($x) {
+                return str_replace(DataProvider::getWorkingDir() . "/", "", $x);
+            }, array_diff(
+                get_included_files(),
+                Framework::$loaded_files
+            )
+        );
+    }
 }