[linear2] merge fallout: restore optimization from #491 / 7b129e8

Author: dw

ansible_mitogen/connection.py

@@ -405,15 +405,6 @@ def _connect_mitogen_doas(spec):
 }
 
 
-class Broker(mitogen.master.Broker):
-    """
-    WorkerProcess maintains at most 2 file descriptors, therefore does not need
-    the exuberant syscall expense of EpollPoller, so override it and restore
-    the poll() poller.
-    """
-    poller_class = mitogen.core.Poller
-
-
 class CallChain(mitogen.parent.CallChain):
     """
     Extend :class:`mitogen.parent.CallChain` to additionally cause the

ansible_mitogen/process.py

@@ -294,6 +294,15 @@ def get_cpu_count(default=None):
     return cpu_count
 
 
+class Broker(mitogen.master.Broker):
+    """
+    WorkerProcess maintains at most 2 file descriptors, therefore does not need
+    the exuberant syscall expense of EpollPoller, so override it and restore
+    the poll() poller.
+    """
+    poller_class = mitogen.core.Poller
+
+
 class Binding(object):
     """
     Represent a bound connection for a particular inventory hostname. When
@@ -530,7 +539,7 @@ def get_binding(self, inventory_name):
         See WorkerModel.get_binding().
         """
         if self.broker is None:
-            self.broker = mitogen.master.Broker()
+            self.broker = Broker()
 
         path = self._listener_for_name(inventory_name)
         if path != self.listener_path: