riscv
/
coriolis
mirror of https://gitlab.lip6.fr/vlsi-eda/coriolis.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bug in overlay.CfgCache, values were never set! 

* Bug: In CRL/helpers/overlay.CachedParameter.cacheRead(), values where
    not read *from* the Configuration DB, due to a forgotten "self.".
      In CRL/helpers/overlay.CfgCache.__setattr__(), value was simply
    never set! Only interval and set of values were manageds!
      In CRL/helpers/overlay.CfgCache.__getattr__(), must distinguish
    between two access cases, when were are truly accessing a
    CachedParameter, return it's *value*. Otherwise, it is a
    recursive CfgCache, then return the object.
This commit is contained in:
Jean-Paul Chaput 2020-10-18 23:16:22 +02:00
parent ccc376f132
commit 04098a4655
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
crlcore/python/helpers/overlay.py
View File

@ -163,13 +163,14 @@ class CachedParameter ( object ):
confDb = Cfg.Configuration.get()
p = confDb.getParameter( self.path )
if p:
if p.type == Cfg.Parameter.Type.Enumerate: v = p.asInt()
elif p.type == Cfg.Parameter.Type.Int: v = p.asInt()
elif p.type == Cfg.Parameter.Type.Bool: v = p.asBool()
elif p.type == Cfg.Parameter.Type.String: v = p.asString()
elif p.type == Cfg.Parameter.Type.Double: v = p.asDouble()
elif p.type == Cfg.Parameter.Type.Percentage: v = p.asDouble()/100.0
else: v = p.asString()
if p.type == Cfg.Parameter.Type.Enumerate: self.v = p.asInt()
elif p.type == Cfg.Parameter.Type.Int:
self.v = p.asInt()
elif p.type == Cfg.Parameter.Type.Bool: self.v = p.asBool()
elif p.type == Cfg.Parameter.Type.String: self.v = p.asString()
elif p.type == Cfg.Parameter.Type.Double: self.v = p.asDouble()
elif p.type == Cfg.Parameter.Type.Percentage: self.v = p.asDouble()/100.0
else: self.v = p.asString()
class CfgCache ( object ):
@ -282,8 +283,9 @@ class CfgCache ( object ):
if isinstance(v,tuple): vEnum = v; v = None
if not self._rattr.has_key(attr):
self._rattr[ attr ] = CachedParameter( self._path+'.'+attr, v )
if vRange is not None: self._rattr[ attr ].vRange = vRange
if vEnum is not None: self._rattr[ attr ].vEnum = vEnum
if vRange is not None: self._rattr[ attr ].vRange = vRange
elif vEnum is not None: self._rattr[ attr ].vEnum = vEnum
else: self._rattr[ attr ].v = v
def __getattr__ ( self, attr ):
"""
@ -293,6 +295,8 @@ class CfgCache ( object ):
if not self._rattr.has_key(attr):
path = self._path+'.'+attr if len(self._path) else attr
self._rattr[attr] = CfgCache( path, self._priority )
if isinstance(self._rattr[attr],CachedParameter):
return self._rattr[attr].v
return self._rattr[attr]
def _hasCachedParam ( self, elements ):
@ -311,6 +315,7 @@ class CfgCache ( object ):
def apply ( self, priority=None ):
"""Apply the parameters values stored in the cache to the ``Cfg`` database."""
if priority is None: priority = self._priority
print( self._path )
if not len(self._path) and priority is not None:
Cfg.Configuration.pushDefaultPriority( priority )
for attrName in self._rattr.keys():