diff mbox series

libtracefs: Fix tracefs_iterate_raw_events() to handle NULL callback

Message ID 20221116115720.6badba48@gandalf.local.home (mailing list archive)
State Accepted
Commit 7a29f6caac2d30ed1887567c948e8f75c9091425
Headers show
Series libtracefs: Fix tracefs_iterate_raw_events() to handle NULL callback | expand

Commit Message

Steven Rostedt Nov. 16, 2022, 4:57 p.m. UTC 
From: "Steven Rostedt (Google)" <rostedt@goodmis.org>

Now that tracefs_follow_event() and tracefs_follow_missed_events() exists,
it is no longer necessary to pass in a callback to
tracefs_iterate_raw_events(). Do not fail that function if callback is
NULL and there exists followers.

Fixes: 8da05d9697ab ("libtracefs: Add tracefs_follow_event() API")
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
 src/tracefs-events.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/src/tracefs-events.c b/src/tracefs-events.c
index daa81c07ecb5..c2adf415342e 100644
--- a/src/tracefs-events.c
+++ b/src/tracefs-events.c
@@ -266,7 +266,8 @@  static int read_cpu_pages(struct tep_handle *tep, struct tracefs_instance *insta
 		if (j < count) {
 			if (call_followers(instance, cpus[j].event, &cpus[j].record, cpus[j].cpu))
 				break;
-			if (callback(cpus[j].event, &cpus[j].record, cpus[j].cpu, callback_context))
+			if (callback &&
+			    callback(cpus[j].event, &cpus[j].record, cpus[j].cpu, callback_context))
 				break;
 			cpus[j].event = NULL;
 			read_next_record(tep, cpus + j);
@@ -420,6 +421,7 @@  int tracefs_iterate_raw_events(struct tep_handle *tep,
 {
 	bool *keep_going = instance ? &instance->iterate_keep_going :
 				      &top_iterate_keep_going;
+	struct follow_event *followers;
 	struct cpu_iterate *all_cpus;
 	int count = 0;
 	int ret;
@@ -427,7 +429,14 @@  int tracefs_iterate_raw_events(struct tep_handle *tep,
 
 	(*(volatile bool *)keep_going) = true;
 
-	if (!tep || !callback)
+	if (!tep)
+		return -1;
+
+	if (instance)
+		followers = instance->followers;
+	else
+		followers = root_followers;
+	if (!callback && !followers)
 		return -1;
 
 	ret = open_cpu_files(instance, cpus, cpu_size, &all_cpus, &count);