perf: add perf-inject builtin

Currently, perf 'live mode' writes build-ids at the end of the
session, which isn't actually useful for processing live mode events.

What would be better would be to have the build-ids sent before any of
the samples that reference them, which can be done by processing the
event stream and retrieving the build-ids on the first hit.  Doing
that in perf-record itself, however, is off-limits.

This patch introduces perf-inject, which does the same job while
leaving perf-record untouched.  Normal mode perf still records the
build-ids at the end of the session as it should, but for live mode,
perf-inject can be injected in between the record and report steps
e.g.:

perf record -o - ./hackbench 10 | perf inject -v -b | perf report -v -i -

perf-inject reads a perf-record event stream and repipes it to stdout.
At any point the processing code can inject other events into the
event stream - in this case build-ids (-b option) are read and
injected as needed into the event stream.

Build-ids are just the first user of perf-inject - potentially
anything that needs userspace processing to augment the trace stream
with additional information could make use of this facility.

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
LKML-Reference: <1272696080-16435-3-git-send-email-tzanussi@gmail.com>
Signed-off-by: Tom Zanussi <tzanussi@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

5 files changed, 50 insertions, 12 deletions

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 2d1d97e0746d..79da0e50ef8f 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -713,10 +713,18 @@ static int __event_process_build_id(struct build_id_event *bev,
 
         dso = __dsos__findnew(head, filename);
         if (dso != NULL) {
+                char sbuild_id[BUILD_ID_SIZE * 2 + 1];
+
                 dso__set_build_id(dso, &bev->build_id);
-                        if (filename[0] == '[')
-                                dso->kernel = dso_type;
-                }
+
+                if (filename[0] == '[')
+                        dso->kernel = dso_type;
+
+                build_id__sprintf(dso->build_id, sizeof(dso->build_id),
+                                  sbuild_id);
+                pr_debug("build id event received for %s: %s\n",
+                         dso->long_name, sbuild_id);
+        }
 
         err = 0;
 out:
@@ -767,7 +775,7 @@ static int perf_file_section__process(struct perf_file_section *self,
 
         switch (feat) {
         case HEADER_TRACE_INFO:
-                trace_report(fd);
+                trace_report(fd, false);
                 break;
 
         case HEADER_BUILD_ID:
@@ -782,12 +790,16 @@ static int perf_file_section__process(struct perf_file_section *self,
 }
 
 static int perf_file_header__read_pipe(struct perf_pipe_file_header *self,
-                                       struct perf_header *ph, int fd)
+                                       struct perf_header *ph, int fd,
+                                       bool repipe)
 {
         if (do_read(fd, self, sizeof(*self)) <= 0 ||
             memcmp(&self->magic, __perf_magic, sizeof(self->magic)))
                 return -1;
 
+        if (repipe && do_write(STDOUT_FILENO, self, sizeof(*self)) < 0)
+                return -1;
+
         if (self->size != sizeof(*self)) {
                 u64 size = bswap_64(self->size);
 
@@ -805,7 +817,8 @@ static int perf_header__read_pipe(struct perf_session *session, int fd)
         struct perf_header *self = &session->header;
         struct perf_pipe_file_header f_header;
 
-        if (perf_file_header__read_pipe(&f_header, self, fd) < 0) {
+        if (perf_file_header__read_pipe(&f_header, self, fd,
+                                        session->repipe) < 0) {
                 pr_debug("incompatible file format\n");
                 return -EINVAL;
         }
@@ -1096,12 +1109,17 @@ int event__process_tracing_data(event_t *self,
         lseek(session->fd, offset + sizeof(struct tracing_data_event),
               SEEK_SET);
 
-        size_read = trace_report(session->fd);
+        size_read = trace_report(session->fd, session->repipe);
 
         padding = ALIGN(size_read, sizeof(u64)) - size_read;
 
         if (read(session->fd, buf, padding) < 0)
                 die("reading input file");
+        if (session->repipe) {
+                int retw = write(STDOUT_FILENO, buf, padding);
+                if (retw <= 0 || retw != padding)
+                        die("repiping tracing data padding");
+        }
 
         if (size_read + padding != size)
                 die("tracing data size mismatch");
@@ -1110,7 +1128,8 @@ int event__process_tracing_data(event_t *self,
 }
 
 int event__synthesize_build_id(struct dso *pos, u16 misc,
-                               event__handler_t process, struct machine *machine,
+                               event__handler_t process,
+                               struct machine *machine,
                                struct perf_session *session)
 {
         event_t ev;
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index a8dd73ed1581..5d353e70fe26 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -77,7 +77,7 @@ int perf_session__create_kernel_maps(struct perf_session *self)
         return ret;
 }
 
-struct perf_session *perf_session__new(const char *filename, int mode, bool force)
+struct perf_session *perf_session__new(const char *filename, int mode, bool force, bool repipe)
 {
         size_t len = filename ? strlen(filename) + 1 : 0;
         struct perf_session *self = zalloc(sizeof(*self) + len);
@@ -97,6 +97,7 @@ struct perf_session *perf_session__new(const char *filename, int mode, bool forc
         self->cwdlen = 0;
         self->unknown_events = 0;
         self->machines = RB_ROOT;
+        self->repipe = repipe;
         self->ordered_samples.flush_limit = ULLONG_MAX;
         INIT_LIST_HEAD(&self->ordered_samples.samples_head);
 
diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
index 61ca92e58ad4..f2b2c6a3a49d 100644
--- a/tools/perf/util/session.h
+++ b/tools/perf/util/session.h
@@ -34,6 +34,7 @@ struct perf_session {
         u64                     sample_type;
         int                     fd;
         bool                    fd_pipe;
+        bool                    repipe;
         int                     cwdlen;
         char                    *cwd;
         struct ordered_samples  ordered_samples;
@@ -59,7 +60,7 @@ struct perf_event_ops {
         bool    ordered_samples;
 };
 
-struct perf_session *perf_session__new(const char *filename, int mode, bool force);
+struct perf_session *perf_session__new(const char *filename, int mode, bool force, bool repipe);
 void perf_session__delete(struct perf_session *self);
 
 void perf_event_header__bswap(struct perf_event_header *self);
diff --git a/tools/perf/util/trace-event-read.c b/tools/perf/util/trace-event-read.c
index 44889c9b5630..43f19c1fed3a 100644
--- a/tools/perf/util/trace-event-read.c
+++ b/tools/perf/util/trace-event-read.c
@@ -51,6 +51,7 @@ static int long_size;
 static unsigned long    page_size;
 
 static ssize_t calc_data_size;
+static bool repipe;
 
 static int do_read(int fd, void *buf, int size)
 {
@@ -62,6 +63,13 @@ static int do_read(int fd, void *buf, int size)
                 if (ret <= 0)
                         return -1;
 
+                if (repipe) {
+                        int retw = write(STDOUT_FILENO, buf, ret);
+
+                        if (retw <= 0 || retw != ret)
+                                die("repiping input file");
+                }
+
                 size -= ret;
                 buf += ret;
         }
@@ -116,6 +124,13 @@ static char *read_string(void)
                 if (!r)
                         die("no data");
 
+                if (repipe) {
+                        int retw = write(STDOUT_FILENO, &c, 1);
+
+                        if (retw <= 0 || retw != r)
+                                die("repiping input file string");
+                }
+
                 buf[size++] = c;
 
                 if (!c)
@@ -454,7 +469,7 @@ struct record *trace_read_data(int cpu)
         return data;
 }
 
-ssize_t trace_report(int fd)
+ssize_t trace_report(int fd, bool __repipe)
 {
         char buf[BUFSIZ];
         char test[] = { 23, 8, 68 };
@@ -465,6 +480,7 @@ ssize_t trace_report(int fd)
         ssize_t size;
 
         calc_data_size = 1;
+        repipe = __repipe;
 
         input_fd = fd;
 
@@ -499,6 +515,7 @@ ssize_t trace_report(int fd)
 
         size = calc_data_size - 1;
         calc_data_size = 0;
+        repipe = false;
 
         if (show_funcs) {
                 print_funcs();
diff --git a/tools/perf/util/trace-event.h b/tools/perf/util/trace-event.h
index 1f45d468fd9a..ebfee80e4a07 100644
--- a/tools/perf/util/trace-event.h
+++ b/tools/perf/util/trace-event.h
@@ -163,7 +163,7 @@ struct record *trace_read_data(int cpu);
 
 void parse_set_info(int nr_cpus, int long_sz);
 
-ssize_t trace_report(int fd);
+ssize_t trace_report(int fd, bool repipe);
 
 void *malloc_or_die(unsigned int size);