@@ -77,12 +77,12 @@ def __init__(self):
77
77
fp .close ()
78
78
self .testdir = datetime .now ().strftime ('boot-%y%m%d-%H%M%S' )
79
79
def kernelVersion (self , msg ):
80
- m = re .match ('^[Ll]inux *[Vv]ersion *(?P<v>\S*) .*' , msg )
80
+ m = re .match (r '^[Ll]inux *[Vv]ersion *(?P<v>\S*) .*' , msg )
81
81
if m :
82
82
return m .group ('v' )
83
83
return 'unknown'
84
84
def checkFtraceKernelVersion (self ):
85
- m = re .match ('^(?P<x>[0-9]*)\.(?P<y>[0-9]*)\.(?P<z>[0-9]*).*' , self .kernel )
85
+ m = re .match (r '^(?P<x>[0-9]*)\.(?P<y>[0-9]*)\.(?P<z>[0-9]*).*' , self .kernel )
86
86
if m :
87
87
val = tuple (map (int , m .groups ()))
88
88
if val >= (4 , 10 , 0 ):
@@ -324,32 +324,32 @@ def parseKernelLog():
324
324
idx = line .find ('[' )
325
325
if idx > 1 :
326
326
line = line [idx :]
327
- m = re .match ('[ \t ]*(\[ *)(?P<ktime>[0-9\.]*)(\]) (?P<msg>.*)' , line )
327
+ m = re .match (r '[ \t]*(\[ *)(?P<ktime>[0-9\.]*)(\]) (?P<msg>.*)' , line )
328
328
if (not m ):
329
329
continue
330
330
ktime = float (m .group ('ktime' ))
331
331
if (ktime > 120 ):
332
332
break
333
333
msg = m .group ('msg' )
334
334
data .dmesgtext .append (line )
335
- if (ktime == 0.0 and re .match ('^Linux version .*' , msg )):
335
+ if (ktime == 0.0 and re .match (r '^Linux version .*' , msg )):
336
336
if (not sysvals .stamp ['kernel' ]):
337
337
sysvals .stamp ['kernel' ] = sysvals .kernelVersion (msg )
338
338
continue
339
- m = re .match ('.* setting system clock to (?P<d>[0-9\-]*)[ A-Z](?P<t>[0-9:]*) UTC.*' , msg )
339
+ m = re .match (r '.* setting system clock to (?P<d>[0-9\-]*)[ A-Z](?P<t>[0-9:]*) UTC.*' , msg )
340
340
if (m ):
341
341
bt = datetime .strptime (m .group ('d' )+ ' ' + m .group ('t' ), '%Y-%m-%d %H:%M:%S' )
342
342
bt = bt - timedelta (seconds = int (ktime ))
343
343
data .boottime = bt .strftime ('%Y-%m-%d_%H:%M:%S' )
344
344
sysvals .stamp ['time' ] = bt .strftime ('%B %d %Y, %I:%M:%S %p' )
345
345
continue
346
- m = re .match ('^calling *(?P<f>.*)\+.* @ (?P<p>[0-9]*)' , msg )
346
+ m = re .match (r '^calling *(?P<f>.*)\+.* @ (?P<p>[0-9]*)' , msg )
347
347
if (m ):
348
348
func = m .group ('f' )
349
349
pid = int (m .group ('p' ))
350
350
devtemp [func ] = (ktime , pid )
351
351
continue
352
- m = re .match ('^initcall *(?P<f>.*)\+.* returned (?P<r>.*) after (?P<t>.*) usecs' , msg )
352
+ m = re .match (r '^initcall *(?P<f>.*)\+.* returned (?P<r>.*) after (?P<t>.*) usecs' , msg )
353
353
if (m ):
354
354
data .valid = True
355
355
data .end = ktime
@@ -359,7 +359,7 @@ def parseKernelLog():
359
359
data .newAction (phase , f , pid , start , ktime , int (r ), int (t ))
360
360
del devtemp [f ]
361
361
continue
362
- if (re .match ('^Freeing unused kernel .*' , msg )):
362
+ if (re .match (r '^Freeing unused kernel .*' , msg )):
363
363
data .tUserMode = ktime
364
364
data .dmesg ['kernel' ]['end' ] = ktime
365
365
data .dmesg ['user' ]['start' ] = ktime
0 commit comments