[OE-core] bitbake/runqueue: Fix 'full' stamp checking to be more efficient and cache results
Richard Purdie
richard.purdie at linuxfoundation.org
Wed May 9 23:57:41 UTC 2012
This fixes issues where bitbake would seemingly lock up when checking
certain configurations of stamp files due to deep recursion and
duplication.
This fixes a problem reported on the OE-Core mailing list to do with
BB_STAMP_POLICY = "full" appearing to hang upon rebuilds for long
periods of time (hours).
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index b870caf..48433be 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -875,7 +875,7 @@ class RunQueue:
bb.msg.fatal("RunQueue", "check_stamps fatal internal error")
return current
- def check_stamp_task(self, task, taskname = None, recurse = False):
+ def check_stamp_task(self, task, taskname = None, recurse = False, cache = {}):
def get_timestamp(f):
try:
if not os.access(f, os.F_OK):
@@ -915,6 +915,9 @@ class RunQueue:
t1 = get_timestamp(stampfile)
for dep in self.rqdata.runq_depends[task]:
if iscurrent:
+ if dep in cache:
+ iscurrent = cache[dep]
+ continue
fn2 = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[dep]]
taskname2 = self.rqdata.runq_task[dep]
stampfile2 = bb.build.stampfile(taskname2, self.rqdata.dataCache, fn2)
@@ -931,7 +934,9 @@ class RunQueue:
logger.debug(2, 'Stampfile %s < %s', stampfile, stampfile2)
iscurrent = False
if recurse and iscurrent:
- iscurrent = self.check_stamp_task(dep, recurse=True)
+ iscurrent = self.check_stamp_task(dep, recurse=True, cache=cache)
+ cache[dep] = iscurrent
+ cache[task] = iscurrent
return iscurrent
def execute_runqueue(self):
More information about the Openembedded-core
mailing list