mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: knotty: Fix for the Second Keyboard Interrupt

Browse Source 
Fixed:
$ rm -fr tmp-glibc/cache/default-glibc/qemux86/x86_64/bb_cache.dat* ; bitbake -p
Press the first Ctrl-C when the parsing process is at about 50%:

Keyboard Interrupt, closing down...

Then presss the second Ctrl-C:

  File "/path/to/bitbake/bitbake/lib/bb/ui/knotty.py", line 619, in main
    event = eventHandler.waitEvent(0.25)
  File "/path/to/bitbake/lib/bb/server/process.py", line 591, in waitEvent
    self.eventQueueNotify.wait(delay)
  File "/usr/lib/python3.5/threading.py", line 549, in wait
    signaled = self._cond.wait(timeout)
  File "/usr/lib/python3.5/threading.py", line 297, in wait
    gotit = waiter.acquire(True, timeout)
KeyboardInterrupt

Capture the second KeyboardInterrupt during stateShutdown is running can fix
the problem. There may be still tracebacks for the third KeyboardInterrupt, but
I'm leaning to not fix it since we aimed for supporting 2 KeyboardInterrupts
only.

(Bitbake rev: 8c26b451f22193ef1c544e2017cc84515566c1b8)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang
2019-08-07 17:50:49 +08:00
committed by Richard Purdie
parent 016b91b334
commit e1f589f044
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/ui/knotty.py
+14 -4
View File
@@ -689,17 +689,27 @@ def main(server, eventHandler, params, tf = TerminalFilter):
if params.observe_only: if params.observe_only:
print("\nKeyboard Interrupt, exiting observer...") print("\nKeyboard Interrupt, exiting observer...")
main.shutdown = 2 main.shutdown = 2
if not params.observe_only and main.shutdown == 1:
def state_force_shutdown():
print("\nSecond Keyboard Interrupt, stopping...\n") print("\nSecond Keyboard Interrupt, stopping...\n")
_, error = server.runCommand(["stateForceShutdown"]) _, error = server.runCommand(["stateForceShutdown"])
if error: if error:
logger.error("Unable to cleanly stop: %s" % error) logger.error("Unable to cleanly stop: %s" % error)
if not params.observe_only and main.shutdown == 1:
state_force_shutdown()
if not params.observe_only and main.shutdown == 0: if not params.observe_only and main.shutdown == 0:
print("\nKeyboard Interrupt, closing down...\n") print("\nKeyboard Interrupt, closing down...\n")
interrupted = True interrupted = True
_, error = server.runCommand(["stateShutdown"]) # Capture the second KeyboardInterrupt during stateShutdown is running
if error: try:
logger.error("Unable to cleanly shutdown: %s" % error) _, error = server.runCommand(["stateShutdown"])
if error:
logger.error("Unable to cleanly shutdown: %s" % error)
except KeyboardInterrupt:
state_force_shutdown()
main.shutdown = main.shutdown + 1 main.shutdown = main.shutdown + 1
pass pass
except Exception as e: except Exception as e: