eater/async-std
1
0
Fork 0
forked from mirror/async-std
Code Issues Pull requests Releases Wiki Activity

Revert "upgrade log, remove kv-log-macro"

Browse source
This commit is contained in:
nasa 2019-12-18 08:01:09 +09:00 committed by GitHub
parent c7cf1934db
commit d8befe24e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.toml
View file

@ -27,6 +27,7 @@ default = [
"crossbeam-channel", "crossbeam-channel",
"crossbeam-deque", "crossbeam-deque",
"futures-timer", "futures-timer",
"kv-log-macro",
"log", "log",
"mio", "mio",
"mio-uds", "mio-uds",
@ -57,7 +58,8 @@ crossbeam-utils = { version = "0.7.0", optional = true }
futures-core = { version = "0.3.1", optional = true } futures-core = { version = "0.3.1", optional = true }
futures-io = { version = "0.3.1", optional = true } futures-io = { version = "0.3.1", optional = true }
futures-timer = { version = "2.0.2", optional = true } futures-timer = { version = "2.0.2", optional = true }
log = { version = "0.4.10", features = ["kv_unstable"], optional = true } kv-log-macro = { version = "1.0.4", optional = true }
log = { version = "0.4.8", features = ["kv_unstable"], optional = true }
memchr = { version = "2.2.1", optional = true } memchr = { version = "2.2.1", optional = true }
mio = { version = "0.6.19", optional = true } mio = { version = "0.6.19", optional = true }
mio-uds = { version = "0.6.7", optional = true } mio-uds = { version = "0.6.7", optional = true }

5
src/task/block_on.rs
View file

@ -6,6 +6,7 @@ use std::task::{RawWaker, RawWakerVTable};
use std::thread; use std::thread;
use crossbeam_utils::sync::Parker; use crossbeam_utils::sync::Parker;
use kv_log_macro::trace;
use log::log_enabled; use log::log_enabled;
use crate::task::{Context, Poll, Task, Waker}; use crate::task::{Context, Poll, Task, Waker};
@ -42,7 +43,7 @@ where
// Log this `block_on` operation. // Log this `block_on` operation.
if log_enabled!(log::Level::Trace) { if log_enabled!(log::Level::Trace) {
log::trace!("block_on", { trace!("block_on", {
task_id: task.id().0, task_id: task.id().0,
parent_task_id: Task::get_current(|t| t.id().0).unwrap_or(0), parent_task_id: Task::get_current(|t| t.id().0).unwrap_or(0),
}); });
@ -58,7 +59,7 @@ where
defer! { defer! {
if log_enabled!(log::Level::Trace) { if log_enabled!(log::Level::Trace) {
Task::get_current(|t| { Task::get_current(|t| {
log::trace!("completed", { trace!("completed", {
task_id: t.id().0, task_id: t.id().0,
}); });
}); });

5
src/task/builder.rs
View file

@ -1,3 +1,4 @@
use kv_log_macro::trace;
use log::log_enabled; use log::log_enabled;
use std::future::Future; use std::future::Future;
@ -37,7 +38,7 @@ impl Builder {
// Log this `spawn` operation. // Log this `spawn` operation.
if log_enabled!(log::Level::Trace) { if log_enabled!(log::Level::Trace) {
log::trace!("spawn", { trace!("spawn", {
task_id: task.id().0, task_id: task.id().0,
parent_task_id: Task::get_current(|t| t.id().0).unwrap_or(0), parent_task_id: Task::get_current(|t| t.id().0).unwrap_or(0),
}); });
@ -53,7 +54,7 @@ impl Builder {
defer! { defer! {
if log_enabled!(log::Level::Trace) { if log_enabled!(log::Level::Trace) {
Task::get_current(|t| { Task::get_current(|t| {
log::trace!("completed", { trace!("completed", {
task_id: t.id().0, task_id: t.id().0,
}); });
}); });