diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-24 11:45:59 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-28 23:46:21 +0100 |
commit | d89b436835ce93de5eb6454373000673df65f082 (patch) | |
tree | 1268fbb11a36312ed5c0e41f3c40bc9b4d81ce31 /bitbake | |
parent | 2824b5e6679a2d773164a302b2fe637de1c0908b (diff) | |
download | poky-d89b436835ce93de5eb6454373000673df65f082.tar.gz |
bitbake: runqueue: Allow rehash loop to exit in case of interrupts
The initial hash serve loop exits in the case where interrupts are present
but probably checks a bit too often. Tweak that and also allow the slow
rehash loop to break on interrupt, improving bitbake Ctrl+C response.
(Bitbake rev: 4534365591fd17bcc2b684900863b67bc69519ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 83e5273449..84a6f4172c 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -1285,7 +1285,8 @@ class RunQueueData: | |||
1285 | dealtwith.add(tid) | 1285 | dealtwith.add(tid) |
1286 | todeal.remove(tid) | 1286 | todeal.remove(tid) |
1287 | self.prepare_task_hash(tid) | 1287 | self.prepare_task_hash(tid) |
1288 | bb.event.check_for_interrupts(self.cooker.data) | 1288 | |
1289 | bb.event.check_for_interrupts(self.cooker.data) | ||
1289 | 1290 | ||
1290 | if time.time() > (lasttime + 30): | 1291 | if time.time() > (lasttime + 30): |
1291 | lasttime = time.time() | 1292 | lasttime = time.time() |
@@ -2602,6 +2603,7 @@ class RunQueueExecute: | |||
2602 | next |= self.rqdata.runtaskentries[tid].revdeps | 2603 | next |= self.rqdata.runtaskentries[tid].revdeps |
2603 | total.remove(tid) | 2604 | total.remove(tid) |
2604 | next.intersection_update(total) | 2605 | next.intersection_update(total) |
2606 | bb.event.check_for_interrupts(self.cooker.data) | ||
2605 | 2607 | ||
2606 | if time.time() > (lasttime + 30): | 2608 | if time.time() > (lasttime + 30): |
2607 | lasttime = time.time() | 2609 | lasttime = time.time() |