lkml.org 
[lkml]   [2015]   [Oct]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC/PATCH 28/38] perf tools: Move BUILD_ID_SIZE definition to perf.h
    Date
    The util/event.h includes util/build-id.h only for BUILD_ID_SIZE.
    This is a problem when I include util/event.h from util/tool.h which
    is also included by util/build-id.h since it now makes a circular
    dependency resulting in incomplete type error.

    Signed-off-by: Namhyung Kim <namhyung@kernel.org>
    ---
    tools/perf/perf.h | 3 +++
    tools/perf/util/build-id.h | 3 ---
    tools/perf/util/dso.h | 1 +
    tools/perf/util/event.h | 1 -
    4 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/tools/perf/perf.h b/tools/perf/perf.h
    index df7c208abb74..d21b5c63f244 100644
    --- a/tools/perf/perf.h
    +++ b/tools/perf/perf.h
    @@ -31,6 +31,9 @@ static inline unsigned long long rdclock(void)

    #define MAX_NR_CPUS 1024

    +#define BUILD_ID_SIZE 20
    +#define SBUILD_ID_SIZE (BUILD_ID_SIZE * 2 + 1)
    +
    extern const char *input_name;
    extern bool perf_host, perf_guest;
    extern const char perf_version_string[];
    diff --git a/tools/perf/util/build-id.h b/tools/perf/util/build-id.h
    index 27a14a8a945b..8f9a5720bc5e 100644
    --- a/tools/perf/util/build-id.h
    +++ b/tools/perf/util/build-id.h
    @@ -1,9 +1,6 @@
    #ifndef PERF_BUILD_ID_H_
    #define PERF_BUILD_ID_H_ 1

    -#define BUILD_ID_SIZE 20
    -#define SBUILD_ID_SIZE (BUILD_ID_SIZE * 2 + 1)
    -
    #include "tool.h"
    #include "strlist.h"
    #include <linux/types.h>
    diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h
    index fc8db9c764ac..416b9a57fcb9 100644
    --- a/tools/perf/util/dso.h
    +++ b/tools/perf/util/dso.h
    @@ -9,6 +9,7 @@
    #include <linux/types.h>
    #include <linux/bitops.h>
    #include "map.h"
    +#include "perf.h"
    #include "build-id.h"

    enum dso_binary_type {
    diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
    index a0dbcbd4f6d8..3812d645362c 100644
    --- a/tools/perf/util/event.h
    +++ b/tools/perf/util/event.h
    @@ -6,7 +6,6 @@

    #include "../perf.h"
    #include "map.h"
    -#include "build-id.h"
    #include "perf_regs.h"

    struct mmap_event {
    --
    2.6.0


    \
     
     \ /
      Last update: 2015-10-02 09:21    [W:2.881 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site