mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf tools: Record whether a dso has data

Browse Source 
Add 'data.status' to record whether a dso has data (i.e. an object
file).  This is used to avoid repeatedly creating the file name and
attempting to open a file that is not present.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1406035081-14301-10-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Adrian Hunter
2014-07-22 16:17:18 +03:00
committed by Arnaldo Carvalho de Melo
parent 578bea4005
commit c27697d6de
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tools/perf/util/dso.c
View File

@@ -331,26 +331,32 @@ int dso__data_fd(struct dso *dso, struct machine *machine)
}; };
int i = 0; int i = 0;
if (dso->data.status == DSO_DATA_STATUS_ERROR)
return -1;
if (dso->data.fd >= 0) if (dso->data.fd >= 0)
return dso->data.fd; goto out;
if (dso->binary_type != DSO_BINARY_TYPE__NOT_FOUND) { if (dso->binary_type != DSO_BINARY_TYPE__NOT_FOUND) {
dso->data.fd = open_dso(dso, machine); dso->data.fd = open_dso(dso, machine);
return dso->data.fd; goto out;
} }
do { do {
int fd;
dso->binary_type = binary_type_data[i++]; dso->binary_type = binary_type_data[i++];
fd = open_dso(dso, machine); dso->data.fd = open_dso(dso, machine);
if (fd >= 0) if (dso->data.fd >= 0)
return dso->data.fd = fd; goto out;
} while (dso->binary_type != DSO_BINARY_TYPE__NOT_FOUND); } while (dso->binary_type != DSO_BINARY_TYPE__NOT_FOUND);
out:
if (dso->data.fd >= 0)
dso->data.status = DSO_DATA_STATUS_OK;
else
dso->data.status = DSO_DATA_STATUS_ERROR;
return -EINVAL; return dso->data.fd;
} }
static void static void
@@ -701,6 +707,7 @@ struct dso *dso__new(const char *name)
dso->symbols[i] = dso->symbol_names[i] = RB_ROOT; dso->symbols[i] = dso->symbol_names[i] = RB_ROOT;
dso->data.cache = RB_ROOT; dso->data.cache = RB_ROOT;
dso->data.fd = -1; dso->data.fd = -1;
dso->data.status = DSO_DATA_STATUS_UNKNOWN;
dso->symtab_type = DSO_BINARY_TYPE__NOT_FOUND; dso->symtab_type = DSO_BINARY_TYPE__NOT_FOUND;
dso->binary_type = DSO_BINARY_TYPE__NOT_FOUND; dso->binary_type = DSO_BINARY_TYPE__NOT_FOUND;
dso->is_64_bit = (sizeof(void *) == 8); dso->is_64_bit = (sizeof(void *) == 8);

7
tools/perf/util/dso.h
View File

@@ -40,6 +40,12 @@ enum dso_swap_type {
DSO_SWAP__YES, 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) \ #define DSO__SWAP(dso, type, val) \
({ \ ({ \
type ____r = val; \ type ____r = val; \
@@ -104,6 +110,7 @@ struct dso {
struct { struct {
struct rb_root cache; struct rb_root cache;
int fd; int fd;
int status;
size_t file_size; size_t file_size;
struct list_head open_entry; struct list_head open_entry;
} data; } data;