Re: [PATCH] perf: fix broken perf inject -b

[Stephane Eranian]

On Fri, Jan 13, 2012 at 5:53 PM, Arnaldo Carvalho de Melo
<acme@xxxxxxxxxx> wrote:
> Em Fri, Jan 13, 2012 at 03:47:31PM +0100, Stephane Eranian escreveu:
>>
>> perf inject -b was broken. It would not inject any build_ids
>> into the stream. Furthermore, it would strip samples from the
>> stream.
>
> Against which tree is this patch?
>
3.2.0-rc7-tip.
Did that get fixed later on?

>> The reason was a missing initialization of the event attribute
>> structures. The perf_tool.tool.attr() callback was pointing to
>> a simple repipe. But there was no initialization of internal data
>> structures to keep track of events and event ids. That later caused
>> event id lookups to fail, and samples would get dropped.
>>
>> The patch simply adds back the call to perf_event__process_attr()
>> to initialize the evlist structure. Build_ids are again injected.
>> The PID is also inject for PERF_RECORD_HEADER_BUILD_ID.
>>
>> Signed-off-by: Stephane Eranian <eranian@xxxxxxxxxx>
>> ---
>>
>> diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
>> index 09c1061..f38f370 100644
>> --- a/tools/perf/builtin-inject.c
>> +++ b/tools/perf/builtin-inject.c
>> @@ -60,6 +60,11 @@ static int perf_event__repipe_tracing_data_synth(union perf_event *event,
>> Âstatic int perf_event__repipe_attr(union perf_event *event,
>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âstruct perf_evlist **pevlist __used)
>> Â{
>> + Â Â int ret;
>> + Â Â ret = perf_event__process_attr(event, pevlist);
>> + Â Â if (ret)
>> + Â Â Â Â Â Â return ret;
>> +
>> Â Â Â return perf_event__repipe_synth(NULL, event, NULL);
>> Â}
>>
>> @@ -173,6 +178,7 @@ static int perf_event__inject_buildid(struct perf_tool *tool,
>> Â Â Â Â Â Â Â Â Â Â Âevent->header.type);
>> Â Â Â Â Â Â Â goto repipe;
>> Â Â Â }
>> + Â Â machine->pid = event->ip.pid;
>>
>> Â Â Â thread__find_addr_map(thread, machine, cpumode, MAP__FUNCTION,
>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â event->ip.ip, &al);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/