diff options
| -rw-r--r-- | lib/bb/cooker.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index 4d2c62cd9..730cdc56f 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -1933,7 +1933,8 @@ class Parser(multiprocessing.Process): except queue.Empty: pass else: - self.results.cancel_join_thread() + self.results.close() + self.results.join_thread() break if pending: @@ -1942,6 +1943,8 @@ class Parser(multiprocessing.Process): try: job = self.jobs.pop() except IndexError: + self.results.close() + self.results.join_thread() break result = self.parse(*job) # Clear the siggen cache after parsing to control memory usage, its huge @@ -2060,8 +2063,6 @@ class CookerParser(object): bb.event.fire(event, self.cfgdata) - # Allow data left in the cancel queue to be discarded - self.parser_quit.cancel_join_thread() for process in self.processes: self.parser_quit.put(None) @@ -2081,7 +2082,8 @@ class CookerParser(object): process.join() self.parser_quit.close() - self.parser_quit.join_thread() + # Allow data left in the cancel queue to be discarded + self.parser_quit.cancel_join_thread() sync = threading.Thread(target=self.bb_cache.sync) self.syncthread = sync |