You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
93 lines
3.4 KiB
93 lines
3.4 KiB
6 months ago
|
From 8d9167b880dac3e4cafac486189e8b534f6b10d8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Fabio Valentini <decathorpe@gmail.com>
|
||
|
|
Date: Wed, 28 Aug 2024 10:18:33 +0200
|
||
|
|
Subject: [PATCH 2/2] Drop tracing-level log statements that depend on
|
||
|
|
kv-log-macro
|
||
|
|
|
||
|
|
---
|
||
|
|
src/task/builder.rs | 40 ++++++++++++++++++++--------------------
|
||
|
|
1 file changed, 20 insertions(+), 20 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/task/builder.rs b/src/task/builder.rs
|
||
|
|
index aba0d61..40c31ab 100644
|
||
|
|
--- a/src/task/builder.rs
|
||
|
|
+++ b/src/task/builder.rs
|
||
|
|
@@ -54,10 +54,10 @@ impl Builder {
|
||
|
|
{
|
||
|
|
let wrapped = self.build(future);
|
||
|
|
|
||
|
|
- kv_log_macro::trace!("spawn", {
|
||
|
|
- task_id: wrapped.tag.id().0,
|
||
|
|
- parent_task_id: TaskLocalsWrapper::get_current(|t| t.id().0).unwrap_or(0),
|
||
|
|
- });
|
||
|
|
+ //kv_log_macro::trace!("spawn", {
|
||
|
|
+ // task_id: wrapped.tag.id().0,
|
||
|
|
+ // parent_task_id: TaskLocalsWrapper::get_current(|t| t.id().0).unwrap_or(0),
|
||
|
|
+ //});
|
||
|
|
|
||
|
|
let task = wrapped.tag.task().clone();
|
||
|
|
let handle = async_global_executor::spawn(wrapped);
|
||
|
|
@@ -74,10 +74,10 @@ impl Builder {
|
||
|
|
{
|
||
|
|
let wrapped = self.build(future);
|
||
|
|
|
||
|
|
- kv_log_macro::trace!("spawn_local", {
|
||
|
|
- task_id: wrapped.tag.id().0,
|
||
|
|
- parent_task_id: TaskLocalsWrapper::get_current(|t| t.id().0).unwrap_or(0),
|
||
|
|
- });
|
||
|
|
+ //kv_log_macro::trace!("spawn_local", {
|
||
|
|
+ // task_id: wrapped.tag.id().0,
|
||
|
|
+ // parent_task_id: TaskLocalsWrapper::get_current(|t| t.id().0).unwrap_or(0),
|
||
|
|
+ //});
|
||
|
|
|
||
|
|
let task = wrapped.tag.task().clone();
|
||
|
|
let handle = async_global_executor::spawn_local(wrapped);
|
||
|
|
@@ -99,10 +99,10 @@ impl Builder {
|
||
|
|
let res = future.await;
|
||
|
|
let _ = sender.send(res);
|
||
|
|
});
|
||
|
|
- kv_log_macro::trace!("spawn_local", {
|
||
|
|
- task_id: wrapped.tag.id().0,
|
||
|
|
- parent_task_id: TaskLocalsWrapper::get_current(|t| t.id().0).unwrap_or(0),
|
||
|
|
- });
|
||
|
|
+ //kv_log_macro::trace!("spawn_local", {
|
||
|
|
+ // task_id: wrapped.tag.id().0,
|
||
|
|
+ // parent_task_id: TaskLocalsWrapper::get_current(|t| t.id().0).unwrap_or(0),
|
||
|
|
+ //});
|
||
|
|
|
||
|
|
let task = wrapped.tag.task().clone();
|
||
|
|
wasm_bindgen_futures::spawn_local(wrapped);
|
||
|
|
@@ -125,10 +125,10 @@ impl Builder {
|
||
|
|
let _ = sender.send(res);
|
||
|
|
});
|
||
|
|
|
||
|
|
- kv_log_macro::trace!("spawn_local", {
|
||
|
|
- task_id: wrapped.tag.id().0,
|
||
|
|
- parent_task_id: TaskLocalsWrapper::get_current(|t| t.id().0).unwrap_or(0),
|
||
|
|
- });
|
||
|
|
+ //kv_log_macro::trace!("spawn_local", {
|
||
|
|
+ // task_id: wrapped.tag.id().0,
|
||
|
|
+ // parent_task_id: TaskLocalsWrapper::get_current(|t| t.id().0).unwrap_or(0),
|
||
|
|
+ //});
|
||
|
|
|
||
|
|
let task = wrapped.tag.task().clone();
|
||
|
|
wasm_bindgen_futures::spawn_local(wrapped);
|
||
|
|
@@ -147,10 +147,10 @@ impl Builder {
|
||
|
|
let wrapped = self.build(future);
|
||
|
|
|
||
|
|
// Log this `block_on` operation.
|
||
|
|
- kv_log_macro::trace!("block_on", {
|
||
|
|
- task_id: wrapped.tag.id().0,
|
||
|
|
- parent_task_id: TaskLocalsWrapper::get_current(|t| t.id().0).unwrap_or(0),
|
||
|
|
- });
|
||
|
|
+ //kv_log_macro::trace!("block_on", {
|
||
|
|
+ // task_id: wrapped.tag.id().0,
|
||
|
|
+ // parent_task_id: TaskLocalsWrapper::get_current(|t| t.id().0).unwrap_or(0),
|
||
|
|
+ //});
|
||
|
|
|
||
|
|
thread_local! {
|
||
|
|
/// Tracks the number of nested block_on calls.
|
||
|
|
--
|
||
|
|
2.46.0
|
||
|
|
|