From nobody Sun Feb 8 20:33:28 2026 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.202]) (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 3D0FB2E6CB2 for ; Sat, 10 Jan 2026 08:27:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768033629; cv=none; b=scnLxw8uup8XvqmXctrgiAkI/XaqXviqwlStJtcOr8C3MroX+ShqJn9rD648Q+dIQQPdfCoSmqDzhlc/QG0ocBpTKBwAfNhgUIcppC/ij+sfckVkEVIco3QZyssU+Qroj16ysjwmmphLJYWcxKkPIyEiqf690d8EIZzimwan1ow= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768033629; c=relaxed/simple; bh=X1MjIcGZucyzCm2r2IlBzTymaxjsdQoFFc+rtk3RK20=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=s0tVU8xv3r/2+NTOf5/xqx4xeDlx0cXRNO/bT7EGTplnPIXWBAVm808ZXBh5xDJv03uPQoNgFBLBHFz3g/Q+qg51SHjNICxC4SBhpXyGcnOQpR3xvxJSvvdmPGvrcGGqM9smj+sz32Bvp4011hSWmUIGuYpb7SuZPDzzRtqlJGM= 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=vUb8wGM+; arc=none smtp.client-ip=74.125.82.202 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="vUb8wGM+" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2ae56205588so5909465eec.1 for ; Sat, 10 Jan 2026 00:27:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1768033626; x=1768638426; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=GeyCcyFu8+y/NnCQ7WsdxHS48sCTNn9MjknKssLg0z0=; b=vUb8wGM+CFbmthM8TckKZ9PYJN50ecvwCP9JOUOInjrK5PbVLd2MfhwPFdqZOs/0d5 NeufndcmZwZopgEV6CWd+bmfUWiV8SBag/F+INL4GXoxHWWVPnKFUi3W1qUcoVNNIzoK VXcvrKSYsncBf2aa2FDcEfN63i14zsaNUWz5iCvVS+z3HZoGvSnMe2XB3xosoX6dzqgP BI4Qwgq7iIOf2oN8XKC121X3QEv9FdvIESwb5sDWW5b/blGNhjS/WfHT0HwULQLX2fTk QQPUThGScLQvZEE2E9tveBXk5Qi1+h/n4oqTXAEaOjaeKPNVOpz4yV31XrWvJ6ozISJF gvfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768033626; x=1768638426; h=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; bh=GeyCcyFu8+y/NnCQ7WsdxHS48sCTNn9MjknKssLg0z0=; b=XJ8XZG0O2imwQE+d8LRaden26oT9q+Yy1Lpq9QDQIU4S9DQo39j5iOr4LHr81wMckR AmmkLyEiWCF54ue9IJLT69n7qn6Sk80JK/0IjpDQbs5nQDE8vjjOAXHsnz9YNs0akR27 fP5gynPMYpRI24PqtydlDHgvTRQx0o8Je5qIunlcrq0dDppieOEdZFxvQrED+ZBsxYEt +a6Ae83eF0B8WEraUpz5EMyo5bzSrftuWpI+R7pPRm5D96UAwWgjmA2Gs2I6rvWr7Fcj riQkjnyTgahK4c4czauj2nYk3XzMplOw5J5PsbA+AIU6zOJa3UO7OysS9Iovc+tsRmyZ bTLw== X-Forwarded-Encrypted: i=1; AJvYcCXKVhnJp7ZdA2f2MIa7kFlxYHUQyLI9DvQgkiighvcXupdRSveOn91U5ZkialRMf0IMOJUjtAg+7yCx1DM=@vger.kernel.org X-Gm-Message-State: AOJu0YziZkm+DcgOzPlXCIMRTqxfp70faTZlP+9kc7b/c0K5iT2HoYZR rkCYzbSoJMxC8i7/UiFAgwi5mFYG5EuZMwFOQ8WdTAp5VuPU2nrQiFM8iwCGkpaJBEqtI9fTgmY UlNL+qLM+GA== X-Google-Smtp-Source: AGHT+IFiNbZL8zBQ61wqoykyJMyxlzCNV4Dnpo+uPuFeWFdkSSYtZrTbTPhfi56pcUDS5JqF9yr4caC+R4C5 X-Received: from dyek19.prod.google.com ([2002:a05:7300:6413:b0:2b0:5041:8a8b]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:8290:b0:2ae:598e:abe5 with SMTP id 5a478bee46e88-2b17d321a6dmr6978326eec.35.1768033626253; Sat, 10 Jan 2026 00:27:06 -0800 (PST) Date: Sat, 10 Jan 2026 00:26:43 -0800 In-Reply-To: <20260110082647.1487574-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: <20260110082647.1487574-1-irogers@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260110082647.1487574-3-irogers@google.com> Subject: [PATCH v2 2/6] perf addr2line.c: Rename a2l_style to cmd_a2l_style From: Ian Rogers To: Tony Jones , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , James Clark , Howard Chu , Stephen Brennan , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The a2l_style is only relevant to the command line version, so rename to make this clearer. Signed-off-by: Ian Rogers --- tools/perf/util/addr2line.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/perf/util/addr2line.c b/tools/perf/util/addr2line.c index f2d94a3272d7..0f1499350d47 100644 --- a/tools/perf/util/addr2line.c +++ b/tools/perf/util/addr2line.c @@ -90,16 +90,16 @@ static struct child_process *addr2line_subprocess_init(= const char *addr2line_pat return a2l; } =20 -enum a2l_style { +enum cmd_a2l_style { BROKEN, GNU_BINUTILS, LLVM, }; =20 -static enum a2l_style addr2line_configure(struct child_process *a2l, const= char *dso_name) +static enum cmd_a2l_style cmd_addr2line_configure(struct child_process *a2= l, const char *dso_name) { static bool cached; - static enum a2l_style style; + static enum cmd_a2l_style style; =20 if (!cached) { char buf[128]; @@ -149,7 +149,7 @@ static enum a2l_style addr2line_configure(struct child_= process *a2l, const char } =20 static int read_addr2line_record(struct io *io, - enum a2l_style style, + enum cmd_a2l_style style, const char *dso_name, u64 addr, bool first, @@ -298,7 +298,7 @@ int cmd__addr2line(const char *dso_name, u64 addr, char buf[128]; ssize_t written; struct io io =3D { .eof =3D false }; - enum a2l_style a2l_style; + enum cmd_a2l_style cmd_a2l_style; =20 if (!a2l) { if (!filename__has_section(dso_name, ".debug_line")) @@ -314,8 +314,8 @@ int cmd__addr2line(const char *dso_name, u64 addr, pr_warning("%s %s: addr2line_subprocess_init failed\n", __func__, dso_n= ame); goto out; } - a2l_style =3D addr2line_configure(a2l, dso_name); - if (a2l_style =3D=3D BROKEN) + cmd_a2l_style =3D cmd_addr2line_configure(a2l, dso_name); + if (cmd_a2l_style =3D=3D BROKEN) goto out; =20 /* @@ -336,7 +336,7 @@ int cmd__addr2line(const char *dso_name, u64 addr, } io__init(&io, a2l->out, buf, sizeof(buf)); io.timeout_ms =3D addr2line_timeout_ms; - switch (read_addr2line_record(&io, a2l_style, dso_name, addr, /*first=3D*= /true, + switch (read_addr2line_record(&io, cmd_a2l_style, dso_name, addr, /*first= =3D*/true, &record_function, &record_filename, &record_line_nr)) { case -1: if (!symbol_conf.disable_add2line_warn) @@ -351,7 +351,7 @@ int cmd__addr2line(const char *dso_name, u64 addr, * binutils, also force a non-zero address as we're no longer * reading that record. */ - switch (read_addr2line_record(&io, a2l_style, dso_name, + switch (read_addr2line_record(&io, cmd_a2l_style, dso_name, /*addr=3D*/1, /*first=3D*/true, NULL, NULL, NULL)) { case -1: @@ -397,7 +397,7 @@ int cmd__addr2line(const char *dso_name, u64 addr, * as we're reading records beyond the first. */ while ((record_status =3D read_addr2line_record(&io, - a2l_style, + cmd_a2l_style, dso_name, /*addr=3D*/1, /*first=3D*/false, --=20 2.52.0.457.g6b5491de43-goog