diff options
Diffstat (limited to 'bitbake/lib/bb/ui')
| -rw-r--r-- | bitbake/lib/bb/ui/uievent.py | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/bitbake/lib/bb/ui/uievent.py b/bitbake/lib/bb/ui/uievent.py index d595f172ac..adbe698939 100644 --- a/bitbake/lib/bb/ui/uievent.py +++ b/bitbake/lib/bb/ui/uievent.py | |||
| @@ -70,30 +70,22 @@ class BBUIEventQueue: | |||
| 70 | self.t.start() | 70 | self.t.start() |
| 71 | 71 | ||
| 72 | def getEvent(self): | 72 | def getEvent(self): |
| 73 | 73 | with bb.utils.lock_timeout(self.eventQueueLock): | |
| 74 | self.eventQueueLock.acquire() | 74 | if not self.eventQueue: |
| 75 | 75 | return None | |
| 76 | if not self.eventQueue: | 76 | item = self.eventQueue.pop(0) |
| 77 | self.eventQueueLock.release() | 77 | if not self.eventQueue: |
| 78 | return None | 78 | self.eventQueueNotify.clear() |
| 79 | 79 | return item | |
| 80 | item = self.eventQueue.pop(0) | ||
| 81 | |||
| 82 | if not self.eventQueue: | ||
| 83 | self.eventQueueNotify.clear() | ||
| 84 | |||
| 85 | self.eventQueueLock.release() | ||
| 86 | return item | ||
| 87 | 80 | ||
| 88 | def waitEvent(self, delay): | 81 | def waitEvent(self, delay): |
| 89 | self.eventQueueNotify.wait(delay) | 82 | self.eventQueueNotify.wait(delay) |
| 90 | return self.getEvent() | 83 | return self.getEvent() |
| 91 | 84 | ||
| 92 | def queue_event(self, event): | 85 | def queue_event(self, event): |
| 93 | self.eventQueueLock.acquire() | 86 | with bb.utils.lock_timeout(self.eventQueueLock): |
| 94 | self.eventQueue.append(event) | 87 | self.eventQueue.append(event) |
| 95 | self.eventQueueNotify.set() | 88 | self.eventQueueNotify.set() |
| 96 | self.eventQueueLock.release() | ||
| 97 | 89 | ||
| 98 | def send_event(self, event): | 90 | def send_event(self, event): |
| 99 | self.queue_event(pickle.loads(event)) | 91 | self.queue_event(pickle.loads(event)) |