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

gstreamer: Get function name for logging outside the internal closure

Browse source 
Otherwise the function name will include the name of the closure.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1260>
This commit is contained in:
Sebastian Dröge 2023-05-10 11:14:21 +03:00
parent 13f4085456
commit 33d4969493
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gstreamer/src/log.rs
View file

@ -728,6 +728,7 @@ macro_rules! log_with_level(
// directly pass it as `&GStr` forward // directly pass it as `&GStr` forward
let obj = unsafe { $obj.unsafe_cast_ref::<$crate::glib::Object>() }; let obj = unsafe { $obj.unsafe_cast_ref::<$crate::glib::Object>() };
let function_name = $crate::glib::function_name!();
// Check if formatting is necessary or not // Check if formatting is necessary or not
// FIXME: This needs to be a closure because the return value of format_args!() can't // FIXME: This needs to be a closure because the return value of format_args!() can't
@ -739,7 +740,7 @@ macro_rules! log_with_level(
Some(obj), Some(obj),
$level, $level,
unsafe { $crate::glib::GStr::from_utf8_with_nul_unchecked(concat!(file!(), "\0").as_bytes()) }, unsafe { $crate::glib::GStr::from_utf8_with_nul_unchecked(concat!(file!(), "\0").as_bytes()) },
$crate::glib::function_name!(), function_name,
line!(), line!(),
$crate::glib::gstr!($msg), $crate::glib::gstr!($msg),
) )
@ -749,7 +750,7 @@ macro_rules! log_with_level(
Some(obj), Some(obj),
$level, $level,
unsafe { $crate::glib::GStr::from_utf8_with_nul_unchecked(concat!(file!(), "\0").as_bytes()) }, unsafe { $crate::glib::GStr::from_utf8_with_nul_unchecked(concat!(file!(), "\0").as_bytes()) },
$crate::glib::function_name!(), function_name,
line!(), line!(),
args, args,
) )
@ -792,6 +793,7 @@ macro_rules! log_with_level(
let obj = $imp.obj(); let obj = $imp.obj();
let obj = unsafe { obj.unsafe_cast_ref::<$crate::glib::Object>() }; let obj = unsafe { obj.unsafe_cast_ref::<$crate::glib::Object>() };
let function_name = $crate::glib::function_name!();
// Check if formatting is necessary or not // Check if formatting is necessary or not
// FIXME: This needs to be a closure because the return value of format_args!() can't // FIXME: This needs to be a closure because the return value of format_args!() can't
@ -803,7 +805,7 @@ macro_rules! log_with_level(
Some(obj), Some(obj),
$level, $level,
unsafe { $crate::glib::GStr::from_utf8_with_nul_unchecked(concat!(file!(), "\0").as_bytes()) }, unsafe { $crate::glib::GStr::from_utf8_with_nul_unchecked(concat!(file!(), "\0").as_bytes()) },
$crate::glib::function_name!(), function_name,
line!(), line!(),
$crate::glib::gstr!($msg), $crate::glib::gstr!($msg),
) )
@ -813,7 +815,7 @@ macro_rules! log_with_level(
Some(obj), Some(obj),
$level, $level,
unsafe { $crate::glib::GStr::from_utf8_with_nul_unchecked(concat!(file!(), "\0").as_bytes()) }, unsafe { $crate::glib::GStr::from_utf8_with_nul_unchecked(concat!(file!(), "\0").as_bytes()) },
$crate::glib::function_name!(), function_name,
line!(), line!(),
args, args,
) )
@ -853,6 +855,8 @@ macro_rules! log_with_level(
// FIXME: Once there's a function_name! macro that returns a string literal we can // FIXME: Once there's a function_name! macro that returns a string literal we can
// directly pass it as `&GStr` forward // directly pass it as `&GStr` forward
let function_name = $crate::glib::function_name!();
// Check if formatting is necessary or not // Check if formatting is necessary or not
// FIXME: This needs to be a closure because the return value of format_args!() can't // FIXME: This needs to be a closure because the return value of format_args!() can't
// be assigned to a variable // be assigned to a variable
@ -863,7 +867,7 @@ macro_rules! log_with_level(
$crate::glib::gstr!($id), $crate::glib::gstr!($id),
$level, $level,
unsafe { $crate::glib::GStr::from_utf8_with_nul_unchecked(concat!(file!(), "\0").as_bytes()) }, unsafe { $crate::glib::GStr::from_utf8_with_nul_unchecked(concat!(file!(), "\0").as_bytes()) },
$crate::glib::function_name!(), function_name,
line!(), line!(),
$crate::glib::gstr!($msg), $crate::glib::gstr!($msg),
) )
@ -873,7 +877,7 @@ macro_rules! log_with_level(
$crate::glib::gstr!($id), $crate::glib::gstr!($id),
$level, $level,
unsafe { $crate::glib::GStr::from_utf8_with_nul_unchecked(concat!(file!(), "\0").as_bytes()) }, unsafe { $crate::glib::GStr::from_utf8_with_nul_unchecked(concat!(file!(), "\0").as_bytes()) },
$crate::glib::function_name!(), function_name,
line!(), line!(),
args, args,
) )
@ -909,6 +913,8 @@ macro_rules! log_with_level(
// FIXME: Once there's a function_name! macro that returns a string literal we can // FIXME: Once there's a function_name! macro that returns a string literal we can
// directly pass it as `&GStr` forward // directly pass it as `&GStr` forward
let function_name = $crate::glib::function_name!();
// Check if formatting is necessary or not // Check if formatting is necessary or not
// FIXME: This needs to be a closure because the return value of format_args!() can't // FIXME: This needs to be a closure because the return value of format_args!() can't
// be assigned to a variable // be assigned to a variable
@ -919,7 +925,7 @@ macro_rules! log_with_level(
$id, $id,
$level, $level,
unsafe { $crate::glib::GStr::from_utf8_with_nul_unchecked(concat!(file!(), "\0").as_bytes()) }, unsafe { $crate::glib::GStr::from_utf8_with_nul_unchecked(concat!(file!(), "\0").as_bytes()) },
$crate::glib::function_name!(), function_name,
line!(), line!(),
$crate::glib::gstr!($msg), $crate::glib::gstr!($msg),
) )
@ -929,7 +935,7 @@ macro_rules! log_with_level(
$id, $id,
$level, $level,
unsafe { $crate::glib::GStr::from_utf8_with_nul_unchecked(concat!(file!(), "\0").as_bytes()) }, unsafe { $crate::glib::GStr::from_utf8_with_nul_unchecked(concat!(file!(), "\0").as_bytes()) },
$crate::glib::function_name!(), function_name,
line!(), line!(),
args, args,
) )
@ -965,6 +971,8 @@ macro_rules! log_with_level(
// FIXME: Once there's a function_name! macro that returns a string literal we can // FIXME: Once there's a function_name! macro that returns a string literal we can
// directly pass it as `&GStr` forward // directly pass it as `&GStr` forward
let function_name = $crate::glib::function_name!();
// Check if formatting is necessary or not // Check if formatting is necessary or not
// FIXME: This needs to be a closure because the return value of format_args!() can't // FIXME: This needs to be a closure because the return value of format_args!() can't
// be assigned to a variable // be assigned to a variable
@ -975,7 +983,7 @@ macro_rules! log_with_level(
None as Option<&$crate::glib::Object>, None as Option<&$crate::glib::Object>,
$level, $level,
unsafe { $crate::glib::GStr::from_utf8_with_nul_unchecked(concat!(file!(), "\0").as_bytes()) }, unsafe { $crate::glib::GStr::from_utf8_with_nul_unchecked(concat!(file!(), "\0").as_bytes()) },
$crate::glib::function_name!(), function_name,
line!(), line!(),
$crate::glib::gstr!($msg), $crate::glib::gstr!($msg),
) )
@ -985,7 +993,7 @@ macro_rules! log_with_level(
None as Option<&$crate::glib::Object>, None as Option<&$crate::glib::Object>,
$level, $level,
unsafe { $crate::glib::GStr::from_utf8_with_nul_unchecked(concat!(file!(), "\0").as_bytes()) }, unsafe { $crate::glib::GStr::from_utf8_with_nul_unchecked(concat!(file!(), "\0").as_bytes()) },
$crate::glib::function_name!(), function_name,
line!(), line!(),
args, args,
) )