Merge b36362b into 465eadc

requirements.txt

@@ -1,6 +1,7 @@
 six
 future
 enum34
+futures; python_version == "2.7"
 SpiNNUtilities >= 1!4.0.1, < 1!5.0.0
 SpiNNMachine >= 1!4.0.1, < 1!5.0.0
 SpiNNStorageHandlers >= 1!4.0.1, < 1!5.0.0

setup.py

@@ -43,5 +43,6 @@
         'SpiNNMachine >= 1!4.0.1, < 1!5.0.0',
         'enum34',
         'future',
+        'futures; python_version == "2.7"',
         'six']
 )

spinnman/connections/connection_listener.py

@@ -1,6 +1,6 @@
 import logging
 from threading import Thread
-from multiprocessing.pool import ThreadPool
+from concurrent.futures import ThreadPoolExecutor
 
 logger = logging.getLogger(__name__)
 _POOL_SIZE = 4
@@ -31,27 +31,29 @@ def __init__(self, connection, n_processes=_POOL_SIZE, timeout=_TIMEOUT):
         self.daemon = True
         self._connection = connection
         self._timeout = timeout
-        self._callback_pool = ThreadPool(processes=n_processes)
+        self._callback_pool = ThreadPoolExecutor(max_workers=n_processes)
         self._done = False
         self._callbacks = set()
 
     def _run_step(self, handler):
         if self._connection.is_ready_to_receive(timeout=self._timeout):
             message = handler()
             for callback in self._callbacks:
-                self._callback_pool.apply_async(callback, [message])
+                self._callback_pool.submit(callback, message)
 
     def run(self):
-        handler = self._connection.get_receive_method()
-        while not self._done:
-            try:
-                self._run_step(handler)
-            except Exception:
-                if not self._done:
-                    logger.warning("problem when dispatching message",
-                                   exc_info=True)
-        self._callback_pool.close()
-        self._callback_pool.join()
+        try:
+            handler = self._connection.get_receive_method()
+            while not self._done:
+                try:
+                    self._run_step(handler)
+                except Exception:
+                    if not self._done:
+                        logger.warning("problem when dispatching message",
+                                       exc_info=True)
+        finally:
+            self._callback_pool.shutdown()
+            self._callback_pool = None
 
     def add_callback(self, callback):
         """ Add a callback to be called when a message is received