From f5b416d9cb5214ff0e46ca6305098085d2fe8742 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期三, 27 九月 2023 18:02:11 +0800
Subject: [PATCH] L2与交易之间的通信采用队列方式/实现L撤单比例动态计算

---
 main.py |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/main.py b/main.py
index dbffea5..26efdef 100644
--- a/main.py
+++ b/main.py
@@ -22,7 +22,7 @@
 # from huaxin_api import trade_client, l2_client, l1_client
 
 
-def createTradeServer(pipe_server, queue_strategy_r_trade_w, pipe_l1, pipe_l2, ptl2_l2, psl2_l2, queue_strategy_w_trade_r):
+def createTradeServer(pipe_server, queue_strategy_r_trade_w: multiprocessing.Queue, pipe_l1, pipe_l2, queue_trade_w_l2_r: multiprocessing.Queue, psl2_l2, queue_strategy_w_trade_r: multiprocessing.Queue):
     logger_system.info("绛栫暐杩涚▼ID锛歿}", os.getpid())
     log.close_print()
     # 鍒濆鍖栧弬鏁�
@@ -43,7 +43,7 @@
     #
     # 鍚姩L2璁㈤槄鏈嶅姟
     t1 = threading.Thread(target=huaxin_client.l2_client.run, name="l2_client",
-                          args=(ptl2_l2, psl2_l2, huaxin_trade_server.my_l2_data_callback),
+                          args=(queue_trade_w_l2_r, psl2_l2, huaxin_trade_server.my_l2_data_callback),
                           daemon=True)
     t1.start()
     #
@@ -83,8 +83,8 @@
         # 绛栫暐涓巗erver闂寸殑閫氫俊
         pss_server, pss_strategy = multiprocessing.Pipe()
 
-        # 浜ゆ槗涓巐2涔嬮棿鐨勯�氫俊
-        ptl2_trade, ptl2_l2 = multiprocessing.Pipe()
+        # 浜ゆ槗鍐橪2璇�
+        queue_trade_w_l2_r = multiprocessing.Queue()
         # 绛栫暐涓巐2涔嬮棿鐨勯�氫俊
         psl2_strategy, psl2_l2 = multiprocessing.Pipe()
 
@@ -107,11 +107,11 @@
 
         # 浜ゆ槗杩涚▼
         tradeProcess = multiprocessing.Process(
-            target=lambda: huaxin_client.trade_client.run(None, ptl2_trade, queue_strategy_r_trade_w, queue_strategy_w_trade_r))
+            target=lambda: huaxin_client.trade_client.run(None, queue_trade_w_l2_r, queue_strategy_r_trade_w, queue_strategy_w_trade_r))
         tradeProcess.start()
 
         # 涓昏繘绋�
-        createTradeServer(pss_strategy, queue_strategy_r_trade_w, pl1t_strategy, psl2_strategy, ptl2_l2, psl2_l2, queue_strategy_w_trade_r)
+        createTradeServer(pss_strategy, queue_strategy_r_trade_w, pl1t_strategy, psl2_strategy, queue_trade_w_l2_r, psl2_l2, queue_strategy_w_trade_r)
 
         # 灏唗radeServer浣滀负涓昏繘绋�
         l1Process.join()

--
Gitblit v1.8.0