From patchwork Sat Jun 29 04:53:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13716804 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 BEB16C30653 for ; Sat, 29 Jun 2024 04:58:14 +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=3Bg3AnvRWACuWqwdpuLSJz+3WOzd8GeuCZa5ozPjEnQ=; b=KrT9BSA1dHe4ECPEYQdoIpqq6n 4DEr4GkID5NKx4tfXtnQCD4hX6Dt/HXYKvStkcl/AEXwxpsoFOZjVgNHBn8TzojqaZEs3ULUP3qgQ I6bRdD3RqhC8LkEnhVQ4rUchV6zCsRT3NmYWdLq6659jLofYuAD99pZDMM2aREqt+ecodFHrgceov VsxteLepDf3JFoRdtej0dWckxxGG7RQ7UXBkNWYAgrXx8YT8ohSq4etXW1Ad9Fjp6Yl3yN1xrIhtl ui0X3tlNTFcO+0aagmDnmT6lfsHPU6yZtYM82yP/Apv4fsdO9mxHHovZ4UA2tprDyc0gv95mZAZGO +ZyHK0gg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sNQ9z-0000000Ft0A-0p9e; Sat, 29 Jun 2024 04:58:03 +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 1sNQ6V-0000000Fr5j-2J3I for linux-arm-kernel@lists.infradead.org; Sat, 29 Jun 2024 04:54:31 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-632588b1bdeso27924407b3.2 for ; Fri, 28 Jun 2024 21:54:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719636866; x=1720241666; 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=3Bg3AnvRWACuWqwdpuLSJz+3WOzd8GeuCZa5ozPjEnQ=; b=y1OeGvtDe4JN6ZMvXz4evWjLildhiTPUQz3ld2IVaIktcBrWhmD4MFpxrbMVbwJ97C E9MYsnZIIlgHvtPVeZlvjO5T1I9TrbmpRkN0mTFueUBNoGtCGkwo9FExDI+wP4lM4lkX qmcnkmLJUbEiOZPFsSAQ9TEpgNXmjms03XfnBzpxv78dE74cN2gFcQZ9k1Y6QA0Tl+AO R8/AE13h5PXFwGewwlf8Rxh9PoUlLevjmnvgyJc437tJ9461SyLhYSWzl6TFlAo2C4sh NzV6WgBomW5F0c8XILrubrUDDEQpfoQnOlHs4/wRWaS1S+/N29JzC+x4/Hr8CYVF6u26 j9bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719636866; x=1720241666; 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=3Bg3AnvRWACuWqwdpuLSJz+3WOzd8GeuCZa5ozPjEnQ=; b=JwmzxcRtPprVZvZ8Zr9MtgdX8rxPnC8PIGMvT+Qmc+QIpAXHKOqZnKCP3dLG64sTZK qgN/xmljjUpbX9O4Akd9qSH/jzTzB3rJBsIaSuDY3C1Pem66uLA7l3/8RpfpO53xlbhu tcQTPY8/NpVQxJkk2CS2Oh+pKULt6XwOPS8gUwVk9qVIcrmAx0cHgHqBBkn8p/Eov7RV cuQDvnY7dgLPWcKEXi6oqacYPLubz+w+y0yDAK0YyxBSpxydRCK5+sSbdB0OFr05HAh4 7pt3ONEQ8C4lniiEzoKYO3DniLbKAS8WqKEg2/cMCH43lv+hr+zjYFMwM4f7i12tLy72 G6/g== X-Forwarded-Encrypted: i=1; AJvYcCVSztbFqIG9GZv5TntGssrq5VrDkk3gx8cSVkAmcorM8BWF1aELZn4oa8AJvxSWsTiw6te15RqXjMJ13mE3qJlgPB2ivsTlecbg9/Ua24VtV/xGtSk= X-Gm-Message-State: AOJu0YwVP+yEhNe4i5Ns75iF2Mu4mCIVhb7NL4ke7ue4fevEEhHyCinr iSadPWC9Vxk7mUbh+/lX5UkhVUSN/iuQFfjy2nvqIGomE7ava9ZUVU6tUYezUFmRyzNk4TdIfDs As/IHow== X-Google-Smtp-Source: AGHT+IEpmxDjZHuM7pSCE3l5lp7ZRN7g4VRVvwxmdXGjCGhbdEOXJD28FVtcHuNeWYTlibaDL55SqrD0psw4 X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:f9fe:7acd:496e:4edb]) (user=irogers job=sendgmr) by 2002:a25:db51:0:b0:dff:1070:84b7 with SMTP id 3f1490d57ef6-e036eb0e2a2mr435276.5.1719636866147; Fri, 28 Jun 2024 21:54:26 -0700 (PDT) Date: Fri, 28 Jun 2024 21:53:30 -0700 In-Reply-To: <20240629045350.285243-1-irogers@google.com> Message-Id: <20240629045350.285243-9-irogers@google.com> Mime-Version: 1.0 References: <20240629045350.285243-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.803.g4e1b14247a-goog Subject: [PATCH v3 08/28] perf buildid-list: 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240628_215427_712440_EA60957D X-CRM114-Status: GOOD ( 17.46 ) 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 scope of build_id__mark_dso_hit_ops to the scope of function perf_session__list_build_ids, its only use, and use perf_tool__init for the default values. Move perf_event__exit_del_thread to event.[ch] so it can be used in builtin-buildid-list.c. Signed-off-by: Ian Rogers --- tools/perf/builtin-buildid-list.c | 10 ++++++++++ tools/perf/util/build-id.c | 32 ------------------------------- tools/perf/util/build-id.h | 4 +--- tools/perf/util/event.c | 20 +++++++++++++++++++ tools/perf/util/event.h | 4 ++++ 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/tools/perf/builtin-buildid-list.c b/tools/perf/builtin-buildid-list.c index 383d5de36ce4..52dfacaff8e3 100644 --- a/tools/perf/builtin-buildid-list.c +++ b/tools/perf/builtin-buildid-list.c @@ -89,6 +89,7 @@ static int perf_session__list_build_ids(bool force, bool with_hits) .mode = PERF_DATA_MODE_READ, .force = force, }; + struct perf_tool build_id__mark_dso_hit_ops; symbol__elf_init(); /* @@ -97,6 +98,15 @@ static int perf_session__list_build_ids(bool force, bool with_hits) if (filename__fprintf_build_id(input_name, stdout) > 0) goto out; + perf_tool__init(&build_id__mark_dso_hit_ops, /*ordered_events=*/true); + build_id__mark_dso_hit_ops.sample = build_id__mark_dso_hit; + build_id__mark_dso_hit_ops.mmap = perf_event__process_mmap; + build_id__mark_dso_hit_ops.mmap2 = perf_event__process_mmap2; + build_id__mark_dso_hit_ops.fork = perf_event__process_fork; + build_id__mark_dso_hit_ops.exit = perf_event__exit_del_thread; + build_id__mark_dso_hit_ops.attr = perf_event__process_attr; + build_id__mark_dso_hit_ops.build_id = perf_event__process_build_id; + session = perf_session__new(&data, &build_id__mark_dso_hit_ops); if (IS_ERR(session)) return PTR_ERR(session); diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c index 098fcc625d91..451d145fa4ed 100644 --- a/tools/perf/util/build-id.c +++ b/tools/perf/util/build-id.c @@ -67,38 +67,6 @@ int build_id__mark_dso_hit(const struct perf_tool *tool __maybe_unused, return 0; } -static int perf_event__exit_del_thread(const struct perf_tool *tool __maybe_unused, - union perf_event *event, - struct perf_sample *sample - __maybe_unused, - struct machine *machine) -{ - struct thread *thread = machine__findnew_thread(machine, - event->fork.pid, - event->fork.tid); - - dump_printf("(%d:%d):(%d:%d)\n", event->fork.pid, event->fork.tid, - event->fork.ppid, event->fork.ptid); - - if (thread) { - machine__remove_thread(machine, thread); - thread__put(thread); - } - - return 0; -} - -struct perf_tool build_id__mark_dso_hit_ops = { - .sample = build_id__mark_dso_hit, - .mmap = perf_event__process_mmap, - .mmap2 = perf_event__process_mmap2, - .fork = perf_event__process_fork, - .exit = perf_event__exit_del_thread, - .attr = perf_event__process_attr, - .build_id = perf_event__process_build_id, - .ordered_events = true, -}; - int build_id__sprintf(const struct build_id *build_id, char *bf) { char *bid = bf; diff --git a/tools/perf/util/build-id.h b/tools/perf/util/build-id.h index ae87c4c58d5b..a212497bfdb0 100644 --- a/tools/perf/util/build-id.h +++ b/tools/perf/util/build-id.h @@ -16,11 +16,9 @@ struct build_id { size_t size; }; -struct nsinfo; - -extern struct perf_tool build_id__mark_dso_hit_ops; struct dso; struct feat_fd; +struct nsinfo; void build_id__init(struct build_id *bid, const u8 *data, size_t size); int build_id__sprintf(const struct build_id *build_id, char *bf); diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index c2f0e7f40ad5..aac96d5d1917 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -426,6 +426,26 @@ int perf_event__process_exit(const struct perf_tool *tool __maybe_unused, return machine__process_exit_event(machine, event, sample); } +int perf_event__exit_del_thread(const struct perf_tool *tool __maybe_unused, + union perf_event *event, + struct perf_sample *sample __maybe_unused, + struct machine *machine) +{ + struct thread *thread = machine__findnew_thread(machine, + event->fork.pid, + event->fork.tid); + + dump_printf("(%d:%d):(%d:%d)\n", event->fork.pid, event->fork.tid, + event->fork.ppid, event->fork.ptid); + + if (thread) { + machine__remove_thread(machine, thread); + thread__put(thread); + } + + return 0; +} + size_t perf_event__fprintf_aux(union perf_event *event, FILE *fp) { return fprintf(fp, " offset: %#"PRI_lx64" size: %#"PRI_lx64" flags: %#"PRI_lx64" [%s%s%s]\n", diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h index 4b24f1c580fd..f8742e6230a5 100644 --- a/tools/perf/util/event.h +++ b/tools/perf/util/event.h @@ -319,6 +319,10 @@ int perf_event__process_exit(const struct perf_tool *tool, union perf_event *event, struct perf_sample *sample, struct machine *machine); +int perf_event__exit_del_thread(const struct perf_tool *tool, + union perf_event *event, + struct perf_sample *sample, + struct machine *machine); int perf_event__process_ksymbol(const struct perf_tool *tool, union perf_event *event, struct perf_sample *sample,