Skip to content

Commit

Permalink
perf tools: Reference count map_groups objects
Browse files Browse the repository at this point in the history
We will share it among threads in the same process.
Adding map_groups__get/map_groups__put interface for that.

Signed-off-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1397490723-1992-4-git-send-email-jolsa@redhat.com
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
  • Loading branch information
Arnaldo Carvalho de Melo authored and Jiri Olsa committed Apr 28, 2014
1 parent 93d5731 commit a26ca67
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 1 deletion.
7 changes: 7 additions & 0 deletions tools/perf/util/map.c
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ void map_groups__init(struct map_groups *mg)
INIT_LIST_HEAD(&mg->removed_maps[i]);
}
mg->machine = NULL;
mg->refcnt = 1;
}

static void maps__delete(struct rb_root *maps)
Expand Down Expand Up @@ -374,6 +375,12 @@ void map_groups__delete(struct map_groups *mg)
free(mg);
}

void map_groups__put(struct map_groups *mg)
{
if (--mg->refcnt == 0)
map_groups__delete(mg);
}

void map_groups__flush(struct map_groups *mg)
{
int type;
Expand Down
9 changes: 9 additions & 0 deletions tools/perf/util/map.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,20 @@ struct map_groups {
struct rb_root maps[MAP__NR_TYPES];
struct list_head removed_maps[MAP__NR_TYPES];
struct machine *machine;
int refcnt;
};

struct map_groups *map_groups__new(void);
void map_groups__delete(struct map_groups *mg);

static inline struct map_groups *map_groups__get(struct map_groups *mg)
{
++mg->refcnt;
return mg;
}

void map_groups__put(struct map_groups *mg);

static inline struct kmap *map__kmap(struct map *map)
{
return (struct kmap *)(map + 1);
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/util/thread.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ void thread__delete(struct thread *thread)
{
struct comm *comm, *tmp;

map_groups__delete(thread->mg);
map_groups__put(thread->mg);
thread->mg = NULL;
list_for_each_entry_safe(comm, tmp, &thread->comm_list, list) {
list_del(&comm->list);
Expand Down

0 comments on commit a26ca67

Please sign in to comment.