lkml.org 
[lkml]   [2014]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 09/52] perf tools: Record whether a dso has data
    Date
    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>
    ---
    tools/perf/util/dso.c | 23 +++++++++++++++--------
    tools/perf/util/dso.h | 7 +++++++
    2 files changed, 22 insertions(+), 8 deletions(-)

    diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
    index 28cf747..8827db3 100644
    --- a/tools/perf/util/dso.c
    +++ b/tools/perf/util/dso.c
    @@ -331,26 +331,32 @@ int dso__data_fd(struct dso *dso, struct machine *machine)
    };
    int i = 0;

    + if (dso->data.status == DSO_DATA_STATUS_ERROR)
    + return -1;
    +
    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.status = DSO_DATA_STATUS_OK;
    + else
    + dso->data.status = DSO_DATA_STATUS_ERROR;

    - return -EINVAL;
    + return dso->data.fd;
    }

    static void
    @@ -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.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..aeb7bcb 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 status;
    size_t file_size;
    struct list_head open_entry;
    } data;
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2014-07-22 18:21    [W:4.039 / U:0.440 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site