linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: tip-bot for Namhyung Kim <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
	jolsa@kernel.org, tglx@linutronix.de, namhyung@kernel.org
Subject: [tip:perf/core] perf hists: Move column length calculation out of hists__inc_stats()
Date: Fri, 25 Apr 2014 06:13:46 -0700	[thread overview]
Message-ID: <tip-ae993efc9c6bd109b027d2799a442892067e9230@git.kernel.org> (raw)
In-Reply-To: <1398327843-31845-4-git-send-email-namhyung@kernel.org>

Commit-ID:  ae993efc9c6bd109b027d2799a442892067e9230
Gitweb:     http://git.kernel.org/tip/ae993efc9c6bd109b027d2799a442892067e9230
Author:     Namhyung Kim <namhyung@kernel.org>
AuthorDate: Thu, 24 Apr 2014 16:25:19 +0900
Committer:  Jiri Olsa <jolsa@kernel.org>
CommitDate: Thu, 24 Apr 2014 16:30:58 +0200

perf hists: Move column length calculation out of hists__inc_stats()

It's not the part of logic of hists__inc_stats() so it'd be better to
move it out of the function.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1398327843-31845-4-git-send-email-namhyung@kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 tools/perf/builtin-diff.c | 3 +++
 tools/perf/util/hist.c    | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index 0e46fa1..c9cc771 100644
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -587,6 +587,9 @@ static void hists__compute_resort(struct hists *hists)
 
 		insert_hist_entry_by_compute(&hists->entries, he, compute);
 		hists__inc_stats(hists, he);
+
+		if (!he->filtered)
+			hists__calc_col_len(hists, he);
 	}
 }
 
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 12d6c1b..f5b388e 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -320,7 +320,6 @@ static struct hist_entry *hist_entry__new(struct hist_entry *template)
 void hists__inc_stats(struct hists *hists, struct hist_entry *h)
 {
 	if (!h->filtered) {
-		hists__calc_col_len(hists, h);
 		hists->nr_non_filtered_entries++;
 		hists->stats.total_non_filtered_period += h->stat.period;
 	}
@@ -687,6 +686,9 @@ void hists__output_resort(struct hists *hists)
 
 		__hists__insert_output_entry(&hists->entries, n, min_callchain_hits);
 		hists__inc_stats(hists, n);
+
+		if (!n->filtered)
+			hists__calc_col_len(hists, n);
 	}
 }
 

  reply	other threads:[~2014-04-25 13:14 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-24  8:23 [PATCHSET 00/11] perf tools: Fixup for the --percentage change (v3) Namhyung Kim
2014-04-24  8:23 ` [PATCH 01/11] perf report: Count number of entries separately Namhyung Kim
2014-04-25 13:13   ` [tip:perf/core] " tip-bot for Namhyung Kim
2014-04-24  8:23 ` [PATCH 02/11] perf hists: Rename hists__inc_stats() Namhyung Kim
2014-04-25 13:13   ` [tip:perf/core] " tip-bot for Namhyung Kim
2014-04-24  8:23 ` [PATCH 03/11] perf hists: Move column length calculation out of hists__inc_stats() Namhyung Kim
2014-04-25 13:13   ` tip-bot for Namhyung Kim [this message]
2014-04-24  8:23 ` [PATCH 04/11] perf hists: Add a couple of hists stat helper functions Namhyung Kim
2014-04-24  9:40   ` Jiri Olsa
2014-04-24 12:57     ` Namhyung Kim
2014-04-24 13:12       ` Jiri Olsa
2014-04-24 13:46         ` Namhyung Kim
2014-04-25 13:13   ` [tip:perf/core] " tip-bot for Namhyung Kim
2014-04-24  8:23 ` [PATCH 05/11] perf hists: Collapse expanded callchains after filter is applied Namhyung Kim
2014-04-25 13:14   ` [tip:perf/core] " tip-bot for Namhyung Kim
2014-04-24  8:23 ` [PATCH 06/11] perf tools: Account entry stats when it's added to the output tree Namhyung Kim
2014-04-25 13:14   ` [tip:perf/core] perf tools: Account entry stats when it' s " tip-bot for Namhyung Kim
2014-04-24  8:23 ` [PATCH 07/11] perf hists: Add missing update on filtered stats in hists__decay_entries() Namhyung Kim
2014-04-25 13:14   ` [tip:perf/core] " tip-bot for Namhyung Kim
2014-04-24  8:24 ` [PATCH 08/11] perf ui/tui: Fix off-by-one in hist_browser__update_nr_entries() Namhyung Kim
2014-04-25 13:14   ` [tip:perf/core] " tip-bot for Namhyung Kim
2014-04-24  8:24 ` [PATCH 09/11] perf ui/tui: Rename hist_browser__update_nr_entries() Namhyung Kim
2014-04-25 13:14   ` [tip:perf/core] " tip-bot for Namhyung Kim
2014-04-24  8:24 ` [PATCH 10/11] perf top/tui: Update nr_entries properly after a filter is applied Namhyung Kim
2014-04-25 13:15   ` [tip:perf/core] " tip-bot for Namhyung Kim
2014-04-24  8:24 ` [PATCH 11/11] perf hists/tui: Count callchain rows separately Namhyung Kim
2014-04-25 13:15   ` [tip:perf/core] " tip-bot for Namhyung Kim
2014-04-24 11:34 ` [PATCHSET 00/11] perf tools: Fixup for the --percentage change (v3) Jiri Olsa

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=tip-ae993efc9c6bd109b027d2799a442892067e9230@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=hpa@zytor.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=tglx@linutronix.de \
    /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;
as well as URLs for NNTP newsgroup(s).