From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966407AbbLRJGB (ORCPT ); Fri, 18 Dec 2015 04:06:01 -0500 Received: from terminus.zytor.com ([198.137.202.10]:52303 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966376AbbLRJF4 (ORCPT ); Fri, 18 Dec 2015 04:05:56 -0500 Date: Fri, 18 Dec 2015 01:05:40 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: jolsa@kernel.org, a.p.zijlstra@chello.nl, mingo@kernel.org, kan.liang@intel.com, acme@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com, dsahern@gmail.com, namhyung@kernel.org, tglx@linutronix.de Reply-To: hpa@zytor.com, namhyung@kernel.org, tglx@linutronix.de, dsahern@gmail.com, jolsa@kernel.org, mingo@kernel.org, a.p.zijlstra@chello.nl, kan.liang@intel.com, acme@redhat.com, linux-kernel@vger.kernel.org In-Reply-To: <1445784728-21732-20-git-send-email-jolsa@kernel.org> References: <1445784728-21732-20-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Add stat events fprintf functions Git-Commit-ID: e08a4564e23f8f89a055d717887674f54a9da515 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: e08a4564e23f8f89a055d717887674f54a9da515 Gitweb: http://git.kernel.org/tip/e08a4564e23f8f89a055d717887674f54a9da515 Author: Jiri Olsa AuthorDate: Sun, 25 Oct 2015 15:51:35 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 17 Dec 2015 15:09:38 -0300 perf tools: Add stat events fprintf functions Introducing the following functions to display the stat events for raw dump. perf_event__fprintf_stat perf_event__fprintf_stat_round perf_event__fprintf_stat_config Signed-off-by: Jiri Olsa Tested-by: Kan Liang Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1445784728-21732-20-git-send-email-jolsa@kernel.org [ s/stat/st/g and s/round/rd/g parameters to fix 'already defined' build error with older distros (e.g. RHEL6.7) ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/stat.c | 39 +++++++++++++++++++++++++++++++++++++++ tools/perf/util/stat.h | 4 ++++ 2 files changed, 43 insertions(+) diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c index 0ad59ce..2f901d1 100644 --- a/tools/perf/util/stat.c +++ b/tools/perf/util/stat.c @@ -364,3 +364,42 @@ int perf_event__process_stat_event(struct perf_tool *tool __maybe_unused, counter->supported = true; return 0; } + +size_t perf_event__fprintf_stat(union perf_event *event, FILE *fp) +{ + struct stat_event *st = (struct stat_event *) event; + size_t ret; + + ret = fprintf(fp, "\n... id %" PRIu64 ", cpu %d, thread %d\n", + st->id, st->cpu, st->thread); + ret += fprintf(fp, "... value %" PRIu64 ", enabled %" PRIu64 ", running %" PRIu64 "\n", + st->val, st->ena, st->run); + + return ret; +} + +size_t perf_event__fprintf_stat_round(union perf_event *event, FILE *fp) +{ + struct stat_round_event *rd = (struct stat_round_event *)event; + size_t ret; + + ret = fprintf(fp, "\n... time %" PRIu64 ", type %s\n", rd->time, + rd->type == PERF_STAT_ROUND_TYPE__FINAL ? "FINAL" : "INTERVAL"); + + return ret; +} + +size_t perf_event__fprintf_stat_config(union perf_event *event, FILE *fp) +{ + struct perf_stat_config sc; + size_t ret; + + perf_event__read_stat_config(&sc, &event->stat_config); + + ret = fprintf(fp, "\n"); + ret += fprintf(fp, "... aggr_mode %d\n", sc.aggr_mode); + ret += fprintf(fp, "... scale %d\n", sc.scale); + ret += fprintf(fp, "... interval %u\n", sc.interval); + + return ret; +} diff --git a/tools/perf/util/stat.h b/tools/perf/util/stat.h index afe6844..086f4e1 100644 --- a/tools/perf/util/stat.h +++ b/tools/perf/util/stat.h @@ -96,4 +96,8 @@ struct perf_session; int perf_event__process_stat_event(struct perf_tool *tool, union perf_event *event, struct perf_session *session); + +size_t perf_event__fprintf_stat(union perf_event *event, FILE *fp); +size_t perf_event__fprintf_stat_round(union perf_event *event, FILE *fp); +size_t perf_event__fprintf_stat_config(union perf_event *event, FILE *fp); #endif