From: Adrian Hunter <adrian.hunter@intel.com>
To: Jiri Olsa <jolsa@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
David Ahern <dsahern@gmail.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Namhyung Kim <namhyung@gmail.com>,
Paul Mackerras <paulus@samba.org>,
Stephane Eranian <eranian@google.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 2/2] perf tools: Record whether a dso has data
Date: Thu, 17 Jul 2014 11:43:10 +0300 [thread overview]
Message-ID: <1405586590-13657-3-git-send-email-adrian.hunter@intel.com> (raw)
In-Reply-To: <1405586590-13657-1-git-send-email-adrian.hunter@intel.com>
Add 'data_status' to record whether a dso has data
(i.e. an object file) as follows:
dso->data_status meaning
----------------------------------
0 don't know
-1 no data
1 has data
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
tools/perf/util/dso.c | 25 ++++++++++++++++---------
tools/perf/util/dso.h | 7 +++++++
2 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
index 28cf747..af274f0 100644
--- a/tools/perf/util/dso.c
+++ b/tools/perf/util/dso.c
@@ -332,25 +332,28 @@ int dso__data_fd(struct dso *dso, struct machine *machine)
int i = 0;
if (dso->data.fd >= 0)
- return dso->data.fd;
+ goto out;
if (dso->binary_type != DSO_BINARY_TYPE__NOT_FOUND) {
dso->data.fd = open_dso(dso, machine);
- return dso->data.fd;
+ goto out;
}
do {
- int fd;
-
dso->binary_type = binary_type_data[i++];
- fd = open_dso(dso, machine);
- if (fd >= 0)
- return dso->data.fd = fd;
+ dso->data.fd = open_dso(dso, machine);
+ if (dso->data.fd >= 0)
+ goto out;
} while (dso->binary_type != DSO_BINARY_TYPE__NOT_FOUND);
+out:
+ if (dso->data.fd >= 0)
+ dso->data.data_status = DSO_DATA_STATUS_OK;
+ else
+ dso->data.data_status = DSO_DATA_STATUS_ERROR;
- return -EINVAL;
+ return dso->data.fd;
}
static void
@@ -556,8 +559,11 @@ static ssize_t data_read_offset(struct dso *dso, u64 offset,
ssize_t dso__data_read_offset(struct dso *dso, struct machine *machine,
u64 offset, u8 *data, ssize_t size)
{
- if (dso__data_fd(dso, machine) < 0)
+ if (dso__data_fd(dso, machine) < 0) {
+ dso->data.data_status = -1;
return -1;
+ }
+ dso->data.data_status = 1;
return data_read_offset(dso, offset, data, size);
}
@@ -701,6 +707,7 @@ struct dso *dso__new(const char *name)
dso->symbols[i] = dso->symbol_names[i] = RB_ROOT;
dso->data.cache = RB_ROOT;
dso->data.fd = -1;
+ dso->data.data_status = DSO_DATA_STATUS_UNKNOWN;
dso->symtab_type = DSO_BINARY_TYPE__NOT_FOUND;
dso->binary_type = DSO_BINARY_TYPE__NOT_FOUND;
dso->is_64_bit = (sizeof(void *) == 8);
diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h
index c239e86..07d0a58 100644
--- a/tools/perf/util/dso.h
+++ b/tools/perf/util/dso.h
@@ -40,6 +40,12 @@ enum dso_swap_type {
DSO_SWAP__YES,
};
+enum dso_data_status {
+ DSO_DATA_STATUS_ERROR = -1,
+ DSO_DATA_STATUS_UNKNOWN = 0,
+ DSO_DATA_STATUS_OK = 1,
+};
+
#define DSO__SWAP(dso, type, val) \
({ \
type ____r = val; \
@@ -104,6 +110,7 @@ struct dso {
struct {
struct rb_root cache;
int fd;
+ int data_status;
size_t file_size;
struct list_head open_entry;
} data;
--
1.8.3.2
next prev parent reply other threads:[~2014-07-17 8:44 UTC|newest]
Thread overview: 122+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-14 10:02 [PATCH 00/41] perf tools: Preparation for call graph from Intel BTS Adrian Hunter
2014-07-14 10:02 ` [PATCH 01/41] perf tools: Fix the value used for unknown pids Adrian Hunter
2014-07-18 4:23 ` [tip:perf/core] perf machine: " tip-bot for Adrian Hunter
2014-07-14 10:02 ` [PATCH 02/41] perf tools: Fix map groups of threads with " Adrian Hunter
2014-07-14 20:18 ` Arnaldo Carvalho de Melo
2014-07-15 11:33 ` Adrian Hunter
2014-07-15 19:33 ` Arnaldo Carvalho de Melo
2014-07-16 8:07 ` [PATCH V2 " Adrian Hunter
2014-07-18 4:26 ` [tip:perf/core] perf machine: " tip-bot for Adrian Hunter
2014-07-14 10:02 ` [PATCH 03/41] perf script: Display PERF_RECORD_MISC_COMM_EXEC flag Adrian Hunter
2014-07-18 4:23 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-14 10:02 ` [PATCH 04/41] perf record: Select comm_exec flag if supported Adrian Hunter
2014-07-18 4:23 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-14 10:02 ` [PATCH 05/41] perf tools: Identify which comms are from exec Adrian Hunter
2014-07-14 20:32 ` Arnaldo Carvalho de Melo
2014-07-15 11:43 ` Adrian Hunter
2014-07-23 14:07 ` Arnaldo Carvalho de Melo
2014-07-23 14:09 ` Arnaldo Carvalho de Melo
2014-07-23 16:46 ` Adrian Hunter
2014-07-23 16:53 ` Arnaldo Carvalho de Melo
2014-07-14 10:02 ` [PATCH 06/41] perf tools: Add machine__thread_exec_comm() Adrian Hunter
2014-07-14 10:02 ` [PATCH 07/41] perf tools: Fix missing kernel map load Adrian Hunter
2014-07-18 4:23 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-14 10:02 ` [PATCH 08/41] perf tools: Fix missing label symbols Adrian Hunter
2014-07-14 20:38 ` Arnaldo Carvalho de Melo
2014-07-15 12:11 ` Adrian Hunter
2014-07-14 10:02 ` [PATCH 09/41] perf tools: Fix missing GNU IFUNC symbols Adrian Hunter
2014-07-18 4:24 ` [tip:perf/core] perf symbols: " tip-bot for Adrian Hunter
2014-07-14 10:02 ` [PATCH 10/41] perf inject: Fix build id injection Adrian Hunter
2014-07-18 4:24 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-14 10:02 ` [PATCH 11/41] perf tools: Fix appending a callchain from a previous sample Adrian Hunter
2014-07-18 4:24 ` [tip:perf/core] perf callchain: " tip-bot for Adrian Hunter
2014-07-14 10:02 ` [PATCH 12/41] perf tools: Fix leak of 'struct thread' on error path Adrian Hunter
2014-07-14 20:43 ` Arnaldo Carvalho de Melo
2014-07-16 7:19 ` [PATCH V2 0/2] perf tools: Allow deletion of a thread with no map groups Adrian Hunter
2014-07-16 7:19 ` [PATCH 1/2] " Adrian Hunter
2014-07-18 4:27 ` [tip:perf/core] perf thread: " tip-bot for Adrian Hunter
2014-07-16 7:19 ` [PATCH V2 2/2] perf tools: Fix leak of 'struct thread' on error path Adrian Hunter
2014-07-18 4:27 ` [tip:perf/core] perf machine: " tip-bot for Adrian Hunter
2014-07-16 14:02 ` [PATCH 12/41] perf tools: " Jiri Olsa
2014-07-16 14:26 ` Adrian Hunter
2014-07-14 10:02 ` [PATCH 13/41] perf tools: Add machine__kernel_ip() Adrian Hunter
2014-07-16 14:15 ` Jiri Olsa
2014-07-16 14:22 ` Adrian Hunter
2014-08-11 12:23 ` Jiri Olsa
2014-08-11 12:36 ` Adrian Hunter
2014-08-11 12:43 ` Jiri Olsa
2014-08-11 12:46 ` Adrian Hunter
2014-08-11 12:55 ` Jiri Olsa
2014-07-14 10:02 ` [PATCH 14/41] perf buildid-cache: Apply force option to copying kcore Adrian Hunter
2014-07-18 4:24 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-14 10:02 ` [PATCH 15/41] perf script: Improve srcline display for BTS Adrian Hunter
2014-07-15 14:16 ` Arnaldo Carvalho de Melo
2014-07-15 17:51 ` Adrian Hunter
2014-07-16 2:08 ` David Ahern
2014-07-14 10:02 ` [PATCH 16/41] perf script: Do not print dangling '=>' " Adrian Hunter
2014-07-14 10:02 ` [PATCH 17/41] perf tools: Record whether a dso is 64-bit Adrian Hunter
2014-07-18 4:24 ` [tip:perf/core] perf symbols: " tip-bot for Adrian Hunter
2014-07-14 10:02 ` [PATCH 18/41] perf tools: Record whether a dso has data Adrian Hunter
2014-07-16 14:20 ` Jiri Olsa
2014-07-17 8:43 ` [PATCH 0/2] perf tools: Fix incorrect fd error comparison Adrian Hunter
2014-07-17 8:43 ` [PATCH 1/2] " Adrian Hunter
2014-07-22 7:51 ` Jiri Olsa
2014-07-28 8:21 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-17 8:43 ` Adrian Hunter [this message]
2014-07-17 8:58 ` [PATCH V3] perf tools: Record whether a dso has data Adrian Hunter
2014-07-22 7:55 ` Jiri Olsa
2014-07-22 13:24 ` Adrian Hunter
2014-07-14 10:02 ` [PATCH 19/41] perf tools: Do not attempt to read data from kallsyms Adrian Hunter
2014-07-18 4:25 ` [tip:perf/core] perf symbols: " tip-bot for Adrian Hunter
2014-07-14 10:02 ` [PATCH 20/41] perf tools: Let a user specify a PMU event without any config terms Adrian Hunter
2014-07-16 14:25 ` Jiri Olsa
2014-07-16 15:04 ` Adrian Hunter
2014-07-16 18:22 ` Jiri Olsa
2014-08-29 18:48 ` Adrian Hunter
2014-08-30 8:53 ` Jiri Olsa
2014-09-01 6:27 ` Adrian Hunter
2014-09-01 19:11 ` Jiri Olsa
2014-09-02 5:39 ` Adrian Hunter
2014-09-02 9:17 ` Jiri Olsa
2014-09-01 15:51 ` Arnaldo Carvalho de Melo
2014-09-01 19:15 ` Jiri Olsa
2014-07-14 10:02 ` [PATCH 21/41] perf tools: Let default config be defined for a PMU Adrian Hunter
2014-07-14 10:02 ` [PATCH 22/41] perf tools: Add perf_pmu__scan_file() Adrian Hunter
2014-07-14 10:02 ` [PATCH 23/41] perf tools: Add dsos__hit_all() Adrian Hunter
2014-07-14 10:02 ` [PATCH 24/41] perf tools: Add cpu to struct thread Adrian Hunter
2014-07-15 14:24 ` Arnaldo Carvalho de Melo
2014-07-15 17:58 ` Adrian Hunter
2014-07-14 10:02 ` [PATCH 25/41] perf tools: Add ability to record the current tid for each cpu Adrian Hunter
2014-07-14 10:02 ` [PATCH 26/41] perf tools: Add ability to iterate over a dso's symbols Adrian Hunter
2014-07-18 4:25 ` [tip:perf/core] perf symbols: Add ability to iterate over a dso' s symbols tip-bot for Adrian Hunter
2014-07-14 10:02 ` [PATCH 27/41] perf session: Flag if the event stream is entirely in memory Adrian Hunter
2014-07-18 4:25 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-14 10:02 ` [PATCH 28/41] perf evlist: Pass mmap parameters in a struct Adrian Hunter
2014-07-18 4:25 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-14 10:02 ` [PATCH 29/41] perf tools: Add feature test for __sync_val_compare_and_swap Adrian Hunter
2014-07-18 4:26 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-14 10:02 ` [PATCH 30/41] perf tools: Add option macro OPT_CALLBACK_OPTARG Adrian Hunter
2014-07-18 4:26 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-14 10:02 ` [PATCH 31/41] perf evlist: Add perf_evlist__set_tracking_event() Adrian Hunter
2014-07-14 10:02 ` [PATCH 32/41] perf evsel: Add 'no_aux_samples' option Adrian Hunter
2014-07-18 4:26 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-14 10:02 ` [PATCH 33/41] perf evsel: Add 'immediate' option Adrian Hunter
2014-07-18 4:26 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-14 10:02 ` [PATCH 34/41] perf evlist: Add 'system_wide' option Adrian Hunter
2014-07-15 15:03 ` Arnaldo Carvalho de Melo
2014-07-15 18:05 ` Adrian Hunter
2014-08-11 13:12 ` Jiri Olsa
2014-08-12 5:52 ` Adrian Hunter
2014-07-14 10:02 ` [PATCH 35/41] perf tools: Add id index Adrian Hunter
2014-07-14 10:03 ` [PATCH 36/41] perf pmu: Let pmu's with no events show up on perf list Adrian Hunter
2014-07-14 10:03 ` [PATCH 37/41] perf session: Add ability to skip 4GiB or more Adrian Hunter
2014-07-14 10:03 ` [PATCH 38/41] perf session: Add perf_session__deliver_synth_event() Adrian Hunter
2014-07-15 15:17 ` Arnaldo Carvalho de Melo
2014-07-15 18:32 ` Adrian Hunter
2014-07-14 10:03 ` [PATCH 39/41] perf tools: Allow TSC conversion on any arch Adrian Hunter
2014-07-15 15:20 ` Arnaldo Carvalho de Melo
2014-07-15 16:17 ` Peter Zijlstra
2014-07-15 17:48 ` Adrian Hunter
2014-07-18 4:28 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-14 10:03 ` [PATCH 40/41] perf tools: Move rdtsc() function Adrian Hunter
2014-07-14 10:03 ` [PATCH 41/41] perf evlist: Add perf_evlist__enable_event_idx() Adrian Hunter
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=1405586590-13657-3-git-send-email-adrian.hunter@intel.com \
--to=adrian.hunter@intel.com \
--cc=acme@kernel.org \
--cc=dsahern@gmail.com \
--cc=eranian@google.com \
--cc=fweisbec@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=namhyung@gmail.com \
--cc=paulus@samba.org \
--cc=peterz@infradead.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).