From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932689AbbGUMky (ORCPT ); Tue, 21 Jul 2015 08:40:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50265 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754727AbbGUMcv (ORCPT ); Tue, 21 Jul 2015 08:32:51 -0400 From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: lkml , David Ahern , Ingo Molnar , Namhyung Kim , Peter Zijlstra Subject: [PATCH 22/47] perf tools: Add stat event synthesize function Date: Tue, 21 Jul 2015 14:31:42 +0200 Message-Id: <1437481927-29538-23-git-send-email-jolsa@kernel.org> In-Reply-To: <1437481927-29538-1-git-send-email-jolsa@kernel.org> References: <1437481927-29538-1-git-send-email-jolsa@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.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 --- tools/perf/tests/builtin-test.c | 4 ++++ tools/perf/tests/stat.c | 40 +++++++++++++++++++++++++++++++++++----- tools/perf/tests/tests.h | 1 + tools/perf/util/event.c | 22 ++++++++++++++++++++++ tools/perf/util/event.h | 7 ++++++- 5 files changed, 68 insertions(+), 6 deletions(-) diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c index 203164ad9c82..7d8772c0ea82 100644 --- a/tools/perf/tests/builtin-test.c +++ b/tools/perf/tests/builtin-test.c @@ -187,6 +187,10 @@ static struct test { .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..31b242159e79 100644 --- a/tools/perf/tests/stat.c +++ b/tools/perf/tests/stat.c @@ -18,10 +18,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 +53,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 = { + .val = 100, + .ena = 200, + .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 dfb6db7d8a4d..98beb2be1e26 100644 --- a/tools/perf/tests/tests.h +++ b/tools/perf/tests/tests.h @@ -65,6 +65,7 @@ int test__thread_map(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(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__) #ifdef HAVE_DWARF_UNWIND_SUPPORT diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index 6779ab62ff6a..02954385ccdc 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -804,6 +804,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 ab98be7a9612..375b1de34cc6 100644 --- a/tools/perf/util/event.h +++ b/tools/perf/util/event.h @@ -437,6 +437,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, @@ -469,7 +470,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