From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Namhyung Kim <namhyung@kernel.org>,
Andi Kleen <andi@firstfloor.org>, Arun Sharma <asharma@fb.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung.kim@lge.com>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Rodrigo Campos <rodrigo@sdfg.com.ar>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 12/13] perf hists: Convert hist entry functions to use struct he_stat
Date: Wed, 15 Jan 2014 17:33:10 -0300 [thread overview]
Message-ID: <1389817991-8145-13-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1389817991-8145-1-git-send-email-acme@infradead.org>
From: Namhyung Kim <namhyung@kernel.org>
The hist_entry__add_cpumode_period() and hist_entry__decay() functions
are dealing with hist_entry's stat fields only.
Make them he_stat methods then.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Arun Sharma <asharma@fb.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Rodrigo Campos <rodrigo@sdfg.com.ar>
Link: http://lkml.kernel.org/r/1389677157-30513-5-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/hist.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 4ed3e883240d..e4e6249b87d4 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -181,21 +181,21 @@ void hists__output_recalc_col_len(struct hists *hists, int max_rows)
}
}
-static void hist_entry__add_cpumode_period(struct hist_entry *he,
- unsigned int cpumode, u64 period)
+static void he_stat__add_cpumode_period(struct he_stat *he_stat,
+ unsigned int cpumode, u64 period)
{
switch (cpumode) {
case PERF_RECORD_MISC_KERNEL:
- he->stat.period_sys += period;
+ he_stat->period_sys += period;
break;
case PERF_RECORD_MISC_USER:
- he->stat.period_us += period;
+ he_stat->period_us += period;
break;
case PERF_RECORD_MISC_GUEST_KERNEL:
- he->stat.period_guest_sys += period;
+ he_stat->period_guest_sys += period;
break;
case PERF_RECORD_MISC_GUEST_USER:
- he->stat.period_guest_us += period;
+ he_stat->period_guest_us += period;
break;
default:
break;
@@ -222,10 +222,10 @@ static void he_stat__add_stat(struct he_stat *dest, struct he_stat *src)
dest->weight += src->weight;
}
-static void hist_entry__decay(struct hist_entry *he)
+static void he_stat__decay(struct he_stat *he_stat)
{
- he->stat.period = (he->stat.period * 7) / 8;
- he->stat.nr_events = (he->stat.nr_events * 7) / 8;
+ he_stat->period = (he_stat->period * 7) / 8;
+ he_stat->nr_events = (he_stat->nr_events * 7) / 8;
/* XXX need decay for weight too? */
}
@@ -236,7 +236,7 @@ static bool hists__decay_entry(struct hists *hists, struct hist_entry *he)
if (prev_period == 0)
return true;
- hist_entry__decay(he);
+ he_stat__decay(&he->stat);
if (!he->filtered)
hists->stats.total_period -= prev_period - he->stat.period;
@@ -402,7 +402,7 @@ static struct hist_entry *add_hist_entry(struct hists *hists,
rb_link_node(&he->rb_node_in, parent, p);
rb_insert_color(&he->rb_node_in, hists->entries_in);
out:
- hist_entry__add_cpumode_period(he, al->cpumode, period);
+ he_stat__add_cpumode_period(&he->stat, al->cpumode, period);
return he;
}
--
1.8.1.4
next prev parent reply other threads:[~2014-01-15 20:33 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-15 20:32 [GIT PULL 00/13] perf/core improvements and fixes Arnaldo Carvalho de Melo
2014-01-15 20:32 ` [PATCH 01/13] perf record: Rename --no-delay to --no-buffering Arnaldo Carvalho de Melo
2014-01-15 20:33 ` [PATCH 02/13] perf record: Rename --initial-delay to --delay Arnaldo Carvalho de Melo
2014-01-15 20:33 ` [PATCH 03/13] perf tools: Fix build error due to zfree() cast Arnaldo Carvalho de Melo
2014-01-15 20:33 ` [PATCH 04/13] tools lib traceevent: Add state member to struct trace_seq Arnaldo Carvalho de Melo
2014-01-15 20:33 ` [PATCH 05/13] tools lib traceevent: Check return value of realloc() Arnaldo Carvalho de Melo
2014-01-15 20:33 ` [PATCH 06/13] tools lib traceevent: Get rid of malloc_or_die() in trace_seq_init() Arnaldo Carvalho de Melo
2014-01-15 20:33 ` [PATCH 07/13] tools lib traceevent: Get rid of die() finally!! Arnaldo Carvalho de Melo
2014-01-15 21:17 ` Steven Rostedt
2014-01-16 8:33 ` Ingo Molnar
2014-01-15 20:33 ` [PATCH 08/13] tools lib traceevent: Make plugin unload function receive pevent Arnaldo Carvalho de Melo
2014-01-15 20:33 ` [PATCH 09/13] perf: tools: Fix cross building Arnaldo Carvalho de Melo
2014-01-15 20:33 ` [PATCH 10/13] perf tools: Remove symbol_conf.use_callchain check Arnaldo Carvalho de Melo
2014-01-15 20:33 ` [PATCH 11/13] perf tools: Factor out sample__resolve_callchain() Arnaldo Carvalho de Melo
2014-01-15 20:33 ` Arnaldo Carvalho de Melo [this message]
2014-01-15 20:33 ` [PATCH 13/13] tools lib traceevent: fix pointer-integer size mismatch Arnaldo Carvalho de Melo
2014-01-16 8:36 ` [GIT PULL 00/13] perf/core improvements and fixes Ingo Molnar
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=1389817991-8145-13-git-send-email-acme@infradead.org \
--to=acme@infradead.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=andi@firstfloor.org \
--cc=asharma@fb.com \
--cc=fweisbec@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung.kim@lge.com \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--cc=rodrigo@sdfg.com.ar \
/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).