@@ -13,8 +13,11 @@
#include "event-internal.h"
typedef struct TraceEventIter {
+ /* iter state */
size_t event;
size_t group;
+ /* filter conditions */
+ size_t group_id;
const char *pattern;
} TraceEventIter;
@@ -39,6 +42,16 @@ void trace_event_iter_init_all(TraceEventIter *iter);
*/
void trace_event_iter_init_pattern(TraceEventIter *iter, const char *pattern);
+/**
+ * trace_event_iter_init_group:
+ * @iter: the event iterator struct
+ * @group_id: group_id to filter events by group.
+ *
+ * Initialize the event iterator struct @iter,
+ * using @group_id to filter for events in the group.
+ */
+void trace_event_iter_init_group(TraceEventIter *iter, size_t group_id);
+
/**
* trace_event_iter_next:
* @iter: the event iterator struct
@@ -103,6 +103,7 @@ void trace_event_iter_init_all(TraceEventIter *iter)
{
iter->event = 0;
iter->group = 0;
+ iter->group_id = -1;
iter->pattern = NULL;
}
@@ -112,20 +113,32 @@ void trace_event_iter_init_pattern(TraceEventIter *iter, const char *pattern)
iter->pattern = pattern;
}
+void trace_event_iter_init_group(TraceEventIter *iter, size_t group_id)
+{
+ trace_event_iter_init_all(iter);
+ iter->group_id = group_id;
+}
+
TraceEvent *trace_event_iter_next(TraceEventIter *iter)
{
while (iter->group < nevent_groups &&
event_groups[iter->group].events[iter->event] != NULL) {
TraceEvent *ev = event_groups[iter->group].events[iter->event];
+ size_t group = iter->group;
iter->event++;
if (event_groups[iter->group].events[iter->event] == NULL) {
iter->event = 0;
iter->group++;
}
- if (!iter->pattern ||
- g_pattern_match_simple(iter->pattern, trace_event_get_name(ev))) {
- return ev;
+ if (iter->pattern &&
+ !g_pattern_match_simple(iter->pattern, trace_event_get_name(ev))) {
+ continue;
}
+ if (iter->group_id != -1 &&
+ iter->group_id != group) {
+ continue;
+ }
+ return ev;
}
return NULL;
This allows to interate over an event group. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- trace/control.h | 13 +++++++++++++ trace/control.c | 19 ++++++++++++++++--- 2 files changed, 29 insertions(+), 3 deletions(-)