mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-05 08:02:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: data_smart: Cache set(self.overrides)

Browse Source 
This performs better than continually regeneratiing the set().

Also only use set comparisions when its necessary to save some overhead
as issubset() is slower in the single item case.

(Bitbake rev: db9a4eedcf78969ec50bf0e4a8defba8ff0daa4a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2015-05-29 10:33:04 +00:00
parent 0ac9c80e08
commit 816acb6ee8
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bitbake/lib/bb/data_smart.py
View File

@@ -369,7 +369,9 @@ class DataSmart(MutableMapping):
self.inoverride = True
# Can end up here recursively so setup dummy values
self.overrides = []
self.overridesset = set()
self.overrides = (self.getVar("OVERRIDES", True) or "").split(":") or []
self.overridesset = set(self.overrides)
self.inoverride = False
self.expand_cache = {}
@@ -450,10 +452,10 @@ class DataSmart(MutableMapping):
active = []
self.need_overrides()
for (r, o) in self.overridedata[var]:
if o in self.overrides:
if o in self.overridesset:
active.append(r)
elif "_" in o:
if set(o.split("_")).issubset(set(self.overrides)):
if set(o.split("_")).issubset(self.overridesset):
active.append(r)
for a in active:
self.delVar(a)
@@ -600,10 +602,12 @@ class DataSmart(MutableMapping):
self.need_overrides()
for (r, o) in self.overridedata[var]:
# What about double overrides both with "_" in the name?
if o in self.overrides:
active[o] = r
elif set(o.split("_")).issubset(set(self.overrides)):
if o in self.overridesset:
active[o] = r
elif "_" in o:
if set(o.split("_")).issubset(self.overridesset):
active[o] = r
mod = True
while mod:
mod = False