rafaelcaricio/gstreamer-rs
1
0
Fork 0
forked from mirrors/gstreamer-rs
Code Pull requests Activity

gstreamer: Simplify and speed up log message string construction

Browse source 
For pre-1.20 simply use `%s` as format string instead of escaping the
`%` inline while writing. This allows a simpler implementation and is
also faster, see https://github.com/gtk-rs/gtk-rs-core/pull/583.
This commit is contained in:
Sebastian Dröge 2022-02-26 13:31:35 +02:00
parent 019ff43b60
commit 24a2bb78a6
1 changed files with 28 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
gstreamer/src/log.rs
View file

@ -180,70 +180,37 @@ impl DebugCategory {
None => ptr::null_mut(),
};
let mut w = glib::GStringBuilder::default();
// Can't really happen but better safe than sorry
if fmt::write(&mut w, args).is_err() {
return;
}
#[cfg(feature = "v1_20")]
{
let mut w = glib::GStringBuilder::default();
// Can't really happen but better safe than sorry
if fmt::write(&mut w, args).is_err() {
return;
}
unsafe {
ffi::gst_debug_log_literal(
cat.as_ptr(),
level.into_glib(),
file.to_glib_none().0,
module.to_glib_none().0,
line as i32,
obj_ptr,
w.into_string().to_glib_none().0,
);
}
unsafe {
ffi::gst_debug_log_literal(
cat.as_ptr(),
level.into_glib(),
file.to_glib_none().0,
module.to_glib_none().0,
line as i32,
obj_ptr,
w.into_string().to_glib_none().0,
);
}
#[cfg(not(feature = "v1_20"))]
{
// Replace literal percentage signs with two so that they are not interpreted as printf
// format specifiers
struct Write(glib::GStringBuilder);
impl fmt::Write for Write {
fn write_str(&mut self, mut s: &str) -> Result<(), fmt::Error> {
while let Some((prefix, suffix)) = s.split_once('%') {
self.0.append(prefix);
self.0.append("%%");
s = suffix;
}
self.0.append(s);
Ok(())
}
fn write_char(&mut self, c: char) -> fmt::Result {
if c == '%' {
self.0.append("%%");
} else {
self.0.append_c(c);
}
Ok(())
}
}
let mut w = Write(glib::GStringBuilder::default());
// Can't really happen but better safe than sorry
if fmt::write(&mut w, args).is_err() {
return;
}
unsafe {
ffi::gst_debug_log(
cat.as_ptr(),
level.into_glib(),
file.to_glib_none().0,
module.to_glib_none().0,
line as i32,
obj_ptr,
w.0.into_string().to_glib_none().0,
);
}
unsafe {
ffi::gst_debug_log(
cat.as_ptr(),
level.into_glib(),
file.to_glib_none().0,
module.to_glib_none().0,
line as i32,
obj_ptr,
b"%s\0".as_ptr() as *const _,
ToGlibPtr::<*const i8>::to_glib_none(&w.into_string()).0,
);
}
}