On 22 September 2015 at 20:41, Dylan Baker <[email protected]> wrote: > I haven't tested this yet, but this looks like it breaks the existing > loggers, have you tested this with the Quiet and Verbose logs?
It doesn't break the quiet and verbose loggers because they use *args and **kwargs when overriding __init__, but it does break the dummy logger. I've sent a new version of the patch with this fixed. > > On Tue, Sep 22, 2015 at 05:22:23PM +0100, Thomas Wood wrote: >> Declare the state and state lock variables at the same time so that the >> same lock can be always used when accessing the state variable. >> >> Signed-off-by: Thomas Wood <[email protected]> >> --- >> framework/log.py | 8 +++++--- >> 1 file changed, 5 insertions(+), 3 deletions(-) >> >> diff --git a/framework/log.py b/framework/log.py >> index 759974a..6d5a31c 100644 >> --- a/framework/log.py >> +++ b/framework/log.py >> @@ -51,9 +51,10 @@ class BaseLog(object): >> SUMMARY_KEYS = set([ >> 'pass', 'fail', 'warn', 'crash', 'skip', 'dmesg-warn', 'dmesg-fail', >> 'dry-run', 'timeout']) >> - _LOCK = threading.Lock() >> + _LOCK = None >> >> - def __init__(self, state): >> + def __init__(self, state, state_lock): >> + self._LOCK = state_lock >> self._state = state >> self._pad = len(str(state['total'])) >> >> @@ -285,7 +286,8 @@ class LogManager(object): >> 'complete': 0, >> 'running': [], >> } >> + self._state_lock = threading.Lock() >> >> def get(self): >> """ Return a new log instance """ >> - return self._log(self._state) >> + return self._log(self._state, self._state_lock) >> -- >> 1.9.1 >> >> _______________________________________________ >> Piglit mailing list >> [email protected] >> http://lists.freedesktop.org/mailman/listinfo/piglit _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
