linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephane Eranian <eranian@google.com>
To: linux-kernel@vger.kernel.org
Cc: acme@redhat.com, peterz@infradead.org, mingo@elte.hu,
	robert.richter@amd.com
Subject: [PATCH] perf: fix broken perf inject -b
Date: Fri, 13 Jan 2012 15:47:31 +0100	[thread overview]
Message-ID: <20120113144731.GA5458@quad> (raw)


perf inject -b was broken. It would not inject any build_ids
into the stream. Furthermore, it would strip samples from the
stream.

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@google.com>
---

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);

             reply	other threads:[~2012-01-13 14:47 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-13 14:47 Stephane Eranian [this message]
2012-01-13 16:53 ` [PATCH] perf: fix broken perf inject -b Arnaldo Carvalho de Melo
2012-01-13 16:54   ` Stephane Eranian
2012-01-16 18:53     ` Stephane Eranian
2012-01-30 19:00       ` Arnaldo Carvalho de Melo
2012-01-30 19:53         ` Stephane Eranian
2012-01-30 20:04           ` Arnaldo Carvalho de Melo
2012-01-30 20:09             ` Stephane Eranian
2012-01-30 20:36               ` Arnaldo Carvalho de Melo
2012-01-31  5:58                 ` Yanmin Zhang
2012-02-02 11:22                   ` Stephane Eranian
2012-02-03  3:30                     ` Yanmin Zhang
2012-01-26 14:16     ` Stephane Eranian
2012-01-26 14:23       ` Arnaldo Carvalho de Melo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120113144731.GA5458@quad \
    --to=eranian@google.com \
    --cc=acme@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=peterz@infradead.org \
    --cc=robert.richter@amd.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).