summaryrefslogtreecommitdiff
path: root/bitbake/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-23 11:48:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-23 11:48:01 +0000
commit6ea24f04cd635295d826f03d9c7d8a08cc1d5b31 (patch)
tree2832426819f702aa2a1f9d21c35a4a3d6dd22f6b /bitbake/lib
parent707132c60a84cdcf50da056c68f2da7402d3b2e8 (diff)
downloadopenembedded-core-6ea24f04cd635295d826f03d9c7d8a08cc1d5b31.tar.gz
openembedded-core-6ea24f04cd635295d826f03d9c7d8a08cc1d5b31.tar.bz2
openembedded-core-6ea24f04cd635295d826f03d9c7d8a08cc1d5b31.tar.xz
openembedded-core-6ea24f04cd635295d826f03d9c7d8a08cc1d5b31.zip
bitbake/data_smart: Improve the way lazyassignment works
Currently, if a variable has been set with ??= and the code looks it up before the data finalisation phase, no value is found. This is causes serious problems for anonymous python functions which manipulate data, or for the fetcher revision handling code where revisions can be set with ??=. There is also a significant performance implication for processing lazy assignment in finalise. Moving the check for a default value into getVarFlag addresses both the timing issue and the performace. This change gives a 7% real time performance improvement to parsing the Poky metadata. The cost of the check at this point is minimal since we have all the data flags available. This should also fix Yocto bug 752. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/data_smart.py2
-rw-r--r--bitbake/lib/bb/parse/ast.py8
2 files changed, 2 insertions, 8 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index 83e6f70cd..e76fbbf6c 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -298,6 +298,8 @@ class DataSmart(MutableMapping):
if local_var:
if flag in local_var:
value = copy.copy(local_var[flag])
+ elif flag == "content" and "defaultval" in local_var:
+ value = copy.copy(local_var["defaultval"])
if expand and value:
value = self.expand(value, None)
return value
diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py
index 8fffe1e8f..b968db40b 100644
--- a/bitbake/lib/bb/parse/ast.py
+++ b/bitbake/lib/bb/parse/ast.py
@@ -115,9 +115,6 @@ class DataNode(AstNode):
if 'flag' in groupd and groupd['flag'] != None:
bb.data.setVarFlag(key, groupd['flag'], val, data)
elif groupd["lazyques"]:
- assigned = bb.data.getVar("__lazy_assigned", data) or []
- assigned.append(key)
- bb.data.setVar("__lazy_assigned", assigned, data)
bb.data.setVarFlag(key, "defaultval", val, data)
else:
bb.data.setVar(key, val, data)
@@ -310,11 +307,6 @@ def handleInherit(statements, filename, lineno, m):
statements.append(InheritNode(filename, lineno, classes.split()))
def finalize(fn, d, variant = None):
- for lazykey in bb.data.getVar("__lazy_assigned", d) or ():
- if bb.data.getVar(lazykey, d) is None:
- val = bb.data.getVarFlag(lazykey, "defaultval", d)
- bb.data.setVar(lazykey, val, d)
-
bb.data.expandKeys(d)
bb.data.update_data(d)
code = []