perf script: Display stat events by default

If no script is specified for stat data, display stat events in raw
form.

  $ perf stat record ls

  SNIP

   Performance counter stats for 'ls':

            0.851585      task-clock (msec)         #    0.717 CPUs utilized
                   0      context-switches          #    0.000 K/sec
                   0      cpu-migrations            #    0.000 K/sec
                 114      page-faults               #    0.134 M/sec
           2,620,918      cycles                    #    3.078 GHz
     <not supported>      stalled-cycles-frontend
     <not supported>      stalled-cycles-backend
           2,714,111      instructions              #    1.04  insns per cycle
             542,434      branches                  #  636.970 M/sec
              15,946      branch-misses             #    2.94% of all branches

         0.001186954 seconds time elapsed

  $ perf script
  CPU   THREAD             VAL             ENA             RUN            TIME EVENT
   -1    26185          851585          851585          851585         1186954 task-clock
   -1    26185               0          851585          851585         1186954 context-switches
   -1    26185               0          851585          851585         1186954 cpu-migrations
   -1    26185             114          851585          851585         1186954 page-faults
   -1    26185         2620918          853340          853340         1186954 cycles
   -1    26185               0               0               0         1186954 stalled-cycles-frontend
   -1    26185               0               0               0         1186954 stalled-cycles-backend
   -1    26185         2714111          853340          853340         1186954 instructions
   -1    26185          542434          853340          853340         1186954 branches
   -1    26185           15946          853340          853340         1186954 branch-misses

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Tested-by: Kan Liang <kan.liang@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1452077397-31958-3-git-send-email-jolsa@kernel.org
[ Rename 'time' parameter to 'tstamp' to fix build on older distros ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 5e1865408aa5b61041ea031eb01cef195cb7e67e..5e2f9d20a2962fa698aa4713a6f688c26023e027 100644 (file)
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -677,10 +677,46 @@ static void process_event(struct perf_script *script __maybe_unused, union perf_
 
 static struct scripting_ops    *scripting_ops;
 
+static void __process_stat(struct perf_evsel *counter, u64 tstamp)
+{
+       int nthreads = thread_map__nr(counter->threads);
+       int ncpus = perf_evsel__nr_cpus(counter);
+       int cpu, thread;
+       static int header_printed;
+
+       if (counter->system_wide)
+               nthreads = 1;
+
+       if (!header_printed) {
+               printf("%3s %8s %15s %15s %15s %15s %s\n",
+                      "CPU", "THREAD", "VAL", "ENA", "RUN", "TIME", "EVENT");
+               header_printed = 1;
+       }
+
+       for (thread = 0; thread < nthreads; thread++) {
+               for (cpu = 0; cpu < ncpus; cpu++) {
+                       struct perf_counts_values *counts;
+
+                       counts = perf_counts(counter->counts, cpu, thread);
+
+                       printf("%3d %8d %15" PRIu64 " %15" PRIu64 " %15" PRIu64 " %15" PRIu64 " %s\n",
+                               counter->cpus->map[cpu],
+                               thread_map__pid(counter->threads, thread),
+                               counts->val,
+                               counts->ena,
+                               counts->run,
+                               tstamp,
+                               perf_evsel__name(counter));
+               }
+       }
+}
+
 static void process_stat(struct perf_evsel *counter, u64 tstamp)
 {
        if (scripting_ops && scripting_ops->process_stat)
                scripting_ops->process_stat(&stat_config, counter, tstamp);
+       else
+               __process_stat(counter, tstamp);
 }
 
 static void process_stat_interval(u64 tstamp)