From patchwork Sat Jun 29 04:53:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13716794 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 33142C27C4F for ; Sat, 29 Jun 2024 04:56:50 +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=3MSmntjEyHp1VfXd+WDcjggsLDUpv4S+apWQbP8i85Y=; b=iYC2F3BoAxNhRNtkhwnl32gN27 VDRPZsr2fhSIrnbvJA0HFFEZ23es7mvaxt6xCdVz6CJKWKXI4WCYtTFMXfF7G1S6XvuF6gd9KPYYJ 1O7KwEKwvx3biSGRf4K/iLrghG49RWvrZXntMVR0nHax45I0bGLXfVD6VurHPkw2mWCzlkcwISl5v dk1fEMCy9e/4/xYu6+tPhP+7MhSGkEcHPlO8Z7VZiCwqMZBXtVU1aDzBY3uU2LgejIAO4MJKwg1qH JzjO5+MdfXnHF2tyyl8egK0BHcraBz/5J05DIofXP/gVbc5CW5s+7A7M7X6MCQbS09fdDBNk4/8Hi JkaXlo9w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sNQ8Z-0000000FsCL-1Z6x; Sat, 29 Jun 2024 04:56:35 +0000 Received: from mail-yw1-x1149.google.com ([2607:f8b0:4864:20::1149]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sNQ6j-0000000FrDI-3OJ2 for linux-arm-kernel@lists.infradead.org; Sat, 29 Jun 2024 04:54:43 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-645eb1025b5so20439567b3.2 for ; Fri, 28 Jun 2024 21:54:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719636879; x=1720241679; 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=3MSmntjEyHp1VfXd+WDcjggsLDUpv4S+apWQbP8i85Y=; b=ZxTJujrToVdUlh1u+37/VKULSt36gOci7VNeT9zxwpYZ8tnY59YzuSJ2FeNHB1UKxp BZtgagptMbNWWajlP+FcNJbkcK0XYCct1HkjMwKmSm/FqArGal70kkFzpWvqmmOifN+b XWQfpUvpXrtrFh8L2wFafdQiw/9mqMAVih9G/PTq+oOn85FIJnvSw/J29pPqB3HBH0UG 6o+smDPkoihT91+o93TNUT4OLhO/oGZEgEu0JMi9Mtc7u8zgVndrEs2/e7Y2eytGQZBk i8DG6uzme7FRf70cS7gU1xoukNJ7agIICtB/ugIGifeLnP2SFChy8g7BvTQCZRAQ+Wl2 z92w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719636879; x=1720241679; 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=3MSmntjEyHp1VfXd+WDcjggsLDUpv4S+apWQbP8i85Y=; b=QXXyz2BdbGg85McOBs+6wPzo8/RKffOe67ixUDJMmz5hvgIiIPa7SDVwHCd/nNscaa jkbZ5X+i+py2ENuF06JI3p1/nfNBUWKyax89lltpUdAqY2dy1PitkuDJtFt07hLd2lFq 3CZyykNkFB9EKrQfXhTYTb06QP/ARjr+CtDp/oRHgPw+w5cVis4bLnxZOjKxSmOvNT7G +Tde3WLigsScv0QyK1c9CW+ByIyikuv7w4DrqTzU3Zk8BDwaQGmD4VTPFoAMKT2U6Zia DO8Wp3KVkHXvX0LmhBs8Q2KZePCIK5TntUgaIKgqYKu4Lia2fmXCFp/1TATCuIgVW4SW 1T2A== X-Forwarded-Encrypted: i=1; AJvYcCWfP5MIMa0LYzXC4EzUy+IYW2+BoOM9l9puRpVYlPsK2PEx6IG48TmRRQtIyzKROz318WYQ0i35sSA0eG7XpKNA8I0ad9mmTDJOppWaJKIG4ab39lU= X-Gm-Message-State: AOJu0Yy4eKQJok2PDEp8iUBSGyF3IdLrsyuuXiIkxsE53OcjLNWCW6sY nEen+9Lblf4CPDmp4+GebAJalKoU0+Gbbj02nfktzP5r3uAUquIOcReYx3HBeQWwQPoYjRAXWT/ MGN1yGg== X-Google-Smtp-Source: AGHT+IHd5kE0IfP/nRLN2cbftjl35zvC0mgizfDEnWFch8Sz6HpMO2QkhZzdMmEc/7weRSowcQlHEmYb1JQS X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:f9fe:7acd:496e:4edb]) (user=irogers job=sendgmr) by 2002:a81:8485:0:b0:64a:8adc:f95c with SMTP id 00721157ae682-64c77cb6557mr6117b3.8.1719636879333; Fri, 28 Jun 2024 21:54:39 -0700 (PDT) Date: Fri, 28 Jun 2024 21:53:36 -0700 In-Reply-To: <20240629045350.285243-1-irogers@google.com> Message-Id: <20240629045350.285243-15-irogers@google.com> Mime-Version: 1.0 References: <20240629045350.285243-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.803.g4e1b14247a-goog Subject: [PATCH v3 14/28] perf script: 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 , Athira Rajeev , 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-20240628_215441_951666_5FE4C6FF X-CRM114-Status: GOOD ( 13.86 ) 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-script.c | 65 +++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 35 deletions(-) diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 394bce9f5338..b4fc2971335b 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -3899,38 +3899,7 @@ int cmd_script(int argc, const char **argv) const char *dlfilter_file = NULL; const char **__argv; int i, j, err = 0; - struct perf_script script = { - .tool = { - .sample = process_sample_event, - .mmap = perf_event__process_mmap, - .mmap2 = perf_event__process_mmap2, - .comm = perf_event__process_comm, - .namespaces = perf_event__process_namespaces, - .cgroup = perf_event__process_cgroup, - .exit = perf_event__process_exit, - .fork = perf_event__process_fork, - .attr = process_attr, - .event_update = perf_event__process_event_update, -#ifdef HAVE_LIBTRACEEVENT - .tracing_data = perf_event__process_tracing_data, -#endif - .feature = process_feature_event, - .build_id = perf_event__process_build_id, - .id_index = perf_event__process_id_index, - .auxtrace_info = perf_script__process_auxtrace_info, - .auxtrace = perf_event__process_auxtrace, - .auxtrace_error = perf_event__process_auxtrace_error, - .stat = perf_event__process_stat_event, - .stat_round = process_stat_round_event, - .stat_config = process_stat_config_event, - .thread_map = process_thread_map_event, - .cpu_map = process_cpu_map_event, - .throttle = process_throttle_event, - .unthrottle = process_throttle_event, - .ordered_events = true, - .ordering_requires_timestamps = true, - }, - }; + struct perf_script script = {}; struct perf_data data = { .mode = PERF_DATA_MODE_READ, }; @@ -4102,10 +4071,8 @@ int cmd_script(int argc, const char **argv) data.path = input_name; data.force = symbol_conf.force; - if (unsorted_dump) { + if (unsorted_dump) dump_trace = true; - script.tool.ordered_events = false; - } if (symbol__validate_sym_arguments()) return -1; @@ -4296,6 +4263,34 @@ int cmd_script(int argc, const char **argv) use_browser = 0; } + perf_tool__init(&script.tool, !unsorted_dump); + script.tool.sample = process_sample_event; + script.tool.mmap = perf_event__process_mmap; + script.tool.mmap2 = perf_event__process_mmap2; + script.tool.comm = perf_event__process_comm; + script.tool.namespaces = perf_event__process_namespaces; + script.tool.cgroup = perf_event__process_cgroup; + script.tool.exit = perf_event__process_exit; + script.tool.fork = perf_event__process_fork; + script.tool.attr = process_attr; + script.tool.event_update = perf_event__process_event_update; +#ifdef HAVE_LIBTRACEEVENT + script.tool.tracing_data = perf_event__process_tracing_data; +#endif + script.tool.feature = process_feature_event; + script.tool.build_id = perf_event__process_build_id; + script.tool.id_index = perf_event__process_id_index; + script.tool.auxtrace_info = perf_script__process_auxtrace_info; + script.tool.auxtrace = perf_event__process_auxtrace; + script.tool.auxtrace_error = perf_event__process_auxtrace_error; + script.tool.stat = perf_event__process_stat_event; + script.tool.stat_round = process_stat_round_event; + script.tool.stat_config = process_stat_config_event; + script.tool.thread_map = process_thread_map_event; + script.tool.cpu_map = process_cpu_map_event; + script.tool.throttle = process_throttle_event; + script.tool.unthrottle = process_throttle_event; + script.tool.ordering_requires_timestamps = true; session = perf_session__new(&data, &script.tool); if (IS_ERR(session)) return PTR_ERR(session);