Replace base::concurrent_queue for std::deque

os/osx/event_queue.h

@@ -9,10 +9,11 @@
 #define OS_OSX_EVENT_QUEUE_INCLUDED
 #pragma once
 
-#include "base/concurrent_queue.h"
 #include "os/event.h"
 #include "os/event_queue.h"
 
+#include <queue>
+
 namespace os {
 
 class EventQueueOSX : public EventQueue {
@@ -26,7 +27,7 @@ class EventQueueOSX : public EventQueue {
 private:
   void wakeUpQueue();
 
-  base::concurrent_queue<Event> m_events;
+  std::deque<Event> m_events;
   mutable std::mutex m_mutex;
   bool m_sleeping;
 };

os/osx/event_queue.mm

@@ -74,31 +74,38 @@
       }
     } while (event);
 
-    m_mutex.lock();
-    if (!m_events.try_pop(ev)) {
+    {
+      // Note that we don't use the try_lock because we can wait for
+      // the lock, since there is no long running functions that might get the
+      // lock for a long time.
+      const std::lock_guard lock(m_mutex);
+      if (!m_events.empty()) {
+        ev = m_events.front();
+        m_events.pop_front();
+        return;
+      }
+
       if (timeout == kWithoutTimeout)
         EV_TRACE("EV: Waiting for events\n");
 
       // Wait until there is a Cocoa event in queue
       m_sleeping = true;
-      m_mutex.unlock();
-      event = [app nextEventMatchingMask:NSEventMaskAny
-                               untilDate:untilDate
-                                  inMode:NSDefaultRunLoopMode
-                                 dequeue:YES];
-      m_mutex.lock();
-      m_sleeping = false;
-      m_mutex.unlock();
-
-      if (event) {
-        EV_TRACE("EV: Event received!\n");
-        goto retry;
-      }
-      else {
-        EV_TRACE("EV: Timeout!");
-      }
     }
+    event = [app nextEventMatchingMask:NSEventMaskAny
+                             untilDate:untilDate
+                                inMode:NSDefaultRunLoopMode
+                               dequeue:YES];
+    m_mutex.lock();
+    m_sleeping = false;
     m_mutex.unlock();
+
+    if (event) {
+      EV_TRACE("EV: Event received!\n");
+      goto retry;
+    }
+    else {
+      EV_TRACE("EV: Timeout!");
+    }
   }
 }
 
@@ -117,7 +124,7 @@
     wakeUpQueue();
     m_sleeping = false;
   }
-  m_events.push(ev);
+  m_events.push_back(ev);
 }
 
 void EventQueueOSX::wakeUpQueue()
@@ -142,6 +149,7 @@
 
 void EventQueueOSX::clearEvents()
 {
+  const std::lock_guard lock(m_mutex);
   m_events.clear();
 }