[PATCH] perf python: Do not force closing original perf descriptor in evlist.get_pollfd
From: Jiri Olsa
Date: Wed Dec 26 2018 - 06:31:13 EST
OndÅej reported that when compiled with python3, the python
extension regress in evlist.get_pollfd function behaviour.
The evlist.get_pollfd creates file objects from evlist's fds
and returns them in the list. The python3 version also sets
them to 'close the original descriptor' when the object die
(is closed), by passing True via 'closefd' arg in PyFile_FromFd
The python's closefd doc says:
If closefd is False, the underlying file descriptor will be kept open
when the file is closed.
That's why following line in python3 closes all evlist fds:
the returned list is immediately destroyed and that takes
down the original events fds.
Passing closefd as False to PyFile_FromFd to fix this.
Reported-by: OndÅej LysonÄk <olysonek@xxxxxxxxxx>
Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
tools/perf/util/python.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
index 47628e85c5eb..dda0ac978b1e 100644
@@ -939,7 +939,8 @@ static PyObject *pyrf_evlist__get_pollfd(struct pyrf_evlist *pevlist,
file = PyFile_FromFile(fp, "perf", "r", NULL);
- file = PyFile_FromFd(evlist->pollfd.entries[i].fd, "perf", "r", -1, NULL, NULL, NULL, 1);
+ file = PyFile_FromFd(evlist->pollfd.entries[i].fd, "perf", "r", -1,
+ NULL, NULL, NULL, 0);
if (file == NULL)