From mboxrd@z Thu Jan 1 00:00:00 1970 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 1300C178396 for ; Thu, 11 Jul 2024 18:00:58 +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=1720720860; cv=none; b=AkX/+nZSirRhXHAvLG/Jof0l5J9VXMRHTkNBn8J/qDZu1ehqNMuNI4EgFJR7gh8PeHeZkMaKib4uosD5bD+zL18Ua/9W4qG1KjDXbB7fmQrz24F2SfRhGA8Ns5jRn4MmGc5cn4vy6Y0lkwrjOdN9fLWaMb9pzTPmiMpDtz4nTq0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720720860; c=relaxed/simple; bh=PQFAc94b+3E6J2xiJdbKRsuyLtZHAm+NZj3v+mP90Hc=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=O00SbYlXp/fqmJIyf7hbGvSM8gbj9xcVZbHh84e9nm5wpBZYvx9yPcQgukXdSHZBLLFTsGYLpMqSXsNnvyBiyMQXtdYHB3IdCgZYIGdmJ936fQIr7K4/lUL0hPo8bYsyfzSGFnPzJOskjfj1NP3LDUdziM06Ji2065vw3Ryqkgk= 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=YhzsTlIG; 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="YhzsTlIG" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-64f30b1f8ecso16920857b3.3 for ; Thu, 11 Jul 2024 11:00:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1720720857; x=1721325657; 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=dI8yaROyMxBgkl/C6HStDZ1DbB4Rpu7ZnQVumFggSVU=; b=YhzsTlIG4ABnF3bTg2LroNQPualviC4lcq/b373kK66v/F5DHwjQ5CwDliKgSKmf9q v3zBBJArimfiD/U6UCHtyOoKaBAw6uIPdN/zo1RiCOfChCjDKW0V4KClmqC9vkdRof+U 3EBUOcILho5Ji6g7C6F49dmIqQDd0HlkHIrojhbBVd/H3kYll5Em4RMNbBjZKRJBy4Lt iW7SRb8GpuCVCbMxXwt2IMwC5O0fo9UVRW+IW+dyc3Z+pomVLbjpU4LcO635HxiodFn5 Ras+foFVUtswXL/he5H0QqLVkGqcK51yvNAu2oZF3+oXj2Vdne9rIl1D/ycxEDk3OUSH zT6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720720857; x=1721325657; 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=dI8yaROyMxBgkl/C6HStDZ1DbB4Rpu7ZnQVumFggSVU=; b=H25FAcZePxM4mOY1wX7kyrmvpg11ZXi1GoRZb6Cr0tRS9UosXl8MoMPNahXTHj1EG6 sNtJpXtIZdGDNXlF6R+PdIho4ir1Yki9L6OcZwW9ouwNjBw0mBt4I1iFe4jixpmhShW/ 3MJoS8Ve1irViOOR1fY6xwNridxfFrEtSi0uDbl77bjnFAmRtEWN3ilrRoEVbHKd18Hc WcoEL0G2eRtKFZCaiWm1Nj5lA+lF7vfP0G5YA3V+4Y8kJjv75jDZ2aF26hGxcx4IcKf/ PrTSFms3jW1Nj5ZuK2VUM77PYZeTZ1s7F4taz5VNFA1fKxolPE4qU8AZzMgaba2iPub9 HcKA== X-Forwarded-Encrypted: i=1; AJvYcCURvei/6P4MuzULWLj2oXnrovLyPRoSwe+AFf+s91IY0TtW4RnwWzKhnKnEydHRx3J0ZzwQMutGyq08lOln146+vun1Z6mU3SUgyjsAsgWagg== X-Gm-Message-State: AOJu0Yzo9RKkOLiLDAdEeUKlzhmlCsyYaHSiYDnUx++3IctqT96aqVqe Ye8/GdHKQ1ZA/QJQM+qO+bgpkQhf/AdNFStcwBrTNN3DwEWNUERVTnCPgdyLipLfZI15ovV00sW tg2nu2Q== X-Google-Smtp-Source: AGHT+IGlvSq0w61dchsRb8EQOsbrRTrATl43/YP+LZQ7kANYJWmfCN5j/cK30JXClPJuEw9Y52zfl0N/IRks X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:bd08:a1e0:c497:32db]) (user=irogers job=sendgmr) by 2002:a05:6902:124a:b0:dff:4c99:915 with SMTP id 3f1490d57ef6-e041b1134a3mr494223276.10.1720720857211; Thu, 11 Jul 2024 11:00:57 -0700 (PDT) Date: Thu, 11 Jul 2024 11:00:00 -0700 In-Reply-To: <20240711180008.188906-1-irogers@google.com> Message-Id: <20240711180008.188906-21-irogers@google.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240711180008.188906-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.993.g49e7a77208-goog Subject: [PATCH v4 20/28] perf mem: 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" 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-mem.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c index c2038a32543c..c12ca0ec1237 100644 --- a/tools/perf/builtin-mem.c +++ b/tools/perf/builtin-mem.c @@ -285,7 +285,23 @@ static int report_raw_events(struct perf_mem *mem) .force = mem->force, }; int ret; - struct perf_session *session = perf_session__new(&data, &mem->tool); + struct perf_session *session; + + perf_tool__init(&mem->tool, /*ordered_events=*/true); + mem->tool.sample = process_sample_event; + mem->tool.mmap = perf_event__process_mmap; + mem->tool.mmap2 = perf_event__process_mmap2; + mem->tool.comm = perf_event__process_comm; + mem->tool.lost = perf_event__process_lost; + mem->tool.fork = perf_event__process_fork; + mem->tool.attr = perf_event__process_attr; + mem->tool.build_id = perf_event__process_build_id; + mem->tool.namespaces = perf_event__process_namespaces; + mem->tool.auxtrace_info = perf_event__process_auxtrace_info; + mem->tool.auxtrace = perf_event__process_auxtrace; + mem->tool.auxtrace_error = perf_event__process_auxtrace_error; + + session = perf_session__new(&data, &mem->tool); if (IS_ERR(session)) return PTR_ERR(session); @@ -449,21 +465,6 @@ int cmd_mem(int argc, const char **argv) { struct stat st; struct perf_mem mem = { - .tool = { - .sample = process_sample_event, - .mmap = perf_event__process_mmap, - .mmap2 = perf_event__process_mmap2, - .comm = perf_event__process_comm, - .lost = perf_event__process_lost, - .fork = perf_event__process_fork, - .attr = perf_event__process_attr, - .build_id = perf_event__process_build_id, - .namespaces = perf_event__process_namespaces, - .auxtrace_info = perf_event__process_auxtrace_info, - .auxtrace = perf_event__process_auxtrace, - .auxtrace_error = perf_event__process_auxtrace_error, - .ordered_events = true, - }, .input_name = "perf.data", /* * default to both load an store sampling -- 2.45.2.993.g49e7a77208-goog