]> asedeno.scripts.mit.edu Git - linux.git/commit
perf python: Do not force closing original perf descriptor in evlist.get_pollfd()
authorJiri Olsa <jolsa@kernel.org>
Wed, 26 Dec 2018 11:21:21 +0000 (12:21 +0100)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 28 Dec 2018 19:33:02 +0000 (16:33 -0300)
commita389aece97938966616ce0336466b98b0351ef10
treee47bc1b312e7f189156dff5025d47378aa6e34ce
parentfbe7e42515af6c2ecee04b1c851f78de1d190281
perf python: Do not force closing original perf descriptor in evlist.get_pollfd()

Ondřej reported that when compiled with python3, the python extension
regresses in evlist.get_pollfd function behaviour.

The evlist.get_pollfd function creates file objects from evlist's fds
and returns them in a list. The python3 version also sets them to 'close
the original descriptor' when the object dies (is closed), by passing
True via the 'closefd' arg in the PyFile_FromFd call.

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 the following line in python3 closes all evlist fds:

  evlist.get_pollfd()

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@redhat.com>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jaroslav Škarvada <jskarvad@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Fixes: 66dfdff03d19 ("perf tools: Add Python 3 support")
Link: http://lkml.kernel.org/r/20181226112121.5285-1-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/python.c