63 lines
2.1 KiB
Diff
63 lines
2.1 KiB
Diff
From 0a0a381759790e5b2b961837faccd6c8aeefb038 Mon Sep 17 00:00:00 2001
|
|
From: Jiri Olsa <jolsa@kernel.org>
|
|
Date: Thu, 30 Aug 2018 08:32:25 +0200
|
|
Subject: [PATCH 002/201] perf stat: Move STAT_RECORD out of
|
|
perf_evlist__print_counters()
|
|
|
|
mainline inclusion
|
|
from mainline-v4.20-rc1
|
|
commit 0174820a8ba108f2e72dac5caaea3500c8ca6323
|
|
category: feature
|
|
bugzilla: https://gitee.com/openeuler/kernel/issues/I8C0CX
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0174820a8ba108f2e72dac5caaea3500c8ca6323
|
|
|
|
-------------------------------------------------------------------
|
|
|
|
It's stat related and should stay in the 'perf stat' command. The
|
|
perf_evlist__print_counters function will be moved out in the following
|
|
patches.
|
|
|
|
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Andi Kleen <andi@firstfloor.org>
|
|
Cc: David Ahern <dsahern@gmail.com>
|
|
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Link: http://lkml.kernel.org/r/20180830063252.23729-17-jolsa@kernel.org
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
---
|
|
tools/perf/builtin-stat.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
|
|
index 48327256f0bf..78dfefd6f49a 100644
|
|
--- a/tools/perf/builtin-stat.c
|
|
+++ b/tools/perf/builtin-stat.c
|
|
@@ -1836,10 +1836,6 @@ perf_evlist__print_counters(struct perf_evlist *evlist,
|
|
struct perf_evsel *counter;
|
|
char buf[64], *prefix = NULL;
|
|
|
|
- /* Do not print anything if we record to the pipe. */
|
|
- if (STAT_RECORD && perf_stat.data.is_pipe)
|
|
- return;
|
|
-
|
|
if (interval)
|
|
print_interval(prefix = buf, ts);
|
|
else
|
|
@@ -1901,6 +1897,10 @@ perf_evlist__print_counters(struct perf_evlist *evlist,
|
|
|
|
static void print_counters(struct timespec *ts, int argc, const char **argv)
|
|
{
|
|
+ /* Do not print anything if we record to the pipe. */
|
|
+ if (STAT_RECORD && perf_stat.data.is_pipe)
|
|
+ return;
|
|
+
|
|
perf_evlist__print_counters(evsel_list, ts, argc, argv);
|
|
}
|
|
|
|
--
|
|
2.27.0
|
|
|