solve the blocking problem

zhouaini528 · Jun 17, 2021 · 783b56f · 783b56f
1 parent b3eef2f
commit 783b56f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/src/Api/WebSocket/SocketClient.php b/src/Api/WebSocket/SocketClient.php
@@ -41,6 +41,8 @@ protected function init(){
 
         $this->add('keysecret',[]);//目前总共key
 
+        $this->add('global_local',[]);//临时存储数据
+
         $this->add('debug',[]);
     }
 
@@ -129,6 +131,7 @@ protected function getData($global,$callback=null,$sub=[]){
         $all_sub=$global->get('all_sub');
         if(empty($all_sub)) return [];
 
+        $global_local=$global->get('global_local');
         $temp=[];
 
         //默认返回所有数据
@@ -142,8 +145,10 @@ protected function getData($global,$callback=null,$sub=[]){
                         $temp[strtolower($vv)]=$data;
                     }
                 }else{
-                    $data=$global->get(strtolower($v));
-                    $temp[strtolower($v)]=$data;
+                    //$data=$global->get(strtolower($v));
+                    //$temp[strtolower($v)]=$data;
+                    $k_strtolower=strtolower($v);
+                    $temp[$k_strtolower]=$global_local['public'][$k_strtolower];
                 }
             }
         }else{
@@ -167,7 +172,8 @@ protected function getData($global,$callback=null,$sub=[]){
                     $data=$global->getQueue(strtolower($v));
                 }else{
                     //public
-                    $data=$global->get(strtolower($v));
+                    //$data=$global->get(strtolower($v));
+                    $data=$global_local['public'][strtolower($v)];
                 }
 
                 if(empty($data)) continue;

diff --git a/src/Api/WebSocket/SocketServer.php b/src/Api/WebSocket/SocketServer.php
@@ -25,6 +25,8 @@ class SocketServer
 
     private $public_url=['market','kline'];
 
+    private $local_global=['public'=>[],'private'=>[]];
+
     function __construct(array $config=[])
     {
         $this->config=$config;
@@ -172,7 +174,9 @@ private function onMessage($global){
                     $table=$this->userKey($con->tag_keysecret,$table);
                     $global->saveQueue($table,$data);
                 }else{
-                    $global->save($table,$data);
+                    //$global->save($table,$data);
+                    $this->local_global['public'][$table]=$data;
+                    //echo date('Y-m-d H:i:s',$data['tick']['ts']/1000).PHP_EOL;
 
                     //最后数据更新时间
                     $con->tag_data_time=time();
@@ -229,7 +233,8 @@ private function onMessage($global){
                     $table=$this->userKey($con->tag_keysecret,$table);
                     $global->saveQueue($table,$data);
                 }else{
-                    $global->save($table,$data);
+                    //$global->save($table,$data);
+                    $this->local_global['public'][$table]=$data;
 
                     //最后数据更新时间
                     $con->tag_data_time=time();
@@ -307,6 +312,12 @@ private function other($con,$global){
                 //private
             }
         });
+
+
+        //异步保存数据，不然会有阻塞问题。 0.2秒保存一次
+        Timer::add(0.2, function() use($global) {
+            $global->save('global_local',$this->local_global);
+        });
     }
 
     /**