Commit d2e31d7e authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo

perf trace-event-info: Rename for_each_event.

Avoid a naming conflict with for_each_event with similar code in
parse-events.c, rename to for_each_event_tps.
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lore.kernel.org/lkml/20210203052659.2975736-1-irogers@google.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 1796829d
...@@ -152,7 +152,7 @@ static bool name_in_tp_list(char *sys, struct tracepoint_path *tps) ...@@ -152,7 +152,7 @@ static bool name_in_tp_list(char *sys, struct tracepoint_path *tps)
return false; return false;
} }
#define for_each_event(dir, dent, tps) \ #define for_each_event_tps(dir, dent, tps) \
while ((dent = readdir(dir))) \ while ((dent = readdir(dir))) \
if (dent->d_type == DT_DIR && \ if (dent->d_type == DT_DIR && \
(strcmp(dent->d_name, ".")) && \ (strcmp(dent->d_name, ".")) && \
...@@ -174,7 +174,7 @@ static int copy_event_system(const char *sys, struct tracepoint_path *tps) ...@@ -174,7 +174,7 @@ static int copy_event_system(const char *sys, struct tracepoint_path *tps)
return -errno; return -errno;
} }
for_each_event(dir, dent, tps) { for_each_event_tps(dir, dent, tps) {
if (!name_in_tp_list(dent->d_name, tps)) if (!name_in_tp_list(dent->d_name, tps))
continue; continue;
...@@ -196,7 +196,7 @@ static int copy_event_system(const char *sys, struct tracepoint_path *tps) ...@@ -196,7 +196,7 @@ static int copy_event_system(const char *sys, struct tracepoint_path *tps)
} }
rewinddir(dir); rewinddir(dir);
for_each_event(dir, dent, tps) { for_each_event_tps(dir, dent, tps) {
if (!name_in_tp_list(dent->d_name, tps)) if (!name_in_tp_list(dent->d_name, tps))
continue; continue;
...@@ -274,7 +274,7 @@ static int record_event_files(struct tracepoint_path *tps) ...@@ -274,7 +274,7 @@ static int record_event_files(struct tracepoint_path *tps)
goto out; goto out;
} }
for_each_event(dir, dent, tps) { for_each_event_tps(dir, dent, tps) {
if (strcmp(dent->d_name, "ftrace") == 0 || if (strcmp(dent->d_name, "ftrace") == 0 ||
!system_in_tp_list(dent->d_name, tps)) !system_in_tp_list(dent->d_name, tps))
continue; continue;
...@@ -289,7 +289,7 @@ static int record_event_files(struct tracepoint_path *tps) ...@@ -289,7 +289,7 @@ static int record_event_files(struct tracepoint_path *tps)
} }
rewinddir(dir); rewinddir(dir);
for_each_event(dir, dent, tps) { for_each_event_tps(dir, dent, tps) {
if (strcmp(dent->d_name, "ftrace") == 0 || if (strcmp(dent->d_name, "ftrace") == 0 ||
!system_in_tp_list(dent->d_name, tps)) !system_in_tp_list(dent->d_name, tps))
continue; continue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment