Commit a26ca671 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by Jiri Olsa

perf tools: Reference count map_groups objects

We will share it among threads in the same process.
Adding map_groups__get/map_groups__put interface for that.
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@kernel.org>
Acked-by: default avatarNamhyung 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.comSigned-off-by: default avatarJiri Olsa <jolsa@kernel.org>
parent 93d5731d
...@@ -323,6 +323,7 @@ void map_groups__init(struct map_groups *mg) ...@@ -323,6 +323,7 @@ void map_groups__init(struct map_groups *mg)
INIT_LIST_HEAD(&mg->removed_maps[i]); INIT_LIST_HEAD(&mg->removed_maps[i]);
} }
mg->machine = NULL; mg->machine = NULL;
mg->refcnt = 1;
} }
static void maps__delete(struct rb_root *maps) static void maps__delete(struct rb_root *maps)
...@@ -374,6 +375,12 @@ void map_groups__delete(struct map_groups *mg) ...@@ -374,6 +375,12 @@ void map_groups__delete(struct map_groups *mg)
free(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) void map_groups__flush(struct map_groups *mg)
{ {
int type; int type;
......
...@@ -59,11 +59,20 @@ struct map_groups { ...@@ -59,11 +59,20 @@ struct map_groups {
struct rb_root maps[MAP__NR_TYPES]; struct rb_root maps[MAP__NR_TYPES];
struct list_head removed_maps[MAP__NR_TYPES]; struct list_head removed_maps[MAP__NR_TYPES];
struct machine *machine; struct machine *machine;
int refcnt;
}; };
struct map_groups *map_groups__new(void); struct map_groups *map_groups__new(void);
void map_groups__delete(struct map_groups *mg); 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) static inline struct kmap *map__kmap(struct map *map)
{ {
return (struct kmap *)(map + 1); return (struct kmap *)(map + 1);
......
...@@ -50,7 +50,7 @@ void thread__delete(struct thread *thread) ...@@ -50,7 +50,7 @@ void thread__delete(struct thread *thread)
{ {
struct comm *comm, *tmp; struct comm *comm, *tmp;
map_groups__delete(thread->mg); map_groups__put(thread->mg);
thread->mg = NULL; thread->mg = NULL;
list_for_each_entry_safe(comm, tmp, &thread->comm_list, list) { list_for_each_entry_safe(comm, tmp, &thread->comm_list, list) {
list_del(&comm->list); list_del(&comm->list);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment