From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7A291471CE2 for ; Mon, 31 Aug 2026 18:22:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.72 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788200563; cv=none; b=NdghPBw7Bb6+NvAKTRQ+ReLvQYyegNS/gG92VY47FVSwS1wRouBIkk9nGr6ro0Obb5mxQ1W/fBeorX3kCNb6pmtxZtJ/CTO0Ee1rTSsrZcQMHYPMRXVkaf/Fy2AoBe7dw5o/hFUbKNxi587XKionZuKPFPEFZ6exz/nClUxLS3s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788200563; c=relaxed/simple; bh=EkuGorxYbnpKRVsw3L4sE1XYcPZZJgjMaX1beCyedrc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=JnmZdnTmKnKx18WrpXyHCFl2mVZZy8B7ulrAn+CVgt/5v2g8SYU3bdCJ2KNQeZVw63o1gbq0s6sV8lTNdrfAxjd2YjF25NmDTmaqdpHte2lhGCT0ON22+dDdvMCrIewDKD3Uy91MM3tAmao9+97w+8MeKfaD52m7T7xNi+JvOxw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=WAgIZeNO; arc=none smtp.client-ip=209.85.216.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="WAgIZeNO" Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-398dc3d8f0aso241536a91.0 for ; Mon, 31 Aug 2026 11:22:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1788200560; x=1788805360; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=cRyAr+lUyaz1JIYzb+dJyG+KIPX1lxrw40Zxa5BpkR8=; b=WAgIZeNO4BWgTTAfAr9nYvPBR0DGhrNX79A4Sy5IYODl5MEewepqw/iRscCIR/Kx6s kAb9zAxltCgY7Q0/qv8KFSMipURz2ijb0bBRJ+LyRE2M7kJ2H2Zj+n9gAGDWb1hRf5XG qOX7ydbvqcIvfOA9IHn3f+Llmvec33y9bvPoGZ5b5wsbzv3B7fjKj2NFl3gwyah1xRFR 8jOvS10O0sJK5BrO0Bi//KF8Of6NS1uV625aPhXZbdSsUB2GcQ2sQ2VbsT2ctZ7eRwEj YICCXbE4p+M61jfpxORUxWCkEjMekbYglLbm+OoUZS+jKtWdefMb8fiyYoGijYM+bf6n zjig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788200560; x=1788805360; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=cRyAr+lUyaz1JIYzb+dJyG+KIPX1lxrw40Zxa5BpkR8=; b=asGfQlGotSHKIn1wFRXrjd3Tw53WFA/RMGfesSvGdQemcBTpTKHfQzkuEUoMPgwvFa vYOQMyGKU7AevuN4kvFYnZNkCRo0hc8Moc5Ze5FnewbMuWzDhTgZP8euDDOEfEM6u3WX Hw8GVoQ/p5/5tasabGuJIp+Scdm3LLFIPW7Tqi/57oJBcspW3JA7NInrmi4HYst5qViO +MvLJAxjpNkcvE9BrbrrHid7txsLp3oHgioIj8Rs+6xY0LOxML2U3qRjxdd1kpk2kCno muOkzyTiXtPDsGUloNyQ8cTndcHnBQdsaDp8e46aVTT1+UyW95Oaq/aJbBLDUpW2PaIa go7g== X-Forwarded-Encrypted: i=1; AKwUvBzXCR6RudlbjCiJMYDgb6vssiJHSpk/yQzgwL8ce5Iijmphb8FXh0MP4lLM4sfXedZVRWpAO70Gwf6jUsc=@vger.kernel.org X-Gm-Message-State: AFuF++k54TzyF5QRSv40cYfhJ9lqec2qa3Vc7k24IihpClxRrk/YO7PV pn0zI0IJaW6y9deCXeyYdPWCVOcmHcJYrjCfAwS2y8HVpjEtNk+8HShSwh2uGIi9rlOR8DraWno qNvZPZDJnFA== X-Received: from dlbts8-n1.prod.google.com ([2002:a05:7022:b048:10b0:142:e77e:11fa]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:4b91:b0:398:b1b8:4719 with SMTP id 98e67ed59e1d1-3990f918cc8mr146034a91.29.1788200559420; Mon, 31 Aug 2026 11:22:39 -0700 (PDT) Date: Mon, 31 Aug 2026 11:22:31 -0700 In-Reply-To: <20260828222045.1314766-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260828222045.1314766-1-irogers@google.com> X-Mailer: git-send-email 2.55.0.897.gb25b4bd76c-goog Message-ID: <20260831182232.2959017-1-irogers@google.com> Subject: [PATCH v2 1/2] perf tool: Remove util/cache.h From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, james.clark@linaro.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, tmricht@linux.ibm.com Content-Type: text/plain; charset="UTF-8" Move definitions to places they are used, or path.h in the case of path.c's mkpath function. Remove unused definitions. Fix transitive include dependencies. Signed-off-by: Ian Rogers --- tools/perf/builtin-annotate.c | 6 +++++- tools/perf/builtin-config.c | 4 +++- tools/perf/builtin-help.c | 3 ++- tools/perf/perf.c | 11 ++++++++++- tools/perf/util/cache.h | 31 ------------------------------ tools/perf/util/config.c | 5 ++++- tools/perf/util/help-unknown-cmd.c | 6 +++++- tools/perf/util/path.c | 2 +- tools/perf/util/path.h | 3 +++ tools/perf/util/strbuf.c | 5 ++++- 10 files changed, 37 insertions(+), 39 deletions(-) delete mode 100644 tools/perf/util/cache.h diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 69cb72b2082a..75cbea567196 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -8,10 +8,10 @@ */ #include "builtin.h" #include "perf.h" +#include #include "util/color.h" #include -#include "util/cache.h" #include #include "util/symbol.h" @@ -38,12 +38,16 @@ #include "util/branch.h" #include "util/util.h" #include "ui/progress.h" +#include "ui/ui.h" #include #include #include #include #include +#include +#include +#include struct perf_annotate { struct perf_tool tool; diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c index 237600643bbd..845a8af67fc5 100644 --- a/tools/perf/builtin-config.c +++ b/tools/perf/builtin-config.c @@ -7,14 +7,16 @@ */ #include "builtin.h" -#include "util/cache.h" #include #include "util/debug.h" #include "util/config.h" +#include "util/path.h" #include #include #include #include +#include +#include static bool use_system_config, use_user_config; diff --git a/tools/perf/builtin-help.c b/tools/perf/builtin-help.c index 2692b2e40a23..f0e95d741892 100644 --- a/tools/perf/builtin-help.c +++ b/tools/perf/builtin-help.c @@ -4,8 +4,8 @@ * * Builtin help command */ -#include "util/cache.h" #include "util/config.h" +#include "util/path.h" #include "util/strbuf.h" #include "builtin.h" #include @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include diff --git a/tools/perf/perf.c b/tools/perf/perf.c index 1f51e8de6b1b..8ad01a78fdd5 100644 --- a/tools/perf/perf.c +++ b/tools/perf/perf.c @@ -10,13 +10,13 @@ #include "perf.h" #include "util/build-id.h" -#include "util/cache.h" #include "util/env.h" #include // page_size #include #include "util/config.h" #include #include "util/parse-events.h" +#include #include #include #include "util/debug.h" @@ -30,7 +30,10 @@ #include #include #include +#include #include +#include +#include #include #include #include @@ -39,6 +42,12 @@ #include #include +#define CMD_EXEC_PATH "--exec-path" +#define CMD_DEBUGFS_DIR "--debugfs-dir=" + +#define EXEC_PATH_ENVIRONMENT "PERF_EXEC_PATH" +#define PERF_PAGER_ENVIRONMENT "PERF_PAGER" + static int use_pager = -1; static FILE *debug_fp = NULL; diff --git a/tools/perf/util/cache.h b/tools/perf/util/cache.h deleted file mode 100644 index 0b61840d4226..000000000000 --- a/tools/perf/util/cache.h +++ /dev/null @@ -1,31 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __PERF_CACHE_H -#define __PERF_CACHE_H - -#include "strbuf.h" -#include -#include "../ui/ui.h" - -#include -#include - -#define CMD_EXEC_PATH "--exec-path" -#define CMD_DEBUGFS_DIR "--debugfs-dir=" - -#define EXEC_PATH_ENVIRONMENT "PERF_EXEC_PATH" -#define PERF_DEBUGFS_ENVIRONMENT "PERF_DEBUGFS_DIR" -#define PERF_TRACEFS_ENVIRONMENT "PERF_TRACEFS_DIR" -#define PERF_PAGER_ENVIRONMENT "PERF_PAGER" - -int split_cmdline(char *cmdline, const char ***argv); - -#define alloc_nr(x) (((x)+16)*3/2) - -static inline int is_absolute_path(const char *path) -{ - return path[0] == '/'; -} - -char *mkpath(char *path_buf, size_t sz, const char *fmt, ...) __printf(3, 4); - -#endif /* __PERF_CACHE_H */ diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c index 7988149dc7ed..5b696139f655 100644 --- a/tools/perf/util/config.c +++ b/tools/perf/util/config.c @@ -11,7 +11,6 @@ */ #include #include -#include "cache.h" #include "callchain.h" #include "header.h" #include @@ -19,6 +18,7 @@ #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" @@ -26,7 +26,10 @@ #include "unwind.h" #include #include +#include #include +#include +#include #include #include #include diff --git a/tools/perf/util/help-unknown-cmd.c b/tools/perf/util/help-unknown-cmd.c index a0a46e34f8d1..f1cd9d4746f3 100644 --- a/tools/perf/util/help-unknown-cmd.c +++ b/tools/perf/util/help-unknown-cmd.c @@ -1,9 +1,9 @@ // SPDX-License-Identifier: GPL-2.0 -#include "cache.h" #include "config.h" #include #include #include +#include #include #include "../builtin.h" #include "levenshtein.h" @@ -36,10 +36,14 @@ static int add_cmd_list(struct cmdnames *cmds, struct cmdnames *old) if (nr > cmds->alloc) { /* Choose bigger one to alloc */ +#define alloc_nr(x) (((x) + 16) * 3 / 2) + if (alloc_nr(cmds->alloc) < nr) cmds->alloc = nr; else cmds->alloc = alloc_nr(cmds->alloc); + +#undef alloc_nr tmp = realloc(cmds->names, cmds->alloc * sizeof(*cmds->names)); if (!tmp) return -1; diff --git a/tools/perf/util/path.c b/tools/perf/util/path.c index 2e62f272fda8..5ba7861a3e65 100644 --- a/tools/perf/util/path.c +++ b/tools/perf/util/path.c @@ -1,8 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 #include "path.h" -#include "cache.h" #include #include +#include #include #include #include diff --git a/tools/perf/util/path.h b/tools/perf/util/path.h index fb850fb55c60..e7cdb0cb1097 100644 --- a/tools/perf/util/path.h +++ b/tools/perf/util/path.h @@ -4,9 +4,12 @@ #include #include +#include struct dirent; +char *mkpath(char *path_buf, size_t sz, const char *fmt, ...) __printf(3, 4); + int path__join(char *bf, size_t size, const char *path1, const char *path2); int path__join3(char *bf, size_t size, const char *path1, const char *path2, const char *path3); diff --git a/tools/perf/util/strbuf.c b/tools/perf/util/strbuf.c index a64a37628f12..df3f9c4123fd 100644 --- a/tools/perf/util/strbuf.c +++ b/tools/perf/util/strbuf.c @@ -1,5 +1,4 @@ // SPDX-License-Identifier: GPL-2.0 -#include "cache.h" #include "debug.h" #include "strbuf.h" #include @@ -8,6 +7,7 @@ #include #include #include +#include #include /* @@ -54,9 +54,12 @@ int strbuf_grow(struct strbuf *sb, size_t extra) if (nr <= sb->len) return -E2BIG; +#define alloc_nr(x) (((x) + 16) * 3 / 2) + if (alloc_nr(sb->alloc) > nr) nr = alloc_nr(sb->alloc); +#undef alloc_nr /* * Note that sb->buf == strbuf_slopbuf if sb->alloc == 0, and it is * a static variable. Thus we have to avoid passing it to realloc. -- 2.55.0.897.gb25b4bd76c-goog