From nobody Mon Feb 9 08:54:41 2026 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.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 40DD55336D for ; Fri, 1 Mar 2024 05:36:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709271420; cv=none; b=Ws8cgAR746/4M/3fQlNKk4OE49I3AeHcSa8hNeOHZJLT+3Z9y+I9Nsc+R/UeaV1OoveHyXX8BbxdELA0OzzA02SEYnzP5kiWhNvjkVYU5sRQfpKgqr/oWD+bW+zdGsXCiypoLaCgPbSgJ+rIfsillPTuXnyv07e+f7iQ4Q8+MtI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709271420; c=relaxed/simple; bh=BBmU04u6tU5hlUeOKBhv7F/E4iRu0Xd0+OelCnDu9d4=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=Q6CDZGPCobSCGPClnsWL3cfotBxifgp3HzszehT1GzLEcr3IWP9+MjWNzOknFx76O4iTVf74+TVaNNsGDL0H50g+sEjFCCJMaksIIZwcn758XF2rUig6SLD6ScneNtb6Nb0VUhqRXWnEG7W5nBcd7Nyf8L3wQwUZ4FowbUR/Oc8= 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=ro/PVEIb; arc=none smtp.client-ip=209.85.219.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="ro/PVEIb" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dc6ade10cb8so3571474276.0 for ; Thu, 29 Feb 2024 21:36:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709271418; x=1709876218; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=TRPVI6egL+2XI2pKzd6EAQy7fDTiYP04TRmL/KfQbAc=; b=ro/PVEIbA41Q4SdR4B2QPlPKNtMHCyuFGJUvsvuk/AtEFRo+N5U4X9+p246GpEtZFS oTardnH8fIDYNTWFC/+L/HxZ/67Zgh4sNVLkl0w8PiPltPr2H/Ithsi411awv1BTsyjs 9uCLZN6j0VOemEVMEGV3H8r9YD+tUCx0TdOgblvCNpX9eeMHtJSfHgIJwbll876fnKmZ a9JdMWVIby1jPAo0k7fuD5ID25qi1xp0E7vflnjVZV+wqUp7vfYF3VzCDJz32u720K3D wkW0uwob92PUw9+3uKARnAUpyqCGH9fsRICo/Xz9PVIMdNmsRC7DlQL2h+qld4EQh9Rv 5GPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709271418; x=1709876218; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=TRPVI6egL+2XI2pKzd6EAQy7fDTiYP04TRmL/KfQbAc=; b=K68DOdOiasclhsjjHMQ8c5H9Af+RmGvuuSWMD7Nu0GpSFbueqVz+FCgbix+q1T4pW1 u2QtHjNRk8skIx2aJ36D1/zZydB6CjVHrmRK9zkJ5QD33I7mex5yTnYc+KAzdDCziSIH jo5qSv7Cbmqpyan8lDi1IKL6xo4ir/niPkQuM9oNLzcJLifGNM4kg/kZ0R8sQ8DV+dia KgofFFPUzFiOVvcchMry9WP9h7pmzZo6MxB6/AMHtDGU9R9oMTSGvqrQNeN3DlY6Ot8D Hw4oKJGzBSyK+e1SCO5o0YfY82ayAkd47BY7o7G3y16TMfJ3KVL0jquQXyQ+/FNvgj4H eT5Q== X-Forwarded-Encrypted: i=1; AJvYcCWygP7CYQBJnjp66QSyzQ/quCdWvpBA7QLkljoae5cazsADi8SygAii/txS/gxow0EJTzAi7UTMSU8qUIhGNMlob7OOF/bgmKSLQe4j X-Gm-Message-State: AOJu0YyBfmE0uhJrEymJVL/BFMldIFCs2Ei8eAMU0E25mslq0i1cfrtn Swz6GkrL1mTq1pT6nkj3kDNgxIQJ+96CHEpeXKiuMlepV7AnM0BYSH2Ml+6UlQ64GyfTgLvchiX 8BCm5cQ== X-Google-Smtp-Source: AGHT+IGRLMrQFbbox60wk3jGuHwsiDSFz/GgzyTXEcf4rK5AC6vMv1Mi7Tmq1hBxxVIampmyF3fsHTa+P71N X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:af4b:7fc1:b7be:fcb7]) (user=irogers job=sendgmr) by 2002:a25:b292:0:b0:dc7:5925:92d2 with SMTP id k18-20020a25b292000000b00dc7592592d2mr757438ybj.1.1709271418281; Thu, 29 Feb 2024 21:36:58 -0800 (PST) Date: Thu, 29 Feb 2024 21:36:41 -0800 In-Reply-To: <20240301053646.1449657-1-irogers@google.com> Message-Id: <20240301053646.1449657-4-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240301053646.1449657-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Subject: [PATCH v4 3/7] perf machine: Move fprintf to for_each loop and a callback From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Oliver Upton , Yang Jihong , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Avoid exposing the threads data structure by switching to the callback machine__for_each_thread approach. machine__fprintf is only used in tests and verbose >3 output so don't turn to list and sort. Add machine__threads_nr to be refactored later. Note, all existing *_fprintf routines ignore fprintf errors. Signed-off-by: Ian Rogers --- tools/perf/util/machine.c | 43 ++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 7872ce92c9fc..e072b2115b64 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -1113,29 +1113,40 @@ size_t machine__fprintf_vmlinux_path(struct machine= *machine, FILE *fp) return printed; } =20 -size_t machine__fprintf(struct machine *machine, FILE *fp) +struct machine_fprintf_cb_args { + FILE *fp; + size_t printed; +}; + +static int machine_fprintf_cb(struct thread *thread, void *data) { - struct rb_node *nd; - size_t ret; - int i; + struct machine_fprintf_cb_args *args =3D data; =20 - for (i =3D 0; i < THREADS__TABLE_SIZE; i++) { - struct threads *threads =3D &machine->threads[i]; + /* TODO: handle fprintf errors. */ + args->printed +=3D thread__fprintf(thread, args->fp); + return 0; +} =20 - down_read(&threads->lock); +static size_t machine__threads_nr(const struct machine *machine) +{ + size_t nr =3D 0; =20 - ret =3D fprintf(fp, "Threads: %u\n", threads->nr); + for (int i =3D 0; i < THREADS__TABLE_SIZE; i++) + nr +=3D machine->threads[i].nr; =20 - for (nd =3D rb_first_cached(&threads->entries); nd; - nd =3D rb_next(nd)) { - struct thread *pos =3D rb_entry(nd, struct thread_rb_node, rb_node)->th= read; + return nr; +} =20 - ret +=3D thread__fprintf(pos, fp); - } +size_t machine__fprintf(struct machine *machine, FILE *fp) +{ + struct machine_fprintf_cb_args args =3D { + .fp =3D fp, + .printed =3D 0, + }; + size_t ret =3D fprintf(fp, "Threads: %zu\n", machine__threads_nr(machine)= ); =20 - up_read(&threads->lock); - } - return ret; + machine__for_each_thread(machine, machine_fprintf_cb, &args); + return ret + args.printed; } =20 static struct dso *machine__get_kernel(struct machine *machine) --=20 2.44.0.278.ge034bb2e1d-goog