1d037ca164
perf defines both __used and __unused variables to use for marking
unused variables. The variable __used is defined to
__attribute__((__unused__)), which contradicts the kernel definition to
__attribute__((__used__)) for new gcc versions. On Android, __used is
also defined in system headers and this leads to warnings like: warning:
'__used__' attribute ignored
__unused is not defined in the kernel and is not a standard definition.
If __unused is included everywhere instead of __used, this leads to
conflicts with glibc headers, since glibc has a variables with this name
in its headers.
The best approach is to use __maybe_unused, the definition used in the
kernel for __attribute__((unused)). In this way there is only one
definition in perf sources (instead of 2 definitions that point to the
same thing: __used and __unused) and it works on both Linux and Android.
This patch simply replaces all instances of __used and __unused with
__maybe_unused.
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
Acked-by: Pekka Enberg <penberg@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1347315303-29906-7-git-send-email-irina.tirdea@intel.com
[ committer note: fixed up conflict with a116e05
in builtin-sched.c ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
287 lines
6.6 KiB
C
287 lines
6.6 KiB
C
/*
|
|
* builtin-inject.c
|
|
*
|
|
* Builtin inject command: Examine the live mode (stdin) event stream
|
|
* and repipe it to stdout while optionally injecting additional
|
|
* events into it.
|
|
*/
|
|
#include "builtin.h"
|
|
|
|
#include "perf.h"
|
|
#include "util/session.h"
|
|
#include "util/tool.h"
|
|
#include "util/debug.h"
|
|
|
|
#include "util/parse-options.h"
|
|
|
|
static char const *input_name = "-";
|
|
static bool inject_build_ids;
|
|
|
|
static int perf_event__repipe_synth(struct perf_tool *tool __maybe_unused,
|
|
union perf_event *event,
|
|
struct machine *machine __maybe_unused)
|
|
{
|
|
uint32_t size;
|
|
void *buf = event;
|
|
|
|
size = event->header.size;
|
|
|
|
while (size) {
|
|
int ret = write(STDOUT_FILENO, buf, size);
|
|
if (ret < 0)
|
|
return -errno;
|
|
|
|
size -= ret;
|
|
buf += ret;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int perf_event__repipe_op2_synth(struct perf_tool *tool,
|
|
union perf_event *event,
|
|
struct perf_session *session
|
|
__maybe_unused)
|
|
{
|
|
return perf_event__repipe_synth(tool, event, NULL);
|
|
}
|
|
|
|
static int perf_event__repipe_event_type_synth(struct perf_tool *tool,
|
|
union perf_event *event)
|
|
{
|
|
return perf_event__repipe_synth(tool, event, NULL);
|
|
}
|
|
|
|
static int perf_event__repipe_tracing_data_synth(union perf_event *event,
|
|
struct perf_session *session
|
|
__maybe_unused)
|
|
{
|
|
return perf_event__repipe_synth(NULL, event, NULL);
|
|
}
|
|
|
|
static int perf_event__repipe_attr(union perf_event *event,
|
|
struct perf_evlist **pevlist __maybe_unused)
|
|
{
|
|
int ret;
|
|
ret = perf_event__process_attr(event, pevlist);
|
|
if (ret)
|
|
return ret;
|
|
|
|
return perf_event__repipe_synth(NULL, event, NULL);
|
|
}
|
|
|
|
static int perf_event__repipe(struct perf_tool *tool,
|
|
union perf_event *event,
|
|
struct perf_sample *sample __maybe_unused,
|
|
struct machine *machine)
|
|
{
|
|
return perf_event__repipe_synth(tool, event, machine);
|
|
}
|
|
|
|
static int perf_event__repipe_sample(struct perf_tool *tool,
|
|
union perf_event *event,
|
|
struct perf_sample *sample __maybe_unused,
|
|
struct perf_evsel *evsel __maybe_unused,
|
|
struct machine *machine)
|
|
{
|
|
return perf_event__repipe_synth(tool, event, machine);
|
|
}
|
|
|
|
static int perf_event__repipe_mmap(struct perf_tool *tool,
|
|
union perf_event *event,
|
|
struct perf_sample *sample,
|
|
struct machine *machine)
|
|
{
|
|
int err;
|
|
|
|
err = perf_event__process_mmap(tool, event, sample, machine);
|
|
perf_event__repipe(tool, event, sample, machine);
|
|
|
|
return err;
|
|
}
|
|
|
|
static int perf_event__repipe_task(struct perf_tool *tool,
|
|
union perf_event *event,
|
|
struct perf_sample *sample,
|
|
struct machine *machine)
|
|
{
|
|
int err;
|
|
|
|
err = perf_event__process_task(tool, event, sample, machine);
|
|
perf_event__repipe(tool, event, sample, machine);
|
|
|
|
return err;
|
|
}
|
|
|
|
static int perf_event__repipe_tracing_data(union perf_event *event,
|
|
struct perf_session *session)
|
|
{
|
|
int err;
|
|
|
|
perf_event__repipe_synth(NULL, event, NULL);
|
|
err = perf_event__process_tracing_data(event, session);
|
|
|
|
return err;
|
|
}
|
|
|
|
static int dso__read_build_id(struct dso *self)
|
|
{
|
|
if (self->has_build_id)
|
|
return 0;
|
|
|
|
if (filename__read_build_id(self->long_name, self->build_id,
|
|
sizeof(self->build_id)) > 0) {
|
|
self->has_build_id = true;
|
|
return 0;
|
|
}
|
|
|
|
return -1;
|
|
}
|
|
|
|
static int dso__inject_build_id(struct dso *self, struct perf_tool *tool,
|
|
struct machine *machine)
|
|
{
|
|
u16 misc = PERF_RECORD_MISC_USER;
|
|
int err;
|
|
|
|
if (dso__read_build_id(self) < 0) {
|
|
pr_debug("no build_id found for %s\n", self->long_name);
|
|
return -1;
|
|
}
|
|
|
|
if (self->kernel)
|
|
misc = PERF_RECORD_MISC_KERNEL;
|
|
|
|
err = perf_event__synthesize_build_id(tool, self, misc, perf_event__repipe,
|
|
machine);
|
|
if (err) {
|
|
pr_err("Can't synthesize build_id event for %s\n", self->long_name);
|
|
return -1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int perf_event__inject_buildid(struct perf_tool *tool,
|
|
union perf_event *event,
|
|
struct perf_sample *sample,
|
|
struct perf_evsel *evsel __maybe_unused,
|
|
struct machine *machine)
|
|
{
|
|
struct addr_location al;
|
|
struct thread *thread;
|
|
u8 cpumode;
|
|
|
|
cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
|
|
|
|
thread = machine__findnew_thread(machine, event->ip.pid);
|
|
if (thread == NULL) {
|
|
pr_err("problem processing %d event, skipping it.\n",
|
|
event->header.type);
|
|
goto repipe;
|
|
}
|
|
|
|
thread__find_addr_map(thread, machine, cpumode, MAP__FUNCTION,
|
|
event->ip.ip, &al);
|
|
|
|
if (al.map != NULL) {
|
|
if (!al.map->dso->hit) {
|
|
al.map->dso->hit = 1;
|
|
if (map__load(al.map, NULL) >= 0) {
|
|
dso__inject_build_id(al.map->dso, tool, machine);
|
|
/*
|
|
* If this fails, too bad, let the other side
|
|
* account this as unresolved.
|
|
*/
|
|
} else {
|
|
#ifndef NO_LIBELF_SUPPORT
|
|
pr_warning("no symbols found in %s, maybe "
|
|
"install a debug package?\n",
|
|
al.map->dso->long_name);
|
|
#endif
|
|
}
|
|
}
|
|
}
|
|
|
|
repipe:
|
|
perf_event__repipe(tool, event, sample, machine);
|
|
return 0;
|
|
}
|
|
|
|
struct perf_tool perf_inject = {
|
|
.sample = perf_event__repipe_sample,
|
|
.mmap = perf_event__repipe,
|
|
.comm = perf_event__repipe,
|
|
.fork = perf_event__repipe,
|
|
.exit = perf_event__repipe,
|
|
.lost = perf_event__repipe,
|
|
.read = perf_event__repipe_sample,
|
|
.throttle = perf_event__repipe,
|
|
.unthrottle = perf_event__repipe,
|
|
.attr = perf_event__repipe_attr,
|
|
.event_type = perf_event__repipe_event_type_synth,
|
|
.tracing_data = perf_event__repipe_tracing_data_synth,
|
|
.build_id = perf_event__repipe_op2_synth,
|
|
};
|
|
|
|
extern volatile int session_done;
|
|
|
|
static void sig_handler(int sig __maybe_unused)
|
|
{
|
|
session_done = 1;
|
|
}
|
|
|
|
static int __cmd_inject(void)
|
|
{
|
|
struct perf_session *session;
|
|
int ret = -EINVAL;
|
|
|
|
signal(SIGINT, sig_handler);
|
|
|
|
if (inject_build_ids) {
|
|
perf_inject.sample = perf_event__inject_buildid;
|
|
perf_inject.mmap = perf_event__repipe_mmap;
|
|
perf_inject.fork = perf_event__repipe_task;
|
|
perf_inject.tracing_data = perf_event__repipe_tracing_data;
|
|
}
|
|
|
|
session = perf_session__new(input_name, O_RDONLY, false, true, &perf_inject);
|
|
if (session == NULL)
|
|
return -ENOMEM;
|
|
|
|
ret = perf_session__process_events(session, &perf_inject);
|
|
|
|
perf_session__delete(session);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static const char * const report_usage[] = {
|
|
"perf inject [<options>]",
|
|
NULL
|
|
};
|
|
|
|
static const struct option options[] = {
|
|
OPT_BOOLEAN('b', "build-ids", &inject_build_ids,
|
|
"Inject build-ids into the output stream"),
|
|
OPT_INCR('v', "verbose", &verbose,
|
|
"be more verbose (show build ids, etc)"),
|
|
OPT_END()
|
|
};
|
|
|
|
int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused)
|
|
{
|
|
argc = parse_options(argc, argv, options, report_usage, 0);
|
|
|
|
/*
|
|
* Any (unrecognized) arguments left?
|
|
*/
|
|
if (argc)
|
|
usage_with_options(report_usage, options);
|
|
|
|
if (symbol__init() < 0)
|
|
return -1;
|
|
|
|
return __cmd_inject();
|
|
}
|