mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 01:19:52 +00:00
Code Issues Projects Releases Wiki Activity

cache: use set for clean, checked

Browse Source 
(Bitbake rev: 3a776ef947e23b1a04bdd9e78a3a0c4616249b0e)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Chris Larson
2010-11-16 17:43:33 -07:00
committed by Richard Purdie
parent f207bb7c93
commit 77d52cb1b8
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/cache.py
+9 -11
View File
@@ -52,8 +52,8 @@ class Cache:
self.cachedir = bb.data.getVar("CACHE", data, True) self.cachedir = bb.data.getVar("CACHE", data, True)
self.clean = {} self.clean = set()
self.checked = {} self.checked = set()
self.depends_cache = {} self.depends_cache = {}
self.data = None self.data = None
self.data_fn = None self.data_fn = None
@@ -242,10 +242,10 @@ class Cache:
if not self.has_cache: if not self.has_cache:
return False return False
self.checked[fn] = "" self.checked.add(fn)
# Pretend we're clean so getVar works # Pretend we're clean so getVar works
self.clean[fn] = "" self.clean.add(fn)
# File isn't in depends_cache # File isn't in depends_cache
if not fn in self.depends_cache: if not fn in self.depends_cache:
@@ -282,15 +282,13 @@ class Cache:
self.remove(fn) self.remove(fn)
return False return False
if not fn in self.clean: self.clean.add(fn)
self.clean[fn] = ""
invalid = False invalid = False
# Mark extended class data as clean too # Mark extended class data as clean too
multi = self.getVar('__VARIANTS', fn, True) multi = self.getVar('__VARIANTS', fn, True)
for cls in (multi or "").split(): for cls in (multi or "").split():
virtualfn = self.realfn2virtual(fn, cls) virtualfn = self.realfn2virtual(fn, cls)
self.clean[virtualfn] = "" self.clean.add(virtualfn)
if not virtualfn in self.depends_cache: if not virtualfn in self.depends_cache:
logger.debug(2, "Cache: %s is not cached", virtualfn) logger.debug(2, "Cache: %s is not cached", virtualfn)
invalid = True invalid = True
@@ -301,10 +299,10 @@ class Cache:
virtualfn = self.realfn2virtual(fn, cls) virtualfn = self.realfn2virtual(fn, cls)
if virtualfn in self.clean: if virtualfn in self.clean:
logger.debug(2, "Cache: Removing %s from cache", virtualfn) logger.debug(2, "Cache: Removing %s from cache", virtualfn)
del self.clean[virtualfn] self.clean.remove(virtualfn)
if fn in self.clean: if fn in self.clean:
logger.debug(2, "Cache: Marking %s as not clean", fn) logger.debug(2, "Cache: Marking %s as not clean", fn)
del self.clean[fn] self.clean.remove(fn)
return False return False
return True return True
@@ -319,7 +317,7 @@ class Cache:
del self.depends_cache[fn] del self.depends_cache[fn]
if fn in self.clean: if fn in self.clean:
logger.debug(1, "Marking %s as unclean", fn) logger.debug(1, "Marking %s as unclean", fn)
del self.clean[fn] self.clean.remove(fn)
def sync(self): def sync(self):
""" """