From: Andi Kleen <andi@firstfloor.org>
To: acme@kernel.org
Cc: jolsa@kernel.org, eranian@google.com, kan.liang@linux.intel.com,
peterz@infradead.org, linux-kernel@vger.kernel.org,
Andi Kleen <ak@linux.intel.com>
Subject: [PATCH v1 2/9] perf evsel: Avoid close(-1)
Date: Sun, 20 Oct 2019 09:13:39 -0700 [thread overview]
Message-ID: <20191020161346.18938-3-andi@firstfloor.org> (raw)
In-Reply-To: <20191020161346.18938-1-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
In some weak fallback cases close can be called a lot with -1. Check
for this case and avoid calling close then.
This is mainly to shut up valgrind which complains about this case.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
tools/perf/lib/evsel.c | 3 ++-
tools/perf/util/evsel.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/perf/lib/evsel.c b/tools/perf/lib/evsel.c
index 24abc80dd767..106522305ed0 100644
--- a/tools/perf/lib/evsel.c
+++ b/tools/perf/lib/evsel.c
@@ -120,7 +120,8 @@ void perf_evsel__close_fd(struct perf_evsel *evsel)
for (cpu = 0; cpu < xyarray__max_x(evsel->fd); cpu++)
for (thread = 0; thread < xyarray__max_y(evsel->fd); ++thread) {
- close(FD(evsel, cpu, thread));
+ if (FD(evsel, cpu, thread) >= 0)
+ close(FD(evsel, cpu, thread));
FD(evsel, cpu, thread) = -1;
}
}
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index a646975a20f3..bc57ac5d51a0 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -1981,7 +1981,8 @@ int evsel__open(struct evsel *evsel, struct perf_cpu_map *cpus,
old_errno = errno;
do {
while (--thread >= 0) {
- close(FD(evsel, cpu, thread));
+ if (FD(evsel, cpu, thread) >= 0)
+ close(FD(evsel, cpu, thread));
FD(evsel, cpu, thread) = -1;
}
thread = nthreads;
--
2.21.0
next prev parent reply other threads:[~2019-10-20 16:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-20 16:13 Optimize perf stat for large number of events/cpus v1 Andi Kleen
2019-10-20 16:13 ` [PATCH v1 1/9] perf evsel: Always preserve errno while cleaning up perf_event_open failures Andi Kleen
2019-10-20 16:13 ` Andi Kleen [this message]
2019-10-20 16:13 ` [PATCH v1 3/9] perf pmu: Use file system cache to optimize sysfs access Andi Kleen
2019-10-20 16:13 ` [PATCH v1 4/9] perf affinity: Add infrastructure to save/restore affinity Andi Kleen
2019-10-20 16:13 ` [PATCH v1 5/9] perf evsel: Add iterator to iterate over events ordered by CPU Andi Kleen
2019-10-20 16:13 ` [PATCH v1 6/9] perf stat: Use affinity for closing file descriptors Andi Kleen
2019-10-20 16:13 ` [PATCH v1 7/9] perf stat: Use affinity for opening events Andi Kleen
2019-10-20 16:13 ` [PATCH v1 8/9] perf stat: Use affinity for reading Andi Kleen
2019-10-20 16:13 ` [PATCH v1 9/9] perf stat: Use affinity for enabling/disabling events Andi Kleen
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=20191020161346.18938-3-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=eranian@google.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.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).