From: Ian Rogers <irogers@google.com>
To: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Namhyung Kim <namhyung@kernel.org>, Jiri Olsa <jolsa@kernel.org>,
Ian Rogers <irogers@google.com>,
Adrian Hunter <adrian.hunter@intel.com>,
James Clark <james.clark@linaro.org>,
Thomas Richter <tmricht@linux.ibm.com>,
linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org
Subject: [PATCH v1 2/2] perf tool: Sort headers from previous cache.h removal
Date: Fri, 28 Aug 2026 15:20:45 -0700 [thread overview]
Message-ID: <20260828222045.1314766-2-irogers@google.com> (raw)
In-Reply-To: <20260828222045.1314766-1-irogers@google.com>
Use git clang-format to sort headers.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/builtin-annotate.c | 49 +++++++++++++++---------------
tools/perf/builtin-config.c | 14 +++++----
tools/perf/builtin-help.c | 31 ++++++++++---------
tools/perf/perf.c | 49 ++++++++++++++++--------------
tools/perf/util/config.c | 34 ++++++++++++---------
tools/perf/util/help-unknown-cmd.c | 9 ++++--
tools/perf/util/path.c | 8 +++--
tools/perf/util/path.h | 3 +-
8 files changed, 107 insertions(+), 90 deletions(-)
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 3efeb845099c..fbdcfae858e2 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -6,44 +6,43 @@
* look up and read DSOs and symbol information and display
* a histogram of results, along various sorting keys.
*/
-#include "builtin.h"
-#include "perf.h"
+#include <errno.h>
+#include <inttypes.h>
-#include "util/color.h"
+#include <dlfcn.h>
+#include <linux/bitmap.h>
+#include <linux/err.h>
#include <linux/list.h>
#include <linux/rbtree.h>
-#include "util/symbol.h"
-#include "util/debug.h"
+#include <subcmd/parse-options.h>
-#include "util/evlist.h"
-#include "util/evsel.h"
-#include "util/annotate.h"
+#include "arch/common.h"
+#include "builtin.h"
+#include "perf.h"
+#include "ui/progress.h"
+#include "ui/ui.h"
#include "util/annotate-data.h"
+#include "util/annotate.h"
+#include "util/block-range.h"
+#include "util/branch.h"
+#include "util/color.h"
+#include "util/data.h"
+#include "util/debug.h"
+#include "util/dso.h"
#include "util/event.h"
-#include <subcmd/parse-options.h>
-#include "util/parse-events.h"
-#include "util/sort.h"
+#include "util/evlist.h"
+#include "util/evsel.h"
#include "util/hist.h"
-#include "util/dso.h"
#include "util/machine.h"
#include "util/map.h"
+#include "util/map_symbol.h"
+#include "util/parse-events.h"
#include "util/session.h"
+#include "util/sort.h"
+#include "util/symbol.h"
#include "util/tool.h"
-#include "util/data.h"
-#include "arch/common.h"
-#include "util/block-range.h"
-#include "util/map_symbol.h"
-#include "util/branch.h"
#include "util/util.h"
-#include "ui/progress.h"
-#include "ui/ui.h"
-
-#include <dlfcn.h>
-#include <errno.h>
-#include <linux/bitmap.h>
-#include <linux/err.h>
-#include <inttypes.h>
struct perf_annotate {
struct perf_tool tool;
diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c
index f4f916241d1d..1ee5461436b6 100644
--- a/tools/perf/builtin-config.c
+++ b/tools/perf/builtin-config.c
@@ -5,16 +5,18 @@
* Copyright (C) 2015, Taeung Song <treeze.taeung@gmail.com>
*
*/
-#include "builtin.h"
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <linux/string.h>
#include <subcmd/parse-options.h>
-#include "util/debug.h"
+
+#include "builtin.h"
#include "util/config.h"
+#include "util/debug.h"
#include "util/path.h"
-#include <linux/string.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
static bool use_system_config, use_user_config;
diff --git a/tools/perf/builtin-help.c b/tools/perf/builtin-help.c
index 36f5c5e94289..676a0bb63b24 100644
--- a/tools/perf/builtin-help.c
+++ b/tools/perf/builtin-help.c
@@ -4,28 +4,31 @@
*
* Builtin help command
*/
-#include "util/config.h"
-#include "util/path.h"
-#include "util/strbuf.h"
-#include "builtin.h"
-#include <subcmd/exec-cmd.h>
-#include <subcmd/parse-options.h>
-#include <subcmd/run-command.h>
-#include <subcmd/help.h>
-#include "util/debug.h"
-#include "util/util.h"
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/zalloc.h>
#include <errno.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <sys/types.h>
+
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/zalloc.h>
#include <sys/stat.h>
+#include <sys/types.h>
#include <unistd.h>
+#include <subcmd/exec-cmd.h>
+#include <subcmd/help.h>
+#include <subcmd/parse-options.h>
+#include <subcmd/run-command.h>
+
+#include "builtin.h"
+#include "util/config.h"
+#include "util/debug.h"
+#include "util/path.h"
+#include "util/strbuf.h"
+#include "util/util.h"
+
static struct man_viewer_list {
struct man_viewer_list *next;
char name[0];
diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index ad8c8067b765..99135d17b85c 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -6,38 +6,41 @@
* This is the main hub from which the sub-commands (perf stat,
* perf top, perf record, perf report, etc.) are started.
*/
-#include "builtin.h"
#include "perf.h"
-#include "util/build-id.h"
-#include "util/env.h"
-#include <internal/lib.h> // page_size
-#include <subcmd/exec-cmd.h>
-#include "util/config.h"
-#include <subcmd/run-command.h>
-#include "util/parse-events.h"
-#include <subcmd/pager.h>
-#include <subcmd/parse-options.h>
-#include <subcmd/help.h>
-#include "util/debug.h"
-#include "util/event.h"
-#include "util/util.h" // usage()
-#include "ui/ui.h"
-#include "perf-sys.h"
-#include <api/fs/fs.h>
-#include <api/fs/tracing_path.h>
-#include <perf/core.h>
#include <errno.h>
-#include <pthread.h>
#include <signal.h>
#include <stdlib.h>
#include <time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
+
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/zalloc.h>
+#include <pthread.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include <api/fs/fs.h>
+#include <api/fs/tracing_path.h>
+#include <internal/lib.h> // page_size
+#include <perf/core.h>
+#include <subcmd/exec-cmd.h>
+#include <subcmd/help.h>
+#include <subcmd/pager.h>
+#include <subcmd/parse-options.h>
+#include <subcmd/run-command.h>
+
+#include "builtin.h"
+#include "perf-sys.h"
+#include "ui/ui.h"
+#include "util/build-id.h"
+#include "util/config.h"
+#include "util/debug.h"
+#include "util/env.h"
+#include "util/event.h"
+#include "util/parse-events.h"
+#include "util/util.h" // usage()
#define CMD_EXEC_PATH "--exec-path"
#define CMD_DEBUGFS_DIR "--debugfs-dir="
diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index 6a310e56a2f1..a748c9fd629e 100644
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -9,28 +9,32 @@
* Copyright (C) Johannes Schindelin, 2005
*
*/
+#include "config.h"
+
#include <errno.h>
+#include <stdlib.h>
+
+#include <linux/ctype.h>
+#include <linux/string.h>
+#include <linux/zalloc.h>
#include <sys/param.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include <subcmd/exec-cmd.h>
+
+#include "build-id.h"
#include "callchain.h"
+#include "debug.h"
#include "header.h"
-#include <subcmd/exec-cmd.h>
-#include "util/event.h" /* proc_map_timeout */
-#include "util/hist.h" /* perf_hist_config */
-#include "util/stat.h" /* perf_stat__set_big_num */
-#include "util/evsel.h" /* evsel__hw_names, evsel__use_bpf_counters */
#include "path.h"
#include "srcline.h"
-#include "build-id.h"
-#include "debug.h"
-#include "config.h"
#include "unwind.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <linux/string.h>
-#include <linux/zalloc.h>
-#include <linux/ctype.h>
+#include "util/event.h" /* proc_map_timeout */
+#include "util/evsel.h" /* evsel__hw_names, evsel__use_bpf_counters */
+#include "util/hist.h" /* perf_hist_config */
+#include "util/stat.h" /* perf_stat__set_big_num */
#define MAXNAME (256)
diff --git a/tools/perf/util/help-unknown-cmd.c b/tools/perf/util/help-unknown-cmd.c
index f1cd9d4746f3..64dbe6e514f5 100644
--- a/tools/perf/util/help-unknown-cmd.c
+++ b/tools/perf/util/help-unknown-cmd.c
@@ -1,13 +1,16 @@
// SPDX-License-Identifier: GPL-2.0
-#include "config.h"
-#include <poll.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+
+#include <linux/zalloc.h>
+#include <poll.h>
+
#include <subcmd/help.h>
+
#include "../builtin.h"
+#include "config.h"
#include "levenshtein.h"
-#include <linux/zalloc.h>
static int autocorrect;
diff --git a/tools/perf/util/path.c b/tools/perf/util/path.c
index bf5d081707e4..7e85bbd8f751 100644
--- a/tools/perf/util/path.c
+++ b/tools/perf/util/path.c
@@ -1,12 +1,14 @@
// SPDX-License-Identifier: GPL-2.0
#include "path.h"
-#include <linux/kernel.h>
+
#include <limits.h>
#include <stdio.h>
#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+
#include <dirent.h>
+#include <linux/kernel.h>
+#include <sys/stat.h>
+#include <sys/types.h>
#include <unistd.h>
static char *cleanup_path(char *path)
diff --git a/tools/perf/util/path.h b/tools/perf/util/path.h
index e7cdb0cb1097..62e86d390589 100644
--- a/tools/perf/util/path.h
+++ b/tools/perf/util/path.h
@@ -2,8 +2,9 @@
#ifndef _PERF_PATH_H
#define _PERF_PATH_H
-#include <stddef.h>
#include <stdbool.h>
+#include <stddef.h>
+
#include <linux/compiler.h>
struct dirent;
--
2.55.0.897.gb25b4bd76c-goog
prev parent reply other threads:[~2026-08-28 22:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-28 22:20 [PATCH v1 1/2] perf tool: Remove util/cache.h Ian Rogers
2026-08-28 22:20 ` Ian Rogers [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260828222045.1314766-2-irogers@google.com \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=james.clark@linaro.org \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=tmricht@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®