diff options
Diffstat (limited to 'tools/perf/builtin-stat.c')
-rw-r--r-- | tools/perf/builtin-stat.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index ff8c413b7e73..9a39ca3c3ac4 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c | |||
@@ -50,6 +50,7 @@ | |||
50 | 50 | ||
51 | #include <sys/prctl.h> | 51 | #include <sys/prctl.h> |
52 | #include <math.h> | 52 | #include <math.h> |
53 | #include <locale.h> | ||
53 | 54 | ||
54 | static struct perf_event_attr default_attrs[] = { | 55 | static struct perf_event_attr default_attrs[] = { |
55 | 56 | ||
@@ -80,6 +81,8 @@ static pid_t *all_tids = NULL; | |||
80 | static int thread_num = 0; | 81 | static int thread_num = 0; |
81 | static pid_t child_pid = -1; | 82 | static pid_t child_pid = -1; |
82 | static bool null_run = false; | 83 | static bool null_run = false; |
84 | static bool big_num = false; | ||
85 | |||
83 | 86 | ||
84 | static int *fd[MAX_NR_CPUS][MAX_COUNTERS]; | 87 | static int *fd[MAX_NR_CPUS][MAX_COUNTERS]; |
85 | 88 | ||
@@ -377,7 +380,7 @@ static void nsec_printout(int counter, double avg) | |||
377 | { | 380 | { |
378 | double msecs = avg / 1e6; | 381 | double msecs = avg / 1e6; |
379 | 382 | ||
380 | fprintf(stderr, " %14.6f %-24s", msecs, event_name(counter)); | 383 | fprintf(stderr, " %18.6f %-24s", msecs, event_name(counter)); |
381 | 384 | ||
382 | if (MATCH_EVENT(SOFTWARE, SW_TASK_CLOCK, counter)) { | 385 | if (MATCH_EVENT(SOFTWARE, SW_TASK_CLOCK, counter)) { |
383 | fprintf(stderr, " # %10.3f CPUs ", | 386 | fprintf(stderr, " # %10.3f CPUs ", |
@@ -389,7 +392,10 @@ static void abs_printout(int counter, double avg) | |||
389 | { | 392 | { |
390 | double total, ratio = 0.0; | 393 | double total, ratio = 0.0; |
391 | 394 | ||
392 | fprintf(stderr, " %14.0f %-24s", avg, event_name(counter)); | 395 | if (big_num) |
396 | fprintf(stderr, " %'18.0f %-24s", avg, event_name(counter)); | ||
397 | else | ||
398 | fprintf(stderr, " %18.0f %-24s", avg, event_name(counter)); | ||
393 | 399 | ||
394 | if (MATCH_EVENT(HARDWARE, HW_INSTRUCTIONS, counter)) { | 400 | if (MATCH_EVENT(HARDWARE, HW_INSTRUCTIONS, counter)) { |
395 | total = avg_stats(&runtime_cycles_stats); | 401 | total = avg_stats(&runtime_cycles_stats); |
@@ -426,7 +432,7 @@ static void print_counter(int counter) | |||
426 | int scaled = event_scaled[counter]; | 432 | int scaled = event_scaled[counter]; |
427 | 433 | ||
428 | if (scaled == -1) { | 434 | if (scaled == -1) { |
429 | fprintf(stderr, " %14s %-24s\n", | 435 | fprintf(stderr, " %18s %-24s\n", |
430 | "<not counted>", event_name(counter)); | 436 | "<not counted>", event_name(counter)); |
431 | return; | 437 | return; |
432 | } | 438 | } |
@@ -477,7 +483,7 @@ static void print_stat(int argc, const char **argv) | |||
477 | print_counter(counter); | 483 | print_counter(counter); |
478 | 484 | ||
479 | fprintf(stderr, "\n"); | 485 | fprintf(stderr, "\n"); |
480 | fprintf(stderr, " %14.9f seconds time elapsed", | 486 | fprintf(stderr, " %18.9f seconds time elapsed", |
481 | avg_stats(&walltime_nsecs_stats)/1e9); | 487 | avg_stats(&walltime_nsecs_stats)/1e9); |
482 | if (run_count > 1) { | 488 | if (run_count > 1) { |
483 | fprintf(stderr, " ( +- %7.3f%% )", | 489 | fprintf(stderr, " ( +- %7.3f%% )", |
@@ -534,6 +540,8 @@ static const struct option options[] = { | |||
534 | "repeat command and print average + stddev (max: 100)"), | 540 | "repeat command and print average + stddev (max: 100)"), |
535 | OPT_BOOLEAN('n', "null", &null_run, | 541 | OPT_BOOLEAN('n', "null", &null_run, |
536 | "null run - dont start any counters"), | 542 | "null run - dont start any counters"), |
543 | OPT_BOOLEAN('B', "big-num", &big_num, | ||
544 | "print large numbers with thousands\' separators"), | ||
537 | OPT_END() | 545 | OPT_END() |
538 | }; | 546 | }; |
539 | 547 | ||
@@ -542,6 +550,8 @@ int cmd_stat(int argc, const char **argv, const char *prefix __used) | |||
542 | int status; | 550 | int status; |
543 | int i,j; | 551 | int i,j; |
544 | 552 | ||
553 | setlocale(LC_ALL, ""); | ||
554 | |||
545 | argc = parse_options(argc, argv, options, stat_usage, | 555 | argc = parse_options(argc, argv, options, stat_usage, |
546 | PARSE_OPT_STOP_AT_NON_OPTION); | 556 | PARSE_OPT_STOP_AT_NON_OPTION); |
547 | if (!argc && target_pid == -1 && target_tid == -1) | 557 | if (!argc && target_pid == -1 && target_tid == -1) |