@@ -1743,7 +1743,7 @@ class BBCooker:
return
def post_serve(self):
- self.shutdown(force=True, idle=False)
+ self.shutdown(force=True)
prserv.serv.auto_shutdown()
if hasattr(bb.parse, "siggen"):
bb.parse.siggen.exit()
@@ -1753,17 +1753,14 @@ class BBCooker:
if hasattr(self, "data"):
bb.event.fire(CookerExit(), self.data)
- def shutdown(self, force=False, idle=True):
+ def shutdown(self, force=False):
if force:
self.state = state.forceshutdown
else:
self.state = state.shutdown
- if idle:
- self.waitIdle(30)
-
if self.parser:
- self.parser.shutdown(clean=not force)
+ self.parser.shutdown(clean=False)
self.parser.final_cleanup()
def finishcommand(self):
@@ -1775,6 +1772,7 @@ class BBCooker:
def reset(self):
if hasattr(bb.parse, "siggen"):
bb.parse.siggen.exit()
+ self.finishcommand()
self.initConfigurationData()
self.handlePRServ()
The shutdown() call should definitely not be waiting for idle, since we expect execution and events to continue even after setting either shutdown state. This was causing the UI to appear to hang at Ctrl+C interrupts. Also ensure that if we reset cooker, we stop any active parser processes since these currently appear to be being left behind. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- lib/bb/cooker.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)