summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@kernel.org>2014-04-30 15:25:10 +0200
committerJiri Olsa <jolsa@kernel.org>2014-06-12 16:53:20 +0200
commitbda6ee4a94d1e1be0c1428d37bc0d3da2e5793ad (patch)
tree3c63fda210643e1d8605ddfbdea472ec9a109c60 /tools
parenteba5102d2f0b4117edd089f2d882d9386025c829 (diff)
downloadlinux-bda6ee4a94d1e1be0c1428d37bc0d3da2e5793ad.tar.gz
linux-bda6ee4a94d1e1be0c1428d37bc0d3da2e5793ad.tar.bz2
linux-bda6ee4a94d1e1be0c1428d37bc0d3da2e5793ad.zip
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.c8
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 @@
+#include <asm/bug.h>
#include "symbol.h"
#include "dso.h"
#include "machine.h"
@@ -137,18 +138,23 @@ int dso__read_binary_type_filename(const struct dso *dso,
}
/*
- * Global list of open DSOs.
+ * Global list of open DSOs and the counter.
*/
static LIST_HEAD(dso__data_open);
+static long dso__data_open_cnt;
static void dso__list_add(struct dso *dso)
{
list_add_tail(&dso->data.open_entry, &dso__data_open);
+ dso__data_open_cnt++;
}
static void dso__list_del(struct dso *dso)
{
list_del(&dso->data.open_entry);
+ WARN_ONCE(dso__data_open_cnt <= 0,
+ "DSO data fd counter out of bounds.");
+ dso__data_open_cnt--;
}
static int __open_dso(struct dso *dso, struct machine *machine)