linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andi Kleen <andi@firstfloor.org>
To: acme@kernel.org
Cc: jolsa@kernel.org, linux-kernel@vger.kernel.org,
	Andi Kleen <ak@linux.intel.com>
Subject: [PATCH v7 06/12] perf evsel: Add functions to close evsel on a CPU
Date: Fri, 15 Nov 2019 21:52:23 -0800	[thread overview]
Message-ID: <20191116055229.62002-7-andi@firstfloor.org> (raw)
In-Reply-To: <20191116055229.62002-1-andi@firstfloor.org>

From: Andi Kleen <ak@linux.intel.com>

Refactor the existing all CPU function to use the per CPU
close internally.

Export APIs to close per CPU.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
 tools/perf/lib/evsel.c              | 27 +++++++++++++++++++++------
 tools/perf/lib/include/perf/evsel.h |  1 +
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/tools/perf/lib/evsel.c b/tools/perf/lib/evsel.c
index 5a89857b0381..ea775dacbd2d 100644
--- a/tools/perf/lib/evsel.c
+++ b/tools/perf/lib/evsel.c
@@ -114,16 +114,23 @@ int perf_evsel__open(struct perf_evsel *evsel, struct perf_cpu_map *cpus,
 	return err;
 }
 
+static void perf_evsel__close_fd_cpu(struct perf_evsel *evsel, int cpu)
+{
+	int thread;
+
+	for (thread = 0; thread < xyarray__max_y(evsel->fd); ++thread) {
+		if (FD(evsel, cpu, thread) >= 0)
+			close(FD(evsel, cpu, thread));
+		FD(evsel, cpu, thread) = -1;
+	}
+}
+
 void perf_evsel__close_fd(struct perf_evsel *evsel)
 {
-	int cpu, thread;
+	int cpu;
 
 	for (cpu = 0; cpu < xyarray__max_x(evsel->fd); cpu++)
-		for (thread = 0; thread < xyarray__max_y(evsel->fd); ++thread) {
-			if (FD(evsel, cpu, thread) >= 0)
-				close(FD(evsel, cpu, thread));
-			FD(evsel, cpu, thread) = -1;
-		}
+		perf_evsel__close_fd_cpu(evsel, cpu);
 }
 
 void perf_evsel__free_fd(struct perf_evsel *evsel)
@@ -141,6 +148,14 @@ void perf_evsel__close(struct perf_evsel *evsel)
 	perf_evsel__free_fd(evsel);
 }
 
+void perf_evsel__close_cpu(struct perf_evsel *evsel, int cpu)
+{
+	if (evsel->fd == NULL)
+		return;
+
+	perf_evsel__close_fd_cpu(evsel, cpu);
+}
+
 int perf_evsel__read_size(struct perf_evsel *evsel)
 {
 	u64 read_format = evsel->attr.read_format;
diff --git a/tools/perf/lib/include/perf/evsel.h b/tools/perf/lib/include/perf/evsel.h
index 557f5815a9c9..e7add554f861 100644
--- a/tools/perf/lib/include/perf/evsel.h
+++ b/tools/perf/lib/include/perf/evsel.h
@@ -26,6 +26,7 @@ LIBPERF_API void perf_evsel__delete(struct perf_evsel *evsel);
 LIBPERF_API int perf_evsel__open(struct perf_evsel *evsel, struct perf_cpu_map *cpus,
 				 struct perf_thread_map *threads);
 LIBPERF_API void perf_evsel__close(struct perf_evsel *evsel);
+LIBPERF_API void perf_evsel__close_cpu(struct perf_evsel *evsel, int cpu);
 LIBPERF_API int perf_evsel__read(struct perf_evsel *evsel, int cpu, int thread,
 				 struct perf_counts_values *count);
 LIBPERF_API int perf_evsel__enable(struct perf_evsel *evsel);
-- 
2.23.0


  parent reply	other threads:[~2019-11-16  5:53 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-16  5:52 Optimize perf stat for large number of events/cpus Andi Kleen
2019-11-16  5:52 ` [PATCH v7 01/12] perf pmu: Use file system cache to optimize sysfs access Andi Kleen
2019-11-16  5:52 ` [PATCH v7 02/12] perf affinity: Add infrastructure to save/restore affinity Andi Kleen
2019-11-16  5:52 ` [PATCH v7 03/12] perf cpumap: Maintain cpumaps ordered and without dups Andi Kleen
2019-11-16  5:52 ` [PATCH v7 04/12] perf evlist: Maintain evlist->all_cpus Andi Kleen
2019-11-16  5:52 ` [PATCH v7 05/12] perf evsel: Add iterator to iterate over events ordered by CPU Andi Kleen
2019-11-16  5:52 ` Andi Kleen [this message]
2019-11-16  5:52 ` [PATCH v7 07/12] perf stat: Use affinity for closing file descriptors Andi Kleen
2019-11-16  5:52 ` [PATCH v7 08/12] perf stat: Factor out open error handling Andi Kleen
2019-11-16  5:52 ` [PATCH v7 09/12] perf stat: Use affinity for opening events Andi Kleen
2019-11-20 15:07   ` Jiri Olsa
2019-11-20 22:31     ` Andi Kleen
2019-11-21 15:13       ` Jiri Olsa
2019-11-16  5:52 ` [PATCH v7 10/12] perf stat: Use affinity for reading Andi Kleen
2019-11-20 15:12   ` Jiri Olsa
2019-11-16  5:52 ` [PATCH v7 11/12] perf evsel: Add functions to enable/disable for a specific CPU Andi Kleen
2019-11-16  5:52 ` [PATCH v7 12/12] perf stat: Use affinity for enabling/disabling events Andi Kleen
2019-11-20 15:16 ` Optimize perf stat for large number of events/cpus Jiri Olsa

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191116055229.62002-7-andi@firstfloor.org \
    --to=andi@firstfloor.org \
    --cc=acme@kernel.org \
    --cc=ak@linux.intel.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).