From nobody Fri Dec 19 07:02:00 2025 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (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 65396181B83 for ; Tue, 25 Jun 2024 17:27:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719336429; cv=none; b=TLG4smmtfam6GLFNGlGd9fECpOcLn+TwD53bRxrbfWHOfU3NeevZvZOSKmNim0Wtv+hRAS0hsy4WQBMCU8sVbuzCFlEBKUrNlyueRu3b89Q6jShXd5FKl+ZBJU7DOtqHkanezIWOMqJq3YGjrYPOhAg9DDSJNR6YOVRNt67plZ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719336429; c=relaxed/simple; bh=zBc2uvOJtPq/nkkHeD/XQYuVocuaC7TNJYbowcyriQc=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=O934xWOWnPLltmWhT2bot6aAOMVtHFDfxJORi0AulSao2qbzSZZWhuz9SvJoQ4xMuDa8LAVluLO0k2TbUjJqNTd6WD059SwCg2JJgIhZkeoZI00iLXzOR6TfqFm6OTH8EBOFSaAVYRjRIurte0ZPmBplpe9QGFN5ELQmAFvwWuo= 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=optzBCfl; arc=none smtp.client-ip=209.85.128.201 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="optzBCfl" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6311e0f4db4so128415967b3.3 for ; Tue, 25 Jun 2024 10:27:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719336427; x=1719941227; 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=0iE986kQkDs5/NJBRf4cgh631/et/Bs7ZiXxgZySXLM=; b=optzBCflmkSRIyUHSYpyX25tndsJ38u64aNu/s7LwIBBJv8K6P/3Hd0HaqZ/whxYIC 7tIgRp8NkizpkCts/5215NjV090WG7MzAMJOjdFnj8WGiybNiOJUsoY3MrD0CVGr99e9 mtSKt/Mm2NHEXI3rwIWRW4VKVX8XAGsA2zm7v30xRZhzllhr331scjx03c16HylsYC/m HRu0LRudeYv1C61kdffSkVH3Dj/jJtxWWi8PjjsQ8KPXjXbpgBGbjK0ZWMqbb+8VRBH/ siqw/KzR/t0c6yWgy1aSjkRpyh95h/+X1T8p2/ZpVxOwPDsspXeeLUMduU/ZYvKh7jIG HQgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719336427; x=1719941227; 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=0iE986kQkDs5/NJBRf4cgh631/et/Bs7ZiXxgZySXLM=; b=e0EX7JihTmADGFb9IRVRx/0IDDXujlKqo8XV+KWkInDSj1cuNoTNsdVVwgtblB5xT+ dHSFjbp+ILm6Ats42MK1yF+2JQI4OcqDqVBQnRKGGHaGq+VSZ91Le0XnEY8gjh3HYni1 WWRn6V49aNZCdI9/mJmEM/Ptr3o7nYtOfNgKcC2UetKJHOBfRQggma9xEo2W+2Yj48P2 1/H1dipO1HTKt0/nvJ4S/RtkwYMj44hqqiY2KZl6rz3tnQ9Jp4vOwN/s3Dj1JOpQmuV4 L/NzsIVNWDs5jC93+GWLy09qyiwRkeB3jKggK/u2bD3/yqdcz7Yh/MdwACSq40uvG5v2 o3vg== X-Forwarded-Encrypted: i=1; AJvYcCUWD77hJp8xkV+wtxf5k/hdmDlcCDmq7GFBV18uPStTQzbeQMUmaiDy6vKrhtVgs28VX4Ezm8lZRgCfDb9RLXARxjQq2wjA6mGKDAxG X-Gm-Message-State: AOJu0YzuVILbj9bl70hwmuRtqxCSwqqG0PRy+Gv3jDvPjQxbmqTAgKGl Z4oJ0bB4qUN/BXvvhubXGJSR0EvC+V4WaaHQcFZGYy2bKfV2i8zd6K9DY8WHI2D0/aqGjqiBWdy KkYEnnQ== X-Google-Smtp-Source: AGHT+IFVccGq12p3z90FxxfCbb9Z1BYcHe+rBZSwJCNoU8cnhklsujvqjEk+IZyJF5UdB6GkIYXsoj+erzAr X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:b4cb:a52b:f9ea:8678]) (user=irogers job=sendgmr) by 2002:a05:690c:6c03:b0:627:dad9:bf54 with SMTP id 00721157ae682-643ae545126mr3852307b3.10.1719336427556; Tue, 25 Jun 2024 10:27:07 -0700 (PDT) Date: Tue, 25 Jun 2024 10:26:02 -0700 In-Reply-To: <20240625172603.900667-1-irogers@google.com> Message-Id: <20240625172603.900667-26-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240625172603.900667-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Subject: [PATCH v1 25/26] 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 , 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" 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 4febff1db5b3..c84a060b588d 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -1750,8 +1750,6 @@ static int __perf_session__process_pipe_events(struct= perf_session *session) ssize_t err; void *p; =20 - perf_tool__fill_defaults(tool); - head =3D 0; cur_size =3D sizeof(union perf_event); =20 @@ -2159,8 +2157,6 @@ static int __perf_session__process_events(struct perf= _session *session) struct ui_progress prog; int err; =20 - perf_tool__fill_defaults(tool); - if (rd.data_size =3D=3D 0) return -1; =20 @@ -2213,8 +2209,6 @@ static int __perf_session__process_dir_events(struct = perf_session *session) u64 total_size =3D perf_data__size(session->data); struct reader *rd; =20 - perf_tool__fill_defaults(tool); - ui_progress__init_size(&prog, total_size, "Sorting events..."); =20 nr_readers =3D 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 orde= red_events) tool->finished_init =3D process_event_op2_stub; } =20 -void perf_tool__fill_defaults(struct perf_tool *tool) -{ - if (tool->sample =3D=3D NULL) - tool->sample =3D process_event_sample_stub; - if (tool->mmap =3D=3D NULL) - tool->mmap =3D process_event_stub; - if (tool->mmap2 =3D=3D NULL) - tool->mmap2 =3D process_event_stub; - if (tool->comm =3D=3D NULL) - tool->comm =3D process_event_stub; - if (tool->namespaces =3D=3D NULL) - tool->namespaces =3D process_event_stub; - if (tool->cgroup =3D=3D NULL) - tool->cgroup =3D process_event_stub; - if (tool->fork =3D=3D NULL) - tool->fork =3D process_event_stub; - if (tool->exit =3D=3D NULL) - tool->exit =3D process_event_stub; - if (tool->lost =3D=3D NULL) - tool->lost =3D perf_event__process_lost; - if (tool->lost_samples =3D=3D NULL) - tool->lost_samples =3D perf_event__process_lost_samples; - if (tool->aux =3D=3D NULL) - tool->aux =3D perf_event__process_aux; - if (tool->itrace_start =3D=3D NULL) - tool->itrace_start =3D perf_event__process_itrace_start; - if (tool->context_switch =3D=3D NULL) - tool->context_switch =3D perf_event__process_switch; - if (tool->ksymbol =3D=3D NULL) - tool->ksymbol =3D perf_event__process_ksymbol; - if (tool->bpf =3D=3D NULL) - tool->bpf =3D perf_event__process_bpf; - if (tool->text_poke =3D=3D NULL) - tool->text_poke =3D perf_event__process_text_poke; - if (tool->aux_output_hw_id =3D=3D NULL) - tool->aux_output_hw_id =3D perf_event__process_aux_output_hw_id; - if (tool->read =3D=3D NULL) - tool->read =3D process_event_sample_stub; - if (tool->throttle =3D=3D NULL) - tool->throttle =3D process_event_stub; - if (tool->unthrottle =3D=3D NULL) - tool->unthrottle =3D process_event_stub; - if (tool->attr =3D=3D NULL) - tool->attr =3D process_event_synth_attr_stub; - if (tool->event_update =3D=3D NULL) - tool->event_update =3D process_event_synth_event_update_stub; - if (tool->tracing_data =3D=3D NULL) - tool->tracing_data =3D process_event_synth_tracing_data_stub; - if (tool->build_id =3D=3D NULL) - tool->build_id =3D process_event_op2_stub; - if (tool->finished_round =3D=3D NULL) { - if (tool->ordered_events) - tool->finished_round =3D perf_event__process_finished_round; - else - tool->finished_round =3D process_finished_round_stub; - } - if (tool->id_index =3D=3D NULL) - tool->id_index =3D process_event_op2_stub; - if (tool->auxtrace_info =3D=3D NULL) - tool->auxtrace_info =3D process_event_op2_stub; - if (tool->auxtrace =3D=3D NULL) - tool->auxtrace =3D process_event_auxtrace_stub; - if (tool->auxtrace_error =3D=3D NULL) - tool->auxtrace_error =3D process_event_op2_stub; - if (tool->thread_map =3D=3D NULL) - tool->thread_map =3D process_event_thread_map_stub; - if (tool->cpu_map =3D=3D NULL) - tool->cpu_map =3D process_event_cpu_map_stub; - if (tool->stat_config =3D=3D NULL) - tool->stat_config =3D process_event_stat_config_stub; - if (tool->stat =3D=3D NULL) - tool->stat =3D process_stat_stub; - if (tool->stat_round =3D=3D NULL) - tool->stat_round =3D process_stat_round_stub; - if (tool->time_conv =3D=3D NULL) - tool->time_conv =3D process_event_time_conv_stub; - if (tool->feature =3D=3D NULL) - tool->feature =3D process_event_op2_stub; - if (tool->compressed =3D=3D NULL) { -#ifdef HAVE_ZSTD_SUPPORT - tool->compressed =3D perf_session__process_compressed_event; -#else - tool->compressed =3D perf_session__process_compressed_event_stub; -#endif - } - if (tool->finished_init =3D=3D NULL) - tool->finished_init =3D process_event_op2_stub; -} - bool perf_tool__compressed_is_stub(const struct perf_tool *tool) { return tool->compressed =3D=3D perf_session__process_compressed_event_stu= b; 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 { }; =20 void perf_tool__init(struct perf_tool *tool, bool ordered_events); -void perf_tool__fill_defaults(struct perf_tool *tool); =20 bool perf_tool__compressed_is_stub(const struct perf_tool *tool); =20 --=20 2.45.2.741.gdbec12cfda-goog