diff options
author | Jiri Olsa <jolsa@kernel.org> | 2014-04-30 09:25:10 -0400 |
---|---|---|
committer | Jiri Olsa <jolsa@kernel.org> | 2014-06-12 10:53:20 -0400 |
commit | bda6ee4a94d1e1be0c1428d37bc0d3da2e5793ad (patch) | |
tree | 3c63fda210643e1d8605ddfbdea472ec9a109c60 /tools | |
parent | eba5102d2f0b4117edd089f2d882d9386025c829 (diff) |
perf tools: Add global count of opened dso objects
Adding global count of opened dso objects so we could
properly limit the number of opened dso data file
descriptors.
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jean Pihet <jean.pihet@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1401892622-30848-6-git-send-email-jolsa@kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/util/dso.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index 5d7c7bcc6276..76e5c13afc8f 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c | |||
@@ -1,3 +1,4 @@ | |||
1 | #include <asm/bug.h> | ||
1 | #include "symbol.h" | 2 | #include "symbol.h" |
2 | #include "dso.h" | 3 | #include "dso.h" |
3 | #include "machine.h" | 4 | #include "machine.h" |
@@ -137,18 +138,23 @@ int dso__read_binary_type_filename(const struct dso *dso, | |||
137 | } | 138 | } |
138 | 139 | ||
139 | /* | 140 | /* |
140 | * Global list of open DSOs. | 141 | * Global list of open DSOs and the counter. |
141 | */ | 142 | */ |
142 | static LIST_HEAD(dso__data_open); | 143 | static LIST_HEAD(dso__data_open); |
144 | static long dso__data_open_cnt; | ||
143 | 145 | ||
144 | static void dso__list_add(struct dso *dso) | 146 | static void dso__list_add(struct dso *dso) |
145 | { | 147 | { |
146 | list_add_tail(&dso->data.open_entry, &dso__data_open); | 148 | list_add_tail(&dso->data.open_entry, &dso__data_open); |
149 | dso__data_open_cnt++; | ||
147 | } | 150 | } |
148 | 151 | ||
149 | static void dso__list_del(struct dso *dso) | 152 | static void dso__list_del(struct dso *dso) |
150 | { | 153 | { |
151 | list_del(&dso->data.open_entry); | 154 | list_del(&dso->data.open_entry); |
155 | WARN_ONCE(dso__data_open_cnt <= 0, | ||
156 | "DSO data fd counter out of bounds."); | ||
157 | dso__data_open_cnt--; | ||
152 | } | 158 | } |
153 | 159 | ||
154 | static int __open_dso(struct dso *dso, struct machine *machine) | 160 | static int __open_dso(struct dso *dso, struct machine *machine) |