From 15199f8e93fe48e6261c99eadf6673d788db3a80 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期日, 17 三月 2024 22:56:10 +0800
Subject: [PATCH] L2进程与策略进程合并

---
 main.py |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/main.py b/main.py
index 5c0aeca..bcc1459 100644
--- a/main.py
+++ b/main.py
@@ -140,11 +140,16 @@
         for i in range(constant.HUAXIN_L2_MAX_CODES_COUNT):
             order_ipc_hosts.append(f"ipc://l2order{i}.ipc")
 
+        # 姝ゅ灏哃2鐨勮繘绋嬩笌绛栫暐杩涚▼鍚堝苟
         # L2
-        l2Process = multiprocessing.Process(
-            target=huaxin_client.l2_client.run,
-            args=(queue_other_w_l2_r, order_queues, transaction_queues, market_queue, order_ipc_hosts))
-        l2Process.start()
+        # l2Process = multiprocessing.Process(
+        #     target=huaxin_client.l2_client.run,
+        #     args=(queue_other_w_l2_r, order_queues, transaction_queues, market_queue, order_ipc_hosts,huaxin_trade_server.my_l2_data_callback))
+        # l2Process.start()
+        # 灏哃2鐨勮繘绋嬫敼涓鸿繘绋嬫墽琛�
+        threading.Thread(target=huaxin_client.l2_client.run, args=(
+            queue_other_w_l2_r, order_queues, transaction_queues, market_queue, order_ipc_hosts,
+            huaxin_trade_server.my_l2_data_callbacks), daemon=True).start()
 
         # 涓昏繘绋�
         createTradeServer(pss_strategy, queue_strategy_r_trade_w, queue_l1_w_strategy_r, queue_strategy_w_trade_r,
@@ -154,7 +159,7 @@
 
         # 灏唗radeServer浣滀负涓昏繘绋�
         l1Process.join()
-        l2Process.join()
+        # l2Process.join()
         tradeProcess.join()
     except Exception as e:
         logging.exception(e)

--
Gitblit v1.8.0