From: Jiri Olsa <jolsa@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: 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>,
Ingo Molnar <mingo@kernel.org>,
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 03/13] perf tools: Add data_fd into dso object
Date: Wed, 4 Jun 2014 16:36:52 +0200 [thread overview]
Message-ID: <1401892622-30848-4-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1401892622-30848-1-git-send-email-jolsa@kernel.org>
Adding data_fd into dso object so we could handle caching
of opened dso file data descriptors coming int next patches.
Adding dso__data_close interface to keep the data_fd updated
when the descriptor is closed.
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>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/util/dso.c | 23 +++++++++++++++++++----
tools/perf/util/dso.h | 3 +++
tools/perf/util/unwind-libunwind.c | 4 ++--
3 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
index 1c3cdaf..5acb4b8 100644
--- a/tools/perf/util/dso.c
+++ b/tools/perf/util/dso.c
@@ -159,6 +159,14 @@ static int open_dso(struct dso *dso, struct machine *machine)
return fd;
}
+void dso__data_close(struct dso *dso)
+{
+ if (dso->data.fd >= 0) {
+ close(dso->data.fd);
+ dso->data.fd = -1;
+ }
+}
+
int dso__data_fd(struct dso *dso, struct machine *machine)
{
enum dso_binary_type binary_type_data[] = {
@@ -168,8 +176,13 @@ int dso__data_fd(struct dso *dso, struct machine *machine)
};
int i = 0;
- if (dso->binary_type != DSO_BINARY_TYPE__NOT_FOUND)
- return open_dso(dso, machine);
+ if (dso->data.fd >= 0)
+ return dso->data.fd;
+
+ if (dso->binary_type != DSO_BINARY_TYPE__NOT_FOUND) {
+ dso->data.fd = open_dso(dso, machine);
+ return dso->data.fd;
+ }
do {
int fd;
@@ -178,7 +191,7 @@ int dso__data_fd(struct dso *dso, struct machine *machine)
fd = open_dso(dso, machine);
if (fd >= 0)
- return fd;
+ return dso->data.fd = fd;
} while (dso->binary_type != DSO_BINARY_TYPE__NOT_FOUND);
@@ -301,7 +314,7 @@ dso_cache__read(struct dso *dso, struct machine *machine,
if (ret <= 0)
free(cache);
- close(fd);
+ dso__data_close(dso);
return ret;
}
@@ -474,6 +487,7 @@ struct dso *dso__new(const char *name)
for (i = 0; i < MAP__NR_TYPES; ++i)
dso->symbols[i] = dso->symbol_names[i] = RB_ROOT;
dso->data.cache = RB_ROOT;
+ dso->data.fd = -1;
dso->symtab_type = DSO_BINARY_TYPE__NOT_FOUND;
dso->binary_type = DSO_BINARY_TYPE__NOT_FOUND;
dso->loaded = 0;
@@ -506,6 +520,7 @@ void dso__delete(struct dso *dso)
dso->long_name_allocated = false;
}
+ dso__data_close(dso);
dso_cache__free(&dso->data.cache);
dso__free_a2l(dso);
zfree(&dso->symsrc_filename);
diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h
index 7637fdd..e48dcf5 100644
--- a/tools/perf/util/dso.h
+++ b/tools/perf/util/dso.h
@@ -102,6 +102,7 @@ struct dso {
/* dso data file */
struct {
struct rb_root cache;
+ int fd;
} data;
char name[0];
@@ -147,6 +148,8 @@ int dso__read_binary_type_filename(const struct dso *dso, enum dso_binary_type t
char *root_dir, char *filename, size_t size);
int dso__data_fd(struct dso *dso, struct machine *machine);
+void dso__data_close(struct dso *dso);
+
ssize_t dso__data_read_offset(struct dso *dso, struct machine *machine,
u64 offset, u8 *data, ssize_t size);
ssize_t dso__data_read_addr(struct dso *dso, struct map *map,
diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c
index bd5768d..4f8dd9e 100644
--- a/tools/perf/util/unwind-libunwind.c
+++ b/tools/perf/util/unwind-libunwind.c
@@ -250,7 +250,7 @@ static int read_unwind_spec_eh_frame(struct dso *dso, struct machine *machine,
/* Check the .eh_frame section for unwinding info */
offset = elf_section_offset(fd, ".eh_frame_hdr");
- close(fd);
+ dso__data_close(dso);
if (offset)
ret = unwind_spec_ehframe(dso, machine, offset,
@@ -271,7 +271,7 @@ static int read_unwind_spec_debug_frame(struct dso *dso,
/* Check the .debug_frame section for unwinding info */
*offset = elf_section_offset(fd, ".debug_frame");
- close(fd);
+ dso__data_close(dso);
if (*offset)
return 0;
--
1.8.3.1
next prev parent reply other threads:[~2014-06-04 14:37 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-04 14:36 [PATCHv4 00/13] perf tools: Speedup DWARF unwind Jiri Olsa
2014-06-04 14:36 ` [PATCH 01/13] perf tools: Cache register accesses for unwind processing Jiri Olsa
2014-06-13 6:24 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-06-04 14:36 ` [PATCH 02/13] perf tools: Separate dso data related variables Jiri Olsa
2014-06-13 6:25 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-06-04 14:36 ` Jiri Olsa [this message]
2014-06-13 6:25 ` [tip:perf/core] perf tools: Add data_fd into dso object tip-bot for Jiri Olsa
2014-06-04 14:36 ` [PATCH 04/13] perf tools: Add global list of opened dso objects Jiri Olsa
2014-06-13 6:25 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-06-04 14:36 ` [PATCH 05/13] perf tools: Add global count " Jiri Olsa
2014-06-13 6:25 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-06-04 14:36 ` [PATCH 06/13] perf tools: Cache dso data file descriptor Jiri Olsa
2014-06-13 6:25 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-06-04 14:36 ` [PATCH 07/13] perf tools: Add file size check and factor dso__data_read_offset Jiri Olsa
2014-06-13 6:26 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-06-04 14:36 ` [PATCH 08/13] perf tools: Allow to close dso fd in case of open failure Jiri Olsa
2014-06-13 6:26 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-06-04 14:36 ` [PATCH 09/13] perf tools: Add dso__data_* interface descriptons Jiri Olsa
2014-06-13 6:26 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-06-04 14:36 ` [PATCH 10/13] perf tests: Spawn child for each test Jiri Olsa
2014-06-13 6:26 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-06-04 14:37 ` [PATCH 11/13] perf tests: Allow reuse of test_file function Jiri Olsa
2014-06-13 6:26 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-06-04 14:37 ` [PATCH 12/13] perf tests: Add test for caching dso file descriptors Jiri Olsa
2014-06-13 6:27 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-06-04 14:37 ` [PATCH 13/13] perf tests: Add test for closing dso objects on EMFILE error Jiri Olsa
2014-06-13 6:27 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-06-10 5:01 ` [PATCHv4 00/13] perf tools: Speedup DWARF unwind Namhyung Kim
-- strict thread matches above, loose matches on Subject: below --
2014-06-02 21:18 [PATCHv3 " Jiri Olsa
2014-06-02 21:18 ` [PATCH 03/13] perf tools: Add data_fd into dso object Jiri Olsa
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=1401892622-30848-4-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).