mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
perf inject: Work with files
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 <avagin@openvz.org> Acked-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1344344165-369636-2-git-send-email-avagin@openvz.org [ committer note: fixed it up to cope with5852a44
,5ded57a
,002439e
&f62d3f0
] Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
fcc328032e
commit
e558a5bd8b
2 changed files with 41 additions and 3 deletions
|
@ -29,6 +29,12 @@ OPTIONS
|
||||||
-v::
|
-v::
|
||||||
--verbose::
|
--verbose::
|
||||||
Be more verbose.
|
Be more verbose.
|
||||||
|
-i::
|
||||||
|
--input=::
|
||||||
|
Input file name. (default: stdin)
|
||||||
|
-o::
|
||||||
|
--output=::
|
||||||
|
Output file name. (default: stdout)
|
||||||
|
|
||||||
SEE ALSO
|
SEE ALSO
|
||||||
--------
|
--------
|
||||||
|
|
|
@ -17,24 +17,30 @@
|
||||||
struct perf_inject {
|
struct perf_inject {
|
||||||
struct perf_tool tool;
|
struct perf_tool tool;
|
||||||
bool build_ids;
|
bool build_ids;
|
||||||
|
const char *input_name;
|
||||||
|
int pipe_output,
|
||||||
|
output;
|
||||||
|
u64 bytes_written;
|
||||||
};
|
};
|
||||||
|
|
||||||
static int perf_event__repipe_synth(struct perf_tool *tool __maybe_unused,
|
static int perf_event__repipe_synth(struct perf_tool *tool,
|
||||||
union perf_event *event,
|
union perf_event *event,
|
||||||
struct machine *machine __maybe_unused)
|
struct machine *machine __maybe_unused)
|
||||||
{
|
{
|
||||||
|
struct perf_inject *inject = container_of(tool, struct perf_inject, tool);
|
||||||
uint32_t size;
|
uint32_t size;
|
||||||
void *buf = event;
|
void *buf = event;
|
||||||
|
|
||||||
size = event->header.size;
|
size = event->header.size;
|
||||||
|
|
||||||
while (size) {
|
while (size) {
|
||||||
int ret = write(STDOUT_FILENO, buf, size);
|
int ret = write(inject->output, buf, size);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return -errno;
|
return -errno;
|
||||||
|
|
||||||
size -= ret;
|
size -= ret;
|
||||||
buf += ret;
|
buf += ret;
|
||||||
|
inject->bytes_written += ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -231,12 +237,20 @@ static int __cmd_inject(struct perf_inject *inject)
|
||||||
inject->tool.tracing_data = perf_event__repipe_tracing_data;
|
inject->tool.tracing_data = perf_event__repipe_tracing_data;
|
||||||
}
|
}
|
||||||
|
|
||||||
session = perf_session__new("-", O_RDONLY, false, true, &inject->tool);
|
session = perf_session__new(inject->input_name, O_RDONLY, false, true, &inject->tool);
|
||||||
if (session == NULL)
|
if (session == NULL)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
if (!inject->pipe_output)
|
||||||
|
lseek(inject->output, session->header.data_offset, SEEK_SET);
|
||||||
|
|
||||||
ret = perf_session__process_events(session, &inject->tool);
|
ret = perf_session__process_events(session, &inject->tool);
|
||||||
|
|
||||||
|
if (!inject->pipe_output) {
|
||||||
|
session->header.data_size = inject->bytes_written;
|
||||||
|
perf_session__write_header(session, session->evlist, inject->output, true);
|
||||||
|
}
|
||||||
|
|
||||||
perf_session__delete(session);
|
perf_session__delete(session);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -260,10 +274,16 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused)
|
||||||
.tracing_data = perf_event__repipe_tracing_data_synth,
|
.tracing_data = perf_event__repipe_tracing_data_synth,
|
||||||
.build_id = perf_event__repipe_op2_synth,
|
.build_id = perf_event__repipe_op2_synth,
|
||||||
},
|
},
|
||||||
|
.input_name = "-",
|
||||||
};
|
};
|
||||||
|
const char *output_name = "-";
|
||||||
const struct option options[] = {
|
const struct option options[] = {
|
||||||
OPT_BOOLEAN('b', "build-ids", &inject.build_ids,
|
OPT_BOOLEAN('b', "build-ids", &inject.build_ids,
|
||||||
"Inject build-ids into the output stream"),
|
"Inject build-ids into the output stream"),
|
||||||
|
OPT_STRING('i', "input", &inject.input_name, "file",
|
||||||
|
"input file name"),
|
||||||
|
OPT_STRING('o', "output", &output_name, "file",
|
||||||
|
"output file name"),
|
||||||
OPT_INCR('v', "verbose", &verbose,
|
OPT_INCR('v', "verbose", &verbose,
|
||||||
"be more verbose (show build ids, etc)"),
|
"be more verbose (show build ids, etc)"),
|
||||||
OPT_END()
|
OPT_END()
|
||||||
|
@ -281,6 +301,18 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused)
|
||||||
if (argc)
|
if (argc)
|
||||||
usage_with_options(inject_usage, options);
|
usage_with_options(inject_usage, options);
|
||||||
|
|
||||||
|
if (!strcmp(output_name, "-")) {
|
||||||
|
inject.pipe_output = 1;
|
||||||
|
inject.output = STDOUT_FILENO;
|
||||||
|
} else {
|
||||||
|
inject.output = open(output_name, O_CREAT | O_WRONLY | O_TRUNC,
|
||||||
|
S_IRUSR | S_IWUSR);
|
||||||
|
if (inject.output < 0) {
|
||||||
|
perror("failed to create output file");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (symbol__init() < 0)
|
if (symbol__init() < 0)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue