lkml.org 
[lkml]   [2015]   [Mar]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 10/14] perf tools: Use kmod_path__parse in is_kernel_module
    Date
    Replacing the current parsing code with kmod_path__parse
    function call.

    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    Acked-by: Namhyung Kim <namhyung@kernel.org>
    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    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: Namhyung Kim <namhyung@kernel.org>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Stephane Eranian <eranian@google.com>
    ---
    tools/perf/util/dso.c | 16 ++++++----------
    1 file changed, 6 insertions(+), 10 deletions(-)

    diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
    index 7a7c54b42b41..f37548322c9d 100644
    --- a/tools/perf/util/dso.c
    +++ b/tools/perf/util/dso.c
    @@ -178,19 +178,15 @@ bool is_kmodule_extension(const char *ext)

    bool is_kernel_module(const char *pathname, bool *compressed)
    {
    - const char *ext = strrchr(pathname, '.');
    + struct kmod_path m;

    - if (ext == NULL)
    - return false;
    + if (kmod_path__parse(&m, pathname))
    + return NULL;

    - if (is_supported_compression(ext + 1)) {
    - if (compressed)
    - *compressed = true;
    - ext -= 3;
    - } else if (compressed)
    - *compressed = false;
    + if (compressed)
    + *compressed = m.comp;

    - return is_kmodule_extension(ext + 1);
    + return m.kmod;
    }

    bool decompress_to_file(const char *ext, const char *filename, int output_fd)
    --
    1.9.3


    \
     
     \ /
      Last update: 2015-03-06 12:21    [W:7.071 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site