Only use multiprocessing.Queue workaround on OSX, rename it from bugf…

…ix_mp for aesthetics

MAVProxy/modules/lib/mp_image.py

@@ -89,9 +89,9 @@ def __init__(self,
         self.menu = None
         self.popup_menu = None
 
-        from bugfix_mp import mpQueue
-        self.in_queue = mpQueue()
-        self.out_queue = mpQueue()
+        from multiprocessing_queue import makeIPCQueue
+        self.in_queue = makeIPCQueue()
+        self.out_queue = makeIPCQueue()
 
         self.default_menu = MPMenuSubMenu('View',
                                           items=[MPMenuItem('Fit Window', 'Fit Window', 'fitWindow'),

MAVProxy/modules/lib/bugfix_mp.py → MAVProxy/modules/lib/multiprocessing_queue.py

@@ -1,23 +1,8 @@
 import multiprocessing
-
-class mpCounter(object):
-        """ Locked/shared counter """
-
-        def __init__(self, default=0):
-                self._value = multiprocessing.RawValue('i', default)
-                self._lock = multiprocessing.Lock()
-
-        def add(self, delta):
-                with self._lock:
-                        self._value.value += delta
-
-        @property
-        def value(self):
-                with self._lock:
-                        return self._value.value
+import sys
 
 from multiprocessing.queues import Queue
-class mpQueue(Queue):
+class osxQueue(Queue):
         """ Wrapper around mp.Queue that works on OSX...
 
         Queue.qsize() relies on sem_getvalue() to get queue size,
@@ -26,18 +11,28 @@ class mpQueue(Queue):
 
         def __init__(self, *args, **kwargs):
                 Queue.__init__(self, *args, **kwargs)
-                self.qsizeCounter = mpCounter(0)
+                self._counter = multiprocessing.RawValue('i', 0)
+                self._lock = multiprocessing.Lock()
 
         def put(self, *args, **kwargs):
-                # If the put fails, the exception will prevent us from incrementing qsizeCounter
+                # If the put fails, the exception will prevent us from incrementing the counter
                 Queue.put(self, *args, **kwargs)
-                self.qsizeCounter.add(1)
+                with self._lock:
+                        self._counter.value += 1
 
         def get(self, *args, **kwargs):
-                # If the get fails, the exception will prevent us from decrementing qsizeCounter
+                # If the get fails, the exception will prevent us from decrementing the counter
                 val = Queue.get(self, *args, **kwargs)
-                self.qsizeCounter.add(-1)
+                with self._lock:
+                        self._counter.value -= 1
                 return val
 
         def qsize(self):
-                return self.qsizeCounter.value
+                with self._lock:
+                        return self._counter.value
+
+def makeIPCQueue(*args, **kwargs):
+        if sys.platform == 'darwin':
+                return osxQueue(*args, **kwargs)
+        else:
+                return Queue(*args, **kwargs)

MAVProxy/modules/mavproxy_map/mp_slipmap.py

@@ -59,9 +59,9 @@ def __init__(self,
         self.drag_step = 10
 
         self.title = title
-        from ..lib.bugfix_mp import mpQueue
-        self.event_queue = mpQueue()
-        self.object_queue = mpQueue()
+        from ..lib.multiprocessing_queue import makeIPCQueue
+        self.event_queue = makeIPCQueue()
+        self.object_queue = makeIPCQueue()
         self.close_window = multiprocessing.Event()
         self.close_window.clear()
         self.child = multiprocessing.Process(target=self.child_task)

MAVProxy/modules/mavproxy_misseditor/__init__.py

@@ -154,10 +154,10 @@ def __init__(self, mpstate):
         self.num_wps_expected = 0 #helps me to know if all my waypoints I'm expecting have arrived
         self.wps_received = {}
 
-        from ..lib.bugfix_mp import mpQueue
-        self.event_queue = mpQueue()
+        from ..lib.multiprocessing_queue import makeIPCQueue
+        self.event_queue = makeIPCQueue()
         self.event_queue_lock = multiprocessing.Lock()
-        self.gui_event_queue = mpQueue()
+        self.gui_event_queue = makeIPCQueue()
         self.gui_event_queue_lock = multiprocessing.Lock()
 
         self.event_thread = MissionEditorEventThread(self, self.event_queue, self.event_queue_lock)