From 5ca4821a29895d3b0ff9761b2a556cbe03db5856 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Wed, 11 Mar 2015 16:48:16 +0100
Subject: [PATCH] ctlmgr: use workaround for asyncio.wait_for(process.wait()...
 Python bug

---
 artiq/frontend/artiq_ctlmgr.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/artiq/frontend/artiq_ctlmgr.py b/artiq/frontend/artiq_ctlmgr.py
index 3d0a9ed61..45ab109c4 100755
--- a/artiq/frontend/artiq_ctlmgr.py
+++ b/artiq/frontend/artiq_ctlmgr.py
@@ -10,6 +10,7 @@ import socket
 
 from artiq.protocols.sync_struct import Subscriber
 from artiq.tools import verbosity_args, init_logger
+from artiq.tools import asyncio_process_wait_timeout
 
 
 logger = logging.getLogger(__name__)
@@ -65,7 +66,7 @@ class Controller:
                 process.send_signal(signal.SIGTERM)
                 logger.debug("Signal sent")
                 try:
-                    yield from asyncio.wait_for(process.wait(), timeout=5.0)
+                    yield from asyncio_process_wait_timeout(process, 5.0)
                 except asyncio.TimeoutError:
                     logger.warning("Controller %s did not respond to SIGTERM",
                                    name)