/* first and last activity on the pad, expected next_ts */
GstClockTime first_ts, last_ts, next_ts;
/* in which thread does it operate */
- guint thread_id;
+ gpointer thread_id;
/* hierarchy */
guint parent_ix;
} GstPadStats;
static inline GstElementStats *
get_element_stats (guint ix)
{
- return (ix != G_MAXUINT) ? g_ptr_array_index (elements, ix) : NULL;
+ return (ix != G_MAXUINT && ix < elements->len) ?
+ g_ptr_array_index (elements, ix) : NULL;
}
static inline GstPadStats *
get_pad_stats (guint ix)
{
- return (ix != G_MAXUINT) ? g_ptr_array_index (pads, ix) : NULL;
+ return (ix != G_MAXUINT && ix < pads->len) ?
+ g_ptr_array_index (pads, ix) : NULL;
}
static void
}
static inline GstThreadStats *
-get_thread_stats (guint id)
+get_thread_stats (gpointer id)
{
- GstThreadStats *stats = g_hash_table_lookup (threads, GUINT_TO_POINTER (id));
+ GstThreadStats *stats = g_hash_table_lookup (threads, id);
if (G_UNLIKELY (!stats)) {
stats = g_slice_new0 (GstThreadStats);
stats->tthread = GST_CLOCK_TIME_NONE;
- g_hash_table_insert (threads, GUINT_TO_POINTER (id), stats);
+ g_hash_table_insert (threads, id, stats);
}
return stats;
}
gchar *type, *name;
gboolean is_ghost_pad;
GstPadDirection dir;
- guint thread_id;
+ guint64 thread_id;
gst_structure_get (s,
"ix", G_TYPE_UINT, &ix,
"type", G_TYPE_STRING, &type,
"is-ghostpad", G_TYPE_BOOLEAN, &is_ghost_pad,
"pad-direction", GST_TYPE_PAD_DIRECTION, &dir,
- "thread-id", G_TYPE_UINT, &thread_id, NULL);
+ "thread-id", G_TYPE_UINT64, &thread_id, NULL);
stats = g_slice_new0 (GstPadStats);
if (is_ghost_pad)
stats->dir = dir;
stats->min_size = G_MAXUINT;
stats->first_ts = stats->last_ts = stats->next_ts = GST_CLOCK_TIME_NONE;
- stats->thread_id = thread_id;
+ stats->thread_id = (gpointer) (guintptr) thread_id;
stats->parent_ix = parent_ix;
if (pads->len <= ix)
static void
do_buffer_stats (GstStructure * s)
{
- guint64 ts, buffer_ts, buffer_dur;
+ guint64 ts;
+ guint64 buffer_pts = GST_CLOCK_TIME_NONE, buffer_dur = GST_CLOCK_TIME_NONE;
guint pad_ix, elem_ix, peer_elem_ix;
guint size;
GstBufferFlags buffer_flags;
num_buffers++;
gst_structure_get (s, "ts", G_TYPE_UINT64, &ts,
"pad-ix", G_TYPE_UINT, &pad_ix,
- "elem-ix", G_TYPE_UINT, &elem_ix,
- "peer-elem-ix", G_TYPE_UINT, &peer_elem_ix,
+ "element-ix", G_TYPE_UINT, &elem_ix,
+ "peer-element-ix", G_TYPE_UINT, &peer_elem_ix,
"buffer-size", G_TYPE_UINT, &size,
- "buffer-ts", G_TYPE_UINT64, &buffer_ts,
- "buffer-duration", G_TYPE_UINT64, &buffer_dur,
"buffer-flags", GST_TYPE_BUFFER_FLAGS, &buffer_flags, NULL);
+ gst_structure_get_uint64 (s, "buffer-pts", &buffer_pts);
+ gst_structure_get_uint64 (s, "buffer-duration", &buffer_dur);
last_ts = MAX (last_ts, ts);
if (!(pad_stats = get_pad_stats (pad_ix))) {
GST_WARNING ("no pad stats found for ix=%u", pad_ix);
GST_WARNING ("no element stats found for ix=%u", peer_elem_ix);
return;
}
- do_pad_stats (pad_stats, elem_ix, size, ts, buffer_ts, buffer_dur,
+ do_pad_stats (pad_stats, elem_ix, size, ts, buffer_pts, buffer_dur,
buffer_flags);
if (pad_stats->dir == GST_PAD_SRC) {
/* push */
num_events++;
gst_structure_get (s, "ts", G_TYPE_UINT64, &ts,
- "pad-ix", G_TYPE_UINT, &pad_ix, "elem-ix", G_TYPE_UINT, &elem_ix, NULL);
+ "pad-ix", G_TYPE_UINT, &pad_ix, "element-ix", G_TYPE_UINT, &elem_ix,
+ NULL);
last_ts = MAX (last_ts, ts);
if (!(pad_stats = get_pad_stats (pad_ix))) {
GST_WARNING ("no pad stats found for ix=%u", pad_ix);
num_messages++;
gst_structure_get (s, "ts", G_TYPE_UINT64, &ts,
- "elem-ix", G_TYPE_UINT, &elem_ix, NULL);
+ "element-ix", G_TYPE_UINT, &elem_ix, NULL);
last_ts = MAX (last_ts, ts);
if (!(elem_stats = get_element_stats (elem_ix))) {
GST_WARNING ("no element stats found for ix=%u", elem_ix);
num_queries++;
gst_structure_get (s, "ts", G_TYPE_UINT64, &ts,
- "elem-ix", G_TYPE_UINT, &elem_ix, NULL);
+ "element-ix", G_TYPE_UINT, &elem_ix, NULL);
last_ts = MAX (last_ts, ts);
if (!(elem_stats = get_element_stats (elem_ix))) {
GST_WARNING ("no element stats found for ix=%u", elem_ix);
static void
do_thread_rusage_stats (GstStructure * s)
{
- guint64 ts, tthread;
- guint thread_id, cpuload;
+ guint64 ts, tthread, thread_id;
+ guint cpuload;
GstThreadStats *thread_stats;
gst_structure_get (s, "ts", G_TYPE_UINT64, &ts,
- "thread-id", G_TYPE_UINT, &thread_id,
+ "thread-id", G_TYPE_UINT64, &thread_id,
"average-cpuload", G_TYPE_UINT, &cpuload, "time", G_TYPE_UINT64, &tthread,
NULL);
- thread_stats = get_thread_stats (thread_id);
+ thread_stats = get_thread_stats ((gpointer) (guintptr) thread_id);
thread_stats->cpuload = cpuload;
thread_stats->tthread = tthread;
last_ts = MAX (last_ts, ts);
{
const GstPadStats *stats = (const GstPadStats *) value;
- if ((stats->thread_id == GPOINTER_TO_UINT (user_data)) &&
- (stats->num_buffers)) {
+ if ((stats->thread_id == user_data) && (stats->num_buffers)) {
return 0;
}
return 1;
{
GstPadStats *stats = (GstPadStats *) value;
- if (stats->thread_id == GPOINTER_TO_UINT (user_data)) {
+ if (stats->thread_id == user_data) {
/* there seem to be some temporary pads */
if (stats->num_buffers) {
GstClockTimeDiff running =
/* 5: category */
"([a-zA-Z_-]+) +"
/* 6: file:line:func: */
- "([^:]+:[0-9]+:[^:]+:)"
+ "([^:]*:[0-9]+:[^:]*:) +"
/* 7: (obj)? log-text */
"(.*)$", 0, 0, NULL);
if (!raw_log) {
/* 1: ts */
"^([0-9:.]+) +"
/* 2: pid */
- "\\\e\\\[[0-9;]+m *([0-9]+)\\\e\\\[00m +"
+ "\\\x1b\\[[0-9;]+m *([0-9]+)\\\x1b\\[00m +"
/* 3: thread */
"(0x[0-9a-fA-F]+) +"
/* 4: level */
- "(?:\\\e\\\[[0-9;]+m)?([A-Z]+) +\\\e\\\[00m +"
+ "(?:\\\x1b\\[[0-9;]+m)?([A-Z]+) +\\\x1b\\[00m +"
/* 5: category */
- "\\\e\\\[[0-9;]+m +([a-zA-Z_-]+) +"
+ "\\\x1b\\[[0-9;]+m +([a-zA-Z_-]+) +"
/* 6: file:line:func: */
- "([^:]+:[0-9]+:[^:]+:)(?:\\\e\\\[00m)?"
+ "([^:]*:[0-9]+:[^:]*:)(?:\\\x1b\\[00m)? +"
/* 7: (obj)? log-text */
"(.*)$", 0, 0, NULL);
if (!raw_log) {
}
}
}
- fclose (log);
} else {
GST_WARNING ("empty log");
}
+ fclose (log);
}
}