-
Notifications
You must be signed in to change notification settings - Fork 183
Re: Introduce Tracing into Chalk #409
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
0923fed
super WIP implementation
davidbarsky 391c33c
conditional logging
nolanderc c4caeeb
Switch logging from `chalk_macros` to `tracing`
nolanderc 7ecb115
Conditionally enable debug output
nolanderc 50f8a2e
Move master to tracing
nolanderc aa07c36
Fix formatting
nolanderc File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,133 +1,2 @@ | ||
| use std::cell::RefCell; | ||
|
|
||
| #[macro_use] | ||
| extern crate lazy_static; | ||
|
|
||
| #[macro_use] | ||
| mod index; | ||
|
|
||
| lazy_static! { | ||
| pub static ref DEBUG_ENABLED: bool = { | ||
| use std::env; | ||
| env::var("CHALK_DEBUG") | ||
| .ok() | ||
| .and_then(|s| s.parse::<u32>().ok()) | ||
| .map(|x| x >= 2) | ||
| .unwrap_or(false) | ||
| }; | ||
| pub static ref INFO_ENABLED: bool = { | ||
| use std::env; | ||
| env::var("CHALK_DEBUG") | ||
| .ok() | ||
| .and_then(|s| s.parse::<u32>().ok()) | ||
| .map(|x| x >= 1) | ||
| .unwrap_or(false) | ||
| }; | ||
| } | ||
|
|
||
| thread_local! { | ||
| pub(crate) static INDENT: RefCell<Vec<String>> = RefCell::new(vec![]); | ||
| } | ||
|
|
||
| // When CHALK_DEBUG is enabled, we only allow this many frames of | ||
| // nested processing, at which point we assume something has gone | ||
| // away. | ||
| const OVERFLOW_DEPTH: usize = 100; | ||
|
|
||
| #[macro_export] | ||
| macro_rules! debug { | ||
| ($($t:tt)*) => { | ||
| if *$crate::DEBUG_ENABLED { | ||
| $crate::dump(&format!($($t)*), ""); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[macro_export] | ||
| macro_rules! debug_heading { | ||
| ($($t:tt)*) => { | ||
| let _ = &if *$crate::DEBUG_ENABLED { | ||
| let string = format!($($t)*); | ||
| $crate::dump(&string, " {"); | ||
| $crate::Indent::new(true, string) | ||
| } else { | ||
| $crate::Indent::new(false, String::new()) | ||
| }; | ||
| } | ||
| } | ||
|
|
||
| #[macro_export] | ||
| macro_rules! info { | ||
| ($($t:tt)*) => { | ||
| if *$crate::INFO_ENABLED { | ||
| $crate::dump(&format!($($t)*), ""); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[macro_export] | ||
| macro_rules! info_heading { | ||
| ($($t:tt)*) => { | ||
| let _ = &if *$crate::INFO_ENABLED { | ||
| let string = format!($($t)*); | ||
| $crate::dump(&string, " {"); | ||
| $crate::Indent::new(true, string) | ||
| } else { | ||
| $crate::Indent::new(false, String::new()) | ||
| }; | ||
| } | ||
| } | ||
|
|
||
| pub fn dump(string: &str, suffix: &str) { | ||
| let indent = INDENT.with(|i| i.borrow().len()); | ||
| let mut first = true; | ||
| for line in string.lines() { | ||
| if first { | ||
| for _ in 0..indent { | ||
| eprint!(": "); | ||
| } | ||
| eprint!("| "); | ||
| } else { | ||
| eprintln!(); | ||
| for _ in 0..indent { | ||
| eprint!(": "); | ||
| } | ||
| eprint!(": "); | ||
| } | ||
| eprint!("{}", line); | ||
| first = false; | ||
| } | ||
|
|
||
| eprintln!("{}", suffix); | ||
| } | ||
|
|
||
| pub struct Indent { | ||
| enabled: bool, | ||
| } | ||
|
|
||
| impl Indent { | ||
| pub fn new(enabled: bool, value: String) -> Self { | ||
| if enabled { | ||
| INDENT.with(|i| { | ||
| i.borrow_mut().push(value); | ||
| if i.borrow().len() > OVERFLOW_DEPTH { | ||
| eprintln!("CHALK_DEBUG OVERFLOW:"); | ||
| for v in i.borrow().iter().rev() { | ||
| eprintln!("- {}", v); | ||
| } | ||
| panic!("CHALK_DEBUG OVERFLOW") | ||
| } | ||
| }); | ||
| } | ||
| Indent { enabled } | ||
| } | ||
| } | ||
|
|
||
| impl Drop for Indent { | ||
| fn drop(&mut self) { | ||
| if self.enabled { | ||
| INDENT.with(|i| i.borrow_mut().pop().unwrap()); | ||
| dump("}", ""); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Woah! what is happening here. I guess this is a different for how tracing works?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yup, in tracing the logging macros generate
Events which may contain a number of fields. The?sigil is a shorthand for creating a new field using theDebugimplementation ofanswer.