From: Jiri Olsa <jolsa@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Jiri Olsa <jolsa@kernel.org>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Corey Ashford <cjashfor@linux.vnet.ibm.com>,
David Ahern <dsahern@gmail.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Jean Pihet <jean.pihet@linaro.org>,
Namhyung Kim <namhyung@kernel.org>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: [PATCH 06/14] perf tools: Add global count of opened dso objects
Date: Thu, 12 Jun 2014 17:30:37 +0200 [thread overview]
Message-ID: <1402587045-5461-7-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1402587045-5461-1-git-send-email-jolsa@kernel.org>
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>
---
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 5d7c7bc..76e5c13 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)
--
1.8.3.1
next prev parent reply other threads:[~2014-06-12 15:34 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-12 15:30 [GIT PULL 00/14] perf/core improvements and fixes Jiri Olsa
2014-06-12 15:30 ` [PATCH 01/14] perf record: Fix to honor user freq/interval properly Jiri Olsa
2014-06-12 15:30 ` [PATCH 02/14] perf tools: Cache register accesses for unwind processing Jiri Olsa
2014-06-12 15:30 ` [PATCH 03/14] perf tools: Separate dso data related variables Jiri Olsa
2014-06-12 15:30 ` [PATCH 04/14] perf tools: Add data_fd into dso object Jiri Olsa
2014-06-12 15:30 ` [PATCH 05/14] perf tools: Add global list of opened dso objects Jiri Olsa
2014-06-12 15:30 ` Jiri Olsa [this message]
2014-06-12 15:30 ` [PATCH 07/14] perf tools: Cache dso data file descriptor Jiri Olsa
2014-06-12 15:30 ` [PATCH 08/14] perf tools: Add file size check and factor dso__data_read_offset Jiri Olsa
2014-06-12 15:30 ` [PATCH 09/14] perf tools: Allow to close dso fd in case of open failure Jiri Olsa
2014-06-12 15:30 ` [PATCH 10/14] perf tools: Add dso__data_* interface descriptons Jiri Olsa
2014-06-12 15:30 ` [PATCH 11/14] perf tests: Spawn child for each test Jiri Olsa
2014-06-12 15:30 ` [PATCH 12/14] perf tests: Allow reuse of test_file function Jiri Olsa
2014-06-12 15:30 ` [PATCH 13/14] perf tests: Add test for caching dso file descriptors Jiri Olsa
2014-06-12 15:30 ` [PATCH 14/14] perf tests: Add test for closing dso objects on EMFILE error Jiri Olsa
2014-06-12 20:55 ` [GIT PULL 00/14] perf/core improvements and fixes Jean Pihet
2014-06-13 9:03 ` Jiri Olsa
2014-06-13 6:20 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1402587045-5461-7-git-send-email-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=cjashfor@linux.vnet.ibm.com \
--cc=dsahern@gmail.com \
--cc=fweisbec@gmail.com \
--cc=jean.pihet@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.