From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
David Ahern <dsahern@gmail.com>, Ingo Molnar <mingo@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
"Liang, Kan" <kan.liang@intel.com>
Subject: [PATCH 14/57] perf tools: Add stat event synthesize function
Date: Fri, 16 Oct 2015 12:40:49 +0200 [thread overview]
Message-ID: <1444992092-17897-15-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1444992092-17897-1-git-send-email-jolsa@kernel.org>
Introduce perf_event__synthesize_stat function to
synthesize 'struct stat_event'.
Link: http://lkml.kernel.org/n/tip-0jr9x4vwk0nxbs2ueclj7jfy@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/tests/builtin-test.c | 4 ++++
tools/perf/tests/stat.c | 41 ++++++++++++++++++++++++++++++++++++-----
tools/perf/tests/tests.h | 1 +
tools/perf/util/event.c | 22 ++++++++++++++++++++++
tools/perf/util/event.h | 7 ++++++-
5 files changed, 69 insertions(+), 6 deletions(-)
diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index 1a9064f54da5..87d6244f15f9 100644
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -178,6 +178,10 @@ static struct test generic_tests[] = {
.func = test__synthesize_stat_config,
},
{
+ .desc = "Test stat synthesize",
+ .func = test__synthesize_stat,
+ },
+ {
.func = NULL,
},
};
diff --git a/tools/perf/tests/stat.c b/tools/perf/tests/stat.c
index 2049c5a3e4a2..805ff30bb1d5 100644
--- a/tools/perf/tests/stat.c
+++ b/tools/perf/tests/stat.c
@@ -2,6 +2,7 @@
#include "event.h"
#include "tests.h"
#include "stat.h"
+#include "counts.h"
#include "debug.h"
static bool has_term(struct stat_config_event *config,
@@ -18,10 +19,10 @@ static bool has_term(struct stat_config_event *config,
return false;
}
-static int process_event(struct perf_tool *tool __maybe_unused,
- union perf_event *event,
- struct perf_sample *sample __maybe_unused,
- struct machine *machine __maybe_unused)
+static int process_stat_config_event(struct perf_tool *tool __maybe_unused,
+ union perf_event *event,
+ struct perf_sample *sample __maybe_unused,
+ struct machine *machine __maybe_unused)
{
struct stat_config_event *config = &event->stat_config;
struct perf_stat_config stat_config;
@@ -53,7 +54,37 @@ int test__synthesize_stat_config(void)
};
TEST_ASSERT_VAL("failed to synthesize stat_config",
- !perf_event__synthesize_stat_config(NULL, &stat_config, process_event, NULL));
+ !perf_event__synthesize_stat_config(NULL, &stat_config, process_stat_config_event, NULL));
+
+ return 0;
+}
+
+static int process_stat_event(struct perf_tool *tool __maybe_unused,
+ union perf_event *event,
+ struct perf_sample *sample __maybe_unused,
+ struct machine *machine __maybe_unused)
+{
+ struct stat_event *stat = &event->stat;
+
+ TEST_ASSERT_VAL("wrong cpu", stat->cpu == 1);
+ TEST_ASSERT_VAL("wrong thread", stat->thread == 2);
+ TEST_ASSERT_VAL("wrong id", stat->id == 3);
+ TEST_ASSERT_VAL("wrong val", stat->val == 100);
+ TEST_ASSERT_VAL("wrong run", stat->ena == 200);
+ TEST_ASSERT_VAL("wrong ena", stat->run == 300);
+ return 0;
+}
+
+int test__synthesize_stat(void)
+{
+ struct perf_counts_values count;
+
+ count.val = 100;
+ count.ena = 200;
+ count.run = 300;
+
+ TEST_ASSERT_VAL("failed to synthesize stat_config",
+ !perf_event__synthesize_stat(NULL, 1, 2, 3, &count, process_stat_event, NULL));
return 0;
}
diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h
index 227ad216197e..edf460e5cd64 100644
--- a/tools/perf/tests/tests.h
+++ b/tools/perf/tests/tests.h
@@ -70,6 +70,7 @@ int test_session_topology(void);
int test__thread_map_synthesize(void);
int test__cpu_map_synthesize(void);
int test__synthesize_stat_config(void);
+int test__synthesize_stat(void);
#if defined(__arm__) || defined(__aarch64__)
#ifdef HAVE_DWARF_UNWIND_SUPPORT
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 74aec1e1f775..c15b569b6a38 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -910,6 +910,28 @@ int perf_event__synthesize_stat_config(struct perf_tool *tool,
return err;
}
+int perf_event__synthesize_stat(struct perf_tool *tool,
+ u32 cpu, u32 thread, u64 id,
+ struct perf_counts_values *count,
+ perf_event__handler_t process,
+ struct machine *machine)
+{
+ struct stat_event event;
+
+ event.header.type = PERF_RECORD_STAT;
+ event.header.size = sizeof(event);
+ event.header.misc = 0;
+
+ event.id = id;
+ event.cpu = cpu;
+ event.thread = thread;
+ event.val = count->val;
+ event.ena = count->ena;
+ event.run = count->run;
+
+ return process(tool, (union perf_event *) &event, NULL, machine);
+}
+
void perf_event__read_stat_config(struct perf_stat_config *config,
struct stat_config_event *event)
{
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index 30f7dc963137..f36ae66d421f 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -466,6 +466,7 @@ struct perf_tool;
struct thread_map;
struct cpu_map;
struct perf_stat_config;
+struct perf_counts_values;
typedef int (*perf_event__handler_t)(struct perf_tool *tool,
union perf_event *event,
@@ -498,7 +499,11 @@ int perf_event__synthesize_stat_config(struct perf_tool *tool,
struct machine *machine);
void perf_event__read_stat_config(struct perf_stat_config *config,
struct stat_config_event *event);
-
+int perf_event__synthesize_stat(struct perf_tool *tool,
+ u32 cpu, u32 thread, u64 id,
+ struct perf_counts_values *count,
+ perf_event__handler_t process,
+ struct machine *machine);
int perf_event__synthesize_modules(struct perf_tool *tool,
perf_event__handler_t process,
struct machine *machine);
--
2.4.3
next prev parent reply other threads:[~2015-10-16 10:42 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-16 10:40 [PATCHv4 00/57] perf stat: Add scripting support Jiri Olsa
2015-10-16 10:40 ` [PATCH 01/57] perf tools: Add thread_map event Jiri Olsa
2015-10-16 10:40 ` [PATCH 02/57] perf tools: Add thread_map event sythesize function Jiri Olsa
2015-10-16 10:40 ` [PATCH 03/57] perf tools: Add thread_map__new_event function Jiri Olsa
2015-10-16 10:40 ` [PATCH 04/57] perf tools: Add perf_event__fprintf_thread_map function Jiri Olsa
2015-10-16 10:40 ` [PATCH 05/57] perf tools: Add cpu_map event Jiri Olsa
2015-10-19 20:45 ` Arnaldo Carvalho de Melo
2015-10-22 7:56 ` Jiri Olsa
2015-10-16 10:40 ` [PATCH 06/57] perf tools: Add cpu_map event synthesize function Jiri Olsa
2015-10-16 10:40 ` [PATCH 07/57] perf tools: Add cpu_map__empty_new function Jiri Olsa
2015-10-16 10:40 ` [PATCH 08/57] perf tools: Add cpu_map__new_event function Jiri Olsa
2015-10-16 10:40 ` [PATCH 09/57] perf tools: Add perf_event__fprintf_cpu_map function Jiri Olsa
2015-10-16 10:40 ` [PATCH 10/57] perf tools: Add stat config event Jiri Olsa
2015-10-16 10:40 ` [PATCH 11/57] perf tools: Add stat config event synthesize function Jiri Olsa
2015-10-16 10:40 ` [PATCH 12/57] perf tools: Add stat config event read function Jiri Olsa
2015-10-16 10:40 ` [PATCH 13/57] perf tools: Add stat event Jiri Olsa
2015-10-16 10:40 ` Jiri Olsa [this message]
2015-10-16 10:40 ` [PATCH 15/57] perf tools: Add stat event read function Jiri Olsa
2015-10-16 10:40 ` [PATCH 16/57] perf tools: Add stat round event Jiri Olsa
2015-10-16 10:40 ` [PATCH 17/57] perf tools: Add stat round event synthesize function Jiri Olsa
2015-10-16 10:40 ` [PATCH 18/57] perf tools: Add stat events fprintf functions Jiri Olsa
2015-10-16 10:40 ` [PATCH 19/57] perf tools: Add attr_update event Jiri Olsa
2015-10-19 21:00 ` Arnaldo Carvalho de Melo
2015-10-22 8:01 ` Jiri Olsa
2015-10-25 12:27 ` Jiri Olsa
2015-10-16 10:40 ` [PATCH 20/57] perf tools: Add attr_update event unit type Jiri Olsa
2015-10-16 10:40 ` [PATCH 21/57] perf tools: Add attr_update event scale type Jiri Olsa
2015-10-16 10:40 ` [PATCH 22/57] perf tools: Add attr_update event name type Jiri Olsa
2015-10-16 10:40 ` [PATCH 23/57] perf tools: Add attr_update event cpus type Jiri Olsa
2015-10-16 10:40 ` [PATCH 24/57] perf tools: Add perf_event__fprintf_attr_update function Jiri Olsa
2015-10-16 10:41 ` [PATCH 25/57] perf report: Display newly added events in raw dump Jiri Olsa
2015-10-16 10:41 ` [PATCH 26/57] perf tools: Introduce stat feature Jiri Olsa
2015-10-16 10:41 ` [PATCH 27/57] perf tools: Move id_offset out of struct perf_evsel union Jiri Olsa
2015-10-16 10:41 ` [PATCH 28/57] perf stat: Rename perf_stat struct into perf_stat_evsel Jiri Olsa
2015-10-19 21:01 ` Arnaldo Carvalho de Melo
2015-10-20 7:48 ` [tip:perf/core] " tip-bot for Jiri Olsa
2015-10-16 10:41 ` [PATCH 29/57] perf stat: Add AGGR_UNSET mode Jiri Olsa
2015-10-19 21:02 ` Arnaldo Carvalho de Melo
2015-10-20 7:48 ` [tip:perf/core] " tip-bot for Jiri Olsa
2015-10-16 10:41 ` [PATCH 30/57] perf stat record: Add record command Jiri Olsa
2015-10-16 10:41 ` [PATCH 31/57] perf stat record: Initialize record features Jiri Olsa
2015-10-16 10:41 ` [PATCH 32/57] perf stat record: Synthesize stat record data Jiri Olsa
2015-10-16 10:41 ` [PATCH 33/57] perf stat record: Store events IDs in perf data file Jiri Olsa
2015-10-16 10:41 ` [PATCH 34/57] perf stat record: Add pipe support for record command Jiri Olsa
2015-10-16 10:41 ` [PATCH 35/57] perf stat record: Write stat events on record Jiri Olsa
2015-10-16 10:41 ` [PATCH 36/57] perf stat record: Write stat round " Jiri Olsa
2015-10-16 10:41 ` [PATCH 37/57] perf stat record: Do not allow record with multiple runs mode Jiri Olsa
2015-10-16 10:41 ` [PATCH 38/57] perf stat record: Synthesize attr update events Jiri Olsa
2015-10-16 10:41 ` [PATCH 39/57] perf tools: Make cpu_map__build_map global Jiri Olsa
2015-10-19 21:03 ` Arnaldo Carvalho de Melo
2015-10-20 7:49 ` [tip:perf/core] perf cpu_map: " tip-bot for Jiri Olsa
2015-10-16 10:41 ` [PATCH 40/57] perf tools: Add data arg to cpu_map__build_map callback Jiri Olsa
2015-10-19 21:04 ` Arnaldo Carvalho de Melo
2015-10-20 7:49 ` [tip:perf/core] perf cpu_map: " tip-bot for Jiri Olsa
2015-10-16 10:41 ` [PATCH 41/57] perf stat report: Cache aggregated map entries in extra cpumap Jiri Olsa
2015-10-16 10:41 ` [PATCH 42/57] perf stat report: Add report command Jiri Olsa
2015-10-16 10:41 ` [PATCH 43/57] perf stat report: Process cpu/threads maps Jiri Olsa
2015-10-16 10:41 ` [PATCH 44/57] perf stat report: Process stat config event Jiri Olsa
2015-10-16 10:41 ` [PATCH 45/57] perf stat report: Add support to initialize aggr_map from file Jiri Olsa
2015-10-16 10:41 ` [PATCH 46/57] perf stat report: Process stat and stat round events Jiri Olsa
2015-10-16 10:41 ` [PATCH 47/57] perf stat report: Process attr update events Jiri Olsa
2015-10-16 10:41 ` [PATCH 48/57] perf stat report: Move csv_sep initialization before report command Jiri Olsa
2015-10-16 10:41 ` [PATCH 49/57] perf stat report: Allow to override aggr_mode Jiri Olsa
2015-10-16 10:41 ` [PATCH 50/57] perf script: Check output fields only for samples Jiri Olsa
2015-10-19 21:06 ` Arnaldo Carvalho de Melo
2015-10-20 7:49 ` [tip:perf/core] " tip-bot for Jiri Olsa
2015-10-16 10:41 ` [PATCH 51/57] perf script: Process cpu/threads maps Jiri Olsa
2015-10-16 10:41 ` [PATCH 52/57] perf script: Process stat config event Jiri Olsa
2015-10-16 10:41 ` [PATCH 53/57] perf script: Add process_stat/process_stat_interval scripting interface Jiri Olsa
2015-10-16 10:41 ` [PATCH 54/57] perf script: Add stat default handlers Jiri Olsa
2015-10-16 10:41 ` [PATCH 55/57] perf script: Display stat events by default Jiri Olsa
2015-10-16 10:41 ` [PATCH 56/57] perf script: Add python support for stat events Jiri Olsa
2015-10-16 10:41 ` [PATCH 57/57] perf script: Add stat-cpi.py script Jiri Olsa
2015-10-19 19:48 ` [PATCHv4 00/57] perf stat: Add scripting support Liang, Kan
2015-10-21 2:03 ` Namhyung Kim
2015-10-21 10:22 ` 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=1444992092-17897-15-git-send-email-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=dsahern@gmail.com \
--cc=kan.liang@intel.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
Powered by JetHome