bitbake/server/process: Move implementation knowledge of event queue into the server

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

4 files changed, 11 insertions, 16 deletions

diff --git a/lib/bb/ui/depexp.py b/lib/bb/ui/depexp.py
index a0737ee0b..f11166fbd 100644
--- a/lib/bb/ui/depexp.py
+++ b/lib/bb/ui/depexp.py
@@ -223,13 +223,7 @@ def main(server, eventHandler):
     progress_total = 0
     while True:
         try:
-            try:
-                # We must get nonblocking here, else we'll never check the
-                # quit signal
-                event = eventHandler.get(False, 0.25)
-            except Queue.Empty:
-                pass
-            
+            event = eventHandler.waitEvent(0.25)
             if gtkthread.quit.isSet():
                 server.runCommand(["stateStop"])
                 break
diff --git a/lib/bb/ui/goggle.py b/lib/bb/ui/goggle.py
index 6278a4cbf..86ab2f473 100644
--- a/lib/bb/ui/goggle.py
+++ b/lib/bb/ui/goggle.py
@@ -30,12 +30,10 @@ import Queue
 def event_handle_idle_func (eventHandler, build, pbar):
 
     # Consume as many messages as we can in the time available to us
-    try:
-        while 1:
-            event = eventHandler.get(False)
-            build.handle_event (event, pbar)
-    except Queue.Empty:
-        pass
+    event = eventHandler.getEvent()
+    while event:
+        build.handle_event (event, pbar)
+        event = eventHandler.getEvent()
 
     return True
 
diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py
index 1396939fc..44d1c1dc9 100644
--- a/lib/bb/ui/knotty.py
+++ b/lib/bb/ui/knotty.py
@@ -96,8 +96,9 @@ def main(server, eventHandler):
     return_value = 0
     while True:
         try:
-            event = eventHandler.get()
-
+            event = eventHandler.waitEvent(0.25)
+            if event is None:
+                continue
             helper.eventHandler(event)
             if isinstance(event, bb.runqueue.runQueueExitWait):
                 if not shutdown:
diff --git a/lib/bb/ui/ncurses.py b/lib/bb/ui/ncurses.py
index ab626c9df..469f1b730 100644
--- a/lib/bb/ui/ncurses.py
+++ b/lib/bb/ui/ncurses.py
@@ -244,7 +244,9 @@ class NCursesUI:
         exitflag = False
         while not exitflag:
             try:
-                event = eventHandler.get()
+                event = eventHandler.waitEvent(0.25)
+                if not event:
+                    continue
 
                 helper.eventHandler(event)
                 if isinstance(event, bb.build.TaskBase):