|
|
|
@ -327,7 +327,6 @@ def popen(**kwargs):
|
|
|
|
is invoked in the child.
|
|
|
|
is invoked in the child.
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
real_preexec_fn = kwargs.pop('preexec_fn', None)
|
|
|
|
real_preexec_fn = kwargs.pop('preexec_fn', None)
|
|
|
|
|
|
|
|
|
|
|
|
def preexec_fn():
|
|
|
|
def preexec_fn():
|
|
|
|
if _preexec_hook:
|
|
|
|
if _preexec_hook:
|
|
|
|
_preexec_hook()
|
|
|
|
_preexec_hook()
|
|
|
|
@ -421,7 +420,7 @@ def _acquire_controlling_tty():
|
|
|
|
|
|
|
|
|
|
|
|
def _linux_broken_devpts_openpty():
|
|
|
|
def _linux_broken_devpts_openpty():
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
# 462: On broken Linux hosts with mismatched configuration (e.g. old
|
|
|
|
#462: On broken Linux hosts with mismatched configuration (e.g. old
|
|
|
|
/etc/fstab template installed), /dev/pts may be mounted without the gid=
|
|
|
|
/etc/fstab template installed), /dev/pts may be mounted without the gid=
|
|
|
|
mount option, causing new slave devices to be created with the group ID of
|
|
|
|
mount option, causing new slave devices to be created with the group ID of
|
|
|
|
the calling process. This upsets glibc, whose openpty() is required by
|
|
|
|
the calling process. This upsets glibc, whose openpty() is required by
|
|
|
|
@ -452,7 +451,7 @@ def _linux_broken_devpts_openpty():
|
|
|
|
# TTY. Otherwise when we close the FD we get killed by the kernel, and
|
|
|
|
# TTY. Otherwise when we close the FD we get killed by the kernel, and
|
|
|
|
# the child we spawn that should really attach to it will get EPERM
|
|
|
|
# the child we spawn that should really attach to it will get EPERM
|
|
|
|
# during _acquire_controlling_tty().
|
|
|
|
# during _acquire_controlling_tty().
|
|
|
|
slave_fd = os.open(pty_name, os.O_RDWR | os.O_NOCTTY)
|
|
|
|
slave_fd = os.open(pty_name, os.O_RDWR|os.O_NOCTTY)
|
|
|
|
return master_fd, slave_fd
|
|
|
|
return master_fd, slave_fd
|
|
|
|
except OSError:
|
|
|
|
except OSError:
|
|
|
|
if master_fd is not None:
|
|
|
|
if master_fd is not None:
|
|
|
|
@ -640,7 +639,7 @@ class TimerList(object):
|
|
|
|
def get_timeout(self):
|
|
|
|
def get_timeout(self):
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
Return the floating point seconds until the next event is due.
|
|
|
|
Return the floating point seconds until the next event is due.
|
|
|
|
|
|
|
|
|
|
|
|
:returns:
|
|
|
|
:returns:
|
|
|
|
Floating point delay, or 0.0, or :data:`None` if no events are
|
|
|
|
Floating point delay, or 0.0, or :data:`None` if no events are
|
|
|
|
scheduled.
|
|
|
|
scheduled.
|
|
|
|
@ -692,7 +691,6 @@ class PartialZlib(object):
|
|
|
|
A full compression costs ~6ms on a modern machine, this method costs ~35
|
|
|
|
A full compression costs ~6ms on a modern machine, this method costs ~35
|
|
|
|
usec.
|
|
|
|
usec.
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
|
|
def __init__(self, s):
|
|
|
|
def __init__(self, s):
|
|
|
|
self.s = s
|
|
|
|
self.s = s
|
|
|
|
if sys.version_info > (2, 5):
|
|
|
|
if sys.version_info > (2, 5):
|
|
|
|
@ -842,7 +840,6 @@ class Argv(object):
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
Wrapper to defer argv formatting when debug logging is disabled.
|
|
|
|
Wrapper to defer argv formatting when debug logging is disabled.
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
|
|
def __init__(self, argv):
|
|
|
|
def __init__(self, argv):
|
|
|
|
self.argv = argv
|
|
|
|
self.argv = argv
|
|
|
|
|
|
|
|
|
|
|
|
@ -869,7 +866,6 @@ class CallSpec(object):
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
Wrapper to defer call argument formatting when debug logging is disabled.
|
|
|
|
Wrapper to defer call argument formatting when debug logging is disabled.
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
|
|
def __init__(self, func, args, kwargs):
|
|
|
|
def __init__(self, func, args, kwargs):
|
|
|
|
self.func = func
|
|
|
|
self.func = func
|
|
|
|
self.args = args
|
|
|
|
self.args = args
|
|
|
|
@ -879,8 +875,8 @@ class CallSpec(object):
|
|
|
|
bits = [self.func.__module__]
|
|
|
|
bits = [self.func.__module__]
|
|
|
|
if inspect.ismethod(self.func):
|
|
|
|
if inspect.ismethod(self.func):
|
|
|
|
im_self = getattr(self.func, IM_SELF_ATTR)
|
|
|
|
im_self = getattr(self.func, IM_SELF_ATTR)
|
|
|
|
bits.append(getattr(im_self, '__name__', None)
|
|
|
|
bits.append(getattr(im_self, '__name__', None) or
|
|
|
|
or getattr(type(im_self), '__name__', None))
|
|
|
|
getattr(type(im_self), '__name__', None))
|
|
|
|
bits.append(self.func.__name__)
|
|
|
|
bits.append(self.func.__name__)
|
|
|
|
return u'.'.join(bits)
|
|
|
|
return u'.'.join(bits)
|
|
|
|
|
|
|
|
|
|
|
|
@ -918,13 +914,13 @@ class PollPoller(mitogen.core.Poller):
|
|
|
|
|
|
|
|
|
|
|
|
# TODO: no proof we dont need writemask too
|
|
|
|
# TODO: no proof we dont need writemask too
|
|
|
|
_readmask = (
|
|
|
|
_readmask = (
|
|
|
|
getattr(select, 'POLLIN', 0)
|
|
|
|
getattr(select, 'POLLIN', 0) |
|
|
|
|
| getattr(select, 'POLLHUP', 0)
|
|
|
|
getattr(select, 'POLLHUP', 0)
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
def _update(self, fd):
|
|
|
|
def _update(self, fd):
|
|
|
|
mask = (((fd in self._rfds) and self._readmask)
|
|
|
|
mask = (((fd in self._rfds) and self._readmask) |
|
|
|
|
| ((fd in self._wfds) and select.POLLOUT))
|
|
|
|
((fd in self._wfds) and select.POLLOUT))
|
|
|
|
if mask:
|
|
|
|
if mask:
|
|
|
|
self._pollobj.register(fd, mask)
|
|
|
|
self._pollobj.register(fd, mask)
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
@ -1047,8 +1043,8 @@ class EpollPoller(mitogen.core.Poller):
|
|
|
|
|
|
|
|
|
|
|
|
def _control(self, fd):
|
|
|
|
def _control(self, fd):
|
|
|
|
mitogen.core._vv and IOLOG.debug('%r._control(%r)', self, fd)
|
|
|
|
mitogen.core._vv and IOLOG.debug('%r._control(%r)', self, fd)
|
|
|
|
mask = (((fd in self._rfds) and select.EPOLLIN)
|
|
|
|
mask = (((fd in self._rfds) and select.EPOLLIN) |
|
|
|
|
| ((fd in self._wfds) and select.EPOLLOUT))
|
|
|
|
((fd in self._wfds) and select.EPOLLOUT))
|
|
|
|
if mask:
|
|
|
|
if mask:
|
|
|
|
if fd in self._registered_fds:
|
|
|
|
if fd in self._registered_fds:
|
|
|
|
self._epoll.modify(fd, mask)
|
|
|
|
self._epoll.modify(fd, mask)
|
|
|
|
@ -1081,8 +1077,8 @@ class EpollPoller(mitogen.core.Poller):
|
|
|
|
self._wfds.pop(fd, None)
|
|
|
|
self._wfds.pop(fd, None)
|
|
|
|
self._control(fd)
|
|
|
|
self._control(fd)
|
|
|
|
|
|
|
|
|
|
|
|
_inmask = (getattr(select, 'EPOLLIN', 0)
|
|
|
|
_inmask = (getattr(select, 'EPOLLIN', 0) |
|
|
|
|
| getattr(select, 'EPOLLHUP', 0))
|
|
|
|
getattr(select, 'EPOLLHUP', 0))
|
|
|
|
|
|
|
|
|
|
|
|
def _poll(self, timeout):
|
|
|
|
def _poll(self, timeout):
|
|
|
|
the_timeout = -1
|
|
|
|
the_timeout = -1
|
|
|
|
@ -1253,7 +1249,6 @@ class LogProtocol(LineLoggingProtocolMixin, mitogen.core.DelimitedProtocol):
|
|
|
|
LogProtocol takes over this FD and creates log messages for anything
|
|
|
|
LogProtocol takes over this FD and creates log messages for anything
|
|
|
|
written to it.
|
|
|
|
written to it.
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
|
|
def on_line_received(self, line):
|
|
|
|
def on_line_received(self, line):
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
Read a line, decode it as UTF-8, and log it.
|
|
|
|
Read a line, decode it as UTF-8, and log it.
|
|
|
|
@ -1267,7 +1262,6 @@ class MitogenProtocol(mitogen.core.MitogenProtocol):
|
|
|
|
Extend core.MitogenProtocol to cause SHUTDOWN to be sent to the child
|
|
|
|
Extend core.MitogenProtocol to cause SHUTDOWN to be sent to the child
|
|
|
|
during graceful shutdown.
|
|
|
|
during graceful shutdown.
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
|
|
def on_shutdown(self, broker):
|
|
|
|
def on_shutdown(self, broker):
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
Respond to the broker's request for the stream to shut down by sending
|
|
|
|
Respond to the broker's request for the stream to shut down by sending
|
|
|
|
@ -1430,29 +1424,29 @@ class Connection(object):
|
|
|
|
# "[1234 refs]" during exit.
|
|
|
|
# "[1234 refs]" during exit.
|
|
|
|
@staticmethod
|
|
|
|
@staticmethod
|
|
|
|
def _first_stage():
|
|
|
|
def _first_stage():
|
|
|
|
R, W = os.pipe()
|
|
|
|
R,W=os.pipe()
|
|
|
|
r, w = os.pipe()
|
|
|
|
r,w=os.pipe()
|
|
|
|
if os.fork():
|
|
|
|
if os.fork():
|
|
|
|
os.dup2(0, 100)
|
|
|
|
os.dup2(0,100)
|
|
|
|
os.dup2(R, 0)
|
|
|
|
os.dup2(R,0)
|
|
|
|
os.dup2(r, 101)
|
|
|
|
os.dup2(r,101)
|
|
|
|
os.close(R)
|
|
|
|
os.close(R)
|
|
|
|
os.close(r)
|
|
|
|
os.close(r)
|
|
|
|
os.close(W)
|
|
|
|
os.close(W)
|
|
|
|
os.close(w)
|
|
|
|
os.close(w)
|
|
|
|
if sys.platform == 'darwin' and sys.executable == '/usr/bin/python':
|
|
|
|
if sys.platform == 'darwin' and sys.executable == '/usr/bin/python':
|
|
|
|
sys.executable += sys.version[:3]
|
|
|
|
sys.executable += sys.version[:3]
|
|
|
|
os.environ['ARGV0'] = sys.executable
|
|
|
|
os.environ['ARGV0']=sys.executable
|
|
|
|
os.execl(sys.executable, sys.executable + '(mitogen:CONTEXT_NAME)')
|
|
|
|
os.execl(sys.executable,sys.executable+'(mitogen:CONTEXT_NAME)')
|
|
|
|
os.write(1, 'MITO000\n'.encode())
|
|
|
|
os.write(1,'MITO000\n'.encode())
|
|
|
|
C = _(os.fdopen(0, 'rb').read(PREAMBLE_COMPRESSED_LEN), 'zip')
|
|
|
|
C=_(os.fdopen(0,'rb').read(PREAMBLE_COMPRESSED_LEN),'zip')
|
|
|
|
fp = os.fdopen(W, 'wb', 0)
|
|
|
|
fp=os.fdopen(W,'wb',0)
|
|
|
|
fp.write(C)
|
|
|
|
fp.write(C)
|
|
|
|
fp.close()
|
|
|
|
fp.close()
|
|
|
|
fp = os.fdopen(w, 'wb', 0)
|
|
|
|
fp=os.fdopen(w,'wb',0)
|
|
|
|
fp.write(C)
|
|
|
|
fp.write(C)
|
|
|
|
fp.close()
|
|
|
|
fp.close()
|
|
|
|
os.write(1, 'MITO001\n'.encode())
|
|
|
|
os.write(1,'MITO001\n'.encode())
|
|
|
|
os.close(2)
|
|
|
|
os.close(2)
|
|
|
|
|
|
|
|
|
|
|
|
def get_python_argv(self):
|
|
|
|
def get_python_argv(self):
|
|
|
|
@ -1508,7 +1502,7 @@ class Connection(object):
|
|
|
|
|
|
|
|
|
|
|
|
def get_preamble(self):
|
|
|
|
def get_preamble(self):
|
|
|
|
suffix = (
|
|
|
|
suffix = (
|
|
|
|
'\nExternalContext(%r).main()\n' %
|
|
|
|
'\nExternalContext(%r).main()\n' %\
|
|
|
|
(self.get_econtext_config(),)
|
|
|
|
(self.get_econtext_config(),)
|
|
|
|
)
|
|
|
|
)
|
|
|
|
partial = get_core_source_partial()
|
|
|
|
partial = get_core_source_partial()
|
|
|
|
@ -1615,13 +1609,13 @@ class Connection(object):
|
|
|
|
if self._reaper:
|
|
|
|
if self._reaper:
|
|
|
|
return
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
|
|
# kill: # Avoid killing so child has chance to write cProfile data
|
|
|
|
|
|
|
|
self._reaper = Reaper(
|
|
|
|
self._reaper = Reaper(
|
|
|
|
broker=self._router.broker,
|
|
|
|
broker=self._router.broker,
|
|
|
|
proc=self.proc,
|
|
|
|
proc=self.proc,
|
|
|
|
kill=not (
|
|
|
|
kill=not (
|
|
|
|
(self.detached and self.child_is_immediate_subprocess)
|
|
|
|
(self.detached and self.child_is_immediate_subprocess) or
|
|
|
|
or self._router.profiling
|
|
|
|
# kill: # Avoid killing so child has chance to write cProfile data
|
|
|
|
|
|
|
|
self._router.profiling
|
|
|
|
),
|
|
|
|
),
|
|
|
|
# Don't delay shutdown waiting for a detached child, since the
|
|
|
|
# Don't delay shutdown waiting for a detached child, since the
|
|
|
|
# detached child may expect to live indefinitely after its parent
|
|
|
|
# detached child may expect to live indefinitely after its parent
|
|
|
|
@ -1717,7 +1711,6 @@ class ChildIdAllocator(object):
|
|
|
|
Allocate new context IDs from a block of unique context IDs allocated by
|
|
|
|
Allocate new context IDs from a block of unique context IDs allocated by
|
|
|
|
the master process.
|
|
|
|
the master process.
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
|
|
def __init__(self, router):
|
|
|
|
def __init__(self, router):
|
|
|
|
self.router = router
|
|
|
|
self.router = router
|
|
|
|
self.lock = threading.Lock()
|
|
|
|
self.lock = threading.Lock()
|
|
|
|
@ -1816,7 +1809,6 @@ class CallChain(object):
|
|
|
|
|
|
|
|
|
|
|
|
# chain.reset() automatically invoked.
|
|
|
|
# chain.reset() automatically invoked.
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
|
|
def __init__(self, context, pipelined=False):
|
|
|
|
def __init__(self, context, pipelined=False):
|
|
|
|
self.context = context
|
|
|
|
self.context = context
|
|
|
|
if pipelined:
|
|
|
|
if pipelined:
|
|
|
|
@ -2004,9 +1996,9 @@ class Context(mitogen.core.Context):
|
|
|
|
|
|
|
|
|
|
|
|
def __eq__(self, other):
|
|
|
|
def __eq__(self, other):
|
|
|
|
return (
|
|
|
|
return (
|
|
|
|
isinstance(other, mitogen.core.Context)
|
|
|
|
isinstance(other, mitogen.core.Context) and
|
|
|
|
and (other.context_id == self.context_id)
|
|
|
|
(other.context_id == self.context_id) and
|
|
|
|
and (other.router == self.router)
|
|
|
|
(other.router == self.router)
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
def __hash__(self):
|
|
|
|
def __hash__(self):
|
|
|
|
@ -2091,7 +2083,6 @@ class RouteMonitor(object):
|
|
|
|
:data:`None` in the master process, or reference to the parent context
|
|
|
|
:data:`None` in the master process, or reference to the parent context
|
|
|
|
we should propagate route updates towards.
|
|
|
|
we should propagate route updates towards.
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
|
|
def __init__(self, router, parent=None):
|
|
|
|
def __init__(self, router, parent=None):
|
|
|
|
self.router = router
|
|
|
|
self.router = router
|
|
|
|
self.parent = parent
|
|
|
|
self.parent = parent
|
|
|
|
@ -2176,9 +2167,9 @@ class RouteMonitor(object):
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
for stream in self.router.get_streams():
|
|
|
|
for stream in self.router.get_streams():
|
|
|
|
if target_id in stream.protocol.egress_ids and (
|
|
|
|
if target_id in stream.protocol.egress_ids and (
|
|
|
|
(self.parent is None)
|
|
|
|
(self.parent is None) or
|
|
|
|
or (self.parent.context_id != stream.protocol.remote_id)
|
|
|
|
(self.parent.context_id != stream.protocol.remote_id)
|
|
|
|
):
|
|
|
|
):
|
|
|
|
self._send_one(stream, mitogen.core.DEL_ROUTE, target_id, None)
|
|
|
|
self._send_one(stream, mitogen.core.DEL_ROUTE, target_id, None)
|
|
|
|
|
|
|
|
|
|
|
|
def notice_stream(self, stream):
|
|
|
|
def notice_stream(self, stream):
|
|
|
|
@ -2348,7 +2339,6 @@ class Router(mitogen.core.Router):
|
|
|
|
|
|
|
|
|
|
|
|
l = mitogen.core.Latch()
|
|
|
|
l = mitogen.core.Latch()
|
|
|
|
mitogen.core.listen(stream, 'disconnect', l.put)
|
|
|
|
mitogen.core.listen(stream, 'disconnect', l.put)
|
|
|
|
|
|
|
|
|
|
|
|
def disconnect():
|
|
|
|
def disconnect():
|
|
|
|
LOG.debug('Starting disconnect of %r', stream)
|
|
|
|
LOG.debug('Starting disconnect of %r', stream)
|
|
|
|
stream.on_disconnect(self.broker)
|
|
|
|
stream.on_disconnect(self.broker)
|
|
|
|
@ -2458,7 +2448,7 @@ class Router(mitogen.core.Router):
|
|
|
|
name=name,
|
|
|
|
name=name,
|
|
|
|
method_name=method_name,
|
|
|
|
method_name=method_name,
|
|
|
|
kwargs=mitogen.core.Kwargs(kwargs),
|
|
|
|
kwargs=mitogen.core.Kwargs(kwargs),
|
|
|
|
)
|
|
|
|
)
|
|
|
|
if resp['msg'] is not None:
|
|
|
|
if resp['msg'] is not None:
|
|
|
|
raise mitogen.core.StreamError(resp['msg'])
|
|
|
|
raise mitogen.core.StreamError(resp['msg'])
|
|
|
|
|
|
|
|
|
|
|
|
@ -2679,7 +2669,6 @@ class PopenProcess(Process):
|
|
|
|
:param subprocess.Popen proc:
|
|
|
|
:param subprocess.Popen proc:
|
|
|
|
The subprocess.
|
|
|
|
The subprocess.
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
|
|
def __init__(self, proc, stdin, stdout, stderr=None):
|
|
|
|
def __init__(self, proc, stdin, stdout, stderr=None):
|
|
|
|
super(PopenProcess, self).__init__(proc.pid, stdin, stdout, stderr)
|
|
|
|
super(PopenProcess, self).__init__(proc.pid, stdin, stdout, stderr)
|
|
|
|
#: The subprocess.
|
|
|
|
#: The subprocess.
|
|
|
|
@ -2695,7 +2684,6 @@ class ModuleForwarder(object):
|
|
|
|
forwarding the request to our parent context, or satisfying the request
|
|
|
|
forwarding the request to our parent context, or satisfying the request
|
|
|
|
from our local Importer cache.
|
|
|
|
from our local Importer cache.
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
|
|
def __init__(self, router, parent_context, importer):
|
|
|
|
def __init__(self, router, parent_context, importer):
|
|
|
|
self.router = router
|
|
|
|
self.router = router
|
|
|
|
self.parent_context = parent_context
|
|
|
|
self.parent_context = parent_context
|
|
|
|
|
Steven Robertson
4 years ago