change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/tools/perf/builtin-list.c
..
..
@@ -10,14 +10,13 @@
10
10
  */
11
11
 #include "builtin.h"
12
12
 
13
-#include "perf.h"
14
-
15
13
 #include "util/parse-events.h"
16
-#include "util/cache.h"
17
14
 #include "util/pmu.h"
18
15
 #include "util/debug.h"
19
16
 #include "util/metricgroup.h"
17
+#include <subcmd/pager.h>
20
18
 #include <subcmd/parse-options.h>
19
+#include <stdio.h>
21
20
 
22
21
 static bool desc_flag = true;
23
22
 static bool details_flag;
..
..
@@ -27,6 +26,7 @@
27
26
 	int i;
28
27
 	bool raw_dump = false;
29
28
 	bool long_desc_flag = false;
29
+	bool deprecated = false;
30
30
 	struct option list_options[] = {
31
31
 		OPT_BOOLEAN(0, "raw-dump", &raw_dump, "Dump raw events"),
32
32
 		OPT_BOOLEAN('d', "desc", &desc_flag,
..
..
@@ -35,12 +35,14 @@
35
35
 			    "Print longer event descriptions."),
36
36
 		OPT_BOOLEAN(0, "details", &details_flag,
37
37
 			    "Print information on the perf event names and expressions used internally by events."),
38
+		OPT_BOOLEAN(0, "deprecated", &deprecated,
39
+			    "Print deprecated events."),
38
40
 		OPT_INCR(0, "debug", &verbose,
39
41
 			     "Enable debugging output"),
40
42
 		OPT_END()
41
43
 	};
42
44
 	const char * const list_usage[] = {
43
-		"perf list [<options>] [hw|sw|cache|tracepoint|pmu|sdt|event_glob]",
45
+		"perf list [<options>] [hw|sw|cache|tracepoint|pmu|sdt|metric|metricgroup|event_glob]",
44
46
 		NULL
45
47
 	};
46
48
 
..
..
@@ -56,7 +58,7 @@
56
58
 
57
59
 	if (argc == 0) {
58
60
 		print_events(NULL, raw_dump, !desc_flag, long_desc_flag,
59
-				details_flag);
61
+				details_flag, deprecated);
60
62
 		return 0;
61
63
 	}
62
64
 
..
..
@@ -70,30 +72,26 @@
70
72
 			print_symbol_events(NULL, PERF_TYPE_HARDWARE,
71
73
 					event_symbols_hw, PERF_COUNT_HW_MAX, raw_dump);
72
74
 		else if (strcmp(argv[i], "sw") == 0 ||
73
-			 strcmp(argv[i], "software") == 0)
75
+			 strcmp(argv[i], "software") == 0) {
74
76
 			print_symbol_events(NULL, PERF_TYPE_SOFTWARE,
75
77
 					event_symbols_sw, PERF_COUNT_SW_MAX, raw_dump);
76
-		else if (strcmp(argv[i], "cache") == 0 ||
78
+			print_tool_events(NULL, raw_dump);
79
+		} else if (strcmp(argv[i], "cache") == 0 ||
77
80
 			 strcmp(argv[i], "hwcache") == 0)
78
81
 			print_hwcache_events(NULL, raw_dump);
79
82
 		else if (strcmp(argv[i], "pmu") == 0)
80
83
 			print_pmu_events(NULL, raw_dump, !desc_flag,
81
-						long_desc_flag, details_flag);
84
+						long_desc_flag, details_flag,
85
+						deprecated);
82
86
 		else if (strcmp(argv[i], "sdt") == 0)
83
87
 			print_sdt_events(NULL, NULL, raw_dump);
84
-		else if (strcmp(argv[i], "metric") == 0)
85
-			metricgroup__print(true, false, NULL, raw_dump);
86
-		else if (strcmp(argv[i], "metricgroup") == 0)
87
-			metricgroup__print(false, true, NULL, raw_dump);
88
+		else if (strcmp(argv[i], "metric") == 0 || strcmp(argv[i], "metrics") == 0)
89
+			metricgroup__print(true, false, NULL, raw_dump, details_flag);
90
+		else if (strcmp(argv[i], "metricgroup") == 0 || strcmp(argv[i], "metricgroups") == 0)
91
+			metricgroup__print(false, true, NULL, raw_dump, details_flag);
88
92
 		else if ((sep = strchr(argv[i], ':')) != NULL) {
89
93
 			int sep_idx;
90
94
 
91
-			if (sep == NULL) {
92
-				print_events(argv[i], raw_dump, !desc_flag,
93
-							long_desc_flag,
94
-							details_flag);
95
-				continue;
96
-			}
97
95
 			sep_idx = sep - argv[i];
98
96
 			s = strdup(argv[i]);
99
97
 			if (s == NULL)
..
..
@@ -102,7 +100,7 @@
102
100
 			s[sep_idx] = '\0';
103
101
 			print_tracepoint_events(s, s + sep_idx + 1, raw_dump);
104
102
 			print_sdt_events(s, s + sep_idx + 1, raw_dump);
105
-			metricgroup__print(true, true, s, raw_dump);
103
+			metricgroup__print(true, true, s, raw_dump, details_flag);
106
104
 			free(s);
107
105
 		} else {
108
106
 			if (asprintf(&s, "*%s*", argv[i]) < 0) {
..
..
@@ -113,13 +111,15 @@
113
111
 					    event_symbols_hw, PERF_COUNT_HW_MAX, raw_dump);
114
112
 			print_symbol_events(s, PERF_TYPE_SOFTWARE,
115
113
 					    event_symbols_sw, PERF_COUNT_SW_MAX, raw_dump);
114
+			print_tool_events(s, raw_dump);
116
115
 			print_hwcache_events(s, raw_dump);
117
116
 			print_pmu_events(s, raw_dump, !desc_flag,
118
117
 						long_desc_flag,
119
-						details_flag);
118
+						details_flag,
119
+						deprecated);
120
120
 			print_tracepoint_events(NULL, s, raw_dump);
121
121
 			print_sdt_events(NULL, s, raw_dump);
122
-			metricgroup__print(true, true, NULL, raw_dump);
122
+			metricgroup__print(true, true, s, raw_dump, details_flag);
123
123
 			free(s);
124
124
 		}
125
125
 	}