Skip to content
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.

Sign up for GitHub

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

Jump to bottom

we have to expect non-utf8 strings in tracing messages #770

Merged
merged 5 commits into from Nov 30, 2021
Merged

we have to expect non-utf8 strings in tracing messages #770

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4652e58
we can expect non-utf8 strings in tracing messages
Nov 20, 2021
50a990f
pass tracing msg as slice instead of &str
Nov 22, 2021
9cdc7af
doc comment
Nov 22, 2021
33fcb27
Revert "pass tracing msg as slice instead of &str"
Nov 29, 2021
4cfb774
update doc comment and add todo
Nov 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/tracing.rs
View file
Open in desktop
Expand Up @@ -57,6 +57,9 @@ impl Binding for TraceLevel {
}
}

//TODO: pass raw &[u8] and leave conversion to consumer (breaking API)
/// Callback type used to pass tracing events to the subscriber.
/// see `trace_set` to register a scubscriber.
pub type TracingCb = fn(TraceLevel, &str);

static CALLBACK: AtomicUsize = AtomicUsize::new(0);
Expand All @@ -76,7 +79,7 @@ extern "C" fn tracing_cb_c(level: raw::git_trace_level_t, msg: *const c_char) {
let cb = CALLBACK.load(Ordering::SeqCst);
panic::wrap(|| unsafe {
let cb: TracingCb = std::mem::transmute(cb);
let msg = std::ffi::CStr::from_ptr(msg).to_str().unwrap();
cb(Binding::from_raw(level), msg);
let msg = std::ffi::CStr::from_ptr(msg).to_string_lossy();
cb(Binding::from_raw(level), msg.as_ref());
});
}