diff options
| author | Chris Laplante <chris.laplante@agilent.com> | 2025-08-06 10:53:07 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-08-12 10:05:11 +0100 |
| commit | f4a8ddd6c80ff13cf5715d632e01fdc148e6b9e2 (patch) | |
| tree | 618230d20a01ed557fe53d25425551cdda7ff989 /bitbake | |
| parent | b25ebbc408444e55922a568ad90ebc2491e70177 (diff) | |
| download | poky-f4a8ddd6c80ff13cf5715d632e01fdc148e6b9e2.tar.gz | |
bitbake: event/runqueue: remove unused 'd' arg from check_for_interrupts
(Bitbake rev: e0c5e94cc14dd6b1cbde491073c1f9407c97e428)
Signed-off-by: Chris Laplante <chris.laplante@agilent.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/event.py | 2 | ||||
| -rw-r--r-- | bitbake/lib/bb/runqueue.py | 32 |
2 files changed, 17 insertions, 17 deletions
diff --git a/bitbake/lib/bb/event.py b/bitbake/lib/bb/event.py index 2256fed764..ddf1006c29 100644 --- a/bitbake/lib/bb/event.py +++ b/bitbake/lib/bb/event.py | |||
| @@ -90,7 +90,7 @@ def disable_heartbeat(): | |||
| 90 | # In long running code, this function should be called periodically | 90 | # In long running code, this function should be called periodically |
| 91 | # to check if we should exit due to an interuption (.e.g Ctrl+C from the UI) | 91 | # to check if we should exit due to an interuption (.e.g Ctrl+C from the UI) |
| 92 | # | 92 | # |
| 93 | def check_for_interrupts(d): | 93 | def check_for_interrupts(): |
| 94 | global _should_exit | 94 | global _should_exit |
| 95 | if _should_exit.is_set(): | 95 | if _should_exit.is_set(): |
| 96 | bb.warn("Exiting due to interrupt.") | 96 | bb.warn("Exiting due to interrupt.") |
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 80f3d3282f..f37a0a7062 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
| @@ -678,7 +678,7 @@ class RunQueueData: | |||
| 678 | 678 | ||
| 679 | self.init_progress_reporter.start() | 679 | self.init_progress_reporter.start() |
| 680 | self.init_progress_reporter.next_stage() | 680 | self.init_progress_reporter.next_stage() |
| 681 | bb.event.check_for_interrupts(self.cooker.data) | 681 | bb.event.check_for_interrupts() |
| 682 | 682 | ||
| 683 | # Step A - Work out a list of tasks to run | 683 | # Step A - Work out a list of tasks to run |
| 684 | # | 684 | # |
| @@ -829,7 +829,7 @@ class RunQueueData: | |||
| 829 | #self.dump_data() | 829 | #self.dump_data() |
| 830 | 830 | ||
| 831 | self.init_progress_reporter.next_stage() | 831 | self.init_progress_reporter.next_stage() |
| 832 | bb.event.check_for_interrupts(self.cooker.data) | 832 | bb.event.check_for_interrupts() |
| 833 | 833 | ||
| 834 | # Resolve recursive 'recrdeptask' dependencies (Part B) | 834 | # Resolve recursive 'recrdeptask' dependencies (Part B) |
| 835 | # | 835 | # |
| @@ -926,7 +926,7 @@ class RunQueueData: | |||
| 926 | self.runtaskentries[tid].depends.difference_update(recursivetasksselfref) | 926 | self.runtaskentries[tid].depends.difference_update(recursivetasksselfref) |
| 927 | 927 | ||
| 928 | self.init_progress_reporter.next_stage() | 928 | self.init_progress_reporter.next_stage() |
| 929 | bb.event.check_for_interrupts(self.cooker.data) | 929 | bb.event.check_for_interrupts() |
| 930 | 930 | ||
| 931 | #self.dump_data() | 931 | #self.dump_data() |
| 932 | 932 | ||
| @@ -1008,7 +1008,7 @@ class RunQueueData: | |||
| 1008 | mark_active(tid, 1) | 1008 | mark_active(tid, 1) |
| 1009 | 1009 | ||
| 1010 | self.init_progress_reporter.next_stage() | 1010 | self.init_progress_reporter.next_stage() |
| 1011 | bb.event.check_for_interrupts(self.cooker.data) | 1011 | bb.event.check_for_interrupts() |
| 1012 | 1012 | ||
| 1013 | # Step C - Prune all inactive tasks | 1013 | # Step C - Prune all inactive tasks |
| 1014 | # | 1014 | # |
| @@ -1055,7 +1055,7 @@ class RunQueueData: | |||
| 1055 | bb.msg.fatal("RunQueue", "Could not find any tasks with the tasknames %s to run within the recipes of the taskgraphs of the targets %s" % (str(self.cooker.configuration.runall), str(self.targets))) | 1055 | bb.msg.fatal("RunQueue", "Could not find any tasks with the tasknames %s to run within the recipes of the taskgraphs of the targets %s" % (str(self.cooker.configuration.runall), str(self.targets))) |
| 1056 | 1056 | ||
| 1057 | self.init_progress_reporter.next_stage() | 1057 | self.init_progress_reporter.next_stage() |
| 1058 | bb.event.check_for_interrupts(self.cooker.data) | 1058 | bb.event.check_for_interrupts() |
| 1059 | 1059 | ||
| 1060 | # Handle runonly | 1060 | # Handle runonly |
| 1061 | if self.cooker.configuration.runonly: | 1061 | if self.cooker.configuration.runonly: |
| @@ -1096,7 +1096,7 @@ class RunQueueData: | |||
| 1096 | logger.verbose("Assign Weightings") | 1096 | logger.verbose("Assign Weightings") |
| 1097 | 1097 | ||
| 1098 | self.init_progress_reporter.next_stage() | 1098 | self.init_progress_reporter.next_stage() |
| 1099 | bb.event.check_for_interrupts(self.cooker.data) | 1099 | bb.event.check_for_interrupts() |
| 1100 | 1100 | ||
| 1101 | # Generate a list of reverse dependencies to ease future calculations | 1101 | # Generate a list of reverse dependencies to ease future calculations |
| 1102 | for tid in self.runtaskentries: | 1102 | for tid in self.runtaskentries: |
| @@ -1104,7 +1104,7 @@ class RunQueueData: | |||
| 1104 | self.runtaskentries[dep].revdeps.add(tid) | 1104 | self.runtaskentries[dep].revdeps.add(tid) |
| 1105 | 1105 | ||
| 1106 | self.init_progress_reporter.next_stage() | 1106 | self.init_progress_reporter.next_stage() |
| 1107 | bb.event.check_for_interrupts(self.cooker.data) | 1107 | bb.event.check_for_interrupts() |
| 1108 | 1108 | ||
| 1109 | # Identify tasks at the end of dependency chains | 1109 | # Identify tasks at the end of dependency chains |
| 1110 | # Error on circular dependency loops (length two) | 1110 | # Error on circular dependency loops (length two) |
| @@ -1121,14 +1121,14 @@ class RunQueueData: | |||
| 1121 | logger.verbose("Compute totals (have %s endpoint(s))", len(endpoints)) | 1121 | logger.verbose("Compute totals (have %s endpoint(s))", len(endpoints)) |
| 1122 | 1122 | ||
| 1123 | self.init_progress_reporter.next_stage() | 1123 | self.init_progress_reporter.next_stage() |
| 1124 | bb.event.check_for_interrupts(self.cooker.data) | 1124 | bb.event.check_for_interrupts() |
| 1125 | 1125 | ||
| 1126 | # Calculate task weights | 1126 | # Calculate task weights |
| 1127 | # Check of higher length circular dependencies | 1127 | # Check of higher length circular dependencies |
| 1128 | self.runq_weight = self.calculate_task_weights(endpoints) | 1128 | self.runq_weight = self.calculate_task_weights(endpoints) |
| 1129 | 1129 | ||
| 1130 | self.init_progress_reporter.next_stage() | 1130 | self.init_progress_reporter.next_stage() |
| 1131 | bb.event.check_for_interrupts(self.cooker.data) | 1131 | bb.event.check_for_interrupts() |
| 1132 | 1132 | ||
| 1133 | # Sanity Check - Check for multiple tasks building the same provider | 1133 | # Sanity Check - Check for multiple tasks building the same provider |
| 1134 | for mc in self.dataCaches: | 1134 | for mc in self.dataCaches: |
| @@ -1229,7 +1229,7 @@ class RunQueueData: | |||
| 1229 | 1229 | ||
| 1230 | self.init_progress_reporter.next_stage() | 1230 | self.init_progress_reporter.next_stage() |
| 1231 | self.init_progress_reporter.next_stage() | 1231 | self.init_progress_reporter.next_stage() |
| 1232 | bb.event.check_for_interrupts(self.cooker.data) | 1232 | bb.event.check_for_interrupts() |
| 1233 | 1233 | ||
| 1234 | # Iterate over the task list looking for tasks with a 'setscene' function | 1234 | # Iterate over the task list looking for tasks with a 'setscene' function |
| 1235 | self.runq_setscene_tids = set() | 1235 | self.runq_setscene_tids = set() |
| @@ -1242,7 +1242,7 @@ class RunQueueData: | |||
| 1242 | self.runq_setscene_tids.add(tid) | 1242 | self.runq_setscene_tids.add(tid) |
| 1243 | 1243 | ||
| 1244 | self.init_progress_reporter.next_stage() | 1244 | self.init_progress_reporter.next_stage() |
| 1245 | bb.event.check_for_interrupts(self.cooker.data) | 1245 | bb.event.check_for_interrupts() |
| 1246 | 1246 | ||
| 1247 | # Invalidate task if force mode active | 1247 | # Invalidate task if force mode active |
| 1248 | if self.cooker.configuration.force: | 1248 | if self.cooker.configuration.force: |
| @@ -1259,7 +1259,7 @@ class RunQueueData: | |||
| 1259 | invalidate_task(fn + ":" + st, True) | 1259 | invalidate_task(fn + ":" + st, True) |
| 1260 | 1260 | ||
| 1261 | self.init_progress_reporter.next_stage() | 1261 | self.init_progress_reporter.next_stage() |
| 1262 | bb.event.check_for_interrupts(self.cooker.data) | 1262 | bb.event.check_for_interrupts() |
| 1263 | 1263 | ||
| 1264 | # Create and print to the logs a virtual/xxxx -> PN (fn) table | 1264 | # Create and print to the logs a virtual/xxxx -> PN (fn) table |
| 1265 | for mc in taskData: | 1265 | for mc in taskData: |
| @@ -1272,7 +1272,7 @@ class RunQueueData: | |||
| 1272 | bb.parse.siggen.tasks_resolved(virtmap, virtpnmap, self.dataCaches[mc]) | 1272 | bb.parse.siggen.tasks_resolved(virtmap, virtpnmap, self.dataCaches[mc]) |
| 1273 | 1273 | ||
| 1274 | self.init_progress_reporter.next_stage() | 1274 | self.init_progress_reporter.next_stage() |
| 1275 | bb.event.check_for_interrupts(self.cooker.data) | 1275 | bb.event.check_for_interrupts() |
| 1276 | 1276 | ||
| 1277 | bb.parse.siggen.set_setscene_tasks(self.runq_setscene_tids) | 1277 | bb.parse.siggen.set_setscene_tasks(self.runq_setscene_tids) |
| 1278 | 1278 | ||
| @@ -1296,7 +1296,7 @@ class RunQueueData: | |||
| 1296 | todeal.remove(tid) | 1296 | todeal.remove(tid) |
| 1297 | self.runtaskentries[tid].unihash = unihashes[tid] | 1297 | self.runtaskentries[tid].unihash = unihashes[tid] |
| 1298 | 1298 | ||
| 1299 | bb.event.check_for_interrupts(self.cooker.data) | 1299 | bb.event.check_for_interrupts() |
| 1300 | 1300 | ||
| 1301 | if time.time() > (lasttime + 30): | 1301 | if time.time() > (lasttime + 30): |
| 1302 | lasttime = time.time() | 1302 | lasttime = time.time() |
| @@ -1555,7 +1555,7 @@ class RunQueue: | |||
| 1555 | """ | 1555 | """ |
| 1556 | 1556 | ||
| 1557 | retval = True | 1557 | retval = True |
| 1558 | bb.event.check_for_interrupts(self.cooker.data) | 1558 | bb.event.check_for_interrupts() |
| 1559 | 1559 | ||
| 1560 | if self.state is runQueuePrepare: | 1560 | if self.state is runQueuePrepare: |
| 1561 | # NOTE: if you add, remove or significantly refactor the stages of this | 1561 | # NOTE: if you add, remove or significantly refactor the stages of this |
| @@ -2638,7 +2638,7 @@ class RunQueueExecute: | |||
| 2638 | next |= self.rqdata.runtaskentries[tid].revdeps | 2638 | next |= self.rqdata.runtaskentries[tid].revdeps |
| 2639 | total.remove(tid) | 2639 | total.remove(tid) |
| 2640 | next.intersection_update(total) | 2640 | next.intersection_update(total) |
| 2641 | bb.event.check_for_interrupts(self.cooker.data) | 2641 | bb.event.check_for_interrupts() |
| 2642 | 2642 | ||
| 2643 | if time.time() > (lasttime + 30): | 2643 | if time.time() > (lasttime + 30): |
| 2644 | lasttime = time.time() | 2644 | lasttime = time.time() |
