From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f74.google.com (mail-dl1-f74.google.com [74.125.82.74]) (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 611B83A7F50 for ; Tue, 12 May 2026 22:30:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778625048; cv=none; b=hTEFKfybkBc2BXHOlh6MdJ6Dwlr9qpJZD2a8k9wCJW5Z/jm1vA5A+K58/PQcuGdFh4sxUrS8Dt+6xWh0Pv/Qo8j1vf7+JfCtEyqTtfjqxxNBLqrS/LEexY4BRkgTndUMUiJyg7awNOu+vK7ouzWraAAhQxQxAAcfbQHQOeWQOo8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778625048; c=relaxed/simple; bh=VP+yMPYamn1r+ox/cH6zuRG5yU8fCc1Rb5ch97Z4oX8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=LBiLglD5ZfnNigQHlV4IUUGl2+R2oyLYYOmmQSNnu8GlRuTl0oG/8LvlLsAYbXfCXM3oFsHyW7nI6aUUaE6kW3n6jomAiCXaoI28vwbtUnc9EKT4Hht++41jzNJXFRqAnHmHumKxVvRnp3l2Z1MCnBL4zcBovsdhS/YlbflWaFw= 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=UzIop47w; arc=none smtp.client-ip=74.125.82.74 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="UzIop47w" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-132a99125f8so7319922c88.1 for ; Tue, 12 May 2026 15:30:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778625045; x=1779229845; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=3cadJ00DCY4cbIT5zIV9+HXWnhIA3Uxax5tLCzTqsAM=; b=UzIop47w07E/V4+ut75w6JoJu1EfAfqGkJzNlPWIqNISRoOreG0ADbmySFuo++BUP4 KXU6LSVh1wJccKLYADUVCObz9AhxBuTNPdnVz3iOvtISMakMF3S2tTh9AwE4xWcBJoBq ivfdycz7dHZAN1gewXOfVxM/UHBG4cJlXmghg00vlqrWRUa1kzxtS+hMJjEcXoPND1e1 vOkHyI5V2zLy9IgexdW3/ipd8LD/ymC44UcaweZHS/pFvsl1xISuccl+19VDqn0pCgbD vVPmp6yubD15wzKPri6BiIcHQ/bDgaNBWr2luC/u9zoCDO+I62WTEXP78ZbGZmQ06T6E G6/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778625045; x=1779229845; h=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; bh=3cadJ00DCY4cbIT5zIV9+HXWnhIA3Uxax5tLCzTqsAM=; b=EpZxFcSNuq9VkovSsBI2eWEvVlgJZH95eirnLS/c7aOKU+ddlzurD5iKFgs4QUQKk6 uJi55qIYQeig/2OOKvQWx8Tykn6y+jmAqidKqoRQAd2KcbpD2DWYMIUoeJndxgQdUoGS bLqCcwk4qaW+Nz8qejavosBzZaFrP/atLIbI0imPessyEoDA9fslqvmFBcobqSou+j3D Bn3xkcRXvoF/rHCtA4p44CV4g8hcwAwpnXTv38mp2A/0a1c6zhWnuiSVA4bgGfofw/3e +dKvVLXROxi1TEvDodguAPTshOxhO+FUzcZpnL96p4Z5Dxj9mPr8t38Jbx7qrejuxJSn 3nnw== X-Forwarded-Encrypted: i=1; AFNElJ+hoxz6zkHK/5/AXKanUb+tqLXw7MqX2I4uVY1ga5Mi3sSdpFbY3wDcICIaEJ49oPATlp/pUt4NC6MpCmo=@vger.kernel.org X-Gm-Message-State: AOJu0Ywz/OG6RK/6ShJDHJ1oXCETPfgYx4OlXU7150UYqCHCie0q0uec CMX22clDYzWEd+P1Onkn3Wk4FDTYqWN8c4sxSXgY/z72Z7ePwVAmIz4XOWiavJFU3DFwteQ5xG6 vvGRg5WI1EA== X-Received: from dlbsw9.prod.google.com ([2002:a05:7022:3a89:b0:12d:b26a:1571]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:6625:b0:12c:8e70:c33b with SMTP id a92af1059eb24-1342ee4231cmr579109c88.8.1778625045056; Tue, 12 May 2026 15:30:45 -0700 (PDT) Date: Tue, 12 May 2026 15:29:40 -0700 In-Reply-To: <20260512223001.2952848-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: <20260413041143.1736055-1-irogers@google.com> <20260512223001.2952848-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260512223001.2952848-12-irogers@google.com> Subject: [PATCH v13 11/32] perf annotate: Don't pass evsel to add_sample From: Ian Rogers To: irogers@google.com, acme@kernel.org Cc: adrian.hunter@intel.com, ajones@ventanamicro.com, ak@linux.intel.com, alex@ghiti.fr, alexander.shishkin@linux.intel.com, anup@brainfault.org, aou@eecs.berkeley.edu, atrajeev@linux.ibm.com, blakejones@google.com, ctshao@google.com, dapeng1.mi@linux.intel.com, derek.foreman@collabora.com, dvyukov@google.com, howardchu95@gmail.com, hrishikesh123s@gmail.com, james.clark@linaro.org, jolsa@kernel.org, krzysztof.m.lopatowski@gmail.com, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux@treblig.org, mingo@redhat.com, namhyung@kernel.org, nichen@iscas.ac.cn, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, ravi.bangoria@amd.com, swapnil.sapkal@amd.com, tanze@kylinos.cn, thomas.falcon@intel.com, tianyou.li@intel.com, yujie.liu@intel.com, zhouquan@iscas.ac.cn Content-Type: text/plain; charset="UTF-8" The sample contains the evsel so read it rather than pass it. Update call site. Signed-off-by: Ian Rogers --- tools/perf/builtin-annotate.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 6f8be9ead43b..719b36d4eed5 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -232,11 +232,11 @@ static bool has_annotation(struct perf_annotate *ann) return ui__has_annotation() || ann->use_stdio2; } -static int evsel__add_sample(struct evsel *evsel, struct perf_sample *sample, - struct addr_location *al, struct perf_annotate *ann, - struct machine *machine) +static int add_sample(struct perf_sample *sample, + struct addr_location *al, struct perf_annotate *ann, + struct machine *machine) { - struct hists *hists = evsel__hists(evsel); + struct hists *hists = evsel__hists(sample->evsel); struct hist_entry *he; int ret; @@ -298,7 +298,7 @@ static int process_sample_event(const struct perf_tool *tool, goto out_put; if (!al.filtered && - evsel__add_sample(sample->evsel, sample, &al, ann, machine)) { + add_sample(sample, &al, ann, machine)) { pr_warning("problem incrementing symbol count, " "skipping event\n"); ret = -1; -- 2.54.0.563.g4f69b47b94-goog