From patchwork Wed Jun 26 20:36:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13713412 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 80130C30659 for ; Wed, 26 Jun 2024 20:41:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:To:From:Subject :References:Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=noJh/0tjGkNOuuOrbqQtPJsWH5lRqwZr7bjDIe61TeY=; b=vOnXxw+rLZCGfHQY/kCVnS91tk h8suwAzyqA49o/meTYZ2T0fbTLgDCdabjlaEUdHevqBOsOWo5+8tcJsGd8l8WYwqoUhxkxh2NXZNB g19TPa7l+jd1rv/P7rhW9l1A5HLVIOGLJJdTghvqoTyrG4GMDUmYUvoUBh8ofVOOdUqS8BYAk5ZXi qv8Lmcuvc6MhNQK6Ks/OZMG0i3IxPaVjocHPuvSV5ECtxS5zP5nQ/V5DPlEwEZXc4EgfeCH+WdLzm iV0QZ0+yq3irpY4RyZt7vl6dEOVqRtRLsOooafdsByR0GR+bXC+FBN9TSuW5/d/ed1JzDcG4t8fQ2 2/89211Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sMZSe-00000008HNi-1aNr; Wed, 26 Jun 2024 20:41:48 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sMZOM-00000008FSk-2Xra for linux-arm-kernel@lists.infradead.org; Wed, 26 Jun 2024 20:37:25 +0000 Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-e032d3114baso1189432276.0 for ; Wed, 26 Jun 2024 13:37:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719434241; x=1720039041; darn=lists.infradead.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=noJh/0tjGkNOuuOrbqQtPJsWH5lRqwZr7bjDIe61TeY=; b=gTwRSFqQQ5y16AodTr+A1NAsr0bDDHK742pDSzLtJFQCdP3lWCG6m3vE3aM0bGoN6f ylU6DFXepsypSVNdo/1+k0N0KKeUfOY4R4uTRoaGanCDhuUrfugxRzqBtdIwupDMJgqD FMq9xYbRirnrRUxNiyGUdl8KaNIu4GvqUMm+2jjTE6JdtSOr2/ruG/EwPBu1x7MXsWOu raj++xF07/bVfdUitviXYQEYKebiQSl8oP38WXVeHdWuAxUbTEEtECbRbhYzlq3DVT38 yN6zbXT7vj6VRRCDs8zq+maQ+L7RAkK9/OmRMJPwDZhwJ5lOjj5pjqqVF9WQTOEwhSMe aV5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719434241; x=1720039041; 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=noJh/0tjGkNOuuOrbqQtPJsWH5lRqwZr7bjDIe61TeY=; b=oe11A5oByYHpOoWl4qWipS3ydrHBm7WAf1wXJc6B/AoF7PAht4qBwT3yZDuRsB834M X9O6pWPyPm3mPT7Nu6dBviQs5zopwm3xH9oPqa3ykIgscpstxt4VO+Ufqjs9+B5bxlGU 6e3VutAFThPGaw6khsj8LdpAIruDWHahTTauRHnJDuaAf3KECY5vf/z71dPB/2rrrCK6 kvgI2Rz4ivnRjykAgchjyrw9J9wd+q7AR1tKn6z+iaVroDFYa0ZmUmRWjFo0aMMY/dSd R4zh+PE4B0qDJgW5y/EJCL0e9fmMwhtZUwGS5Nq2GPCLTyvVClcnDpXTNl2Lg/m71ZUE 6LPw== X-Forwarded-Encrypted: i=1; AJvYcCWyeq2s/aLzwh724Lyt1dxfFB3fqyM32VpyFyPWl6WzNEOn5AnYpDOvmPulPxOnJv96/5SzLVA7HjLWIQ0o3hlW049fqcTe3AZ1l3vseDEcUZuUJ9o= X-Gm-Message-State: AOJu0Yx1VNVHoizZ2aSQjdDcvFYtEAooR2sI36197VGAfvcKTrLpx7Uf cn8IFyUfyKc9Kr7cSj9XyIdEtuFHcOu5f9oiDW6kgvK2AAabS5qJWTXwBthSCz/v9USzKxpclyi C2briQQ== X-Google-Smtp-Source: AGHT+IGiGW+2TJjLsVxDfeBzcOXXY+C6/W3uoEMYOZ3zt3pmoGji/Ifg/sPaursww2GTCUQox0G8p7+0iMLD X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:23a1:25b9:2412:56de]) (user=irogers job=sendgmr) by 2002:a25:ad0b:0:b0:e02:7c5f:e0d5 with SMTP id 3f1490d57ef6-e03451b46ccmr89276.4.1719434240611; Wed, 26 Jun 2024 13:37:20 -0700 (PDT) Date: Wed, 26 Jun 2024 13:36:20 -0700 In-Reply-To: <20240626203630.1194748-1-irogers@google.com> Message-Id: <20240626203630.1194748-19-irogers@google.com> 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 18/27] perf sched: 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240626_133722_908141_6ECAF394 X-CRM114-Status: GOOD ( 11.98 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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-sched.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index 2d24250f60fa..2b227b01d64b 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c @@ -3013,7 +3013,6 @@ static int perf_sched__timehist(struct perf_sched *sched) sched->tool.tracing_data = perf_event__process_tracing_data; sched->tool.build_id = perf_event__process_build_id; - sched->tool.ordered_events = true; sched->tool.ordering_requires_timestamps = true; symbol_conf.use_callchain = sched->show_callchain; @@ -3511,14 +3510,6 @@ int cmd_sched(int argc, const char **argv) { static const char default_sort_order[] = "avg, max, switch, runtime"; struct perf_sched sched = { - .tool = { - .sample = perf_sched__process_tracepoint_sample, - .comm = perf_sched__process_comm, - .namespaces = perf_event__process_namespaces, - .lost = perf_event__process_lost, - .fork = perf_sched__process_fork_event, - .ordered_events = true, - }, .cmp_pid = LIST_HEAD_INIT(sched.cmp_pid), .sort_list = LIST_HEAD_INIT(sched.sort_list), .sort_order = default_sort_order, @@ -3635,6 +3626,13 @@ int cmd_sched(int argc, const char **argv) }; int ret; + perf_tool__init(&sched.tool, /*ordered_events=*/true); + sched.tool.sample = perf_sched__process_tracepoint_sample; + sched.tool.comm = perf_sched__process_comm; + sched.tool.namespaces = perf_event__process_namespaces; + sched.tool.lost = perf_event__process_lost; + sched.tool.fork = perf_sched__process_fork_event; + argc = parse_options_subcommand(argc, argv, sched_options, sched_subcommands, sched_usage, PARSE_OPT_STOP_AT_NON_OPTION); if (!argc)