make fork + exec non blocking on unix

Author: Martiusweb

asyncio/base_subprocess.py

@@ -35,25 +35,53 @@ def __init__(self, loop, protocol, args, shell,
             self._pipes[2] = None
 
         # Create the child process: set the _proc attribute
+        self._loop.create_task(self._create_child(
+            waiter, args=args, shell=shell, stdin=stdin, stdout=stdout,
+            stderr=stderr, bufsize=bufsize, start_kwargs=kwargs))
+
+    @coroutine
+    def _create_child(self, waiter, args, shell, stdin, stdout, stderr,
+                      bufsize, start_kwargs):
         try:
-            self._start(args=args, shell=shell, stdin=stdin, stdout=stdout,
-                        stderr=stderr, bufsize=bufsize, **kwargs)
-        except:
-            self.close()
-            raise
+            try:
+                start = self._start(args=args, shell=shell, stdin=stdin,
+                                    stdout=stdout, stderr=stderr,
+                                    bufsize=bufsize, **start_kwargs)
+
+                if start is not None:
+                    # _start is not required to be a coroutine
+                    yield from start
+            except:
+                self.close()
+                raise
 
-        self._pid = self._proc.pid
-        self._extra['subprocess'] = self._proc
+            self._pid = self._proc.pid
+            self._extra['subprocess'] = self._proc
 
-        if self._loop.get_debug():
-            if isinstance(args, (bytes, str)):
-                program = args
+            if self._loop.get_debug():
+                if isinstance(args, (bytes, str)):
+                    program = args
+                else:
+                    program = args[0]
+                logger.debug('process %r created: pid %s', program, self._pid)
+
+            if self._closed:
+                # transport.close() may have been called concurrently, for
+                # instance if _make_subprocess_transport() has been cancelled.
+                if self._proc.stdin:
+                    self._proc.stdin.close()
+                if self._proc.stdout:
+                    self._proc.stdout.close()
+                if self._proc.stderr:
+                    self._proc.stderr.close()
             else:
-                program = args[0]
-            logger.debug('process %r created: pid %s',
-                         program, self._pid)
-
-        self._loop.create_task(self._connect_pipes(waiter))
+                yield from self._connect_pipes(waiter)
+        except Exception as exc:
+            if waiter is not None and not waiter.cancelled():
+                waiter.set_exception(exc)
+        else:
+            if waiter is not None and not waiter.cancelled():
+                waiter.set_result(None)
 
     def __repr__(self):
         info = [self.__class__.__name__]
@@ -161,40 +189,33 @@ def kill(self):
 
     @coroutine
     def _connect_pipes(self, waiter):
-        try:
-            proc = self._proc
-            loop = self._loop
-
-            if proc.stdin is not None:
-                _, pipe = yield from loop.connect_write_pipe(
-                    lambda: WriteSubprocessPipeProto(self, 0),
-                    proc.stdin)
-                self._pipes[0] = pipe
-
-            if proc.stdout is not None:
-                _, pipe = yield from loop.connect_read_pipe(
-                    lambda: ReadSubprocessPipeProto(self, 1),
-                    proc.stdout)
-                self._pipes[1] = pipe
-
-            if proc.stderr is not None:
-                _, pipe = yield from loop.connect_read_pipe(
-                    lambda: ReadSubprocessPipeProto(self, 2),
-                    proc.stderr)
-                self._pipes[2] = pipe
-
-            assert self._pending_calls is not None
-
-            loop.call_soon(self._protocol.connection_made, self)
-            for callback, data in self._pending_calls:
-                loop.call_soon(callback, *data)
-            self._pending_calls = None
-        except Exception as exc:
-            if waiter is not None and not waiter.cancelled():
-                waiter.set_exception(exc)
-        else:
-            if waiter is not None and not waiter.cancelled():
-                waiter.set_result(None)
+        proc = self._proc
+        loop = self._loop
+
+        if proc.stdin is not None:
+            _, pipe = yield from loop.connect_write_pipe(
+                lambda: WriteSubprocessPipeProto(self, 0),
+                proc.stdin)
+            self._pipes[0] = pipe
+
+        if proc.stdout is not None:
+            _, pipe = yield from loop.connect_read_pipe(
+                lambda: ReadSubprocessPipeProto(self, 1),
+                proc.stdout)
+            self._pipes[1] = pipe
+
+        if proc.stderr is not None:
+            _, pipe = yield from loop.connect_read_pipe(
+                lambda: ReadSubprocessPipeProto(self, 2),
+                proc.stderr)
+            self._pipes[2] = pipe
+
+        assert self._pending_calls is not None
+
+        loop.call_soon(self._protocol.connection_made, self)
+        for callback, data in self._pending_calls:
+            loop.call_soon(callback, *data)
+        self._pending_calls = None
 
     def _call(self, cb, *data):
         if self._pending_calls is not None: