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 0C907C3DA5D for ; Thu, 18 Jul 2024 01:02:59 +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=Y0AwPG4o0G47V27ShPbkOoNNhsGypnaaBt/qve64P2w=; b=Y+DhkGea78cI92z5+G6dP+WYS3 FaPcdWvgggny9ZLNAGJU3VnetHmSaehKmS7ayBFK5bfHD+oo0RrIULNJPQkjbzleGnx5XQduzrO42 c4HQDoTEJPVB6SflUkzv3ORbb15/MnWvysTuj7edWQ1EhArsjIYiBK2UQOt2jU5SYfiFH1dPw1JjJ tUh3P6S49J7jx0062G6fyMw15M5ryNpKq5ouovVLZXCDI8sd+K1pJ1Mc8AG976COsPH7A7EavoZPt PWq8+P4GxAdC8yFOrKAXWLKBHcDW5+lZfzkr6Xrr/m7ml3khySGyywWnb1oBXOZZsoQ0OVZpkI1Dk xgRQ0KQQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sUFXi-0000000FKO0-3BTB; Thu, 18 Jul 2024 01:02:47 +0000 Received: from mail-yw1-x1149.google.com ([2607:f8b0:4864:20::1149]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sUFVs-0000000FJVj-1GiG for linux-arm-kernel@lists.infradead.org; Thu, 18 Jul 2024 01:00:54 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-6648363b329so5845697b3.3 for ; Wed, 17 Jul 2024 18:00:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1721264450; x=1721869250; 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=Y0AwPG4o0G47V27ShPbkOoNNhsGypnaaBt/qve64P2w=; b=25koUhE8hdxywsfahcS//Wpv+6EDla7XhjeNA7kd/rqqVwo4GaH2fdCTzUd5n1QO2W u1dO30lLLxvbc4bY6CE9zE6EEN7EHgf04ikc3vdF1+APjhdlL6DO8gFJuYG8HRfUrZIv zJqXgK6lFOGKFN6bnyA/ewobO/jdy+zDGESHeL1XXar14WWNtMd9HCmsoafMRkZCCcy2 8p8hxRCSXHU8+MgF6yN1goaVW2/TsTDxsFb7i9FBf0z7xILREjU2nVIjOqAQ/PIrl3M/ 3g5F30/yYglw6sYQ8Q86WX648GR2MubKE7kjIpseRAiRiM9ymx5oD/A4O+klO+IvdeI2 eI+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721264450; x=1721869250; 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=Y0AwPG4o0G47V27ShPbkOoNNhsGypnaaBt/qve64P2w=; b=qijmT8I4ZXDXVsvs1FF/WFxaak5vWHlOcrZlVebfzoSkGyHKvYUhRIzTkZlEdZrsF3 nO67+SYjnQZS5y6DjE4S71RrJV9hN0PZRPtzCBvYRkRj+egx/T8l7loAobePvsigGdKi RAZ+veU7p8vRXE7XKT/hXh0nv6NBet3n/3tCCzLVUIL6spPtyU2QzisVqNucLdojN27L 3XrkXoJ0NX1FTqxEs5Nbwzkgt/cuyfNfGhd2BvbF/zbzwwod5sVe6QUtNh/QP+YETxIZ SPitDrSJneJ4tSf1O4JMB/ESkQRxvSa/XxquX7SP3m9EJyGQ4V6jCjOoXtn1OlHf8HRH m5IA== X-Forwarded-Encrypted: i=1; AJvYcCW7atyykJvUYSPIvEmViki/i7QI8tsfBehTgp5C5Jl4se/qhRUyW5KYh5c5M0+mSai0RbsRGWuwnLpzZcEGHSiF2SusmISoot9+gbD8TlYR9+VUAcs= X-Gm-Message-State: AOJu0YxyP2dZw4MiSQwbuByefbUhiJnVCi+gDQQoSfRe3gFw6ZhZgYDm kguFVpcExpMtFc815axpixzP4fQTgg4lX/pGy2xYWxWmy0IL5r4aIOpIh7wMlHADq6kGza6zx8X x9sgo4A== X-Google-Smtp-Source: AGHT+IF6Z+ddaWru78kkv+Rbe/2ixIoAa0Oh0Ttd6cumo1XTW3h3Qcnj/31TOiTWD2HXbFwryaFb3vcyoCHV X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:940b:9044:fa83:4060]) (user=irogers job=sendgmr) by 2002:a05:690c:ec8:b0:665:a4a4:57c1 with SMTP id 00721157ae682-666015f3170mr275337b3.2.1721264450488; Wed, 17 Jul 2024 18:00:50 -0700 (PDT) Date: Wed, 17 Jul 2024 18:00:02 -0700 In-Reply-To: <20240718010023.1495687-1-irogers@google.com> Message-Id: <20240718010023.1495687-7-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 06/27] 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 , 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_180052_499751_5FA92CB2 X-CRM114-Status: GOOD ( 14.15 ) 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 Reviewed-by: Adrian Hunter --- 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.1089.g2a221341d9-goog