Em Sat, Jun 09, 2012 at 01:05:58PM +0400, Dmitry Antipov escreveu:
> Use new function trace_find_event_by_name to lookup events before
> looking through /sys files. This helps 'perf sched replay' to map
> event names to IDs correctly when processing perf.data recorded
> on another machine.
> 
> Signed-off-by: Dmitry Antipov <dmitry.anti...@linaro.org>
> ---
>  tools/perf/util/evlist.c            |   18 ++++++++++++++++--
>  tools/perf/util/trace-event-parse.c |    4 ++++
>  tools/perf/util/trace-event.h       |    1 +
>  3 files changed, 21 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
> index 4ac5f5a..7ebb9c5 100644
> --- a/tools/perf/util/evlist.c
> +++ b/tools/perf/util/evlist.c
> @@ -17,6 +17,7 @@
>  #include <unistd.h>
>  
>  #include "parse-events.h"
> +#include "trace-event.h"
>  
>  #include <sys/mman.h>
>  
> @@ -231,12 +232,25 @@ int perf_evlist__set_tracepoints_handlers(struct 
> perf_evlist *evlist,
>                                         const struct perf_evsel_str_handler 
> *assocs,
>                                         size_t nr_assocs)
>  {
> +     struct event_format *event;
>       struct perf_evsel *evsel;
> +     char *p, *sys, *name;
>       int err;
> -     size_t i;
> +     size_t i, off;
>  
>       for (i = 0; i < nr_assocs; i++) {
> -             err = trace_event__id(assocs[i].name);
> +             err = -ENOENT;
> +             p = strchr(assocs[i].name, ':');
> +             if (!p)
> +                     goto out;
> +             off = p - assocs[i].name;
> +             sys = malloc(off + 1);

malloc can fail, so testing it is needed here. Also I think using just
strdup(assocs[i].name), then looking at the separators and then inline
setting them to '\0', etc would be simpler, no?

> +             memcpy(sys, assocs[i].name, off);
> +             sys[off] = '\0';
> +             name = p + 1;
> +             event = trace_find_event_by_name(sys, name);
> +             err = event ? event->id : trace_event__id(assocs[i].name);

I'll try and cook an alternate patch fixing this problem.

> +             free(sys);
>               if (err < 0)
>                       goto out;
>  
> diff --git a/tools/perf/util/trace-event-parse.c 
> b/tools/perf/util/trace-event-parse.c
> index df2fddb..44cbb40 100644
> --- a/tools/perf/util/trace-event-parse.c
> +++ b/tools/perf/util/trace-event-parse.c
> @@ -176,6 +176,10 @@ struct event_format *trace_find_event(int type)
>       return pevent_find_event(pevent, type);
>  }
>  
> +struct event_format *trace_find_event_by_name(const char *sys, const char 
> *name)
> +{
> +     return pevent_find_event_by_name(pevent, sys, name);
> +}
>  
>  void print_trace_event(int cpu, void *data, int size)
>  {
> diff --git a/tools/perf/util/trace-event.h b/tools/perf/util/trace-event.h
> index 639852a..66f83a0 100644
> --- a/tools/perf/util/trace-event.h
> +++ b/tools/perf/util/trace-event.h
> @@ -40,6 +40,7 @@ int parse_event_file(char *buf, unsigned long size, char 
> *sys);
>  
>  struct pevent_record *trace_peek_data(int cpu);
>  struct event_format *trace_find_event(int type);
> +struct event_format *trace_find_event_by_name(const char *sys, const char 
> *name);
>  
>  unsigned long long
>  raw_field_value(struct event_format *event, const char *name, void *data);
> -- 
> 1.7.7.6

_______________________________________________
linaro-dev mailing list
linaro-dev@lists.linaro.org
http://lists.linaro.org/mailman/listinfo/linaro-dev

Reply via email to