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 9E1FAC3064D for ; Tue, 25 Jun 2024 17:26: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=xUgjNt0xneeMqPZ/Mwlp/Zt17wNAbGBqOmTw4fJjROQ=; b=EmUdbLBZ4rEWdi1vhhQBZym3Yc lhYJ1A2jpdiQNKleGfnED2qjZfkeCztx5tIkhgP7SXqh1fArBSF1HLL6PvG/6Qtm4PeatXQhc6/ts WmP6O8za1MM6t3qqpeuWi4qLZc0qdPRRaOYRnf/qyf8vfwoNaWV6/ZBqS1PeG68+dxWOsfFWp9+89 9LtyfpRc1Tf+jObiAkzEipxm2E8a8edU4+vWn5pbPXkoE3gnKpZdBQUQrE4eTL2W5jnOaiW/CVhVj FoWQNau5G6PuVpmwYMiuvJqgOlBO3fWsrR5IT7A9KfsxeqSlZUdwMtyybufKSDS3tvkcr6bwygh55 seJ4lZxA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sM9wA-00000003sc5-3k4Y; Tue, 25 Jun 2024 17:26:34 +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 1sM9vu-00000003sSh-3uRS for linux-arm-kernel@lists.infradead.org; Tue, 25 Jun 2024 17:26:20 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-e02b7adfb95so12993678276.2 for ; Tue, 25 Jun 2024 10:26:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719336377; x=1719941177; 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=xUgjNt0xneeMqPZ/Mwlp/Zt17wNAbGBqOmTw4fJjROQ=; b=AU2b1gV7FS8IN160nN1lvsO+O+WfcCvN7XllISpduijC0HKeIMyfL0EG27F/9OMQN0 ReNIqgn2zHxjcy+aH/l1prqLBO63dHtukaFAAjOInaYr7TBgNSRKDeU4TlwYdxcSY/mo 6iKALDnj8VLtniwrAdgomRaBbHSNf7fXuRR0MTUxg0NGFC/Cv8aVlNANaPuN1znAgpDb 6COtL6Y9VZa6X8vhVC+11q2gOePnnN6TjScr8SBUV/aw/T7ngv+d5/+s306qD+Cj+My/ 6WCIYYNAXuYrtTKBnTG87EAkIMb3u23MyJ5JsM3tiR8poJNUS9uG2LO0la24+DhJB4S4 8k1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719336377; x=1719941177; 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=xUgjNt0xneeMqPZ/Mwlp/Zt17wNAbGBqOmTw4fJjROQ=; b=AUkiQPvqJ9C5NObMIN54+pv3HwCK11g6ceDIQTeQcgzukascVRj7y7mqj2AQ+ruCQ5 Zwfe14LRUatrcSJKzQuzXei3HHFoaCxMwayyM29w5A1XnORfshdO7uDxU0RaxcHZhG55 C380eeFkv9e4fkPt16xdRVnyZ6V140ycSfMmQ0qEu4Vimy8JOV697lLetMu4dUzfLXdJ h2f/Vc+2dHb/45Xq53jFGaJ2OksBmVQ89rOpUUL0y+R8osYpXBrr027qEUXbGL9pUNSU NE+Avo66BsZHdJgPcyk3vMauTxt6rGrDGb+MPIoqkOBZbBF8TTFD5pDGehzlLa+Ki9G4 jidQ== X-Forwarded-Encrypted: i=1; AJvYcCWAs5MX6n4IAa2Yo3e9QY9kCoMctCet2cBxAVU7kLuPF0+tKthfu6Red6rjLUk6Lh7sCqLiIphOVC9Bg8KuY9wPtCmHUIpXH4TPf1l1GbgI8bJ0W6Y= X-Gm-Message-State: AOJu0Yxx+1X2unT+oDl11ocAaAH0wfrWL7gcjzCP/fGiMkBK6BCjrrnQ KLhikcUOiPJxjaq+xLLOYcQl265h/0IHFRSQSXU3wR4xZ+TTSIdWDl5G+dfjqtg2sNqXe+Fa6Gm 2PIzQrA== X-Google-Smtp-Source: AGHT+IEug2riBjyQ5J5/zm+p50Ba9JZYc7CfD/IFxeRNPwpJVP3SLj0aXwP/kplaHWhb2QQb7pyYEG7HBm6P X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:b4cb:a52b:f9ea:8678]) (user=irogers job=sendgmr) by 2002:a05:6902:f84:b0:e03:31ec:8a24 with SMTP id 3f1490d57ef6-e0331ec8aa0mr2108276.8.1719336377155; Tue, 25 Jun 2024 10:26:17 -0700 (PDT) Date: Tue, 25 Jun 2024 10:25:41 -0700 In-Reply-To: <20240625172603.900667-1-irogers@google.com> Message-Id: <20240625172603.900667-5-irogers@google.com> 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 04/26] perf kmem: 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 , 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-20240625_102619_162611_F6954229 X-CRM114-Status: GOOD ( 14.94 ) 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 Reduce the scope of the tool from global/static to just that of the cmd_kmem function where the session is scoped. Use the perf_tool__init to initialize default values. Signed-off-by: Ian Rogers --- tools/perf/builtin-kmem.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c index 859ff018eace..b3cbac40b8c7 100644 --- a/tools/perf/builtin-kmem.c +++ b/tools/perf/builtin-kmem.c @@ -986,15 +986,6 @@ static int process_sample_event(const struct perf_tool *tool __maybe_unused, return err; } -static struct perf_tool perf_kmem = { - .sample = process_sample_event, - .comm = perf_event__process_comm, - .mmap = perf_event__process_mmap, - .mmap2 = perf_event__process_mmap2, - .namespaces = perf_event__process_namespaces, - .ordered_events = true, -}; - static double fragmentation(unsigned long n_req, unsigned long n_alloc) { if (n_alloc == 0) @@ -1971,6 +1962,7 @@ int cmd_kmem(int argc, const char **argv) NULL }; struct perf_session *session; + struct perf_tool perf_kmem; static const char errmsg[] = "No %s allocation events found. Have you run 'perf kmem record --%s'?\n"; int ret = perf_config(kmem_config, NULL); @@ -1998,6 +1990,13 @@ int cmd_kmem(int argc, const char **argv) data.path = input_name; + perf_tool__init(&perf_kmem, /*ordered_events=*/true); + perf_kmem.sample = process_sample_event; + perf_kmem.comm = perf_event__process_comm; + perf_kmem.mmap = perf_event__process_mmap; + perf_kmem.mmap2 = perf_event__process_mmap2; + perf_kmem.namespaces = perf_event__process_namespaces; + kmem_session = session = perf_session__new(&data, &perf_kmem); if (IS_ERR(session)) return PTR_ERR(session); -- 2.45.2.741.gdbec12cfda-goog