From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756903AbbLDWCg (ORCPT ); Fri, 4 Dec 2015 17:02:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45678 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756749AbbLDV7n (ORCPT ); Fri, 4 Dec 2015 16:59:43 -0500 From: Josh Poimboeuf To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org Subject: [PATCH 06/13] perf: Remove cache.h Date: Fri, 4 Dec 2015 15:59:17 -0600 Message-Id: <2dfb22a107a908014780146f0276da8d2f5829c4.1449265570.git.jpoimboe@redhat.com> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org cache.h is now just a collection of some commonly used includes. Move the includes to util.h, which has a similar collection. Signed-off-by: Josh Poimboeuf --- tools/perf/builtin-annotate.c | 1 - tools/perf/builtin-buildid-cache.c | 2 +- tools/perf/builtin-buildid-list.c | 2 +- tools/perf/builtin-config.c | 3 +-- tools/perf/builtin-help.c | 2 +- tools/perf/builtin-kmem.c | 1 - tools/perf/builtin-kvm.c | 1 - tools/perf/builtin-list.c | 2 +- tools/perf/builtin-lock.c | 1 - tools/perf/builtin-report.c | 1 - tools/perf/builtin-sched.c | 1 - tools/perf/builtin-script.c | 1 - tools/perf/builtin-timechart.c | 1 - tools/perf/builtin-top.c | 1 - tools/perf/perf.c | 2 +- tools/perf/tests/llvm.c | 2 +- tools/perf/ui/browser.c | 1 - tools/perf/ui/browsers/header.c | 2 +- tools/perf/ui/gtk/browser.c | 2 +- tools/perf/ui/gtk/hists.c | 2 +- tools/perf/ui/gtk/setup.c | 2 +- tools/perf/ui/helpline.h | 2 +- tools/perf/ui/progress.c | 2 +- tools/perf/ui/setup.c | 2 +- tools/perf/ui/tui/progress.c | 2 +- tools/perf/ui/tui/setup.c | 1 - tools/perf/ui/tui/util.c | 1 - tools/perf/util/abspath.c | 2 +- tools/perf/util/alias.c | 2 +- tools/perf/util/annotate.c | 1 - tools/perf/util/cache.h | 16 ---------------- tools/perf/util/color.c | 2 +- tools/perf/util/config.c | 1 - tools/perf/util/debug.c | 1 - tools/perf/util/exec_cmd.c | 2 +- tools/perf/util/help.c | 2 +- tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 1 - tools/perf/util/levenshtein.c | 2 +- tools/perf/util/llvm-utils.c | 1 - tools/perf/util/pager.c | 2 +- tools/perf/util/parse-events.c | 1 - tools/perf/util/parse-options.c | 1 - tools/perf/util/path.c | 2 +- tools/perf/util/probe-event.c | 1 - tools/perf/util/probe-file.c | 1 - tools/perf/util/quote.c | 2 +- tools/perf/util/run-command.c | 2 +- tools/perf/util/sigchain.c | 2 +- tools/perf/util/sort.h | 1 - tools/perf/util/strbuf.c | 2 +- tools/perf/util/util.h | 6 ++++++ tools/perf/util/wrapper.c | 2 +- 52 files changed, 34 insertions(+), 67 deletions(-) delete mode 100644 tools/perf/util/cache.h diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 2bf9b3f..50695c7 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -10,7 +10,6 @@ #include "util/util.h" #include "util/color.h" #include -#include "util/cache.h" #include #include "util/symbol.h" diff --git a/tools/perf/builtin-buildid-cache.c b/tools/perf/builtin-buildid-cache.c index 7b8450c..bed484f 100644 --- a/tools/perf/builtin-buildid-cache.c +++ b/tools/perf/builtin-buildid-cache.c @@ -13,7 +13,7 @@ #include #include "builtin.h" #include "perf.h" -#include "util/cache.h" +#include "util/util.h" #include "util/debug.h" #include "util/header.h" #include "util/parse-options.h" diff --git a/tools/perf/builtin-buildid-list.c b/tools/perf/builtin-buildid-list.c index 918b4de..bd7558e 100644 --- a/tools/perf/builtin-buildid-list.c +++ b/tools/perf/builtin-buildid-list.c @@ -10,7 +10,7 @@ #include "builtin.h" #include "perf.h" #include "util/build-id.h" -#include "util/cache.h" +#include "util/util.h" #include "util/debug.h" #include "util/parse-options.h" #include "util/session.h" diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c index 427ea7a..03117c8 100644 --- a/tools/perf/builtin-config.c +++ b/tools/perf/builtin-config.c @@ -8,9 +8,8 @@ #include "perf.h" -#include "util/cache.h" -#include "util/parse-options.h" #include "util/util.h" +#include "util/parse-options.h" #include "util/debug.h" static const char * const config_usage[] = { diff --git a/tools/perf/builtin-help.c b/tools/perf/builtin-help.c index a7d588b..23c3fdb 100644 --- a/tools/perf/builtin-help.c +++ b/tools/perf/builtin-help.c @@ -4,7 +4,7 @@ * Builtin help command */ #include "perf.h" -#include "util/cache.h" +#include "util/util.h" #include "builtin.h" #include "util/exec_cmd.h" #include "common-cmds.h" diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c index 93ce665..1c3d3d9 100644 --- a/tools/perf/builtin-kmem.c +++ b/tools/perf/builtin-kmem.c @@ -4,7 +4,6 @@ #include "util/evlist.h" #include "util/evsel.h" #include "util/util.h" -#include "util/cache.h" #include "util/symbol.h" #include "util/thread.h" #include "util/header.h" diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index dd94b4c..a9ad326 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -4,7 +4,6 @@ #include "util/evsel.h" #include "util/evlist.h" #include "util/util.h" -#include "util/cache.h" #include "util/symbol.h" #include "util/thread.h" #include "util/header.h" diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c index bf679e2..70856ac 100644 --- a/tools/perf/builtin-list.c +++ b/tools/perf/builtin-list.c @@ -12,7 +12,7 @@ #include "perf.h" #include "util/parse-events.h" -#include "util/cache.h" +#include "util/util.h" #include "util/pmu.h" #include "util/parse-options.h" diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c index de16aae..191d32f 100644 --- a/tools/perf/builtin-lock.c +++ b/tools/perf/builtin-lock.c @@ -4,7 +4,6 @@ #include "util/evlist.h" #include "util/evsel.h" #include "util/util.h" -#include "util/cache.h" #include "util/symbol.h" #include "util/thread.h" #include "util/header.h" diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index af5db88..61ed8f2 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -8,7 +8,6 @@ #include "builtin.h" #include "util/util.h" -#include "util/cache.h" #include "util/annotate.h" #include "util/color.h" diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index e3d3e32..43dedd4 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c @@ -3,7 +3,6 @@ #include "util/util.h" #include "util/evlist.h" -#include "util/cache.h" #include "util/evsel.h" #include "util/symbol.h" #include "util/thread.h" diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 3c3f8d0..8873021 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -1,7 +1,6 @@ #include "builtin.h" #include "perf.h" -#include "util/cache.h" #include "util/debug.h" #include "util/exec_cmd.h" #include "util/header.h" diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c index 30e5962..ab75e5b 100644 --- a/tools/perf/builtin-timechart.c +++ b/tools/perf/builtin-timechart.c @@ -20,7 +20,6 @@ #include "util/color.h" #include -#include "util/cache.h" #include "util/evlist.h" #include "util/evsel.h" #include diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 7e2e72e..c8dd628 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -22,7 +22,6 @@ #include "perf.h" #include "util/annotate.h" -#include "util/cache.h" #include "util/color.h" #include "util/evlist.h" #include "util/evsel.h" diff --git a/tools/perf/perf.c b/tools/perf/perf.c index 4bee53c..bcf4fab 100644 --- a/tools/perf/perf.c +++ b/tools/perf/perf.c @@ -10,7 +10,7 @@ #include "util/env.h" #include "util/exec_cmd.h" -#include "util/cache.h" +#include "util/util.h" #include "util/quote.h" #include "util/run-command.h" #include "util/parse-events.h" diff --git a/tools/perf/tests/llvm.c b/tools/perf/tests/llvm.c index dc90cea..fdb7e84 100644 --- a/tools/perf/tests/llvm.c +++ b/tools/perf/tests/llvm.c @@ -1,7 +1,7 @@ #include #include #include "util/llvm-utils.h" -#include "util/cache.h" +#include "util/util.h" #include "llvm.h" #include "tests.h" #include "debug.h" diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c index e9703c0..97b570d 100644 --- a/tools/perf/ui/browser.c +++ b/tools/perf/ui/browser.c @@ -1,5 +1,4 @@ #include "../util.h" -#include "../cache.h" #include "../../perf.h" #include "libslang.h" #include "ui.h" diff --git a/tools/perf/ui/browsers/header.c b/tools/perf/ui/browsers/header.c index edbeaaf..d4c9fac 100644 --- a/tools/perf/ui/browsers/header.c +++ b/tools/perf/ui/browsers/header.c @@ -1,4 +1,4 @@ -#include "util/cache.h" +#include "util/util.h" #include "util/debug.h" #include "ui/browser.h" #include "ui/keysyms.h" diff --git a/tools/perf/ui/gtk/browser.c b/tools/perf/ui/gtk/browser.c index c24d912..4305b1b 100644 --- a/tools/perf/ui/gtk/browser.c +++ b/tools/perf/ui/gtk/browser.c @@ -1,5 +1,5 @@ #include "../evlist.h" -#include "../cache.h" +#include "../util.h" #include "../evsel.h" #include "../sort.h" #include "../hist.h" diff --git a/tools/perf/ui/gtk/hists.c b/tools/perf/ui/gtk/hists.c index 4677172..9f3db1f 100644 --- a/tools/perf/ui/gtk/hists.c +++ b/tools/perf/ui/gtk/hists.c @@ -1,5 +1,5 @@ #include "../evlist.h" -#include "../cache.h" +#include "../util.h" #include "../evsel.h" #include "../sort.h" #include "../hist.h" diff --git a/tools/perf/ui/gtk/setup.c b/tools/perf/ui/gtk/setup.c index 1d57676..562a800 100644 --- a/tools/perf/ui/gtk/setup.c +++ b/tools/perf/ui/gtk/setup.c @@ -1,5 +1,5 @@ #include "gtk.h" -#include "../../util/cache.h" +#include "../../util/util.h" #include "../../util/debug.h" extern struct perf_error_ops perf_gtk_eops; diff --git a/tools/perf/ui/helpline.h b/tools/perf/ui/helpline.h index 46181f4..66901b2 100644 --- a/tools/perf/ui/helpline.h +++ b/tools/perf/ui/helpline.h @@ -4,7 +4,7 @@ #include #include -#include "../util/cache.h" +#include "../util/util.h" struct ui_helpline { void (*pop)(void); diff --git a/tools/perf/ui/progress.c b/tools/perf/ui/progress.c index a0f24c7..8857f99 100644 --- a/tools/perf/ui/progress.c +++ b/tools/perf/ui/progress.c @@ -1,4 +1,4 @@ -#include "../cache.h" +#include "../util.h" #include "progress.h" static void null_progress__update(struct ui_progress *p __maybe_unused) diff --git a/tools/perf/ui/setup.c b/tools/perf/ui/setup.c index ba51fa8..df4bd94 100644 --- a/tools/perf/ui/setup.c +++ b/tools/perf/ui/setup.c @@ -1,7 +1,7 @@ #include #include -#include "../util/cache.h" +#include "../util/util.h" #include "../util/debug.h" #include "../util/hist.h" diff --git a/tools/perf/ui/tui/progress.c b/tools/perf/ui/tui/progress.c index c4b9900..89df2eb 100644 --- a/tools/perf/ui/tui/progress.c +++ b/tools/perf/ui/tui/progress.c @@ -1,4 +1,4 @@ -#include "../cache.h" +#include "../util.h" #include "../progress.h" #include "../libslang.h" #include "../ui.h" diff --git a/tools/perf/ui/tui/setup.c b/tools/perf/ui/tui/setup.c index 7dfeba0..b498733 100644 --- a/tools/perf/ui/tui/setup.c +++ b/tools/perf/ui/tui/setup.c @@ -4,7 +4,6 @@ #include #endif -#include "../../util/cache.h" #include "../../util/debug.h" #include "../browser.h" #include "../helpline.h" diff --git a/tools/perf/ui/tui/util.c b/tools/perf/ui/tui/util.c index d96ad7c..c2de719 100644 --- a/tools/perf/ui/tui/util.c +++ b/tools/perf/ui/tui/util.c @@ -4,7 +4,6 @@ #include #include -#include "../../util/cache.h" #include "../../util/debug.h" #include "../browser.h" #include "../keysyms.h" diff --git a/tools/perf/util/abspath.c b/tools/perf/util/abspath.c index 0e76aff..eab5d85 100644 --- a/tools/perf/util/abspath.c +++ b/tools/perf/util/abspath.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "util.h" static const char *get_pwd_cwd(void) { diff --git a/tools/perf/util/alias.c b/tools/perf/util/alias.c index c0b43ee..f905664 100644 --- a/tools/perf/util/alias.c +++ b/tools/perf/util/alias.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "util.h" static const char *alias_key; static char *alias_val; diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 1dd1949..2ab2407 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -12,7 +12,6 @@ #include "sort.h" #include "build-id.h" #include "color.h" -#include "cache.h" #include "symbol.h" #include "debug.h" #include "annotate.h" diff --git a/tools/perf/util/cache.h b/tools/perf/util/cache.h deleted file mode 100644 index 32e1f52..0000000 --- a/tools/perf/util/cache.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef __PERF_CACHE_H -#define __PERF_CACHE_H - -#include -#include "util.h" -#include "strbuf.h" -#include "../perf.h" -#include "../ui/ui.h" - -#include "abspath.h" -#include "alias.h" -#include "config.h" -#include "pager.h" -#include "path.h" - -#endif /* __PERF_CACHE_H */ diff --git a/tools/perf/util/color.c b/tools/perf/util/color.c index e5fb88b..f436c12 100644 --- a/tools/perf/util/color.c +++ b/tools/perf/util/color.c @@ -1,5 +1,5 @@ #include -#include "cache.h" +#include "util.h" #include "color.h" #include diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c index 2e452ac..6b9e91f 100644 --- a/tools/perf/util/config.c +++ b/tools/perf/util/config.c @@ -9,7 +9,6 @@ * */ #include "util.h" -#include "cache.h" #include "exec_cmd.h" #include "util/hist.h" /* perf_hist_config */ #include "util/llvm-utils.h" /* perf_llvm_config */ diff --git a/tools/perf/util/debug.c b/tools/perf/util/debug.c index 86d9c73..8931f4e 100644 --- a/tools/perf/util/debug.c +++ b/tools/perf/util/debug.c @@ -6,7 +6,6 @@ #include #include -#include "cache.h" #include "color.h" #include "event.h" #include "debug.h" diff --git a/tools/perf/util/exec_cmd.c b/tools/perf/util/exec_cmd.c index 1099e92..8d5661e 100644 --- a/tools/perf/util/exec_cmd.c +++ b/tools/perf/util/exec_cmd.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "util.h" #include "exec_cmd.h" #include "quote.h" diff --git a/tools/perf/util/help.c b/tools/perf/util/help.c index 29efb03..2d5e304 100644 --- a/tools/perf/util/help.c +++ b/tools/perf/util/help.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "util.h" #include "../builtin.h" #include "exec_cmd.h" #include "levenshtein.h" diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c index 9409d01..697ed0a 100644 --- a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +++ b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c @@ -23,7 +23,6 @@ #include #include -#include "../cache.h" #include "../util.h" #include "intel-pt-insn-decoder.h" diff --git a/tools/perf/util/levenshtein.c b/tools/perf/util/levenshtein.c index e521d15..61bb371 100644 --- a/tools/perf/util/levenshtein.c +++ b/tools/perf/util/levenshtein.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "util.h" #include "levenshtein.h" /* diff --git a/tools/perf/util/llvm-utils.c b/tools/perf/util/llvm-utils.c index 00724d4..5f02deb 100644 --- a/tools/perf/util/llvm-utils.c +++ b/tools/perf/util/llvm-utils.c @@ -7,7 +7,6 @@ #include "util.h" #include "debug.h" #include "llvm-utils.h" -#include "cache.h" #define CLANG_BPF_CMD_DEFAULT_TEMPLATE \ "$CLANG_EXEC -D__KERNEL__ -D__NR_CPUS__=$NR_CPUS "\ diff --git a/tools/perf/util/pager.c b/tools/perf/util/pager.c index 53ef006..bb19546 100644 --- a/tools/perf/util/pager.c +++ b/tools/perf/util/pager.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "util.h" #include "run-command.h" #include "sigchain.h" diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 6fc8cd7..d2ec59d 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -9,7 +9,6 @@ #include "exec_cmd.h" #include "string.h" #include "symbol.h" -#include "cache.h" #include "header.h" #include "bpf-loader.h" #include "debug.h" diff --git a/tools/perf/util/parse-options.c b/tools/perf/util/parse-options.c index 29366ae..9937e91 100644 --- a/tools/perf/util/parse-options.c +++ b/tools/perf/util/parse-options.c @@ -1,6 +1,5 @@ #include "util.h" #include "parse-options.h" -#include "cache.h" #include "header.h" #include diff --git a/tools/perf/util/path.c b/tools/perf/util/path.c index 5d13cb4..1e22ac0 100644 --- a/tools/perf/util/path.c +++ b/tools/perf/util/path.c @@ -10,7 +10,7 @@ * * which is what it's designed for. */ -#include "cache.h" +#include "util.h" static char bad_path[] = "/bad-path/"; /* diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index 93996ec..388fec5 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -36,7 +36,6 @@ #include "event.h" #include "strlist.h" #include "debug.h" -#include "cache.h" #include "color.h" #include "symbol.h" #include "thread.h" diff --git a/tools/perf/util/probe-file.c b/tools/perf/util/probe-file.c index e3b3b92..724a6ce 100644 --- a/tools/perf/util/probe-file.c +++ b/tools/perf/util/probe-file.c @@ -18,7 +18,6 @@ #include "event.h" #include "strlist.h" #include "debug.h" -#include "cache.h" #include "color.h" #include "symbol.h" #include "thread.h" diff --git a/tools/perf/util/quote.c b/tools/perf/util/quote.c index 01f0324..57ed644 100644 --- a/tools/perf/util/quote.c +++ b/tools/perf/util/quote.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "util.h" #include "quote.h" /* Help to copy the thing properly quoted for the shell safety. diff --git a/tools/perf/util/run-command.c b/tools/perf/util/run-command.c index 34622b5..38d2cc6 100644 --- a/tools/perf/util/run-command.c +++ b/tools/perf/util/run-command.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "util.h" #include "run-command.h" #include "exec_cmd.h" #include "debug.h" diff --git a/tools/perf/util/sigchain.c b/tools/perf/util/sigchain.c index ba785e9..5eebf88 100644 --- a/tools/perf/util/sigchain.c +++ b/tools/perf/util/sigchain.c @@ -1,5 +1,5 @@ +#include "util.h" #include "sigchain.h" -#include "cache.h" #define SIGCHAIN_MAX_SIGNALS 32 diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h index 3122885..139a566 100644 --- a/tools/perf/util/sort.h +++ b/tools/perf/util/sort.h @@ -6,7 +6,6 @@ #include "color.h" #include -#include "cache.h" #include #include "symbol.h" #include "string.h" diff --git a/tools/perf/util/strbuf.c b/tools/perf/util/strbuf.c index 25671fa..0e53793 100644 --- a/tools/perf/util/strbuf.c +++ b/tools/perf/util/strbuf.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "util.h" #include int prefixcmp(const char *str, const char *prefix) diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h index d8e3d8d..c7b50d5 100644 --- a/tools/perf/util/util.h +++ b/tools/perf/util/util.h @@ -3,13 +3,19 @@ #include "compat-util.h" +#include "../perf.h" +#include "abspath.h" +#include "alias.h" #include "config.h" #include "ctype.h" #include "lzma.h" +#include "pager.h" +#include "path.h" #include "srcline.h" #include "strbuf.h" #include "string.h" #include "term.h" +#include "../ui/ui.h" #include "usage.h" #include "wrapper.h" #include "zlib.h" diff --git a/tools/perf/util/wrapper.c b/tools/perf/util/wrapper.c index 19f15b6..861ecfa 100644 --- a/tools/perf/util/wrapper.c +++ b/tools/perf/util/wrapper.c @@ -1,7 +1,7 @@ /* * Various trivial helper wrappers around standard functions */ -#include "cache.h" +#include "util.h" /* * There's no pack memory to release - but stay close to the Git -- 2.4.3