From c8d828e625fa5b3ae6232666ac2c0e5f51a62c54 Mon Sep 17 00:00:00 2001 From: Administrator <admin@example.com> Date: 星期一, 18 八月 2025 15:02:56 +0800 Subject: [PATCH] 13:01之前下单规则修改/接口修改/自动加想策略修改 --- main.py | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/main.py b/main.py index 6f762ee..e3bac57 100644 --- a/main.py +++ b/main.py @@ -84,8 +84,8 @@ channel_list = [] for i in range(constant.HUAXIN_L2_MAX_CODES_COUNT): # 鍒涘缓濮旀墭/鎴愪氦鐨勫叡浜暟缁勫拰ZMQ閫氫俊閫氶亾 - delegate_ipc_addr = f"ipc://order_{i}.ipc", - deal_ipc_addr = f"ipc://deal_{i}.ipc", + delegate_ipc_addr = f"ipc://order_{i}.ipc" + deal_ipc_addr = f"ipc://deal_{i}.ipc" delegate = [0, shared_memery_util.create_array(), delegate_ipc_addr] delegate[0] = shared_memery_util.get_number(delegate[1]) deal = [0, shared_memery_util.create_array(), deal_ipc_addr] @@ -113,7 +113,7 @@ channels = channel_list[index:index + channel_count] index += channel_count # 璁㈤槄淇″彿闃熷垪, 鏁版嵁鍥炶皟闃熷垪锛堝洖璋冮娆″皬鐨勬暟鎹�氳繃杩欑鍥炶皟锛� - sub_single_queue, data_callback_queue = multiprocessing.Queue(), multiprocessing.Queue() + sub_single_queue, data_callback_queue = multiprocessing.Queue(maxsize=1024), multiprocessing.Queue(maxsize=1024) sub_single_queue_list.append(sub_single_queue) data_callback_queue_list.append(data_callback_queue) l2_process = multiprocessing.Process(target=l2_client_v2.run, @@ -176,14 +176,15 @@ queue_strategy_w_trade_r_for_read)) tradeProcess.start() # 姝ゅ灏哃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,huaxin_trade_server.my_l2_data_callback)) - # l2Process.start() - # 灏哃2鐨勮繘绋嬫敼涓虹嚎绋嬫墽琛� - threading.Thread(target=huaxin_client.l2_client.run, args=( - queue_other_w_l2_r, huaxin_trade_server.my_l2_data_callbacks), daemon=True).start() + + # 娴嬭瘯L2鍗曠嫭杩涚▼ + + if constant.IS_L2_NEW: + __create_l2_subscript() + else: + # 灏哃2鐨勮繘绋嬫敼涓虹嚎绋嬫墽琛� + threading.Thread(target=huaxin_client.l2_client.run, args=( + queue_other_w_l2_r, huaxin_trade_server.my_l2_data_callbacks), daemon=True).start() # 杩愯鍗庨懌澧炲�兼湇鍔¤繘绋� threading.Thread(target=hx_qc_value_util.run, daemon=True).start() -- Gitblit v1.8.0