diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2014-10-21 16:29:02 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2014-10-29 08:32:46 -0400 |
commit | 11246c708acdfa9512d7b69c18938810c20fd6ab (patch) | |
tree | ef571dcfac1d69884897118276b36781bba53da3 /tools/perf/util/map.c | |
parent | 7d073b335edc8d97af730c2e3b83ed6642bd3c27 (diff) |
perf tools: Set thread->mg.machine in all places
We were setting this only in machine__init(), i.e. for the map_groups that
holds the kernel module maps, not for the one used for a thread's executable
mmaps.
Now we are sure that we can obtain the machine where a thread is by going
via thread->mg->machine, thus we can, in the following patch, make all
codepaths that receive machine _and_ thread, drop the machine one.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jean Pihet <jean.pihet@linaro.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-y6zgaqsvhrf04v57u15e4ybm@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/map.c')
-rw-r--r-- | tools/perf/util/map.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index 2137c4596ec7..040a785c857b 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c | |||
@@ -413,14 +413,14 @@ u64 map__objdump_2mem(struct map *map, u64 ip) | |||
413 | return ip + map->reloc; | 413 | return ip + map->reloc; |
414 | } | 414 | } |
415 | 415 | ||
416 | void map_groups__init(struct map_groups *mg) | 416 | void map_groups__init(struct map_groups *mg, struct machine *machine) |
417 | { | 417 | { |
418 | int i; | 418 | int i; |
419 | for (i = 0; i < MAP__NR_TYPES; ++i) { | 419 | for (i = 0; i < MAP__NR_TYPES; ++i) { |
420 | mg->maps[i] = RB_ROOT; | 420 | mg->maps[i] = RB_ROOT; |
421 | INIT_LIST_HEAD(&mg->removed_maps[i]); | 421 | INIT_LIST_HEAD(&mg->removed_maps[i]); |
422 | } | 422 | } |
423 | mg->machine = NULL; | 423 | mg->machine = machine; |
424 | mg->refcnt = 1; | 424 | mg->refcnt = 1; |
425 | } | 425 | } |
426 | 426 | ||
@@ -471,12 +471,12 @@ bool map_groups__empty(struct map_groups *mg) | |||
471 | return true; | 471 | return true; |
472 | } | 472 | } |
473 | 473 | ||
474 | struct map_groups *map_groups__new(void) | 474 | struct map_groups *map_groups__new(struct machine *machine) |
475 | { | 475 | { |
476 | struct map_groups *mg = malloc(sizeof(*mg)); | 476 | struct map_groups *mg = malloc(sizeof(*mg)); |
477 | 477 | ||
478 | if (mg != NULL) | 478 | if (mg != NULL) |
479 | map_groups__init(mg); | 479 | map_groups__init(mg, machine); |
480 | 480 | ||
481 | return mg; | 481 | return mg; |
482 | } | 482 | } |