lkml.org 
[lkml]   [2017]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/22] perf tools: Add compress.h for the *_decompress_to_file() headers
    Date
    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    Out of util.h, the implementations were already in separate files, that
    are built conditionally.

    Link: http://lkml.kernel.org/n/tip-0ur7szxsb59f8758kfe63prb@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/util/compress.h | 12 ++++++++++++
    tools/perf/util/dso.c | 1 +
    tools/perf/util/lzma.c | 1 +
    tools/perf/util/util.h | 8 --------
    tools/perf/util/zlib.c | 1 +
    5 files changed, 15 insertions(+), 8 deletions(-)
    create mode 100644 tools/perf/util/compress.h

    diff --git a/tools/perf/util/compress.h b/tools/perf/util/compress.h
    new file mode 100644
    index 000000000000..67fd1bb7c2b7
    --- /dev/null
    +++ b/tools/perf/util/compress.h
    @@ -0,0 +1,12 @@
    +#ifndef PERF_COMPRESS_H
    +#define PERF_COMPRESS_H
    +
    +#ifdef HAVE_ZLIB_SUPPORT
    +int gzip_decompress_to_file(const char *input, int output_fd);
    +#endif
    +
    +#ifdef HAVE_LZMA_SUPPORT
    +int lzma_decompress_to_file(const char *input, int output_fd);
    +#endif
    +
    +#endif /* PERF_COMPRESS_H */
    diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
    index cbfe17f5168a..3339ab7cabc5 100644
    --- a/tools/perf/util/dso.c
    +++ b/tools/perf/util/dso.c
    @@ -3,6 +3,7 @@
    #include <sys/time.h>
    #include <sys/resource.h>
    #include <errno.h>
    +#include "compress.h"
    #include "path.h"
    #include "symbol.h"
    #include "dso.h"
    diff --git a/tools/perf/util/lzma.c b/tools/perf/util/lzma.c
    index 5b73b268c169..4ca7c5c6cdcd 100644
    --- a/tools/perf/util/lzma.c
    +++ b/tools/perf/util/lzma.c
    @@ -2,6 +2,7 @@
    #include <lzma.h>
    #include <stdio.h>
    #include <linux/compiler.h>
    +#include "compress.h"
    #include "util.h"
    #include "debug.h"

    diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
    index 07c4293742e7..5dea8a96cf84 100644
    --- a/tools/perf/util/util.h
    +++ b/tools/perf/util/util.h
    @@ -99,14 +99,6 @@ void mem_bswap_32(void *src, int byte_size);

    bool find_process(const char *name);

    -#ifdef HAVE_ZLIB_SUPPORT
    -int gzip_decompress_to_file(const char *input, int output_fd);
    -#endif
    -
    -#ifdef HAVE_LZMA_SUPPORT
    -int lzma_decompress_to_file(const char *input, int output_fd);
    -#endif
    -
    int get_stack_size(const char *str, unsigned long *_size);

    int fetch_kernel_version(unsigned int *puint,
    diff --git a/tools/perf/util/zlib.c b/tools/perf/util/zlib.c
    index 495a449fc25c..1329d843eb7b 100644
    --- a/tools/perf/util/zlib.c
    +++ b/tools/perf/util/zlib.c
    @@ -4,6 +4,7 @@
    #include <sys/mman.h>
    #include <zlib.h>

    +#include "util/compress.h"
    #include "util/util.h"
    #include "util/debug.h"

    --
    2.9.3
    \
     
     \ /
      Last update: 2017-04-24 21:56    [W:4.125 / U:0.208 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site