Skip to contentSkip to conversation

perf list: Fix --raw-dump argument

PATCH Superseded Ramkumar Ramachandra 2 participants 3 messages Mar 27, 2014 – Apr 11, 2014 perf events

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 perf list: Fix --raw-dump argument

While adding usage information, 44d742e (perf list: Add usage, 2013-10-30) broke

  $ perf list --raw-dump

Fix this by making raw-dump a proper argument.

Cc David Ahern <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>

---
I sent this patch earlier, but it didn't get picked up due to some confusion.

 tools/perf/builtin-list.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
tools/perf/builtin-list.c +6 -2
index 011195e..2629c24 100644
@@ -19,7 +19,9 @@
 int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
 {
 	int i;
+	bool raw_dump = false;
 	const struct option list_options[] = {
+		OPT_BOOLEAN(0, "raw-dump", &raw_dump, "raw dump for completion"),
 		OPT_END()
 	};
 	const char * const list_usage[] = {
@@ -32,6 +34,10 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
 
 	setup_pager();
 
+	if (raw_dump) {
+		print_events(NULL, true);
+		return 0;
+	}
 	if (argc == 0) {
 		print_events(NULL, false);
 		return 0;
@@ -53,8 +59,6 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
 			print_hwcache_events(NULL, false);
 		else if (strcmp(argv[i], "pmu") == 0)
 			print_pmu_events(NULL, false);
-		else if (strcmp(argv[i], "--raw-dump") == 0)
-			print_events(NULL, true);
 		else {
 			char *sep = strchr(argv[i], ':'), *s;
 			int sep_idx;
Signature · 1 line
1.9.0.431.g014438b
#1 lore raw
Quoted 55 lines · Ramkumar Ramachandra

While adding usage information, 44d742e (perf list: Add usage, 2013-10-30) broke

  $ perf list --raw-dump

Fix this by making raw-dump a proper argument.

Cc David Ahern <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>

---
I sent this patch earlier, but it didn't get picked up due to some confusion.

 tools/perf/builtin-list.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
tools/perf/builtin-list.c +6 -2
index 011195e..2629c24 100644
@@ -19,7 +19,9 @@
 int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
 {
 	int i;
+	bool raw_dump = false;
 	const struct option list_options[] = {
+		OPT_BOOLEAN(0, "raw-dump", &raw_dump, "raw dump for completion"),
 		OPT_END()
 	};
 	const char * const list_usage[] = {
@@ -32,6 +34,10 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
 
 	setup_pager();
 
+	if (raw_dump) {
+		print_events(NULL, true);
+		return 0;
+	}
 	if (argc == 0) {
 		print_events(NULL, false);
 		return 0;
@@ -53,8 +59,6 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
 			print_hwcache_events(NULL, false);
 		else if (strcmp(argv[i], "pmu") == 0)
 			print_pmu_events(NULL, false);
-		else if (strcmp(argv[i], "--raw-dump") == 0)
-			print_events(NULL, true);
 		else {
 			char *sep = strchr(argv[i], ':'), *s;
 			int sep_idx;
Signature · 1 line
1.9.0.431.g014438b

hi,
I understand you're just fixing a bug, but if it's an --raw-dump option (not command) shoudn't we use it for all commands? like:

  $ perf list --raw-dump      # all events via raw dump
  $ perf list --raw-dump pmu  # pmu event via raw dump
  ...

Please check attached change to your patch below (not completely working/tested).

Also.. the option is not mentioned in the man page (please do ;-)), but looks like the usage is for bash completion only, so we probably need only the first example functionality above.

If this is the case I think it should not be an option but another command like 'raw-dump'.

thanks,
jirka

---

tools/perf/builtin-list.c +6 -10
index 2629c24..a3b2da8 100644
@@ -34,12 +34,8 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
 
 	setup_pager();
 
-	if (raw_dump) {
-		print_events(NULL, true);
-		return 0;
-	}
 	if (argc == 0) {
-		print_events(NULL, false);
+		print_events(NULL, raw_dump);
 		return 0;
 	}
 
@@ -47,7 +43,7 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
 		if (i)
 			putchar('\n');
 		if (strncmp(argv[i], "tracepoint", 10) == 0)
-			print_tracepoint_events(NULL, NULL, false);
+			print_tracepoint_events(NULL, NULL, raw_dump);
 		else if (strcmp(argv[i], "hw") == 0 ||
 			 strcmp(argv[i], "hardware") == 0)
 			print_events_type(PERF_TYPE_HARDWARE);
@@ -56,15 +52,15 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
 			print_events_type(PERF_TYPE_SOFTWARE);
 		else if (strcmp(argv[i], "cache") == 0 ||
 			 strcmp(argv[i], "hwcache") == 0)
-			print_hwcache_events(NULL, false);
+			print_hwcache_events(NULL, raw_dump);
 		else if (strcmp(argv[i], "pmu") == 0)
-			print_pmu_events(NULL, false);
+			print_pmu_events(NULL, raw_dump);
 		else {
 			char *sep = strchr(argv[i], ':'), *s;
 			int sep_idx;
 
 			if (sep == NULL) {
-				print_events(argv[i], false);
+				print_events(argv[i], raw_dump);
 				continue;
 			}
 			sep_idx = sep - argv[i];
@@ -73,7 +69,7 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
 				return -1;
 
 			s[sep_idx] = '\0';
-			print_tracepoint_events(s, s + sep_idx + 1, false);
+			print_tracepoint_events(s, s + sep_idx + 1, raw_dump);
 			free(s);
 		}
 	}
#2 lore raw
Quoted 5 lines · Jiri Olsa

but looks like the usage is for bash completion only, so we probably need only the first example functionality above.

If this is the case I think it should not be an option but another command like 'raw-dump'.

I decided that there's no point making it an option, so I've sent you a patch making it a subcommand instead.

Thanks.