aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Olsa <[email protected]>2014-04-30 15:25:10 +0200
committerJiri Olsa <[email protected]>2014-06-12 16:53:20 +0200
commitbda6ee4a94d1e1be0c1428d37bc0d3da2e5793ad (patch)
tree3c63fda210643e1d8605ddfbdea472ec9a109c60
parenteba5102d2f0b4117edd089f2d882d9386025c829 (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 <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Corey Ashford <[email protected]> Cc: David Ahern <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Jean Pihet <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Jiri Olsa <[email protected]>
-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)