From 56a92105fe6b779c69bccd44c2cff8f21cafdfbd Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 23 Feb 2011 11:09:07 +0000 Subject: bitbake/cooker: Fix parsing failure zombie problem When parsing if a SystemExit event is triggered, it causes the parsing thread to exit and the main process hangs waiting for it to finish indefintely. Add code to catch BaseExceptions and raise these with the main process gracefully instead of just hanging indefinitely with zombie processes. Signed-off-by: Richard Purdie --- bitbake/lib/bb/cooker.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 825c357988..ff16daf83f 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -948,6 +948,13 @@ class CookerExit(bb.event.Event): def __init__(self): bb.event.Event.__init__(self) +class ParsingFailure(Exception): + def __init__(self, realexception, recipe): + self.realexception = realexception + self.recipe = recipe + Exception.__init__(self, "Failure when parsing %s" % recipe) + self.args = (realexception, recipe) + def parse_file(task): filename, appends = task try: @@ -955,6 +962,11 @@ def parse_file(task): except Exception, exc: exc.recipe = filename raise exc + # Need to turn BaseExceptions into Exceptions here so we gracefully shutdown + # and for example a worker thread doesn't just exit on its own in response to + # a SystemExit event for example. + except BaseException, exc: + raise ParsingFailure(exc, filename) class CookerParser(object): def __init__(self, cooker, filelist, masked): -- cgit v1.2.3-54-g00ecf