Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755149AbbGUMl1 (ORCPT ); Tue, 21 Jul 2015 08:41:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50245 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752635AbbGUMcr (ORCPT ); Tue, 21 Jul 2015 08:32:47 -0400 From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: lkml , David Ahern , Ingo Molnar , Namhyung Kim , Peter Zijlstra Subject: [PATCH 20/47] perf tools: Add stat config event read function Date: Tue, 21 Jul 2015 14:31:40 +0200 Message-Id: <1437481927-29538-21-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 Content-Length: 2986 Lines: 91 Introducing perf_event__read_stat_config function to read struct perf_stat_config object data from stat config event. Link: http://lkml.kernel.org/n/tip-62ae08zz97jp2qkhygp8uet5@git.kernel.org Signed-off-by: Jiri Olsa --- tools/perf/tests/stat.c | 6 ++++++ tools/perf/util/event.c | 24 ++++++++++++++++++++++++ tools/perf/util/event.h | 2 ++ 3 files changed, 32 insertions(+) diff --git a/tools/perf/tests/stat.c b/tools/perf/tests/stat.c index 5e6a2441998c..2049c5a3e4a2 100644 --- a/tools/perf/tests/stat.c +++ b/tools/perf/tests/stat.c @@ -24,6 +24,7 @@ static int process_event(struct perf_tool *tool __maybe_unused, struct machine *machine __maybe_unused) { struct stat_config_event *config = &event->stat_config; + struct perf_stat_config stat_config; #define HAS(term, val) \ has_term(config, PERF_STAT_CONFIG_TERM__##term, val) @@ -35,6 +36,11 @@ static int process_event(struct perf_tool *tool __maybe_unused, #undef HAS + perf_event__read_stat_config(&stat_config, config); + + TEST_ASSERT_VAL("wrong aggr_mode", stat_config.aggr_mode == AGGR_CORE); + TEST_ASSERT_VAL("wrong scale", stat_config.scale == 1); + TEST_ASSERT_VAL("wrong interval", stat_config.interval == 1); return 0; } diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index aa166ebf9fc0..887731b52c40 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -803,6 +803,30 @@ int perf_event__synthesize_stat_config(struct perf_tool *tool, return err; } +void perf_event__read_stat_config(struct perf_stat_config *config, + struct stat_config_event *event) +{ + unsigned i; + + for (i = 0; i < event->nr; i++) { + + switch (event->data[i].tag) { +#define CASE(__term, __val) \ + case PERF_STAT_CONFIG_TERM__##__term: \ + config->__val = event->data[i].val; \ + break; + + CASE(AGGR_MODE, aggr_mode); + CASE(SCALE, scale); + CASE(INTERVAL, interval); +#undef CASE + default: + pr_warning("unknown stat config term %" PRIu64 "\n", + event->data[i].tag); + } + } +} + size_t perf_event__fprintf_comm(union perf_event *event, FILE *fp) { const char *s; diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h index 23dba7bb8973..72da01b30cf9 100644 --- a/tools/perf/util/event.h +++ b/tools/perf/util/event.h @@ -448,6 +448,8 @@ int perf_event__synthesize_stat_config(struct perf_tool *tool, struct perf_stat_config *config, perf_event__handler_t process, struct machine *machine); +void perf_event__read_stat_config(struct perf_stat_config *config, + struct stat_config_event *event); int perf_event__synthesize_modules(struct perf_tool *tool, perf_event__handler_t process, -- 2.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/