mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>, Jiri Olsa <jolsa@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	LKML <linux-kernel@vger.kernel.org>,
	Ian Rogers <irogers@google.com>,
	Adrian Hunter <adrian.hunter@intel.com>,
	linux-perf-users@vger.kernel.org,
	Kan Liang <kan.liang@linux.intel.com>,
	Zhengjun Xing <zhengjun.xing@linux.intel.com>,
	James Clark <james.clark@arm.com>
Subject: [PATCH 08/11] perf stat: Fix condition in print_interval()
Date: Fri, 11 Nov 2022 19:22:41 -0800	[thread overview]
Message-ID: <20221112032244.1077370-9-namhyung@kernel.org> (raw)
In-Reply-To: <20221112032244.1077370-1-namhyung@kernel.org>

The num_print_interval and config->interval_clear should be checked
together like other places like later in the function.  Otherwise,
the --interval-clear option could print the headers for the CSV or
JSON output unnecessarily.

Acked-by: Ian Rogers <irogers@google.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 tools/perf/util/stat-display.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
index 03d58277e8d6..5f4fb0bd4037 100644
--- a/tools/perf/util/stat-display.c
+++ b/tools/perf/util/stat-display.c
@@ -902,8 +902,8 @@ static void print_interval(struct perf_stat_config *config,
 		sprintf(prefix, "{\"interval\" : %lu.%09lu}", (unsigned long)
 				 ts->tv_sec, ts->tv_nsec);
 
-	if ((num_print_interval == 0 && !config->csv_output && !config->json_output)
-			 || config->interval_clear) {
+	if ((num_print_interval == 0 || config->interval_clear) &&
+			!config->csv_output && !config->json_output) {
 		switch (config->aggr_mode) {
 		case AGGR_NODE:
 			fprintf(output, "#           time node   cpus");
-- 
2.38.1.493.g58b659f92b-goog


  parent reply	other threads:[~2022-11-12  3:23 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-12  3:22 [PATCHSET 00/11] perf stat: Cleanup perf stat output display (v2) Namhyung Kim
2022-11-12  3:22 ` [PATCH 01/11] perf stat: Fix crash with --per-node --metric-only in CSV mode Namhyung Kim
2022-11-14 18:17   ` Ian Rogers
2022-11-12  3:22 ` [PATCH 02/11] perf stat: Move common code in print_metric_headers() Namhyung Kim
2022-11-12  3:22 ` [PATCH 03/11] perf stat: Fix --metric-only --json output Namhyung Kim
2022-11-14 18:18   ` Ian Rogers
2022-11-12  3:22 ` [PATCH 04/11] perf stat: Increase metric length to align outputs Namhyung Kim
2022-11-12  3:22 ` [PATCH 05/11] perf stat: Clear screen only if output file is a tty Namhyung Kim
2022-11-14 18:19   ` Ian Rogers
2022-11-12  3:22 ` [PATCH 06/11] perf stat: Do not indent headers for JSON Namhyung Kim
2022-11-12  3:22 ` [PATCH 07/11] perf stat: Add header for interval in JSON output Namhyung Kim
2022-11-12  3:22 ` Namhyung Kim [this message]
2022-11-12  3:22 ` [PATCH 09/11] perf stat: Consolidate condition to print metrics Namhyung Kim
2022-11-12  3:22 ` [PATCH 10/11] perf stat: Fix summary output in CSV with --metric-only Namhyung Kim
2022-11-14 18:20   ` Ian Rogers
2022-11-12  3:22 ` [PATCH 11/11] perf stat: Add missing separator in the CSV header Namhyung Kim
2022-11-14 18:21   ` Ian Rogers

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221112032244.1077370-9-namhyung@kernel.org \
    --to=namhyung@kernel.org \
    --cc=acme@kernel.org \
    --cc=adrian.hunter@intel.com \
    --cc=irogers@google.com \
    --cc=james.clark@arm.com \
    --cc=jolsa@kernel.org \
    --cc=kan.liang@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-perf-users@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=zhengjun.xing@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®