From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934096AbbIDWuz (ORCPT ); Fri, 4 Sep 2015 18:50:55 -0400 Received: from mail.kernel.org ([198.145.29.136]:33068 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933646AbbIDWuy (ORCPT ); Fri, 4 Sep 2015 18:50:54 -0400 Date: Fri, 4 Sep 2015 19:50:50 -0300 From: Arnaldo Carvalho de Melo To: Andi Kleen Cc: jolsa@kernel.org, linux-kernel@vger.kernel.org, Andi Kleen Subject: Re: [PATCH 1/6] perf, tools, stat: Move sw clock metrics printout to stat-shadow Message-ID: <20150904225050.GE3475@kernel.org> References: <1441406717-1717-1-git-send-email-andi@firstfloor.org> <1441406717-1717-2-git-send-email-andi@firstfloor.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1441406717-1717-2-git-send-email-andi@firstfloor.org> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Fri, Sep 04, 2015 at 03:45:12PM -0700, Andi Kleen escreveu: > From: Andi Kleen > > The sw clock metrics printing was missed in the earlier move to > stat-shadow of all the other metric printouts. Move it too. > > Acked-by: Jiri Olsa Merging this one, letting Jiri react to the others, - Arnaldo > Signed-off-by: Andi Kleen > --- > tools/perf/builtin-stat.c | 9 --------- > tools/perf/util/stat-shadow.c | 3 +++ > 2 files changed, 3 insertions(+), 9 deletions(-) > > diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c > index a96fb5c..77e5781 100644 > --- a/tools/perf/builtin-stat.c > +++ b/tools/perf/builtin-stat.c > @@ -510,15 +510,6 @@ static void nsec_printout(int id, int nr, struct perf_evsel *evsel, double avg) > > if (evsel->cgrp) > fprintf(output, "%s%s", csv_sep, evsel->cgrp->name); > - > - if (csv_output || stat_config.interval) > - return; > - > - if (perf_evsel__match(evsel, SOFTWARE, SW_TASK_CLOCK)) > - fprintf(output, " # %8.3f CPUs utilized ", > - avg / avg_stats(&walltime_nsecs_stats)); > - else > - fprintf(output, " "); > } > > static void abs_printout(int id, int nr, struct perf_evsel *evsel, double avg) > diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c > index 2a5d8d7..625ab3b 100644 > --- a/tools/perf/util/stat-shadow.c > +++ b/tools/perf/util/stat-shadow.c > @@ -413,6 +413,9 @@ void perf_stat__print_shadow_stats(FILE *out, struct perf_evsel *evsel, > ratio = total / avg; > > fprintf(out, " # %8.0f cycles / elision ", ratio); > + } else if (perf_evsel__match(evsel, SOFTWARE, SW_TASK_CLOCK) && > + (ratio = avg_stats(&walltime_nsecs_stats)) != 0) { > + fprintf(out, " # %8.3f CPUs utilized ", avg / ratio); > } else if (runtime_nsecs_stats[cpu].n != 0) { > char unit = 'M'; > > -- > 2.4.3