From nobody Fri Dec 19 22:01:53 2025 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 BD265194098 for ; Wed, 26 Jun 2024 20:37:14 +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=1719434236; cv=none; b=E6f1sPbA0/8JrfrE+Xi53bZkQUXTHpYc7m1rObsvPqoNJ2egi4T8NMKtiYOsQWEC9pfjUrWmlq4/WMBjlejON6NQvrkq8ZoPkj/NWANSurrc6X7omHaF3sKmoAcc/OveOP+gcaSN5ydoqHl4qGgbcchEmBYnTZNcBIGQFMzx7pI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719434236; c=relaxed/simple; bh=3FrpPhcqSWlNmnpFwaNx96Z+Mpxf4dIupHzPwx6lfeQ=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=phMpqC06rnjR9/McKmHCYuxGBgkNV9nhoHRz6ibbW9G4H9cLIRfPoV1LNqIcYvy1dDJBOfsiydFRk3fb2JSQxEChEWMD4VxdMlooAFEA7MZT/hWbZrMH418Yuu8DQGI0nSdYTs6z/aXOfH628kfxpcjS5jkr12bSy53lA4m1B84= 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=No33cHiE; 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="No33cHiE" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-e02b5792baaso14974925276.2 for ; Wed, 26 Jun 2024 13:37:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719434234; x=1720039034; 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=/glFNS8XgikFm2z1yC/0AkpB2sfHIN5dEG3tYazcbCw=; b=No33cHiEorzydKntL3UYfx9jmvKJlMLdbprVzgYwyFjAR4zeM20Prkyq+rdVcvtuWC USZSEouxrVGnVWrAjWychgwVegB7JDzNpoM7j8Ek76VUJBlhWp9ZEWLnto/T6PTqWnIW 3QxcVcE5AlfcgNoqlra1/2cVt6K2xgUmrkWN9P9uOJSk3WRtYd1xhc66uLN9Mdq0ujq/ r/sXXyByGmeuNJiR6Wai3TMywZZXPdeM1PAEFrQi07u+aOBWrp5SFt1IwbY55tLzVg5o xIJUExVlTzWS11B6RT8xLMNk8ZVWsu4EulltjkPR9A+MeKKnZWRldVKmPQI5TKWqQ9LQ 3Tig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719434234; x=1720039034; 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=/glFNS8XgikFm2z1yC/0AkpB2sfHIN5dEG3tYazcbCw=; b=LnKwgVrbKroKIrOzrtVj+urgKYUs+5F0POvcdPVXzHi3ne7RTUFyj1RhQOa8wup9G6 vQZhWIZL95+T+HIkCwVADIL/fsfge/6sqM1DCzz0zkuTJuwerCKVGIUpl/zazJQ1i5Wt J4oYWbEoA1cTAYhiJH5/wh14mNt0t6BjrPQweVTm+iGkl7vTSm0SnnqYEj9BYIxKX6K0 HjNpmCq3T2LWPnMm9E4bnDtM0hazwkjbiAtdcjGao8jpQlFa9QmE0Vaz5xAKNDj43RX9 LNIQIIKzHQKJOttuJibS9fXynLsFuREPaecusdnG0I7IJrB7E0X2WDZiNeEr7dhSalFf aw5A== X-Forwarded-Encrypted: i=1; AJvYcCWwg2ZyoGYmV9tqEDITFqyDBEu6KtThMtuGCyJtbhOuu4tQsYcUVXlOHRK5TcWpTH5lb2hyDgSa7zpy1Wt2BBhuBouTp0N+gNEqfXOV X-Gm-Message-State: AOJu0Ywnm3lrlOw0G+EBCzm8w6KVCSrF6naX5pvl3Tba66zql4Imf06D lDmICsfynPDGXLJ14+DepbGJqokxZpVEU9GMg8abp6KhMgWueqWViM1xUKMfvH2Xl0PxLCgQvKN eh2pT+g== X-Google-Smtp-Source: AGHT+IH7xWjVfQ6FHHEhPxwNW11DF2T5pKfJxSXy/6lYJ9C2XxhVZeGCRnAlj0G2V0YLxBcrHW6+1vNR/qYQ X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:23a1:25b9:2412:56de]) (user=irogers job=sendgmr) by 2002:a25:9742:0:b0:e02:bdcd:d68c with SMTP id 3f1490d57ef6-e0303f474c7mr96082276.7.1719434233758; Wed, 26 Jun 2024 13:37:13 -0700 (PDT) Date: Wed, 26 Jun 2024 13:36:17 -0700 In-Reply-To: <20240626203630.1194748-1-irogers@google.com> Message-Id: <20240626203630.1194748-16-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240626203630.1194748-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Subject: [PATCH v2 15/27] perf report: Use perf_tool__init From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Suzuki K Poulose , Yicong Yang , Jonathan Cameron , Nick Terrell , Nick Desaulniers , Oliver Upton , Anshuman Khandual , Song Liu , Ilkka Koskinen , Huacai Chen , Yanteng Si , Sun Haiyong , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use perf_tool__init so that more uses of struct perf_tool can be const and not relying on perf_tool__fill_defaults. Signed-off-by: Ian Rogers --- tools/perf/builtin-report.c | 55 ++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 2313bacea0d2..86501edd5a7d 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -799,7 +799,7 @@ static int process_attr(const struct perf_tool *tool __= maybe_unused, =20 static void stats_setup(struct report *rep) { - memset(&rep->tool, 0, sizeof(rep->tool)); + perf_tool__init(&rep->tool, /*ordered_events=3D*/false); rep->tool.attr =3D process_attr; rep->tool.sample =3D count_sample_event; rep->tool.lost_samples =3D count_lost_samples_event; @@ -817,8 +817,7 @@ static int stats_print(struct report *rep) =20 static void tasks_setup(struct report *rep) { - memset(&rep->tool, 0, sizeof(rep->tool)); - rep->tool.ordered_events =3D true; + perf_tool__init(&rep->tool, /*ordered_events=3D*/true); if (rep->mmaps_mode) { rep->tool.mmap =3D perf_event__process_mmap; rep->tool.mmap2 =3D perf_event__process_mmap2; @@ -1273,30 +1272,6 @@ int cmd_report(int argc, const char **argv) NULL }; struct report report =3D { - .tool =3D { - .sample =3D process_sample_event, - .mmap =3D perf_event__process_mmap, - .mmap2 =3D perf_event__process_mmap2, - .comm =3D perf_event__process_comm, - .namespaces =3D perf_event__process_namespaces, - .cgroup =3D perf_event__process_cgroup, - .exit =3D perf_event__process_exit, - .fork =3D perf_event__process_fork, - .lost =3D perf_event__process_lost, - .read =3D process_read_event, - .attr =3D process_attr, -#ifdef HAVE_LIBTRACEEVENT - .tracing_data =3D perf_event__process_tracing_data, -#endif - .build_id =3D perf_event__process_build_id, - .id_index =3D perf_event__process_id_index, - .auxtrace_info =3D perf_event__process_auxtrace_info, - .auxtrace =3D perf_event__process_auxtrace, - .event_update =3D perf_event__process_event_update, - .feature =3D process_feature_event, - .ordered_events =3D true, - .ordering_requires_timestamps =3D true, - }, .max_stack =3D PERF_MAX_STACK_DEPTH, .pretty_printing_style =3D "normal", .socket_filter =3D -1, @@ -1478,6 +1453,7 @@ int cmd_report(int argc, const char **argv) }; int ret =3D hists__init(); char sort_tmp[128]; + bool ordered_events =3D true; =20 if (ret < 0) goto exit; @@ -1532,7 +1508,7 @@ int cmd_report(int argc, const char **argv) report.tasks_mode =3D true; =20 if (dump_trace && report.disable_order) - report.tool.ordered_events =3D false; + ordered_events =3D false; =20 if (quiet) perf_quiet_option(); @@ -1563,6 +1539,29 @@ int cmd_report(int argc, const char **argv) symbol_conf.skip_empty =3D report.skip_empty; =20 repeat: + perf_tool__init(&report.tool, ordered_events); + report.tool.sample =3D process_sample_event; + report.tool.mmap =3D perf_event__process_mmap; + report.tool.mmap2 =3D perf_event__process_mmap2; + report.tool.comm =3D perf_event__process_comm; + report.tool.namespaces =3D perf_event__process_namespaces; + report.tool.cgroup =3D perf_event__process_cgroup; + report.tool.exit =3D perf_event__process_exit; + report.tool.fork =3D perf_event__process_fork; + report.tool.lost =3D perf_event__process_lost; + report.tool.read =3D process_read_event; + report.tool.attr =3D process_attr; +#ifdef HAVE_LIBTRACEEVENT + report.tool.tracing_data =3D perf_event__process_tracing_data; +#endif + report.tool.build_id =3D perf_event__process_build_id; + report.tool.id_index =3D perf_event__process_id_index; + report.tool.auxtrace_info =3D perf_event__process_auxtrace_info; + report.tool.auxtrace =3D perf_event__process_auxtrace; + report.tool.event_update =3D perf_event__process_event_update; + report.tool.feature =3D process_feature_event; + report.tool.ordering_requires_timestamps =3D true; + session =3D perf_session__new(&data, &report.tool); if (IS_ERR(session)) { ret =3D PTR_ERR(session); --=20 2.45.2.741.gdbec12cfda-goog