summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-15 17:46:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-16 23:27:14 +0000
commitd98e9d86d17c62a08fd5cfe78e2350242407bb78 (patch)
treefc19e3d9641d8f0d1f17366bf9ff1635be812a55
parent45f62a4a25a6db94d861685914fceb7953a753e3 (diff)
downloadpoky-d98e9d86d17c62a08fd5cfe78e2350242407bb78.tar.gz
bitbake: runqueue: Optimise out pointless loop iteration
(Bitbake rev: 105d1f0748edde7753a4063e6fdc758ffc8a8a9e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/runqueue.py12
1 files changed, 3 insertions, 9 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 6da612b719..73775d9761 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -1182,11 +1182,8 @@ class RunQueueData:
1182 return len(self.runtaskentries) 1182 return len(self.runtaskentries)
1183 1183
1184 def prepare_task_hash(self, tid): 1184 def prepare_task_hash(self, tid):
1185 procdep = [] 1185 bb.parse.siggen.prep_taskhash(tid, self.runtaskentries[tid].depends, self.dataCaches[mc_from_tid(tid)])
1186 for dep in self.runtaskentries[tid].depends: 1186 self.runtaskentries[tid].hash = bb.parse.siggen.get_taskhash(tid, self.runtaskentries[tid].depends, self.dataCaches[mc_from_tid(tid)])
1187 procdep.append(dep)
1188 bb.parse.siggen.prep_taskhash(tid, procdep, self.dataCaches[mc_from_tid(tid)])
1189 self.runtaskentries[tid].hash = bb.parse.siggen.get_taskhash(tid, procdep, self.dataCaches[mc_from_tid(tid)])
1190 self.runtaskentries[tid].unihash = bb.parse.siggen.get_unihash(tid) 1187 self.runtaskentries[tid].unihash = bb.parse.siggen.get_unihash(tid)
1191 1188
1192 def dump_data(self): 1189 def dump_data(self):
@@ -2294,11 +2291,8 @@ class RunQueueExecute:
2294 for tid in current: 2291 for tid in current:
2295 if len(self.rqdata.runtaskentries[p].depends) and not self.rqdata.runtaskentries[tid].depends.isdisjoint(total): 2292 if len(self.rqdata.runtaskentries[p].depends) and not self.rqdata.runtaskentries[tid].depends.isdisjoint(total):
2296 continue 2293 continue
2297 procdep = []
2298 for dep in self.rqdata.runtaskentries[tid].depends:
2299 procdep.append(dep)
2300 orighash = self.rqdata.runtaskentries[tid].hash 2294 orighash = self.rqdata.runtaskentries[tid].hash
2301 newhash = bb.parse.siggen.get_taskhash(tid, procdep, self.rqdata.dataCaches[mc_from_tid(tid)]) 2295 newhash = bb.parse.siggen.get_taskhash(tid, self.rqdata.runtaskentries[tid].depends, self.rqdata.dataCaches[mc_from_tid(tid)])
2302 origuni = self.rqdata.runtaskentries[tid].unihash 2296 origuni = self.rqdata.runtaskentries[tid].unihash
2303 newuni = bb.parse.siggen.get_unihash(tid) 2297 newuni = bb.parse.siggen.get_unihash(tid)
2304 # FIXME, need to check it can come from sstate at all for determinism? 2298 # FIXME, need to check it can come from sstate at all for determinism?