tracers/log: log more detail

Log the objects like we would in GST_TRACE_OBJECT. Add the hook function into
the fucntion field.
This commit is contained in:
Stefan Sauer 2016-12-08 22:03:19 +01:00
parent 8d819a51b8
commit a25453c2c6

View file

@ -63,12 +63,13 @@ G_DEFINE_TYPE_WITH_CODE (GstLogTracer, gst_log_tracer, GST_TYPE_TRACER,
_do_init); _do_init);
static void static void
do_log (GstDebugCategory * cat, const char *fmt, ...) do_log (GstDebugCategory * cat, const char *func, GObject * obj,
const char *fmt, ...)
{ {
va_list var_args; va_list var_args;
va_start (var_args, fmt); va_start (var_args, fmt);
gst_debug_log_valist (cat, GST_LEVEL_TRACE, "", "", 0, NULL, fmt, var_args); gst_debug_log_valist (cat, GST_LEVEL_TRACE, "", func, 0, obj, fmt, var_args);
va_end (var_args); va_end (var_args);
} }
@ -76,7 +77,7 @@ static void
do_push_buffer_pre (GstTracer * self, guint64 ts, GstPad * pad, do_push_buffer_pre (GstTracer * self, guint64 ts, GstPad * pad,
GstBuffer * buffer) GstBuffer * buffer)
{ {
do_log (GST_CAT_BUFFER, do_log (GST_CAT_BUFFER, GST_FUNCTION, (GObject *) pad,
"%" GST_TIME_FORMAT ", pad=%" GST_PTR_FORMAT ", buffer=%" GST_PTR_FORMAT, "%" GST_TIME_FORMAT ", pad=%" GST_PTR_FORMAT ", buffer=%" GST_PTR_FORMAT,
GST_TIME_ARGS (ts), pad, buffer); GST_TIME_ARGS (ts), pad, buffer);
} }
@ -85,7 +86,7 @@ static void
do_push_buffer_post (GstTracer * self, guint64 ts, GstPad * pad, do_push_buffer_post (GstTracer * self, guint64 ts, GstPad * pad,
GstFlowReturn res) GstFlowReturn res)
{ {
do_log (GST_CAT_BUFFER, do_log (GST_CAT_BUFFER, GST_FUNCTION, (GObject *) pad,
"%" GST_TIME_FORMAT ", pad=%" GST_PTR_FORMAT ", res=%d", "%" GST_TIME_FORMAT ", pad=%" GST_PTR_FORMAT ", res=%d",
GST_TIME_ARGS (ts), pad, res); GST_TIME_ARGS (ts), pad, res);
} }
@ -94,7 +95,7 @@ static void
do_push_buffer_list_pre (GstTracer * self, guint64 ts, GstPad * pad, do_push_buffer_list_pre (GstTracer * self, guint64 ts, GstPad * pad,
GstBufferList * list) GstBufferList * list)
{ {
do_log (GST_CAT_BUFFER_LIST, do_log (GST_CAT_BUFFER_LIST, GST_FUNCTION, (GObject *) pad,
"%" GST_TIME_FORMAT ", pad=%" GST_PTR_FORMAT ", list=%p", "%" GST_TIME_FORMAT ", pad=%" GST_PTR_FORMAT ", list=%p",
GST_TIME_ARGS (ts), pad, list); GST_TIME_ARGS (ts), pad, list);
} }
@ -103,7 +104,7 @@ static void
do_push_buffer_list_post (GstTracer * self, guint64 ts, GstPad * pad, do_push_buffer_list_post (GstTracer * self, guint64 ts, GstPad * pad,
GstFlowReturn res) GstFlowReturn res)
{ {
do_log (GST_CAT_BUFFER_LIST, do_log (GST_CAT_BUFFER_LIST, GST_FUNCTION, (GObject *) pad,
"%" GST_TIME_FORMAT ", pad=%" GST_PTR_FORMAT ", res=%d", "%" GST_TIME_FORMAT ", pad=%" GST_PTR_FORMAT ", res=%d",
GST_TIME_ARGS (ts), pad, res); GST_TIME_ARGS (ts), pad, res);
} }
@ -112,7 +113,7 @@ static void
do_pull_range_pre (GstTracer * self, guint64 ts, GstPad * pad, guint64 offset, do_pull_range_pre (GstTracer * self, guint64 ts, GstPad * pad, guint64 offset,
guint size) guint size)
{ {
do_log (GST_CAT_BUFFER, do_log (GST_CAT_BUFFER, GST_FUNCTION, (GObject *) pad,
"%" GST_TIME_FORMAT ", pad=%" GST_PTR_FORMAT ", offset=%" G_GUINT64_FORMAT "%" GST_TIME_FORMAT ", pad=%" GST_PTR_FORMAT ", offset=%" G_GUINT64_FORMAT
", size=%u", GST_TIME_ARGS (ts), pad, offset, size); ", size=%u", GST_TIME_ARGS (ts), pad, offset, size);
} }
@ -121,7 +122,7 @@ static void
do_pull_range_post (GstTracer * self, guint64 ts, GstPad * pad, do_pull_range_post (GstTracer * self, guint64 ts, GstPad * pad,
GstBuffer * buffer, GstFlowReturn res) GstBuffer * buffer, GstFlowReturn res)
{ {
do_log (GST_CAT_BUFFER, do_log (GST_CAT_BUFFER, GST_FUNCTION, (GObject *) pad,
"%" GST_TIME_FORMAT ", pad=%" GST_PTR_FORMAT ", buffer=%" GST_PTR_FORMAT "%" GST_TIME_FORMAT ", pad=%" GST_PTR_FORMAT ", buffer=%" GST_PTR_FORMAT
", res=%d", GST_TIME_ARGS (ts), pad, buffer, res); ", res=%d", GST_TIME_ARGS (ts), pad, buffer, res);
} }
@ -129,7 +130,7 @@ do_pull_range_post (GstTracer * self, guint64 ts, GstPad * pad,
static void static void
do_push_event_pre (GstTracer * self, guint64 ts, GstPad * pad, GstEvent * event) do_push_event_pre (GstTracer * self, guint64 ts, GstPad * pad, GstEvent * event)
{ {
do_log (GST_CAT_EVENT, do_log (GST_CAT_EVENT, GST_FUNCTION, (GObject *) pad,
"%" GST_TIME_FORMAT ", pad=%" GST_PTR_FORMAT ", event=%" GST_PTR_FORMAT, "%" GST_TIME_FORMAT ", pad=%" GST_PTR_FORMAT ", event=%" GST_PTR_FORMAT,
GST_TIME_ARGS (ts), pad, event); GST_TIME_ARGS (ts), pad, event);
} }
@ -137,7 +138,7 @@ do_push_event_pre (GstTracer * self, guint64 ts, GstPad * pad, GstEvent * event)
static void static void
do_push_event_post (GstTracer * self, guint64 ts, GstPad * pad, gboolean res) do_push_event_post (GstTracer * self, guint64 ts, GstPad * pad, gboolean res)
{ {
do_log (GST_CAT_EVENT, do_log (GST_CAT_EVENT, GST_FUNCTION, (GObject *) pad,
"%" GST_TIME_FORMAT ", pad=%" GST_PTR_FORMAT ", res=%d", "%" GST_TIME_FORMAT ", pad=%" GST_PTR_FORMAT ", res=%d",
GST_TIME_ARGS (ts), pad, res); GST_TIME_ARGS (ts), pad, res);
} }
@ -145,7 +146,7 @@ do_push_event_post (GstTracer * self, guint64 ts, GstPad * pad, gboolean res)
static void static void
do_pad_query_pre (GstTracer * self, guint64 ts, GstPad * pad, GstQuery * query) do_pad_query_pre (GstTracer * self, guint64 ts, GstPad * pad, GstQuery * query)
{ {
do_log (GST_CAT_QUERY, do_log (GST_CAT_QUERY, GST_FUNCTION, (GObject *) pad,
"%" GST_TIME_FORMAT ", pad=%" GST_PTR_FORMAT ", query=%" "%" GST_TIME_FORMAT ", pad=%" GST_PTR_FORMAT ", query=%"
GST_PTR_FORMAT, GST_TIME_ARGS (ts), pad, query); GST_PTR_FORMAT, GST_TIME_ARGS (ts), pad, query);
} }
@ -153,7 +154,7 @@ do_pad_query_pre (GstTracer * self, guint64 ts, GstPad * pad, GstQuery * query)
static void static void
do_pad_query_post (GstTracer * self, guint64 ts, GstPad * pad, gboolean res) do_pad_query_post (GstTracer * self, guint64 ts, GstPad * pad, gboolean res)
{ {
do_log (GST_CAT_QUERY, do_log (GST_CAT_QUERY, GST_FUNCTION, (GObject *) pad,
"%" GST_TIME_FORMAT ", pad=%" GST_PTR_FORMAT ", res=%d", "%" GST_TIME_FORMAT ", pad=%" GST_PTR_FORMAT ", res=%d",
GST_TIME_ARGS (ts), pad, res); GST_TIME_ARGS (ts), pad, res);
} }
@ -162,7 +163,7 @@ static void
do_post_message_pre (GstTracer * self, guint64 ts, GstElement * elem, do_post_message_pre (GstTracer * self, guint64 ts, GstElement * elem,
GstMessage * msg) GstMessage * msg)
{ {
do_log (GST_CAT_MESSAGE, do_log (GST_CAT_MESSAGE, GST_FUNCTION, (GObject *) elem,
"%" GST_TIME_FORMAT ", element=%" GST_PTR_FORMAT ", message=%" "%" GST_TIME_FORMAT ", element=%" GST_PTR_FORMAT ", message=%"
GST_PTR_FORMAT, GST_TIME_ARGS (ts), elem, msg); GST_PTR_FORMAT, GST_TIME_ARGS (ts), elem, msg);
} }
@ -171,7 +172,7 @@ static void
do_post_message_post (GstTracer * self, guint64 ts, GstElement * elem, do_post_message_post (GstTracer * self, guint64 ts, GstElement * elem,
gboolean res) gboolean res)
{ {
do_log (GST_CAT_MESSAGE, do_log (GST_CAT_MESSAGE, GST_FUNCTION, (GObject *) elem,
"%" GST_TIME_FORMAT ", element=%" GST_PTR_FORMAT ", res=%d", "%" GST_TIME_FORMAT ", element=%" GST_PTR_FORMAT ", res=%d",
GST_TIME_ARGS (ts), elem, res); GST_TIME_ARGS (ts), elem, res);
} }
@ -180,7 +181,7 @@ static void
do_element_query_pre (GstTracer * self, guint64 ts, GstElement * elem, do_element_query_pre (GstTracer * self, guint64 ts, GstElement * elem,
GstQuery * query) GstQuery * query)
{ {
do_log (GST_CAT_QUERY, do_log (GST_CAT_QUERY, GST_FUNCTION, (GObject *) elem,
"%" GST_TIME_FORMAT ", element=%" GST_PTR_FORMAT ", query=%" "%" GST_TIME_FORMAT ", element=%" GST_PTR_FORMAT ", query=%"
GST_PTR_FORMAT, GST_TIME_ARGS (ts), elem, query); GST_PTR_FORMAT, GST_TIME_ARGS (ts), elem, query);
} }
@ -189,7 +190,7 @@ static void
do_element_query_post (GstTracer * self, guint64 ts, GstElement * elem, do_element_query_post (GstTracer * self, guint64 ts, GstElement * elem,
gboolean res) gboolean res)
{ {
do_log (GST_CAT_QUERY, do_log (GST_CAT_QUERY, GST_FUNCTION, (GObject *) elem,
"%" GST_TIME_FORMAT ", element=%" GST_PTR_FORMAT ", res=%d", "%" GST_TIME_FORMAT ", element=%" GST_PTR_FORMAT ", res=%d",
GST_TIME_ARGS (ts), elem, res); GST_TIME_ARGS (ts), elem, res);
} }
@ -197,7 +198,7 @@ do_element_query_post (GstTracer * self, guint64 ts, GstElement * elem,
static void static void
do_element_new (GstTracer * self, guint64 ts, GstElement * elem) do_element_new (GstTracer * self, guint64 ts, GstElement * elem)
{ {
do_log (GST_CAT_ELEMENT_FACTORY, do_log (GST_CAT_ELEMENT_FACTORY, GST_FUNCTION, (GObject *) elem,
"%" GST_TIME_FORMAT ", element=%" GST_PTR_FORMAT, "%" GST_TIME_FORMAT ", element=%" GST_PTR_FORMAT,
GST_TIME_ARGS (ts), elem); GST_TIME_ARGS (ts), elem);
} }
@ -206,7 +207,7 @@ static void
do_element_add_pad (GstTracer * self, guint64 ts, GstElement * elem, do_element_add_pad (GstTracer * self, guint64 ts, GstElement * elem,
GstPad * pad) GstPad * pad)
{ {
do_log (GST_CAT_ELEMENT_PADS, do_log (GST_CAT_ELEMENT_PADS, GST_FUNCTION, (GObject *) elem,
"%" GST_TIME_FORMAT ", element=%" GST_PTR_FORMAT ", pad=%" GST_PTR_FORMAT, "%" GST_TIME_FORMAT ", element=%" GST_PTR_FORMAT ", pad=%" GST_PTR_FORMAT,
GST_TIME_ARGS (ts), elem, pad); GST_TIME_ARGS (ts), elem, pad);
} }
@ -215,7 +216,7 @@ static void
do_element_remove_pad (GstTracer * self, guint64 ts, GstElement * elem, do_element_remove_pad (GstTracer * self, guint64 ts, GstElement * elem,
GstPad * pad) GstPad * pad)
{ {
do_log (GST_CAT_ELEMENT_PADS, do_log (GST_CAT_ELEMENT_PADS, GST_FUNCTION, (GObject *) elem,
"%" GST_TIME_FORMAT ", element=%" GST_PTR_FORMAT ", pad=%" GST_PTR_FORMAT, "%" GST_TIME_FORMAT ", element=%" GST_PTR_FORMAT ", pad=%" GST_PTR_FORMAT,
GST_TIME_ARGS (ts), elem, pad); GST_TIME_ARGS (ts), elem, pad);
} }
@ -224,7 +225,7 @@ static void
do_element_change_state_pre (GstTracer * self, guint64 ts, GstElement * elem, do_element_change_state_pre (GstTracer * self, guint64 ts, GstElement * elem,
GstStateChange change) GstStateChange change)
{ {
do_log (GST_CAT_STATES, do_log (GST_CAT_STATES, GST_FUNCTION, (GObject *) elem,
"%" GST_TIME_FORMAT ", element=%" GST_PTR_FORMAT ", change=%d", "%" GST_TIME_FORMAT ", element=%" GST_PTR_FORMAT ", change=%d",
GST_TIME_ARGS (ts), elem, (gint) change); GST_TIME_ARGS (ts), elem, (gint) change);
} }
@ -233,7 +234,7 @@ static void
do_element_change_state_post (GstTracer * self, guint64 ts, GstElement * elem, do_element_change_state_post (GstTracer * self, guint64 ts, GstElement * elem,
GstStateChange change, GstStateChangeReturn res) GstStateChange change, GstStateChangeReturn res)
{ {
do_log (GST_CAT_STATES, do_log (GST_CAT_STATES, GST_FUNCTION, (GObject *) elem,
"%" GST_TIME_FORMAT ", element=%" GST_PTR_FORMAT ", change=%d, res=%d", "%" GST_TIME_FORMAT ", element=%" GST_PTR_FORMAT ", change=%d, res=%d",
GST_TIME_ARGS (ts), elem, (gint) change, (gint) res); GST_TIME_ARGS (ts), elem, (gint) change, (gint) res);
} }
@ -241,7 +242,7 @@ do_element_change_state_post (GstTracer * self, guint64 ts, GstElement * elem,
static void static void
do_bin_add_pre (GstTracer * self, guint64 ts, GstBin * bin, GstElement * elem) do_bin_add_pre (GstTracer * self, guint64 ts, GstBin * bin, GstElement * elem)
{ {
do_log (GST_CAT_BIN, do_log (GST_CAT_BIN, GST_FUNCTION, (GObject *) bin,
"%" GST_TIME_FORMAT ", bin=%" GST_PTR_FORMAT ", element=%" GST_PTR_FORMAT, "%" GST_TIME_FORMAT ", bin=%" GST_PTR_FORMAT ", element=%" GST_PTR_FORMAT,
GST_TIME_ARGS (ts), bin, elem); GST_TIME_ARGS (ts), bin, elem);
} }
@ -250,7 +251,7 @@ static void
do_bin_add_post (GstTracer * self, guint64 ts, GstBin * bin, GstElement * elem, do_bin_add_post (GstTracer * self, guint64 ts, GstBin * bin, GstElement * elem,
gboolean res) gboolean res)
{ {
do_log (GST_CAT_BIN, do_log (GST_CAT_BIN, GST_FUNCTION, (GObject *) bin,
"%" GST_TIME_FORMAT ", bin=%" GST_PTR_FORMAT ", element=%" GST_PTR_FORMAT "%" GST_TIME_FORMAT ", bin=%" GST_PTR_FORMAT ", element=%" GST_PTR_FORMAT
", res=%d", GST_TIME_ARGS (ts), bin, elem, res); ", res=%d", GST_TIME_ARGS (ts), bin, elem, res);
} }
@ -259,7 +260,7 @@ static void
do_bin_remove_pre (GstTracer * self, guint64 ts, GstBin * bin, do_bin_remove_pre (GstTracer * self, guint64 ts, GstBin * bin,
GstElement * elem) GstElement * elem)
{ {
do_log (GST_CAT_BIN, do_log (GST_CAT_BIN, GST_FUNCTION, (GObject *) bin,
"%" GST_TIME_FORMAT ", bin=%" GST_PTR_FORMAT ", element=%" GST_PTR_FORMAT, "%" GST_TIME_FORMAT ", bin=%" GST_PTR_FORMAT ", element=%" GST_PTR_FORMAT,
GST_TIME_ARGS (ts), bin, elem); GST_TIME_ARGS (ts), bin, elem);
} }
@ -267,7 +268,7 @@ do_bin_remove_pre (GstTracer * self, guint64 ts, GstBin * bin,
static void static void
do_bin_remove_post (GstTracer * self, guint64 ts, GstBin * bin, gboolean res) do_bin_remove_post (GstTracer * self, guint64 ts, GstBin * bin, gboolean res)
{ {
do_log (GST_CAT_BIN, do_log (GST_CAT_BIN, GST_FUNCTION, (GObject *) bin,
"%" GST_TIME_FORMAT ", bin=%" GST_PTR_FORMAT ", res=%d", "%" GST_TIME_FORMAT ", bin=%" GST_PTR_FORMAT ", res=%d",
GST_TIME_ARGS (ts), bin, res); GST_TIME_ARGS (ts), bin, res);
} }
@ -275,7 +276,7 @@ do_bin_remove_post (GstTracer * self, guint64 ts, GstBin * bin, gboolean res)
static void static void
do_pad_link_pre (GstTracer * self, guint64 ts, GstPad * src, GstPad * sink) do_pad_link_pre (GstTracer * self, guint64 ts, GstPad * src, GstPad * sink)
{ {
do_log (GST_CAT_PADS, do_log (GST_CAT_PADS, GST_FUNCTION, (GObject *) src,
"%" GST_TIME_FORMAT ", src=%" GST_PTR_FORMAT ", sink=%" GST_PTR_FORMAT, "%" GST_TIME_FORMAT ", src=%" GST_PTR_FORMAT ", sink=%" GST_PTR_FORMAT,
GST_TIME_ARGS (ts), src, sink); GST_TIME_ARGS (ts), src, sink);
} }
@ -284,7 +285,7 @@ static void
do_pad_link_post (GstTracer * self, guint64 ts, GstPad * src, GstPad * sink, do_pad_link_post (GstTracer * self, guint64 ts, GstPad * src, GstPad * sink,
GstPadLinkReturn res) GstPadLinkReturn res)
{ {
do_log (GST_CAT_PADS, do_log (GST_CAT_PADS, GST_FUNCTION, (GObject *) src,
"%" GST_TIME_FORMAT ", src=%" GST_PTR_FORMAT ", sink=%" GST_PTR_FORMAT "%" GST_TIME_FORMAT ", src=%" GST_PTR_FORMAT ", sink=%" GST_PTR_FORMAT
", res=%d", GST_TIME_ARGS (ts), src, sink, (gint) res); ", res=%d", GST_TIME_ARGS (ts), src, sink, (gint) res);
} }
@ -293,7 +294,7 @@ static void
do_pad_unlink_pre (GstTracer * self, guint64 ts, GstPad * src, do_pad_unlink_pre (GstTracer * self, guint64 ts, GstPad * src,
GstElement * sink) GstElement * sink)
{ {
do_log (GST_CAT_PADS, do_log (GST_CAT_PADS, GST_FUNCTION, (GObject *) src,
"%" GST_TIME_FORMAT ", src=%" GST_PTR_FORMAT ", sink=%" GST_PTR_FORMAT, "%" GST_TIME_FORMAT ", src=%" GST_PTR_FORMAT ", sink=%" GST_PTR_FORMAT,
GST_TIME_ARGS (ts), src, sink); GST_TIME_ARGS (ts), src, sink);
} }
@ -302,7 +303,7 @@ static void
do_pad_unlink_post (GstTracer * self, guint64 ts, GstPad * src, do_pad_unlink_post (GstTracer * self, guint64 ts, GstPad * src,
GstElement * sink, gboolean res) GstElement * sink, gboolean res)
{ {
do_log (GST_CAT_PADS, do_log (GST_CAT_PADS, GST_FUNCTION, (GObject *) src,
"%" GST_TIME_FORMAT ", src=%" GST_PTR_FORMAT ", sink=%" GST_PTR_FORMAT "%" GST_TIME_FORMAT ", src=%" GST_PTR_FORMAT ", sink=%" GST_PTR_FORMAT
", res=%d", GST_TIME_ARGS (ts), src, sink, (gint) res); ", res=%d", GST_TIME_ARGS (ts), src, sink, (gint) res);
} }