tmp connect

src/ZM/Store/LightCache.php

@@ -7,7 +7,6 @@ namespace ZM\Store;
 use Exception;
 use Swoole\Table;
 use ZM\Annotation\Swoole\OnSave;
-use ZM\Config\ZMConfig;
 use ZM\Console\Console;
 use ZM\Event\EventDispatcher;
 use ZM\Exception\ZMException;
@@ -182,17 +181,12 @@ class LightCache
     }
 
     /**
-     * @param false $only_worker
+     * 这个只能在唯一一个工作进程中执行
      * @throws Exception
      */
-    public static function savePersistence($only_worker = false) {
-        // 下面将OnSave激活一下
-        if (server()->worker_id == (ZMConfig::get("global", "worker_cache")["worker"] ?? 0)) {
-            $dispatcher = new EventDispatcher(OnSave::class);
-            $dispatcher->dispatchEvents();
-        }
-
-        if($only_worker) return;
+    public static function savePersistence() {
+        $dispatcher = new EventDispatcher(OnSave::class);
+        $dispatcher->dispatchEvents();
 
         if (self::$kv_table === null) return;
         $r = [];
@@ -207,8 +201,7 @@ class LightCache
             $r = file_put_contents(self::$config["persistence_path"], json_encode($r, 128 | 256));
             if ($r === false) Console::error("Not saved, please check your \"persistence_path\"!");
         }
-
-
+        Console::verbose("Saved.");
     }
 
     private static function checkExpire($key) {

src/ZM/Store/LightCacheInside.php

@@ -18,6 +18,7 @@ class LightCacheInside
             self::createTable("wait_api", 3, 65536);
             self::createTable("connect", 3, 64);        //用于存单机器人模式下的机器人fd的
             self::createTable("static_route", 64, 256);//用于存储
+            self::createTable("light_array", 8, 512, 0.6);
         } catch (ZMException $e) {
             return false;
         }    //用于存协程等待的状态内容的
@@ -59,10 +60,11 @@ class LightCacheInside
      * @param $name
      * @param $size
      * @param $str_size
+     * @param int $conflict_proportion
      * @throws ZMException
      */
-    private static function createTable($name, $size, $str_size) {
-        self::$kv_table[$name] = new Table($size, 0);
+    private static function createTable($name, $size, $str_size, $conflict_proportion = 0) {
+        self::$kv_table[$name] = new Table($size, $conflict_proportion);
         self::$kv_table[$name]->column("value", Table::TYPE_STRING, $str_size);
         $r = self::$kv_table[$name]->create();
         if ($r === false) throw new ZMException("内存不足，创建静态表失败！");

src/ZM/Store/ZMAtomic.php

@@ -32,6 +32,9 @@ class ZMAtomic
         self::$atomics["wait_msg_id"] = new Atomic(0);
         self::$atomics["_event_id"] = new Atomic(0);
         self::$atomics["server_is_stopped"] = new Atomic(0);
+        for($i = 0; $i < ZM_WORKER_NUM; ++$i) {
+            self::$atomics["_#worker_".$i] = new Atomic(0);
+        }
         for ($i = 0; $i < 10; ++$i) {
             self::$atomics["_tmp_" . $i] = new Atomic(0);
         }