From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753316Ab3GKQ06 (ORCPT ); Thu, 11 Jul 2013 12:26:58 -0400 Received: from mail-pb0-f43.google.com ([209.85.160.43]:41181 "EHLO mail-pb0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752193Ab3GKQ04 (ORCPT ); Thu, 11 Jul 2013 12:26:56 -0400 From: David Ahern To: acme@ghostprotocols.net, linux-kernel@vger.kernel.org Cc: David Ahern , Ingo Molnar , Frederic Weisbecker , Peter Zijlstra , Jiri Olsa , Namhyung Kim , Xiao Guangrong , Runzhen Wang Subject: [PATCH 03/11] perf evlist: add initialzation function for tracepoints Date: Thu, 11 Jul 2013 10:26:34 -0600 Message-Id: <1373560002-14618-4-git-send-email-dsahern@gmail.com> X-Mailer: git-send-email 1.7.10.1 In-Reply-To: <1373560002-14618-1-git-send-email-dsahern@gmail.com> References: <1373560002-14618-1-git-send-email-dsahern@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Handles initializations typically done as part of processing the file header and HEADER_TRACING_DATA event. v2: close fd as noticed by Namhyung. Signed-off-by: David Ahern Cc: Arnaldo Carvalho de Melo Cc: Ingo Molnar Cc: Frederic Weisbecker Cc: Peter Zijlstra Cc: Jiri Olsa Cc: Namhyung Kim Cc: Xiao Guangrong Cc: Runzhen Wang --- tools/perf/util/evlist.c | 35 +++++++++++++++++++++++++++++++++++ tools/perf/util/evlist.h | 3 +++ 2 files changed, 38 insertions(+) diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index c4d371c..8d30e9e 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -14,6 +14,7 @@ #include "target.h" #include "evlist.h" #include "evsel.h" +#include "trace-event.h" #include #include "parse-events.h" @@ -234,6 +235,40 @@ int perf_evlist__prepare_tracepoint_events(struct perf_evlist *evlist, return 0; } +int perf_evlist__trace_init(struct perf_evlist *evlist, + struct perf_session *session) +{ + struct tracing_data *tdata; + char temp_file[] = "/tmp/perf-XXXXXXXX"; + int fd; + int rc = 0; + + fd = mkstemp(temp_file); + if (fd < 0) { + pr_err("mkstemp failed\n"); + return -1; + } + unlink(temp_file); + + tdata = tracing_data_get(&evlist->entries, fd, false); + if (!tdata) { + rc = -1; + goto out; + } + + lseek(fd, 0, SEEK_SET); + (void) trace_report(fd, &session->pevent, false); + tracing_data_put(tdata); + + rc = perf_evlist__prepare_tracepoint_events(evlist, session->pevent); + +out: + close(fd); + + return rc; +} + + static int trace_event__id(const char *evname) { char *filename, *colon; diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index 8438100..bbc4c38 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -8,6 +8,7 @@ #include "trace-event.h" #include "evsel.h" #include "util.h" +#include "session.h" #include struct pollfd; @@ -66,6 +67,8 @@ int perf_evlist__prepare_tracepoint_events(struct perf_evlist *evlist, int perf_evlist__add_tracepoints(struct perf_evlist *evlist, const char * const tracepoints[], size_t nr_tracepoints); +int perf_evlist__trace_init(struct perf_evlist *evlist, + struct perf_session *session); #define perf_evlist__add_default_attrs(evlist, array) \ __perf_evlist__add_default_attrs(evlist, array, ARRAY_SIZE(array)) -- 1.7.10.1