Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove duplicate tracing filter code, fix compiling voxygen with the

Browse Source 
tracy feature
This commit is contained in:
Imbris 2020-09-06 15:51:04 -04:00
parent 0683a40741
commit 7efbc74551
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cargo/config
View File

@ -8,6 +8,6 @@ generate = "run --package tools --"
test-server = "-Zpackage-features run --bin veloren-server-cli --no-default-features"
tracy-server = "-Zunstable-options -Zpackage-features run --bin veloren-server-cli --no-default-features --features tracy --profile no_overflow"
test-voxygen = "-Zpackage-features run --bin veloren-voxygen --no-default-features --features gl"
tracy-voxygen = "-Zunstable-options -Zpackage-features run --bin veloren-voxygen --no-default-features --features tracy gl --profile no_overflow"
tracy-voxygen = "-Zunstable-options -Zpackage-features run --bin veloren-voxygen --no-default-features --features tracy,gl --profile no_overflow"
server = "run --bin veloren-server-cli"

2
common/src/util/mod.rs
View File

@ -31,7 +31,7 @@ macro_rules! span {
let $guard_name = span.enter();
// Directly use `tracy_client` to decrease overhead for better timing
#[cfg(feature = "tracy")]
let $guard_name = tracy_client::Span::new(
let $guard_name = $crate::util::tracy_client::Span::new(
$name,
"",
module_path!(),

6
voxygen/src/logging.rs
View File

@ -63,11 +63,7 @@ pub fn init(settings: &Settings) -> Vec<impl Drop> {
};
#[cfg(feature = "tracy")]
let filter = EnvFilter::new("dot_vox::parser=warn")
.add_directive("gfx_device_gl=warn".parse().unwrap())
.add_directive("uvth=warn".parse().unwrap())
.add_directive("tiny_http=warn".parse().unwrap())
.add_directive(LevelFilter::TRACE.into());
let filter = base_exceptions(EnvFilter::new("")).add_directive(LevelFilter::TRACE.into());
// Create the terminal writer layer.
let (non_blocking, _stdio_guard) = tracing_appender::non_blocking(std::io::stdout());