lkml.org 
[lkml]   [2019]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 22/41] perf dso: Separate generic code in dso__data_file_size()
    Date
    From: Jiri Olsa <jolsa@kernel.org>

    Moving file specific code in dso__data_file_size function into separate
    file_size function. I'll add bpf specific code in following patches.

    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    Acked-by: Song Liu <songliubraving@fb.com>
    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Cc: Andi Kleen <ak@linux.intel.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Stanislav Fomichev <sdf@google.com>
    Link: http://lkml.kernel.org/r/20190508132010.14512-2-jolsa@kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/util/dso.c | 19 ++++++++++++-------
    1 file changed, 12 insertions(+), 7 deletions(-)

    diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
    index e059976d9d93..cb6199c1390a 100644
    --- a/tools/perf/util/dso.c
    +++ b/tools/perf/util/dso.c
    @@ -898,18 +898,12 @@ static ssize_t cached_read(struct dso *dso, struct machine *machine,
    return r;
    }

    -int dso__data_file_size(struct dso *dso, struct machine *machine)
    +static int file_size(struct dso *dso, struct machine *machine)
    {
    int ret = 0;
    struct stat st;
    char sbuf[STRERR_BUFSIZE];

    - if (dso->data.file_size)
    - return 0;
    -
    - if (dso->data.status == DSO_DATA_STATUS_ERROR)
    - return -1;
    -
    pthread_mutex_lock(&dso__data_open_lock);

    /*
    @@ -938,6 +932,17 @@ int dso__data_file_size(struct dso *dso, struct machine *machine)
    return ret;
    }

    +int dso__data_file_size(struct dso *dso, struct machine *machine)
    +{
    + if (dso->data.file_size)
    + return 0;
    +
    + if (dso->data.status == DSO_DATA_STATUS_ERROR)
    + return -1;
    +
    + return file_size(dso, machine);
    +}
    +
    /**
    * dso__data_size - Return dso data size
    * @dso: dso object
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-05-29 15:38    [W:3.817 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site