From b3c41b1f469a1d4d558e5dbef827322444d3ba54 Mon Sep 17 00:00:00 2001 From: Liping Ke Date: Fri, 3 Jun 2011 08:21:44 +0800 Subject: Introduce new param caches_array into Cache impl. When using hob ui interface, we need extra cache fields. We will save ui required extra cache fields into a separate cache file. This patch introduce this caches_array parameter. It will be used in the extra cache implementation (following patch). Caches_array at least contains CoreRecipeInfo. If users need extra cache fields support, such as 'hob', caches_array will contain more relevant elements such as HobRecipeInfo. (Bitbake rev: d50389ae692377c957afec7c846fc2ce2c070a09) Signed-off-by: Liping Ke --- bitbake/lib/bb/cooker.py | 52 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 44 insertions(+), 8 deletions(-) (limited to 'bitbake/lib/bb/cooker.py') diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 0b52f182ea..89da7e99cf 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -72,6 +72,41 @@ class BBCooker: self.configuration = configuration + self.caches_array = [] + # Currently, only Image Creator hob ui needs extra cache. + # So, we save Extra Cache class name and container file + # information into a extraCaches field in hob UI. + # TODO: In future, bin/bitbake should pass information into cooker, + # instead of getting information from configuration.ui. Also, some + # UI start up issues need to be addressed at the same time. + caches_name_array = ['bb.cache:CoreRecipeInfo'] + if configuration.ui: + try: + module = __import__('bb.ui', fromlist=[configuration.ui]) + name_array = (getattr(module, configuration.ui)).extraCaches + for recipeInfoName in name_array: + caches_name_array.append(recipeInfoName) + except ImportError, exc: + # bb.ui.XXX is not defined and imported. It's an error! + logger.critical("Unable to import '%s' interface from bb.ui: %s" % (configuration.ui, exc)) + sys.exit("FATAL: Failed to import '%s' interface." % configuration.ui) + except AttributeError: + # This is not an error. If the field is not defined in the ui, + # this interface might need no extra cache fields, so + # just skip this error! + logger.debug("UI '%s' does not require extra cache!" % (configuration.ui)) + + # At least CoreRecipeInfo will be loaded, so caches_array will never be empty! + # This is the entry point, no further check needed! + for var in caches_name_array: + try: + module_name, cache_name = var.split(':') + module = __import__(module_name, fromlist=(cache_name,)) + self.caches_array.append(getattr(module, cache_name)) + except ImportError, exc: + logger.critical("Unable to import extra RecipeInfo '%s' from '%s': %s" % (cache_name, module_name, exc)) + sys.exit("FATAL: Failed to import extra cache class '%s'." % cache_name) + self.configuration.data = bb.data.init() if not server: @@ -730,9 +765,10 @@ class BBCooker: self.buildSetVars() - self.status = bb.cache.CacheData() + self.status = bb.cache.CacheData(self.caches_array) infos = bb.cache.Cache.parse(fn, self.get_file_appends(fn), \ - self.configuration.data) + self.configuration.data, + self.caches_array) infos = dict(infos) fn = bb.cache.Cache.realfn2virtual(fn, cls) @@ -876,7 +912,7 @@ class BBCooker: else: collectlog.info("You have disabled Psyco. This decreases performance.") - self.status = bb.cache.CacheData() + self.status = bb.cache.CacheData(self.caches_array) ignore = bb.data.getVar("ASSUME_PROVIDED", self.configuration.data, 1) or "" self.status.ignored_dependencies = set(ignore.split()) @@ -1091,9 +1127,9 @@ class ParsingFailure(Exception): self.args = (realexception, recipe) def parse_file(task): - filename, appends = task + filename, appends, caches_array = task try: - return True, bb.cache.Cache.parse(filename, appends, parse_file.cfg) + return True, bb.cache.Cache.parse(filename, appends, parse_file.cfg, caches_array) except Exception, exc: exc.recipe = filename raise exc @@ -1123,13 +1159,13 @@ class CookerParser(object): self.num_processes = int(self.cfgdata.getVar("BB_NUMBER_PARSE_THREADS", True) or multiprocessing.cpu_count()) - self.bb_cache = bb.cache.Cache(self.cfgdata) + self.bb_cache = bb.cache.Cache(self.cfgdata, cooker.caches_array) self.fromcache = [] self.willparse = [] for filename in self.filelist: appends = self.cooker.get_file_appends(filename) if not self.bb_cache.cacheValid(filename): - self.willparse.append((filename, appends)) + self.willparse.append((filename, appends, cooker.caches_array)) else: self.fromcache.append((filename, appends)) self.toparse = self.total - len(self.fromcache) @@ -1205,6 +1241,6 @@ class CookerParser(object): def reparse(self, filename): infos = self.bb_cache.parse(filename, self.cooker.get_file_appends(filename), - self.cfgdata) + self.cfgdata, self.cooker.caches_array) for vfn, info in infos: self.cooker.status.add_from_recipeinfo(vfn, info) -- cgit v1.2.3-54-g00ecf