mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-19 13:49:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: cooker: Ensure parse_quit thread is closed down

Browse Source 
Each run through the parser would leak a thread from the queue created to
shut the parser down. Close this down correctly and clean up the code flow
slightly whilst in the area, making sure this thread does shut down correctly
(we don't care if it loses data).

(Bitbake rev: 51ba35e9bbd4da8b5f3b3b5b8213cb634a6b0f06)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2020-08-22 15:10:41 +01:00
parent e4df6ef7f5
commit b991cc4f89
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bitbake/lib/bb/cooker.py
View File

@@ -2103,12 +2103,11 @@ class CookerParser(object):
self.total)
bb.event.fire(event, self.cfgdata)
for process in self.processes:
self.parser_quit.put(None)
else:
self.parser_quit.cancel_join_thread()
for process in self.processes:
self.parser_quit.put(None)
# 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)
# Cleanup the queue before call process.join(), otherwise there might be
# deadlocks.
@@ -2125,6 +2124,9 @@ class CookerParser(object):
else:
process.join()
self.parser_quit.close()
self.parser_quit.join_thread()
def sync_caches():
for c in self.bb_caches.values():
c.sync()