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 18/22] perf tools: Use just forward declarations for struct thread where possible
    Date
    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    Removing various instances of unnecessary includes, reducing the maze of
    header dependencies.

    Link: http://lkml.kernel.org/n/tip-hwu6eyuok9pc57alookyzmsf@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/arch/arm/util/unwind-libdw.c | 1 +
    tools/perf/arch/x86/util/unwind-libdw.c | 1 +
    tools/perf/builtin-c2c.c | 1 +
    tools/perf/builtin-inject.c | 1 +
    tools/perf/builtin-mem.c | 1 +
    tools/perf/builtin-timechart.c | 1 +
    tools/perf/ui/browsers/hists.c | 1 +
    tools/perf/ui/stdio/hist.c | 1 +
    tools/perf/util/build-id.c | 1 +
    tools/perf/util/hist.c | 1 +
    tools/perf/util/session.c | 1 +
    tools/perf/util/session.h | 3 +--
    tools/perf/util/sort.c | 1 +
    tools/perf/util/sort.h | 3 ++-
    tools/perf/util/unwind-libdw.h | 6 ++++--
    15 files changed, 19 insertions(+), 5 deletions(-)

    diff --git a/tools/perf/arch/arm/util/unwind-libdw.c b/tools/perf/arch/arm/util/unwind-libdw.c
    index b4176c60117a..bacfa00fca39 100644
    --- a/tools/perf/arch/arm/util/unwind-libdw.c
    +++ b/tools/perf/arch/arm/util/unwind-libdw.c
    @@ -1,6 +1,7 @@
    #include <elfutils/libdwfl.h>
    #include "../../util/unwind-libdw.h"
    #include "../../util/perf_regs.h"
    +#include "../../util/event.h"

    bool libdw__arch_set_initial_registers(Dwfl_Thread *thread, void *arg)
    {
    diff --git a/tools/perf/arch/x86/util/unwind-libdw.c b/tools/perf/arch/x86/util/unwind-libdw.c
    index c4b72176ca83..38dc9bb2a7c9 100644
    --- a/tools/perf/arch/x86/util/unwind-libdw.c
    +++ b/tools/perf/arch/x86/util/unwind-libdw.c
    @@ -1,6 +1,7 @@
    #include <elfutils/libdwfl.h>
    #include "../../util/unwind-libdw.h"
    #include "../../util/perf_regs.h"
    +#include "../../util/event.h"

    bool libdw__arch_set_initial_registers(Dwfl_Thread *thread, void *arg)
    {
    diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c
    index a14be1cd3d70..e33b4acece90 100644
    --- a/tools/perf/builtin-c2c.c
    +++ b/tools/perf/builtin-c2c.c
    @@ -32,6 +32,7 @@
    #include <asm/bug.h>
    #include "ui/browsers/hists.h"
    #include "evlist.h"
    +#include "thread.h"

    struct c2c_hists {
    struct hists hists;
    diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
    index 8bd791cca008..ea8db38eedd1 100644
    --- a/tools/perf/builtin-inject.c
    +++ b/tools/perf/builtin-inject.c
    @@ -18,6 +18,7 @@
    #include "util/data.h"
    #include "util/auxtrace.h"
    #include "util/jit.h"
    +#include "util/thread.h"

    #include <subcmd/parse-options.h>

    diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c
    index 2e5be1d63af6..e001c0290793 100644
    --- a/tools/perf/builtin-mem.c
    +++ b/tools/perf/builtin-mem.c
    @@ -12,6 +12,7 @@
    #include "util/data.h"
    #include "util/mem-events.h"
    #include "util/debug.h"
    +#include "util/symbol.h"

    #define MEM_OPERATION_LOAD 0x1
    #define MEM_OPERATION_STORE 0x2
    diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c
    index 38e2c437b7b3..4e2e61695986 100644
    --- a/tools/perf/builtin-timechart.c
    +++ b/tools/perf/builtin-timechart.c
    @@ -29,6 +29,7 @@
    #include <linux/rbtree.h>
    #include <linux/time64.h>
    #include "util/symbol.h"
    +#include "util/thread.h"
    #include "util/callchain.h"

    #include "perf.h"
    diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
    index 1b12a69740b3..69f4570bd4f9 100644
    --- a/tools/perf/ui/browsers/hists.c
    +++ b/tools/perf/ui/browsers/hists.c
    @@ -14,6 +14,7 @@
    #include "../../util/sort.h"
    #include "../../util/util.h"
    #include "../../util/top.h"
    +#include "../../util/thread.h"
    #include "../../arch/common.h"

    #include "../browsers/hists.h"
    diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c
    index 5565105c9688..42e432bd2eb4 100644
    --- a/tools/perf/ui/stdio/hist.c
    +++ b/tools/perf/ui/stdio/hist.c
    @@ -6,6 +6,7 @@
    #include "../../util/evsel.h"
    #include "../../util/srcline.h"
    #include "../../util/string2.h"
    +#include "../../util/thread.h"
    #include "../../util/sane_ctype.h"

    static size_t callchain__fprintf_left_margin(FILE *fp, int left_margin)
    diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c
    index 687b5add4bde..168cc49654e7 100644
    --- a/tools/perf/util/build-id.c
    +++ b/tools/perf/util/build-id.c
    @@ -15,6 +15,7 @@
    #include "build-id.h"
    #include "event.h"
    #include "symbol.h"
    +#include "thread.h"
    #include <linux/kernel.h>
    #include "debug.h"
    #include "session.h"
    diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
    index 2944458b9edf..cf0186a088c1 100644
    --- a/tools/perf/util/hist.c
    +++ b/tools/perf/util/hist.c
    @@ -9,6 +9,7 @@
    #include "evsel.h"
    #include "annotate.h"
    #include "srcline.h"
    +#include "thread.h"
    #include "ui/progress.h"
    #include <errno.h>
    #include <math.h>
    diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
    index 19d993f2a305..3041c6b98191 100644
    --- a/tools/perf/util/session.c
    +++ b/tools/perf/util/session.c
    @@ -19,6 +19,7 @@
    #include "perf_regs.h"
    #include "asm/bug.h"
    #include "auxtrace.h"
    +#include "thread.h"
    #include "thread-stack.h"
    #include "stat.h"

    diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
    index 1ffae42f76a1..47b5e7dbcb18 100644
    --- a/tools/perf/util/session.h
    +++ b/tools/perf/util/session.h
    @@ -5,8 +5,6 @@
    #include "event.h"
    #include "header.h"
    #include "machine.h"
    -#include "symbol.h"
    -#include "thread.h"
    #include "data.h"
    #include "ordered-events.h"
    #include <linux/kernel.h>
    @@ -14,6 +12,7 @@
    #include <linux/perf_event.h>

    struct ip_callchain;
    +struct symbol;
    struct thread;

    struct auxtrace;
    diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
    index fe4fd7b5f8e0..5762ae4e9e91 100644
    --- a/tools/perf/util/sort.c
    +++ b/tools/perf/util/sort.c
    @@ -6,6 +6,7 @@
    #include "hist.h"
    #include "comm.h"
    #include "symbol.h"
    +#include "thread.h"
    #include "evsel.h"
    #include "evlist.h"
    #include "strlist.h"
    diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h
    index 8bcec05ee578..b7c75597e18f 100644
    --- a/tools/perf/util/sort.h
    +++ b/tools/perf/util/sort.h
    @@ -21,7 +21,8 @@
    #include "parse-events.h"
    #include "hist.h"
    #include "srcline.h"
    -#include "thread.h"
    +
    +struct thread;

    extern regex_t parent_regex;
    extern const char *sort_order;
    diff --git a/tools/perf/util/unwind-libdw.h b/tools/perf/util/unwind-libdw.h
    index 58328669ed16..4a2b269a7b3b 100644
    --- a/tools/perf/util/unwind-libdw.h
    +++ b/tools/perf/util/unwind-libdw.h
    @@ -2,10 +2,12 @@
    #define __PERF_UNWIND_LIBDW_H

    #include <elfutils/libdwfl.h>
    -#include "event.h"
    -#include "thread.h"
    #include "unwind.h"

    +struct machine;
    +struct perf_sample;
    +struct thread;
    +
    bool libdw__arch_set_initial_registers(Dwfl_Thread *thread, void *arg);

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