From mboxrd@z Thu Jan 1 00:00:00 1970 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 1C0A4C3DA60 for ; Thu, 18 Jul 2024 01:04:54 +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=6ObbEjhFM3S/nqQ2a9JTWztyQVhPi6FIfEEKm2Nh8Ec=; b=bt2xLyNnqmyW36DiGpX5OzmyH6 O2MFD2Q3ACveqZ/fUpzgLl9rkgHAWtJSrXlC+iK4OKy94c/00WERPJSfCPuzd+wyqXQYE8iuAJnUq 3fF7Wpa8XoyCAbgsGQ6SeO6WSW/eWSW/KLg7aSRXPkai6MCvKR7E9H3QonO1+NB+HJtcQCUjLBwiP x5vfWSlzL2VMiNi3PL8TqQFkoontP9bRvKHWiHoirWXlqI+82merx3DXM0+xURPcrPSLrPfIq5pAp OVtAR6pP9UgeYaxiyRY6wtp4dpgE5f3MBUZtHRM+Q+BoHL4r5qMHGZxwTGoZfrg6XJ6eyRQyIcgie skuagM5g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sUFZb-0000000FL9C-2rms; Thu, 18 Jul 2024 01:04:43 +0000 Received: from mail-yw1-x114a.google.com ([2607:f8b0:4864:20::114a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sUFW6-0000000FJcO-0QRP for linux-arm-kernel@lists.infradead.org; Thu, 18 Jul 2024 01:01:07 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-664b7a67ad4so6037167b3.2 for ; Wed, 17 Jul 2024 18:01:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1721264465; x=1721869265; 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=6ObbEjhFM3S/nqQ2a9JTWztyQVhPi6FIfEEKm2Nh8Ec=; b=IaluyEEOVLy6aCnJc1yCGjevyf7eCF1e0pT0fy9+mFMIoMEzFLdFKfsiAc4ds9ue4f QFmsmDX++tZCbPXDaNpN63joevplXHSfGcOuRwBCluFdFN9HbmIMLYXjADki9Wd/rSKD KalvBg1jNx3McSWyKBlSx9CuAViZCx+bYO0kaAb1wl/A8ImONHsU9JfFElLencW02y+r xqTush2KrpTKaat/652yfmgXoy7rBsBZuGsoD6IuUMfyhJCFi1Dhkzt7ZMtiM7TYo2Q4 U2+PBWHOzWAGDVBZKshOaEiHfi5HxNO92Qh4sgSqsLuwFA8EkJzlt2KJMQKltjRaUfW4 sgHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721264465; x=1721869265; 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=6ObbEjhFM3S/nqQ2a9JTWztyQVhPi6FIfEEKm2Nh8Ec=; b=thwgE+3HCC86sUxehkTan9grJnC1SxIWCHHhtAzWF0jPUIr2fUsQYjW6DN4Jg9OASS K5UeI8R9izyZ5T4Cr8ou2l2dQI1SSVZGF/IA4e2gkElilAzeIO5U9twAdLXvQW6ftCKh GXeVVq76JAGStBs6pzhHKqiDxiO1n5gbCQrTs4w14RXGL6lwZdn/Sqz4qSHBlSKNluRP LYYKfY1Pa3kwbhuWZTbFe903WCOY0oTkCafQiz+UlVHVx2QXmA3yBiE096KHRRiRDMVL 0DzvDZoyWmnaaPI9Ln0VuilnCZZTXaWKUVJ+4orXD4/UsIciPNQrYOz9I0wTC7JYjiuw XHqw== X-Forwarded-Encrypted: i=1; AJvYcCWWxIO0Y/j/xBPhkooOvMZFIpKR6gi5oeSM1ptIAsMG0ZMRAYgkF3zm7+OQfP1WjuMzyBRWOWO6Bh2h6Hai9cu3NC/0vCd0mF2rz6Vc+E1D/si1xUQ= X-Gm-Message-State: AOJu0YyRKYGXYIY+F2KgjoHgCRvVBWpM/0WWBvP6IxrhdffIOKwlNqXf EwV/vAuEtNNeXtV1vgLA8GL2NySupyZigyRfEkgliJPXO9dqrqlxosfwxGtCLGc15OaLs0WrqlK O+DNmZw== X-Google-Smtp-Source: AGHT+IFdgOy/X0s/tSjgL8YFyCv2y+t9vrNn3n8rqeB7qn0Nz6DvIZ6Nsl/HvGV8i0mKMunHPP3MdC/NEvT0 X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:940b:9044:fa83:4060]) (user=irogers job=sendgmr) by 2002:a05:690c:3405:b0:622:cd7d:fec4 with SMTP id 00721157ae682-66605444531mr325627b3.9.1721264464720; Wed, 17 Jul 2024 18:01:04 -0700 (PDT) Date: Wed, 17 Jul 2024 18:00:08 -0700 In-Reply-To: <20240718010023.1495687-1-irogers@google.com> Message-Id: <20240718010023.1495687-13-irogers@google.com> Mime-Version: 1.0 References: <20240718010023.1495687-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.1089.g2a221341d9-goog Subject: [PATCH v6 12/27] perf c2c: 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 Content-Type: text/plain; charset="UTF-8" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240717_180106_188291_6B820576 X-CRM114-Status: GOOD ( 11.65 ) 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 Reviewed-by: Adrian Hunter --- tools/perf/builtin-c2c.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c index 88c131d05186..cd2bd573bfc3 100644 --- a/tools/perf/builtin-c2c.c +++ b/tools/perf/builtin-c2c.c @@ -385,24 +385,6 @@ static int process_sample_event(const struct perf_tool *tool __maybe_unused, goto out; } -static struct perf_c2c c2c = { - .tool = { - .sample = process_sample_event, - .mmap = perf_event__process_mmap, - .mmap2 = perf_event__process_mmap2, - .comm = perf_event__process_comm, - .exit = perf_event__process_exit, - .fork = perf_event__process_fork, - .lost = perf_event__process_lost, - .attr = perf_event__process_attr, - .auxtrace_info = perf_event__process_auxtrace_info, - .auxtrace = perf_event__process_auxtrace, - .auxtrace_error = perf_event__process_auxtrace_error, - .ordered_events = true, - .ordering_requires_timestamps = true, - }, -}; - static const char * const c2c_usage[] = { "perf c2c {record|report}", NULL @@ -3070,6 +3052,19 @@ static int perf_c2c__report(int argc, const char **argv) data.path = input_name; data.force = symbol_conf.force; + perf_tool__init(&c2c.tool, /*ordered_events=*/true); + c2c.tool.sample = process_sample_event; + c2c.tool.mmap = perf_event__process_mmap; + c2c.tool.mmap2 = perf_event__process_mmap2; + c2c.tool.comm = perf_event__process_comm; + c2c.tool.exit = perf_event__process_exit; + c2c.tool.fork = perf_event__process_fork; + c2c.tool.lost = perf_event__process_lost; + c2c.tool.attr = perf_event__process_attr; + c2c.tool.auxtrace_info = perf_event__process_auxtrace_info; + c2c.tool.auxtrace = perf_event__process_auxtrace; + c2c.tool.auxtrace_error = perf_event__process_auxtrace_error; + c2c.tool.ordering_requires_timestamps = true; session = perf_session__new(&data, &c2c.tool); if (IS_ERR(session)) { err = PTR_ERR(session); -- 2.45.2.1089.g2a221341d9-goog