Messages in this thread Patch in this message | | | Date | Thu, 25 Jun 2015 10:38:41 +0200 | From | Jiri Olsa <> | Subject | Re: [PATCH 12/13] perf thread_map: Change map entries into a struct |
| |
On Tue, Jun 23, 2015 at 06:47:26PM -0300, Arnaldo Carvalho de Melo wrote: > From: Jiri Olsa <jolsa@kernel.org> > > We need to store command names with the pid. Changing map entries to be > a struct holding pid. Process name is coming in shortly. > > Signed-off-by: Jiri Olsa <jolsa@kernel.org> > Cc: Adrian Hunter <adrian.hunter@intel.com> > Cc: Andi Kleen <ak@linux.intel.com> > Cc: David Ahern <dsahern@gmail.com> > Cc: Namhyung Kim <namhyung@kernel.org> > Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> > Cc: Stephane Eranian <eranian@google.com> > Link: http://lkml.kernel.org/r/1435012588-9007-2-git-send-email-jolsa@kernel.org > [ Split providing the set/get accessors from transforming the entries structs ]
the comment in [] is wrong..
and you missed following hunk:
--- static struct thread_map *thread_map__realloc(struct thread_map *map, int nr) { - size_t size = sizeof(*map) + sizeof(pid_t) * nr; + size_t size = sizeof(*map) + sizeof(struct thread_map_data) * nr; ---
shouldn't be fatal, it probably has the same or biggger size ATM I'll include the fix in the next version
jirka
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> > --- > tools/perf/util/thread_map.h | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/tools/perf/util/thread_map.h b/tools/perf/util/thread_map.h > index e22570390470..b9f40679f589 100644 > --- a/tools/perf/util/thread_map.h > +++ b/tools/perf/util/thread_map.h > @@ -4,9 +4,13 @@ > #include <sys/types.h> > #include <stdio.h> > > +struct thread_map_data { > + pid_t pid; > +}; > + > struct thread_map { > int nr; > - pid_t map[]; > + struct thread_map_data map[]; > }; > > struct thread_map *thread_map__new_dummy(void); > @@ -29,12 +33,12 @@ static inline int thread_map__nr(struct thread_map *threads) > > static inline pid_t thread_map__pid(struct thread_map *map, int thread) > { > - return map->map[thread]; > + return map->map[thread].pid; > } > > static inline void > thread_map__set_pid(struct thread_map *map, int thread, pid_t pid) > { > - map->map[thread] = pid; > + map->map[thread].pid = pid; > } > #endif /* __PERF_THREAD_MAP_H */ > -- > 2.1.0 >
| |