tracer: gststats: add thread-id to log line

This commit is contained in:
Thiago Santos 2015-03-13 18:31:40 +00:00 committed by Stefan Sauer
parent 567865c81c
commit 0913f699e2

View file

@ -87,6 +87,7 @@ static void
log_new_element_stats (GstElementStats * stats, GstElement * element) log_new_element_stats (GstElementStats * stats, GstElement * element)
{ {
gst_tracer_log_trace (gst_structure_new ("new-element", gst_tracer_log_trace (gst_structure_new ("new-element",
"thread-id", G_TYPE_UINT, GPOINTER_TO_UINT (g_thread_self ()),
"ix", G_TYPE_UINT, stats->index, "ix", G_TYPE_UINT, stats->index,
"parent-ix", G_TYPE_UINT, stats->parent_ix, "parent-ix", G_TYPE_UINT, stats->parent_ix,
"name", G_TYPE_STRING, GST_OBJECT_NAME (element), "name", G_TYPE_STRING, GST_OBJECT_NAME (element),
@ -242,6 +243,7 @@ do_buffer_stats (GstStatsTracer * self, GstPad * this_pad,
/* TODO(ensonic): need a quark-table (shared with the tracer-front-ends?) */ /* TODO(ensonic): need a quark-table (shared with the tracer-front-ends?) */
gst_tracer_log_trace (gst_structure_new ("buffer", gst_tracer_log_trace (gst_structure_new ("buffer",
"thread-id", G_TYPE_UINT, GPOINTER_TO_UINT (g_thread_self ()),
"ts", G_TYPE_UINT64, elapsed, "ts", G_TYPE_UINT64, elapsed,
"pad-ix", G_TYPE_UINT, this_pad_stats->index, "pad-ix", G_TYPE_UINT, this_pad_stats->index,
"elem-ix", G_TYPE_UINT, this_elem_stats->index, "elem-ix", G_TYPE_UINT, this_elem_stats->index,
@ -271,6 +273,7 @@ do_query_stats (GstStatsTracer * self, GstPad * this_pad,
GstStructure *s; GstStructure *s;
s = gst_structure_new ("query", s = gst_structure_new ("query",
"thread-id", G_TYPE_UINT, GPOINTER_TO_UINT (g_thread_self ()),
"ts", G_TYPE_UINT64, elapsed, "ts", G_TYPE_UINT64, elapsed,
"pad-ix", G_TYPE_UINT, this_pad_stats->index, "pad-ix", G_TYPE_UINT, this_pad_stats->index,
"elem-ix", G_TYPE_UINT, this_elem_stats->index, "elem-ix", G_TYPE_UINT, this_elem_stats->index,
@ -456,6 +459,7 @@ do_push_event_pre (GstStatsTracer * self, guint64 ts, GstPad * pad,
elem_stats->last_ts = ts; elem_stats->last_ts = ts;
gst_tracer_log_trace (gst_structure_new ("event", gst_tracer_log_trace (gst_structure_new ("event",
"thread-id", G_TYPE_UINT, GPOINTER_TO_UINT (g_thread_self ()),
"ts", G_TYPE_UINT64, ts, "ts", G_TYPE_UINT64, ts,
"pad-ix", G_TYPE_UINT, pad_stats->index, "pad-ix", G_TYPE_UINT, pad_stats->index,
"elem-ix", G_TYPE_UINT, elem_stats->index, "elem-ix", G_TYPE_UINT, elem_stats->index,
@ -470,6 +474,7 @@ do_post_message_pre (GstStatsTracer * self, guint64 ts, GstElement * elem,
stats->last_ts = ts; stats->last_ts = ts;
gst_tracer_log_trace (gst_structure_new ("message", gst_tracer_log_trace (gst_structure_new ("message",
"thread-id", G_TYPE_UINT, GPOINTER_TO_UINT (g_thread_self ()),
"ts", G_TYPE_UINT64, ts, "ts", G_TYPE_UINT64, ts,
"elem-ix", G_TYPE_UINT, stats->index, "elem-ix", G_TYPE_UINT, stats->index,
"name", G_TYPE_STRING, GST_MESSAGE_TYPE_NAME (msg), NULL)); "name", G_TYPE_STRING, GST_MESSAGE_TYPE_NAME (msg), NULL));
@ -483,6 +488,7 @@ do_element_query_pre (GstStatsTracer * self, guint64 ts, GstElement * elem,
stats->last_ts = ts; stats->last_ts = ts;
gst_tracer_log_trace (gst_structure_new ("element-query", gst_tracer_log_trace (gst_structure_new ("element-query",
"thread-id", G_TYPE_UINT, GPOINTER_TO_UINT (g_thread_self ()),
"ts", G_TYPE_UINT64, ts, "ts", G_TYPE_UINT64, ts,
"elem-ix", G_TYPE_UINT, stats->index, "elem-ix", G_TYPE_UINT, stats->index,
"name", G_TYPE_STRING, GST_QUERY_TYPE_NAME (qry), NULL)); "name", G_TYPE_STRING, GST_QUERY_TYPE_NAME (qry), NULL));
@ -520,6 +526,9 @@ gst_stats_tracer_class_init (GstStatsTracerClass * klass)
/* announce trace formats */ /* announce trace formats */
/* *INDENT-OFF* */ /* *INDENT-OFF* */
gst_tracer_log_trace (gst_structure_new ("buffer.class", gst_tracer_log_trace (gst_structure_new ("buffer.class",
"thread-id", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"related-to", G_TYPE_STRING, "thread", /* TODO use genum */
NULL),
"pad-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "pad-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"related-to", G_TYPE_STRING, "pad", /* TODO: use genum */ "related-to", G_TYPE_STRING, "pad", /* TODO: use genum */
NULL), NULL),
@ -556,6 +565,9 @@ gst_stats_tracer_class_init (GstStatsTracerClass * klass)
/* TODO(ensonic): "buffer-flags" */ /* TODO(ensonic): "buffer-flags" */
NULL)); NULL));
gst_tracer_log_trace (gst_structure_new ("event.class", gst_tracer_log_trace (gst_structure_new ("event.class",
"thread-id", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"related-to", G_TYPE_STRING, "thread", /* TODO use genum */
NULL),
"pad-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "pad-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"related-to", G_TYPE_STRING, "pad", /* TODO: use genum */ "related-to", G_TYPE_STRING, "pad", /* TODO: use genum */
NULL), NULL),
@ -569,6 +581,9 @@ gst_stats_tracer_class_init (GstStatsTracerClass * klass)
NULL), NULL),
NULL)); NULL));
gst_tracer_log_trace (gst_structure_new ("message.class", gst_tracer_log_trace (gst_structure_new ("message.class",
"thread-id", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"related-to", G_TYPE_STRING, "thread", /* TODO use genum */
NULL),
"element-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "element-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"related-to", G_TYPE_STRING, "element", /* TODO: use genum */ "related-to", G_TYPE_STRING, "element", /* TODO: use genum */
NULL), NULL),
@ -579,6 +594,9 @@ gst_stats_tracer_class_init (GstStatsTracerClass * klass)
NULL), NULL),
NULL)); NULL));
gst_tracer_log_trace (gst_structure_new ("elementquery.class", gst_tracer_log_trace (gst_structure_new ("elementquery.class",
"thread-id", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"related-to", G_TYPE_STRING, "thread", /* TODO use genum */
NULL),
"element-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "element-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"related-to", G_TYPE_STRING, "element", /* TODO: use genum */ "related-to", G_TYPE_STRING, "element", /* TODO: use genum */
NULL), NULL),
@ -589,6 +607,9 @@ gst_stats_tracer_class_init (GstStatsTracerClass * klass)
NULL), NULL),
NULL)); NULL));
gst_tracer_log_trace (gst_structure_new ("query.class", gst_tracer_log_trace (gst_structure_new ("query.class",
"thread-id", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"related-to", G_TYPE_STRING, "thread", /* TODO use genum */
NULL),
"pad-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope", "pad-ix", GST_TYPE_STRUCTURE, gst_structure_new ("scope",
"related-to", G_TYPE_STRING, "pad", /* TODO: use genum */ "related-to", G_TYPE_STRING, "pad", /* TODO: use genum */
NULL), NULL),