Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754643Ab2HGM4N (ORCPT ); Tue, 7 Aug 2012 08:56:13 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:41798 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752959Ab2HGM4J (ORCPT ); Tue, 7 Aug 2012 08:56:09 -0400 From: Andrew Vagin To: linux-kernel@vger.kernel.org Cc: Peter Zijlstra , Paul Mackerras , Ingo Molnar , Arnaldo Carvalho de Melo Subject: [PATCH 1/4] perf: teach "perf inject" to work with files (v2) Date: Tue, 7 Aug 2012 16:56:02 +0400 Message-Id: <1344344165-369636-2-git-send-email-avagin@openvz.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1344344165-369636-1-git-send-email-avagin@openvz.org> References: <1344344165-369636-1-git-send-email-avagin@openvz.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3342 Lines: 116 Before this patch "perf inject" can only handle data from pipe. I want to use "perf inject" for reworking events. Look at my following patch. v2: add information about new options in tools/perf/Documentation/ Signed-off-by: Andrew Vagin --- tools/perf/Documentation/perf-inject.txt | 6 +++++ tools/perf/builtin-inject.c | 33 ++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/tools/perf/Documentation/perf-inject.txt b/tools/perf/Documentation/perf-inject.txt index 025630d..6be2101 100644 --- a/tools/perf/Documentation/perf-inject.txt +++ b/tools/perf/Documentation/perf-inject.txt @@ -29,6 +29,12 @@ OPTIONS -v:: --verbose:: Be more verbose. +-i:: +--input=:: + Input file name. (default: stdin) +-o:: +--output=:: + Output file name. (default: stdout) SEE ALSO -------- diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c index 3beab48..4c9cdbb 100644 --- a/tools/perf/builtin-inject.c +++ b/tools/perf/builtin-inject.c @@ -14,7 +14,12 @@ #include "util/parse-options.h" -static char const *input_name = "-"; +static const char *input_name = "-"; +static const char *output_name = "-"; +static int pipe_output; +static int output; +static u64 bytes_written; + static bool inject_build_ids; static int perf_event__repipe_synth(struct perf_tool *tool __used, @@ -27,12 +32,14 @@ static int perf_event__repipe_synth(struct perf_tool *tool __used, size = event->header.size; while (size) { - int ret = write(STDOUT_FILENO, buf, size); + int ret = write(output, buf, size); if (ret < 0) return -errno; size -= ret; buf += ret; + + bytes_written += ret; } return 0; @@ -244,8 +251,14 @@ static int __cmd_inject(void) if (session == NULL) return -ENOMEM; + if (!pipe_output) + lseek(output, session->header.data_offset, SEEK_SET); ret = perf_session__process_events(session, &perf_inject); + if (!pipe_output) { + session->header.data_size = bytes_written; + perf_session__write_header(session, session->evlist, output, true); + } perf_session__delete(session); return ret; @@ -259,6 +272,10 @@ static const char * const report_usage[] = { static const struct option options[] = { OPT_BOOLEAN('b', "build-ids", &inject_build_ids, "Inject build-ids into the output stream"), + OPT_STRING('i', "input", &input_name, "file", + "input file name"), + OPT_STRING('o', "output", &output_name, "file", + "output file name"), OPT_INCR('v', "verbose", &verbose, "be more verbose (show build ids, etc)"), OPT_END() @@ -274,6 +291,18 @@ int cmd_inject(int argc, const char **argv, const char *prefix __used) if (argc) usage_with_options(report_usage, options); + if (!strcmp(output_name, "-")) { + pipe_output = 1; + output = STDOUT_FILENO; + } else { + output = open(output_name, O_CREAT | O_WRONLY | O_TRUNC, + S_IRUSR | S_IWUSR); + if (output < 0) { + perror("failed to create output file"); + exit(-1); + } + } + if (symbol__init() < 0) return -1; -- 1.7.1 -- 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/