public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
	Adrian Hunter <adrian.hunter@intel.com>,
	Andi Kleen <ak@linux.intel.com>, David Ahern <dsahern@gmail.com>,
	Ingo Molnar <mingo@kernel.org>,
	Namhyung Kim <namhyung@kernel.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Stephane Eranian <eranian@google.com>
Subject: [PATCH 09/22] perf stat: Move perf_evsel__(alloc|free|reset)_stat_priv into stat object
Date: Fri, 26 Jun 2015 11:29:14 +0200	[thread overview]
Message-ID: <1435310967-14570-10-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1435310967-14570-1-git-send-email-jolsa@kernel.org>

Moving perf_evsel__(alloc|free|reset)_stat_priv into stat object,
so it could be used outside stat command in following patches.

Link: http://lkml.kernel.org/n/tip-ti0tocuk8fuw0zb7puyuw4e7@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 tools/perf/builtin-stat.c | 25 -------------------------
 tools/perf/util/stat.c    | 25 +++++++++++++++++++++++++
 tools/perf/util/stat.h    |  4 ++++
 3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 188cd98a4ab3..8a7fd0c60ab1 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -141,31 +141,6 @@ static inline void diff_timespec(struct timespec *r, struct timespec *a,
 	}
 }
 
-static void perf_evsel__reset_stat_priv(struct perf_evsel *evsel)
-{
-	int i;
-	struct perf_stat *ps = evsel->priv;
-
-	for (i = 0; i < 3; i++)
-		init_stats(&ps->res_stats[i]);
-
-	perf_stat_evsel_id_init(evsel);
-}
-
-static int perf_evsel__alloc_stat_priv(struct perf_evsel *evsel)
-{
-	evsel->priv = zalloc(sizeof(struct perf_stat));
-	if (evsel->priv == NULL)
-		return -ENOMEM;
-	perf_evsel__reset_stat_priv(evsel);
-	return 0;
-}
-
-static void perf_evsel__free_stat_priv(struct perf_evsel *evsel)
-{
-	zfree(&evsel->priv);
-}
-
 static int perf_evsel__alloc_prev_raw_counts(struct perf_evsel *evsel,
 					     int ncpus, int nthreads)
 {
diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c
index 197a2db5f2c4..b8c329f41f13 100644
--- a/tools/perf/util/stat.c
+++ b/tools/perf/util/stat.c
@@ -143,3 +143,28 @@ void perf_evsel__free_counts(struct perf_evsel *evsel)
 	perf_counts__delete(evsel->counts);
 	evsel->counts = NULL;
 }
+
+void perf_evsel__reset_stat_priv(struct perf_evsel *evsel)
+{
+	int i;
+	struct perf_stat *ps = evsel->priv;
+
+	for (i = 0; i < 3; i++)
+		init_stats(&ps->res_stats[i]);
+
+	perf_stat_evsel_id_init(evsel);
+}
+
+int perf_evsel__alloc_stat_priv(struct perf_evsel *evsel)
+{
+	evsel->priv = zalloc(sizeof(struct perf_stat));
+	if (evsel->priv == NULL)
+		return -ENOMEM;
+	perf_evsel__reset_stat_priv(evsel);
+	return 0;
+}
+
+void perf_evsel__free_stat_priv(struct perf_evsel *evsel)
+{
+	zfree(&evsel->priv);
+}
diff --git a/tools/perf/util/stat.h b/tools/perf/util/stat.h
index 295d1e29d3d6..c441cb312565 100644
--- a/tools/perf/util/stat.h
+++ b/tools/perf/util/stat.h
@@ -92,4 +92,8 @@ void perf_counts__delete(struct perf_counts *counts);
 void perf_evsel__reset_counts(struct perf_evsel *evsel);
 int perf_evsel__alloc_counts(struct perf_evsel *evsel, int ncpus, int nthreads);
 void perf_evsel__free_counts(struct perf_evsel *evsel);
+
+void perf_evsel__reset_stat_priv(struct perf_evsel *evsel);
+int perf_evsel__alloc_stat_priv(struct perf_evsel *evsel);
+void perf_evsel__free_stat_priv(struct perf_evsel *evsel);
 #endif
-- 
1.9.3


  parent reply	other threads:[~2015-06-26  9:30 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-26  9:29 [PATCHv5 00/22] perf stat: Introduce --per-thread option Jiri Olsa
2015-06-26  9:29 ` [PATCH 01/22] perf thread_map: Introduce thread_map__reset function Jiri Olsa
2015-06-26 14:06   ` Arnaldo Carvalho de Melo
2015-06-30  4:52   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 02/22] perf tools: Add comm string into struct thread_map Jiri Olsa
2015-06-30  4:52   ` [tip:perf/urgent] perf thrad_map: Add comm string into array tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 03/22] perf tests: Add thread_map object tests Jiri Olsa
2015-06-30  4:53   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 04/22] perf stat: Introduce perf_counts function Jiri Olsa
2015-06-30  4:53   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 05/22] perf stat: Use xyarray for cpu evsel counts Jiri Olsa
2015-06-30  4:53   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 06/22] perf stat: Make stats work over the thread dimension Jiri Olsa
2015-06-30  4:54   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 07/22] perf stat: Rename struct perf_counts::cpu member to values Jiri Olsa
2015-06-30  4:54   ` [tip:perf/urgent] perf stat: Rename struct perf_counts:: cpu " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 08/22] perf stat: Introduce perf_evlist__reset_stats Jiri Olsa
2015-06-30  4:54   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` Jiri Olsa [this message]
2015-06-30  4:54   ` [tip:perf/urgent] perf stat: Move perf_evsel__(alloc|free|reset) _stat_priv into stat object tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 10/22] perf stat: Move perf_evsel__(alloc|free)_prev_raw_counts " Jiri Olsa
2015-06-30  4:55   ` [tip:perf/urgent] perf stat: Move perf_evsel__(alloc|free) _prev_raw_counts " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 11/22] perf stat: Move perf_evlist__(alloc|free|reset)_stats " Jiri Olsa
2015-06-30  4:55   ` [tip:perf/urgent] perf stat: Move perf_evlist__(alloc|free|reset) _stats " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 12/22] perf stat: Introduce perf_evsel__alloc_stats function Jiri Olsa
2015-06-30  4:55   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 13/22] perf stat: Introduce perf_evsel__read function Jiri Olsa
2015-06-30  4:56   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 14/22] perf stat: Introduce read_counters function Jiri Olsa
2015-06-30  4:56   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 15/22] perf stat: Separate counters reading and processing Jiri Olsa
2015-06-30  4:56   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 16/22] perf stat: Move zero_per_pkg into counter process code Jiri Olsa
2015-06-30  4:57   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 17/22] perf stat: Move perf_stat initialization " Jiri Olsa
2015-06-30  4:57   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 18/22] perf stat: Remove perf_evsel__read_cb function Jiri Olsa
2015-06-30  4:57   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 19/22] perf stat: Rename print_interval to process_interval Jiri Olsa
2015-06-30  4:57   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 20/22] perf stat: Using init_stats instead of memset Jiri Olsa
2015-06-30  4:58   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 21/22] perf stat: Introduce print_counters function Jiri Olsa
2015-06-30  4:58   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26  9:29 ` [PATCH 22/22] perf stat: Introduce --per-thread option Jiri Olsa
2015-06-30  4:58   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-06-26 15:06 ` [PATCHv5 00/22] " Arnaldo Carvalho de Melo

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=1435310967-14570-10-git-send-email-jolsa@kernel.org \
    --to=jolsa@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@kernel.org \
    --cc=adrian.hunter@intel.com \
    --cc=ak@linux.intel.com \
    --cc=dsahern@gmail.com \
    --cc=eranian@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    /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