浏览代码

binance_usdt_swap、kucoin_usdt_swap、gate_usdt_swap支持数据生成耗时显示。

skyfffire 1 年之前
父节点
当前提交
0452b038ab
共有 4 个文件被更改,包括 10 次插入5 次删除
  1. 1 1
      global/src/trace_stack.rs
  2. 2 0
      strategy/src/binance_usdt_swap.rs
  3. 1 0
      strategy/src/gate_swap.rs
  4. 6 4
      strategy/src/kucoin_swap.rs

+ 1 - 1
global/src/trace_stack.rs

@@ -98,7 +98,7 @@ impl fmt::Display for TraceStack {
         }
 
         if self.before_network != 0 && self.after_network != 0 {
-            msg.push_str(format!("数据生成+到达rust耗时{}微秒  ", self.after_network - self.before_network * 1000).as_str());
+            msg.push_str(format!("数据生成+到达rust耗时{}毫秒  ", (self.after_network - self.before_network).to_f64().unwrap() / 1000.0).as_str());
         }
 
         if self.before_quant != 0 && self.after_network != 0 {

+ 2 - 0
strategy/src/binance_usdt_swap.rs

@@ -84,6 +84,7 @@ async fn on_data(bot_arc_clone: Arc<Mutex<Quant>>,
         trace_stack.on_before_format();
         // 将ticker数据转换为模拟深度
         let special_depth = standard::handle_info::HandleSwapInfo::handle_special_ticker(BinanceSwap, data.clone());
+        trace_stack.on_before_network(special_depth.create_at.clone());
         trace_stack.on_after_format();
 
         on_special_depth(bot_arc_clone, update_flag_u, data.label.clone(), trace_stack, special_depth).await;
@@ -91,6 +92,7 @@ async fn on_data(bot_arc_clone: Arc<Mutex<Quant>>,
         trace_stack.on_before_format();
         // 将depth数据转换为模拟深度
         let special_depth = standard::handle_info::HandleSwapInfo::handle_special_depth(BinanceSwap, data.clone());
+        trace_stack.on_before_network(special_depth.create_at.clone());
         trace_stack.on_after_format();
 
         on_special_depth(bot_arc_clone, update_flag_u, data.label.clone(), trace_stack, special_depth).await;

+ 1 - 0
strategy/src/gate_swap.rs

@@ -110,6 +110,7 @@ async fn on_data(bot_arc_clone: Arc<Mutex<Quant>>,
     if data.channel == "futures.order_book" {
         trace_stack.on_before_format();
         let depth = standard::handle_info::HandleSwapInfo::handle_special_depth(GateSwap, data.clone());
+        trace_stack.on_before_network(depth.create_at.clone());
         trace_stack.on_after_format();
 
         on_special_depth(bot_arc_clone, update_flag_u, data.label, trace_stack, depth).await;

+ 6 - 4
strategy/src/kucoin_swap.rs

@@ -119,14 +119,16 @@ async fn on_data(bot_arc_clone: Arc<Mutex<Quant>>,
     }
     if data.channel == "level2" {
         trace_stack.on_before_format();
-        let depth = standard::handle_info::HandleSwapInfo::handle_special_depth(KucoinSwap,data.clone());
+        let special_depth = standard::handle_info::HandleSwapInfo::handle_special_depth(KucoinSwap,data.clone());
+        trace_stack.on_before_network(special_depth.create_at.clone());
         trace_stack.on_after_format();
 
-        on_special_depth(bot_arc_clone, update_flag_u, data.label, trace_stack, depth).await
+        on_special_depth(bot_arc_clone, update_flag_u, data.label, trace_stack, special_depth).await
     } else if data.channel == "tickerV2" {
-        let depth = standard::handle_info::HandleSwapInfo::handle_special_ticker(KucoinSwap, data.clone());
+        let special_depth = standard::handle_info::HandleSwapInfo::handle_special_ticker(KucoinSwap, data.clone());
+        trace_stack.on_before_network(special_depth.create_at.clone());
 
-        on_special_depth(bot_arc_clone, update_flag_u, data.label, trace_stack, depth).await
+        on_special_depth(bot_arc_clone, update_flag_u, data.label, trace_stack, special_depth).await
     } else if data.channel == "availableBalance.change" {
         // 取消原有推送解析,因为推送的信息不准确
         // let account = standard::handle_info::HandleSwapInfo::handle_account_info(KucoinSwap, data, run_symbol.clone());