diff options
author | Zac Medico <zmedico@gentoo.org> | 2013-01-03 20:16:17 -0800 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2013-01-03 20:16:17 -0800 |
commit | 67f618433366316dca8e8c5cdc08e106e268c81a (patch) | |
tree | ec451083ab5ef091b0b4d64288782cb48e2535ed /pym/_emerge/FifoIpcDaemon.py | |
parent | 65a5f14f8b76a250f5df42e57512bfc140543622 (diff) | |
download | portage-67f618433366316dca8e8c5cdc08e106e268c81a.tar.gz portage-67f618433366316dca8e8c5cdc08e106e268c81a.tar.bz2 portage-67f618433366316dca8e8c5cdc08e106e268c81a.zip |
Enable FD_CLOEXEC for non-blocking pipes.
Diffstat (limited to 'pym/_emerge/FifoIpcDaemon.py')
-rw-r--r-- | pym/_emerge/FifoIpcDaemon.py | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/pym/_emerge/FifoIpcDaemon.py b/pym/_emerge/FifoIpcDaemon.py index 959c00769..113e49da8 100644 --- a/pym/_emerge/FifoIpcDaemon.py +++ b/pym/_emerge/FifoIpcDaemon.py @@ -1,6 +1,12 @@ -# Copyright 2010-2012 Gentoo Foundation +# Copyright 2010-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +try: + import fcntl +except ImportError: + # http://bugs.jython.org/issue1074 + fcntl = None + from portage import os from _emerge.AbstractPollTask import AbstractPollTask from portage.cache.mappings import slot_dict_class @@ -21,6 +27,16 @@ class FifoIpcDaemon(AbstractPollTask): self._files.pipe_in = \ os.open(self.input_fifo, os.O_RDONLY|os.O_NONBLOCK) + if fcntl is not None: + try: + fcntl.FD_CLOEXEC + except AttributeError: + pass + else: + fcntl.fcntl(self._files.pipe_in, fcntl.F_SETFL, + fcntl.fcntl(self._files.pipe_in, + fcntl.F_GETFL) | fcntl.FD_CLOEXEC) + self._reg_id = self.scheduler.io_add_watch( self._files.pipe_in, self._registered_events, self._input_handler) @@ -36,6 +52,17 @@ class FifoIpcDaemon(AbstractPollTask): os.close(self._files.pipe_in) self._files.pipe_in = \ os.open(self.input_fifo, os.O_RDONLY|os.O_NONBLOCK) + + if fcntl is not None: + try: + fcntl.FD_CLOEXEC + except AttributeError: + pass + else: + fcntl.fcntl(self._files.pipe_in, fcntl.F_SETFL, + fcntl.fcntl(self._files.pipe_in, + fcntl.F_GETFL) | fcntl.FD_CLOEXEC) + self._reg_id = self.scheduler.io_add_watch( self._files.pipe_in, self._registered_events, self._input_handler) |