From patchwork Sat Jun 29 04:53:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13716811 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 61895C30653 for ; Sat, 29 Jun 2024 04:59:10 +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=CzceA3PnZIITcf46Xf33bNMRePSLAdcPAZsGB0bFPNM=; b=JMydBvGRiplLGUckgubjhYUf86 fh0lnQr5Zc2yrxS3PO1KfnW0RtwZ5P5A1T+/8k+avHx6kJINzwgALrnzcjfUIS9wbPiShPH5pfe/r BnJYv3WC2S19TKh4AD/RvUrH6NFwdG1XB/pNr+Cc7yt+2Cdib+kNvl+7PBQ0lj3iYvdZeLi7jgjgI UVsAMRKQ5sHswBsJYvKDnDMH5+/3SuGoHIb6ZP44Z7cLQ5BOS0n7wJUtql328yNcjWXi80ZsEztV0 vRlQr5e7OoQVwM1wlGJ9kIVKomGc2iOCyWSZuL+RYHJGGWesZaSX8LUEgsM3p1xBZkm2tY+HmcmO1 DGv10Xww==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sNQAu-0000000FtXs-2T8L; Sat, 29 Jun 2024 04:59:00 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sNQ7B-0000000Frc0-3dL2 for linux-arm-kernel@lists.infradead.org; Sat, 29 Jun 2024 04:55:11 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-e03623b24ddso1776545276.1 for ; Fri, 28 Jun 2024 21:55:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719636908; x=1720241708; 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=CzceA3PnZIITcf46Xf33bNMRePSLAdcPAZsGB0bFPNM=; b=kYl7424nQUK5J2BvG0TzCt7vX9B/kTbdlNqRTepulgrJf88ir9eLb4YpDJOCnKj+kz J96xAHGZ9VBjnyxFqCvFDr3YxLRn1/NdkSVx+pgCw+oxZCFqd8eW+lif6MT0xoHsmV/Y kkHYIiacCy7WJBKwQjS6VhagFpBmU3AgwmgkwrqdLuC+jaMZbdmwXtzCUaWHdyTyoD5c pHbO7O6K+ygmcFPVcaUartN9ct/z4YYSHjyfFffPAnTHI3btVHCQIcoYgoU55B6OOm91 aCsBWzQrfb0My95mcC/vwlg0wt/a2uxQJoFEE2fvywMvVExJMKZpMbKuOL6uA7SVrPEh vVHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719636908; x=1720241708; 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=CzceA3PnZIITcf46Xf33bNMRePSLAdcPAZsGB0bFPNM=; b=Pw5C/rh+ux6D0brDfk+TjZ4V32gywE26mmSwWZzBIzqhl1KLxI2lFcT4pJZOXVPi2q bsxhXhqVJP9dBNbj9O7Haw63GtA5/uS04ube0CVw/JxyX1vSf+ET7M9mTUczUQP347XG FtzW+MvMsDAUyU9K6eYLeXFMGkn6mJ2jzn/grOA1FmcvyiDAVceXMNWp4RuwZg37qo0n ZhGh6siaxcQHQJsIDAH6OLjSFVdtgLHgw7rOJylQMYNE0OzMPxUlY45i4KjNEHIoEdbQ ETfi8Kc288JvhU5LzwxXB2WWjvm89V6EYLwekGLp6b3kJSe1NAt94lji2UvedqzAngx3 mRzA== X-Forwarded-Encrypted: i=1; AJvYcCXAobh+GXf6MBLvvosOccnpRfLZ54HMv/KcMsDib4P0e8VtCzw4t4MDl5/IV6cmq/BcB1zhsw2eZJEAmKnw2fEgdGnvtNGShOyWLcRPkq90DGb5GhM= X-Gm-Message-State: AOJu0Yy7egJRxvR7ppG+C6FKpkYagpMcAWLocD5DBotQrdokjx06cPMg Yu92S1Pw3tFEhUgha7qgh3S3Si7dFuGAGEPhAnx5fRlepcwlzHoBUjKT5auMH8uqh0RE32+D/LL oCRJPYA== X-Google-Smtp-Source: AGHT+IGF/SJXJ/sR+JmKyUtE7KPOf5EJWXpjDLqKIoIjmwh6hh573ZiZG4/nnUrG20dJHib8/wRPscsvi5Mh X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:f9fe:7acd:496e:4edb]) (user=irogers job=sendgmr) by 2002:a05:6902:102f:b0:dfa:6ea5:c8d5 with SMTP id 3f1490d57ef6-e036ec36959mr14094276.10.1719636908382; Fri, 28 Jun 2024 21:55:08 -0700 (PDT) Date: Fri, 28 Jun 2024 21:53:49 -0700 In-Reply-To: <20240629045350.285243-1-irogers@google.com> Message-Id: <20240629045350.285243-28-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 27/28] perf tool: Remove perf_tool__fill_defaults 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_215510_119246_3256D623 X-CRM114-Status: GOOD ( 13.20 ) 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 Now all tools are fully initialized prior to use it has no use so remove. Signed-off-by: Ian Rogers --- tools/perf/util/session.c | 6 --- tools/perf/util/tool.c | 89 --------------------------------------- tools/perf/util/tool.h | 1 - 3 files changed, 96 deletions(-) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 1490d33eab2b..6f5692902892 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -1780,8 +1780,6 @@ static int __perf_session__process_pipe_events(struct perf_session *session) ssize_t err; void *p; - perf_tool__fill_defaults(tool); - head = 0; cur_size = sizeof(union perf_event); @@ -2189,8 +2187,6 @@ static int __perf_session__process_events(struct perf_session *session) struct ui_progress prog; int err; - perf_tool__fill_defaults(tool); - if (rd.data_size == 0) return -1; @@ -2243,8 +2239,6 @@ static int __perf_session__process_dir_events(struct perf_session *session) u64 total_size = perf_data__size(session->data); struct reader *rd; - perf_tool__fill_defaults(tool); - ui_progress__init_size(&prog, total_size, "Sorting events..."); nr_readers = 1; diff --git a/tools/perf/util/tool.c b/tools/perf/util/tool.c index a4ca16e5eefe..3b7f390f26eb 100644 --- a/tools/perf/util/tool.c +++ b/tools/perf/util/tool.c @@ -288,95 +288,6 @@ void perf_tool__init(struct perf_tool *tool, bool ordered_events) tool->finished_init = process_event_op2_stub; } -void perf_tool__fill_defaults(struct perf_tool *tool) -{ - if (tool->sample == NULL) - tool->sample = process_event_sample_stub; - if (tool->mmap == NULL) - tool->mmap = process_event_stub; - if (tool->mmap2 == NULL) - tool->mmap2 = process_event_stub; - if (tool->comm == NULL) - tool->comm = process_event_stub; - if (tool->namespaces == NULL) - tool->namespaces = process_event_stub; - if (tool->cgroup == NULL) - tool->cgroup = process_event_stub; - if (tool->fork == NULL) - tool->fork = process_event_stub; - if (tool->exit == NULL) - tool->exit = process_event_stub; - if (tool->lost == NULL) - tool->lost = perf_event__process_lost; - if (tool->lost_samples == NULL) - tool->lost_samples = perf_event__process_lost_samples; - if (tool->aux == NULL) - tool->aux = perf_event__process_aux; - if (tool->itrace_start == NULL) - tool->itrace_start = perf_event__process_itrace_start; - if (tool->context_switch == NULL) - tool->context_switch = perf_event__process_switch; - if (tool->ksymbol == NULL) - tool->ksymbol = perf_event__process_ksymbol; - if (tool->bpf == NULL) - tool->bpf = perf_event__process_bpf; - if (tool->text_poke == NULL) - tool->text_poke = perf_event__process_text_poke; - if (tool->aux_output_hw_id == NULL) - tool->aux_output_hw_id = perf_event__process_aux_output_hw_id; - if (tool->read == NULL) - tool->read = process_event_sample_stub; - if (tool->throttle == NULL) - tool->throttle = process_event_stub; - if (tool->unthrottle == NULL) - tool->unthrottle = process_event_stub; - if (tool->attr == NULL) - tool->attr = process_event_synth_attr_stub; - if (tool->event_update == NULL) - tool->event_update = process_event_synth_event_update_stub; - if (tool->tracing_data == NULL) - tool->tracing_data = process_event_synth_tracing_data_stub; - if (tool->build_id == NULL) - tool->build_id = process_event_op2_stub; - if (tool->finished_round == NULL) { - if (tool->ordered_events) - tool->finished_round = perf_event__process_finished_round; - else - tool->finished_round = process_finished_round_stub; - } - if (tool->id_index == NULL) - tool->id_index = process_event_op2_stub; - if (tool->auxtrace_info == NULL) - tool->auxtrace_info = process_event_op2_stub; - if (tool->auxtrace == NULL) - tool->auxtrace = process_event_auxtrace_stub; - if (tool->auxtrace_error == NULL) - tool->auxtrace_error = process_event_op2_stub; - if (tool->thread_map == NULL) - tool->thread_map = process_event_thread_map_stub; - if (tool->cpu_map == NULL) - tool->cpu_map = process_event_cpu_map_stub; - if (tool->stat_config == NULL) - tool->stat_config = process_event_stat_config_stub; - if (tool->stat == NULL) - tool->stat = process_stat_stub; - if (tool->stat_round == NULL) - tool->stat_round = process_stat_round_stub; - if (tool->time_conv == NULL) - tool->time_conv = process_event_time_conv_stub; - if (tool->feature == NULL) - tool->feature = process_event_op2_stub; - if (tool->compressed == NULL) { -#ifdef HAVE_ZSTD_SUPPORT - tool->compressed = perf_session__process_compressed_event; -#else - tool->compressed = perf_session__process_compressed_event_stub; -#endif - } - if (tool->finished_init == NULL) - tool->finished_init = process_event_op2_stub; -} - bool perf_tool__compressed_is_stub(const struct perf_tool *tool) { return tool->compressed == perf_session__process_compressed_event_stub; diff --git a/tools/perf/util/tool.h b/tools/perf/util/tool.h index fb7e32d98dda..0874e7924687 100644 --- a/tools/perf/util/tool.h +++ b/tools/perf/util/tool.h @@ -89,7 +89,6 @@ struct perf_tool { }; void perf_tool__init(struct perf_tool *tool, bool ordered_events); -void perf_tool__fill_defaults(struct perf_tool *tool); bool perf_tool__compressed_is_stub(const struct perf_tool *tool);