diff options
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/server/process.py | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py index 613956f30f..74b74dc39b 100644 --- a/bitbake/lib/bb/server/process.py +++ b/bitbake/lib/bb/server/process.py | |||
@@ -667,18 +667,14 @@ class BBUIEventQueue: | |||
667 | self.t.start() | 667 | self.t.start() |
668 | 668 | ||
669 | def getEvent(self): | 669 | def getEvent(self): |
670 | self.eventQueueLock.acquire() | 670 | with self.eventQueueLock: |
671 | 671 | if len(self.eventQueue) == 0: | |
672 | if len(self.eventQueue) == 0: | 672 | return None |
673 | self.eventQueueLock.release() | ||
674 | return None | ||
675 | |||
676 | item = self.eventQueue.pop(0) | ||
677 | 673 | ||
678 | if len(self.eventQueue) == 0: | 674 | item = self.eventQueue.pop(0) |
679 | self.eventQueueNotify.clear() | 675 | if len(self.eventQueue) == 0: |
676 | self.eventQueueNotify.clear() | ||
680 | 677 | ||
681 | self.eventQueueLock.release() | ||
682 | return item | 678 | return item |
683 | 679 | ||
684 | def waitEvent(self, delay): | 680 | def waitEvent(self, delay): |
@@ -686,10 +682,9 @@ class BBUIEventQueue: | |||
686 | return self.getEvent() | 682 | return self.getEvent() |
687 | 683 | ||
688 | def queue_event(self, event): | 684 | def queue_event(self, event): |
689 | self.eventQueueLock.acquire() | 685 | with self.eventQueueLock: |
690 | self.eventQueue.append(event) | 686 | self.eventQueue.append(event) |
691 | self.eventQueueNotify.set() | 687 | self.eventQueueNotify.set() |
692 | self.eventQueueLock.release() | ||
693 | 688 | ||
694 | def send_event(self, event): | 689 | def send_event(self, event): |
695 | self.queue_event(pickle.loads(event)) | 690 | self.queue_event(pickle.loads(event)) |