From bda6ee4a94d1e1be0c1428d37bc0d3da2e5793ad Mon Sep 17 00:00:00 2001 From: Jiri Olsa Date: Wed, 30 Apr 2014 15:25:10 +0200 Subject: [PATCH] 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 Cc: Arnaldo Carvalho de Melo Cc: Corey Ashford Cc: David Ahern Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Jean Pihet Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1401892622-30848-6-git-send-email-jolsa@kernel.org Signed-off-by: Jiri Olsa --- tools/perf/util/dso.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 #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) -- 2.30.2