aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/perf_counter/builtin-stat.c
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/perf_counter/builtin-stat.c')
-rw-r--r--Documentation/perf_counter/builtin-stat.c24
1 files changed, 22 insertions, 2 deletions
diff --git a/Documentation/perf_counter/builtin-stat.c b/Documentation/perf_counter/builtin-stat.c
index 6de38d256883..e2fa117eab58 100644
--- a/Documentation/perf_counter/builtin-stat.c
+++ b/Documentation/perf_counter/builtin-stat.c
@@ -87,6 +87,9 @@
87 87
88#include "perf.h" 88#include "perf.h"
89 89
90#define EVENT_MASK_KERNEL 1
91#define EVENT_MASK_USER 2
92
90static int system_wide = 0; 93static int system_wide = 0;
91 94
92static int nr_counters = 0; 95static int nr_counters = 0;
@@ -104,6 +107,7 @@ static __u64 event_id[MAX_COUNTERS] = {
104static int default_interval = 100000; 107static int default_interval = 100000;
105static int event_count[MAX_COUNTERS]; 108static int event_count[MAX_COUNTERS];
106static int fd[MAX_NR_CPUS][MAX_COUNTERS]; 109static int fd[MAX_NR_CPUS][MAX_COUNTERS];
110static int event_mask[MAX_COUNTERS];
107 111
108static int tid = -1; 112static int tid = -1;
109static int profile_cpu = -1; 113static int profile_cpu = -1;
@@ -258,12 +262,23 @@ static __u64 match_event_symbols(char *str)
258 __u64 config, id; 262 __u64 config, id;
259 int type; 263 int type;
260 unsigned int i; 264 unsigned int i;
265 char mask_str[4];
261 266
262 if (sscanf(str, "r%llx", &config) == 1) 267 if (sscanf(str, "r%llx", &config) == 1)
263 return config | PERF_COUNTER_RAW_MASK; 268 return config | PERF_COUNTER_RAW_MASK;
264 269
265 if (sscanf(str, "%d:%llu", &type, &id) == 2) 270 switch (sscanf(str, "%d:%llu:%2s", &type, &id, mask_str)) {
266 return EID(type, id); 271 case 3:
272 if (strchr(mask_str, 'u'))
273 event_mask[nr_counters] |= EVENT_MASK_USER;
274 if (strchr(mask_str, 'k'))
275 event_mask[nr_counters] |= EVENT_MASK_KERNEL;
276 case 2:
277 return EID(type, id);
278
279 default:
280 break;
281 }
267 282
268 for (i = 0; i < ARRAY_SIZE(event_symbols); i++) { 283 for (i = 0; i < ARRAY_SIZE(event_symbols); i++) {
269 if (!strncmp(str, event_symbols[i].symbol, 284 if (!strncmp(str, event_symbols[i].symbol,
@@ -313,6 +328,11 @@ static void create_perfstat_counter(int counter)
313 hw_event.config = event_id[counter]; 328 hw_event.config = event_id[counter];
314 hw_event.record_type = 0; 329 hw_event.record_type = 0;
315 hw_event.nmi = 0; 330 hw_event.nmi = 0;
331 hw_event.exclude_kernel = event_mask[counter] & EVENT_MASK_KERNEL;
332 hw_event.exclude_user = event_mask[counter] & EVENT_MASK_USER;
333
334printf("exclude: %d\n", event_mask[counter]);
335
316 if (scale) 336 if (scale)
317 hw_event.read_format = PERF_FORMAT_TOTAL_TIME_ENABLED | 337 hw_event.read_format = PERF_FORMAT_TOTAL_TIME_ENABLED |
318 PERF_FORMAT_TOTAL_TIME_RUNNING; 338 PERF_FORMAT_TOTAL_TIME_RUNNING;