data_smart: Improve override history logging
PATCH 1/1 data_smart: Improve override history logging
Calling record() for each override alteration is slow. Since we now expand overrides dynamically we don't have to record the log data at each alteration, we can instead print it directly from the existing data stores at variable history print time using the exact same data stores.
This massively improves performance of the data store when parsing with bitbake -e for example, it will improve memory overhead as well.
The only downside is that VariableHistory has to poke into the datastore for some of its data but that seems an acceptable tradeoff rather than double caching.
Signed-off-by Richard Purdie <[email protected]>
bitbake/lib/bb/data.py +1 -1
@@ -202,7 +202,7 @@ def emit_var(var, o=sys.__stdout__, d = init(), all=False): return False if all: - d.varhistory.emit(var, oval, val, o) + d.varhistory.emit(var, oval, val, o, d) if (var.find("-") != -1 or var.find(".") != -1 or var.find('{') != -1 or var.find('}') != -1 or var.find('+') != -1) and not all: return False
bitbake/lib/bb/data_smart.py +13 -10
@@ -252,10 +252,22 @@ class VariableHistory(object): else: return [] - def emit(self, var, oval, val, o): + def emit(self, var, oval, val, o, d): #if var == 'copy': # return history = self.variable(var) + + # Append override history + if var in d.overridedata: + for (r, override) in d.overridedata[var]: + for event in self.variable(r): + loginfo = event.copy() + if 'flag' in loginfo and not loginfo['flag'].startswith("_"): + continue + loginfo['variable'] = var + loginfo['op'] = 'override[%s]:%s' % (override, loginfo['op']) + history.append(loginfo) + commentVal = re.sub('\n', '\n#', str(oval)) if history: if len(history) == 1:
@@ -503,15 +515,6 @@ class DataSmart(MutableMapping): # Force CoW by recreating the list first self.overridedata[shortvar] = list(self.overridedata[shortvar]) self.overridedata[shortvar].append([var, override]) - for event in self.varhistory.variable(var): - if 'flag' in loginfo and not loginfo['flag'].startswith("_"): - continue - loginfo = event.copy() - loginfo['variable'] = shortvar - loginfo['op'] = 'override[%s]:%s' % (override, loginfo['op']) - loginfo['nodups'] = True - self.varhistory.record(**loginfo) - override = None if "_" in shortvar: override = var[shortvar.rfind('_')+1:]