[PATCH] perf tools: Create for_each_event{_system, _file} macros for tracepoints iteration

public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed

* [PATCH] perf tools: Create for_each_event{_system, _file} macros for tracepoints iteration
@ 2017-01-30  8:35 Taeung Song
  2017-01-30  9:08 ` Jiri Olsa
  0 siblings, 1 reply; 5+ messages in thread
From: Taeung Song @ 2017-01-30  8:35 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: linux-kernel, Jiri Olsa, Namhyung Kim, Ingo Molnar,
	Peter Zijlstra, Wang Nan, Taeung Song, Steven Rostedt,
	Frederic Weisbecker

Such as for_each_subsystem and for_each_event in util/parse-events.c,
add new macros 'for_each_event_system' and 'for_each_event_file'
for easy iteration over the tracepoints
in order to be more compact and readable.

Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
---
 tools/perf/util/trace-event-info.c | 45 ++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/tools/perf/util/trace-event-info.c b/tools/perf/util/trace-event-info.c
index ceb0e27..27beaff 100644
--- a/tools/perf/util/trace-event-info.c
+++ b/tools/perf/util/trace-event-info.c
@@ -170,6 +170,13 @@ static bool name_in_tp_list(char *sys, struct tracepoint_path *tps)
 	return false;
 }
 
+#define for_each_event_system(dir, dent, tps)			\
+	while ((dent = readdir(dir)))				\
+		if (dent->d_type == DT_DIR &&			\
+		    (strcmp(dent->d_name, ".")) &&		\
+		    (strcmp(dent->d_name, "..")) &&		\
+		    (name_in_tp_list(dent->d_name, tps)))
+
 static int copy_event_system(const char *sys, struct tracepoint_path *tps)
 {
 	struct dirent *dent;
@@ -186,12 +193,7 @@ static int copy_event_system(const char *sys, struct tracepoint_path *tps)
 		return -errno;
 	}
 
-	while ((dent = readdir(dir))) {
-		if (dent->d_type != DT_DIR ||
-		    strcmp(dent->d_name, ".") == 0 ||
-		    strcmp(dent->d_name, "..") == 0 ||
-		    !name_in_tp_list(dent->d_name, tps))
-			continue;
+	for_each_event_system(dir, dent, tps) {
 		if (asprintf(&format, "%s/%s/format", sys, dent->d_name) < 0) {
 			err = -ENOMEM;
 			goto out;
@@ -210,12 +212,7 @@ static int copy_event_system(const char *sys, struct tracepoint_path *tps)
 	}
 
 	rewinddir(dir);
-	while ((dent = readdir(dir))) {
-		if (dent->d_type != DT_DIR ||
-		    strcmp(dent->d_name, ".") == 0 ||
-		    strcmp(dent->d_name, "..") == 0 ||
-		    !name_in_tp_list(dent->d_name, tps))
-			continue;
+	for_each_event_system(dir, dent, tps) {
 		if (asprintf(&format, "%s/%s/format", sys, dent->d_name) < 0) {
 			err = -ENOMEM;
 			goto out;
@@ -266,6 +263,14 @@ static bool system_in_tp_list(char *sys, struct tracepoint_path *tps)
 	return false;
 }
 
+#define for_each_event_file(dir, dent, tps)			\
+	while ((dent = readdir(dir)))				\
+		if (dent->d_type == DT_DIR &&			\
+		    (strcmp(dent->d_name, ".")) &&		\
+		    (strcmp(dent->d_name, "..")) &&		\
+		    (strcmp(dent->d_name, "ftrace")) &&		\
+		    (system_in_tp_list(dent->d_name, tps)))
+
 static int record_event_files(struct tracepoint_path *tps)
 {
 	struct dirent *dent;
@@ -290,13 +295,7 @@ static int record_event_files(struct tracepoint_path *tps)
 		goto out;
 	}
 
-	while ((dent = readdir(dir))) {
-		if (dent->d_type != DT_DIR ||
-		    strcmp(dent->d_name, ".") == 0 ||
-		    strcmp(dent->d_name, "..") == 0 ||
-		    strcmp(dent->d_name, "ftrace") == 0 ||
-		    !system_in_tp_list(dent->d_name, tps))
-			continue;
+	for_each_event_file(dir, dent, tps) {
 		count++;
 	}
 
@@ -307,13 +306,7 @@ static int record_event_files(struct tracepoint_path *tps)
 	}
 
 	rewinddir(dir);
-	while ((dent = readdir(dir))) {
-		if (dent->d_type != DT_DIR ||
-		    strcmp(dent->d_name, ".") == 0 ||
-		    strcmp(dent->d_name, "..") == 0 ||
-		    strcmp(dent->d_name, "ftrace") == 0 ||
-		    !system_in_tp_list(dent->d_name, tps))
-			continue;
+	for_each_event_file(dir, dent, tps) {
 		if (asprintf(&sys, "%s/%s", path, dent->d_name) < 0) {
 			err = -ENOMEM;
 			goto out;
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] perf tools: Create for_each_event{_system, _file} macros for tracepoints iteration
  2017-01-30  8:35 [PATCH] perf tools: Create for_each_event{_system, _file} macros for tracepoints iteration Taeung Song
@ 2017-01-30  9:08 ` Jiri Olsa
  2017-01-30 10:32   ` Taeung Song
  0 siblings, 1 reply; 5+ messages in thread
From: Jiri Olsa @ 2017-01-30  9:08 UTC (permalink / raw)
  To: Taeung Song
  Cc: Arnaldo Carvalho de Melo, linux-kernel, Jiri Olsa, Namhyung Kim,
	Ingo Molnar, Peter Zijlstra, Wang Nan, Steven Rostedt,
	Frederic Weisbecker

On Mon, Jan 30, 2017 at 05:35:28PM +0900, Taeung Song wrote:

SNIP

> +#define for_each_event_system(dir, dent, tps)			\
> +	while ((dent = readdir(dir)))				\
> +		if (dent->d_type == DT_DIR &&			\
> +		    (strcmp(dent->d_name, ".")) &&		\
> +		    (strcmp(dent->d_name, "..")) &&		\
> +		    (name_in_tp_list(dent->d_name, tps)))
> +
>  static int copy_event_system(const char *sys, struct tracepoint_path *tps)
>  {
>  	struct dirent *dent;
> @@ -186,12 +193,7 @@ static int copy_event_system(const char *sys, struct tracepoint_path *tps)
>  		return -errno;
>  	}
>  
> -	while ((dent = readdir(dir))) {
> -		if (dent->d_type != DT_DIR ||
> -		    strcmp(dent->d_name, ".") == 0 ||
> -		    strcmp(dent->d_name, "..") == 0 ||
> -		    !name_in_tp_list(dent->d_name, tps))
> -			continue;
> +	for_each_event_system(dir, dent, tps) {
>  		if (asprintf(&format, "%s/%s/format", sys, dent->d_name) < 0) {
>  			err = -ENOMEM;
>  			goto out;
> @@ -210,12 +212,7 @@ static int copy_event_system(const char *sys, struct tracepoint_path *tps)
>  	}
>  
>  	rewinddir(dir);
> -	while ((dent = readdir(dir))) {
> -		if (dent->d_type != DT_DIR ||
> -		    strcmp(dent->d_name, ".") == 0 ||
> -		    strcmp(dent->d_name, "..") == 0 ||
> -		    !name_in_tp_list(dent->d_name, tps))
> -			continue;
> +	for_each_event_system(dir, dent, tps) {
>  		if (asprintf(&format, "%s/%s/format", sys, dent->d_name) < 0) {
>  			err = -ENOMEM;
>  			goto out;
> @@ -266,6 +263,14 @@ static bool system_in_tp_list(char *sys, struct tracepoint_path *tps)
>  	return false;
>  }
>  
> +#define for_each_event_file(dir, dent, tps)			\
> +	while ((dent = readdir(dir)))				\
> +		if (dent->d_type == DT_DIR &&			\
> +		    (strcmp(dent->d_name, ".")) &&		\
> +		    (strcmp(dent->d_name, "..")) &&		\
> +		    (strcmp(dent->d_name, "ftrace")) &&		\
> +		    (system_in_tp_list(dent->d_name, tps)))

looks almost the same as for_each_event_system macro,
what's the difference other than 'ftrace' check?
also why's one 'file' and the other 'system'? looks
like we coud have just one macro in here

jirka

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] perf tools: Create for_each_event{_system, _file} macros for tracepoints iteration
  2017-01-30  9:08 ` Jiri Olsa
@ 2017-01-30 10:32   ` Taeung Song
  2017-01-30 12:38     ` Jiri Olsa
  0 siblings, 1 reply; 5+ messages in thread
From: Taeung Song @ 2017-01-30 10:32 UTC (permalink / raw)
  To: Jiri Olsa
  Cc: Arnaldo Carvalho de Melo, linux-kernel, Jiri Olsa, Namhyung Kim,
	Ingo Molnar, Peter Zijlstra, Wang Nan, Steven Rostedt,
	Frederic Weisbecker



On 01/30/2017 06:08 PM, Jiri Olsa wrote:
> On Mon, Jan 30, 2017 at 05:35:28PM +0900, Taeung Song wrote:
>
> SNIP
>
>> +#define for_each_event_system(dir, dent, tps)			\
>> +	while ((dent = readdir(dir)))				\
>> +		if (dent->d_type == DT_DIR &&			\
>> +		    (strcmp(dent->d_name, ".")) &&		\
>> +		    (strcmp(dent->d_name, "..")) &&		\
>> +		    (name_in_tp_list(dent->d_name, tps)))
>> +
>>  static int copy_event_system(const char *sys, struct tracepoint_path *tps)
>>  {
>>  	struct dirent *dent;
>> @@ -186,12 +193,7 @@ static int copy_event_system(const char *sys, struct tracepoint_path *tps)
>>  		return -errno;
>>  	}
>>
>> -	while ((dent = readdir(dir))) {
>> -		if (dent->d_type != DT_DIR ||
>> -		    strcmp(dent->d_name, ".") == 0 ||
>> -		    strcmp(dent->d_name, "..") == 0 ||
>> -		    !name_in_tp_list(dent->d_name, tps))
>> -			continue;
>> +	for_each_event_system(dir, dent, tps) {
>>  		if (asprintf(&format, "%s/%s/format", sys, dent->d_name) < 0) {
>>  			err = -ENOMEM;
>>  			goto out;
>> @@ -210,12 +212,7 @@ static int copy_event_system(const char *sys, struct tracepoint_path *tps)
>>  	}
>>
>>  	rewinddir(dir);
>> -	while ((dent = readdir(dir))) {
>> -		if (dent->d_type != DT_DIR ||
>> -		    strcmp(dent->d_name, ".") == 0 ||
>> -		    strcmp(dent->d_name, "..") == 0 ||
>> -		    !name_in_tp_list(dent->d_name, tps))
>> -			continue;
>> +	for_each_event_system(dir, dent, tps) {
>>  		if (asprintf(&format, "%s/%s/format", sys, dent->d_name) < 0) {
>>  			err = -ENOMEM;
>>  			goto out;
>> @@ -266,6 +263,14 @@ static bool system_in_tp_list(char *sys, struct tracepoint_path *tps)
>>  	return false;
>>  }
>>
>> +#define for_each_event_file(dir, dent, tps)			\
>> +	while ((dent = readdir(dir)))				\
>> +		if (dent->d_type == DT_DIR &&			\
>> +		    (strcmp(dent->d_name, ".")) &&		\
>> +		    (strcmp(dent->d_name, "..")) &&		\
>> +		    (strcmp(dent->d_name, "ftrace")) &&		\
>> +		    (system_in_tp_list(dent->d_name, tps)))
>
> looks almost the same as for_each_event_system macro,
> what's the difference other than 'ftrace' check?

Little thing.
In parse-events.c for_each_event macro contains
tp_event_has_id() function But this function isn't used in 
util/trace-event-info.c

> also why's one 'file' and the other 'system'? looks

Just, I follow the name of each function that use the macros..

> like we coud have just one macro in here
>

I understood. :)
How about this ?

diff --git a/tools/perf/util/trace-event-info.c 
b/tools/perf/util/trace-event-info.c
index ceb0e27..fb6d95d 100644
--- a/tools/perf/util/trace-event-info.c
+++ b/tools/perf/util/trace-event-info.c
@@ -170,6 +170,12 @@ static bool name_in_tp_list(char *sys, struct 
tracepoint_path *tps)
          return false;
  }

+#define for_each_event(dir, dent, tps)                          \
+        while ((dent = readdir(dir)))                           \
+                if (dent->d_type == DT_DIR &&                   \
+                    (strcmp(dent->d_name, ".")) &&              \
+                    (strcmp(dent->d_name, "..")))               \
+
  static int copy_event_system(const char *sys, struct tracepoint_path *tps)
  {
          struct dirent *dent;
@@ -186,12 +192,10 @@ static int copy_event_system(const char *sys, 
struct tracepoint_path *tps)
                  return -errno;
          }

-        while ((dent = readdir(dir))) {
-                if (dent->d_type != DT_DIR ||
-                    strcmp(dent->d_name, ".") == 0 ||
-                    strcmp(dent->d_name, "..") == 0 ||
-                    !name_in_tp_list(dent->d_name, tps))
+        for_each_event(dir, dent, tps) {
+                if (!name_in_tp_list(dent->d_name, tps))
                          continue;
+
                  if (asprintf(&format, "%s/%s/format", sys, 
dent->d_name) < 0) {
                          err = -ENOMEM;
                          goto out;
@@ -210,12 +214,10 @@ static int copy_event_system(const char *sys, 
struct tracepoint_path *tps)
          }

          rewinddir(dir);
-        while ((dent = readdir(dir))) {
-                if (dent->d_type != DT_DIR ||
-                    strcmp(dent->d_name, ".") == 0 ||
-                    strcmp(dent->d_name, "..") == 0 ||
-                    !name_in_tp_list(dent->d_name, tps))
+        for_each_event(dir, dent, tps) {
+                if (!name_in_tp_list(dent->d_name, tps))
                          continue;
+
                  if (asprintf(&format, "%s/%s/format", sys, 
dent->d_name) < 0) {
                          err = -ENOMEM;
                          goto out;
@@ -290,13 +292,11 @@ static int record_event_files(struct 
tracepoint_path *tps)
                  goto out;
          }

-        while ((dent = readdir(dir))) {
-                if (dent->d_type != DT_DIR ||
-                    strcmp(dent->d_name, ".") == 0 ||
-                    strcmp(dent->d_name, "..") == 0 ||
-                    strcmp(dent->d_name, "ftrace") == 0 ||
+        for_each_event(dir, dent, tps) {
+                if (!strcmp(dent->d_name, "ftrace") ||
                      !system_in_tp_list(dent->d_name, tps))
                          continue;
+
                  count++;
          }

@@ -307,13 +307,11 @@ static int record_event_files(struct 
tracepoint_path *tps)
          }

          rewinddir(dir);
-        while ((dent = readdir(dir))) {
-                if (dent->d_type != DT_DIR ||
-                    strcmp(dent->d_name, ".") == 0 ||
-                    strcmp(dent->d_name, "..") == 0 ||
-                    strcmp(dent->d_name, "ftrace") == 0 ||
+        for_each_event(dir, dent, tps) {
+                if (!strcmp(dent->d_name, "ftrace") ||
                      !system_in_tp_list(dent->d_name, tps))
                          continue;
+
                  if (asprintf(&sys, "%s/%s", path, dent->d_name) < 0) {
                          err = -ENOMEM;
                          goto out;

Thanks,
Taeung

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] perf tools: Create for_each_event{_system, _file} macros for tracepoints iteration
  2017-01-30 10:32   ` Taeung Song
@ 2017-01-30 12:38     ` Jiri Olsa
  2017-01-31  2:37       ` Taeung Song
  0 siblings, 1 reply; 5+ messages in thread
From: Jiri Olsa @ 2017-01-30 12:38 UTC (permalink / raw)
  To: Taeung Song
  Cc: Arnaldo Carvalho de Melo, linux-kernel, Jiri Olsa, Namhyung Kim,
	Ingo Molnar, Peter Zijlstra, Wang Nan, Steven Rostedt,
	Frederic Weisbecker

On Mon, Jan 30, 2017 at 07:32:03PM +0900, Taeung Song wrote:

SNIP

> > looks almost the same as for_each_event_system macro,
> > what's the difference other than 'ftrace' check?
> 
> Little thing.
> In parse-events.c for_each_event macro contains
> tp_event_has_id() function But this function isn't used in
> util/trace-event-info.c
> 
> > also why's one 'file' and the other 'system'? looks
> 
> Just, I follow the name of each function that use the macros..
> 
> > like we coud have just one macro in here
> > 
> 
> I understood. :)
> How about this ?


looks ok, but can't apply it.. it's probably mangled

jirka

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] perf tools: Create for_each_event{_system, _file} macros for tracepoints iteration
  2017-01-30 12:38     ` Jiri Olsa
@ 2017-01-31  2:37       ` Taeung Song
  0 siblings, 0 replies; 5+ messages in thread
From: Taeung Song @ 2017-01-31  2:37 UTC (permalink / raw)
  To: Jiri Olsa
  Cc: Arnaldo Carvalho de Melo, linux-kernel, Jiri Olsa, Namhyung Kim,
	Ingo Molnar, Peter Zijlstra, Wang Nan, Steven Rostedt,
	Frederic Weisbecker



On 01/30/2017 09:38 PM, Jiri Olsa wrote:
> On Mon, Jan 30, 2017 at 07:32:03PM +0900, Taeung Song wrote:
>
> SNIP
>
>>> looks almost the same as for_each_event_system macro,
>>> what's the difference other than 'ftrace' check?
>>
>> Little thing.
>> In parse-events.c for_each_event macro contains
>> tp_event_has_id() function But this function isn't used in
>> util/trace-event-info.c
>>
>>> also why's one 'file' and the other 'system'? looks
>>
>> Just, I follow the name of each function that use the macros..
>>
>>> like we coud have just one macro in here
>>>
>>
>> I understood. :)
>> How about this ?
>
>
> looks ok, but can't apply it.. it's probably mangled
>

I got it.
I'll resend this changed patch!

Thanks,
Taeung

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2017-01-31  2:46 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-30  8:35 [PATCH] perf tools: Create for_each_event{_system, _file} macros for tracepoints iteration Taeung Song
2017-01-30  9:08 ` Jiri Olsa
2017-01-30 10:32   ` Taeung Song
2017-01-30 12:38     ` Jiri Olsa
2017-01-31  2:37       ` Taeung Song

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox