Commit 8b2f0cb6 authored by Todd Brandt's avatar Todd Brandt Committed by Rafael J. Wysocki
Browse files

pm-graph: v5.12, code revamp for python3.12 



sleepgraph/bootgraph function correctly in python3.12 but include a slew
of deprecation warnings for unsupported regexes. This patch fixes up all
the strings in the code so that it comforms with python3.12 standards.

Signed-off-by: default avatarTodd Brandt <todd.e.brandt@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent c9d197ec

tools/power/pm-graph/bootgraph.py

+8 −8
Original line number Diff line number Diff line
@@ -77,12 +77,12 @@ class SystemValues(aslib.SystemValues): 
			fp.close()

		self.testdir = datetime.now().strftime('boot-%y%m%d-%H%M%S')

	def kernelVersion(self, msg):

		m = re.match('^[Ll]inux *[Vv]ersion *(?P<v>\S*) .*', msg)

		m = re.match(r'^[Ll]inux *[Vv]ersion *(?P<v>\S*) .*', msg)

		if m:

			return m.group('v')

		return 'unknown'

	def checkFtraceKernelVersion(self):

		m = re.match('^(?P<x>[0-9]*)\.(?P<y>[0-9]*)\.(?P<z>[0-9]*).*', self.kernel)

		m = re.match(r'^(?P<x>[0-9]*)\.(?P<y>[0-9]*)\.(?P<z>[0-9]*).*', self.kernel)

		if m:

			val = tuple(map(int, m.groups()))

			if val >= (4, 10, 0):
@@ -324,7 +324,7 @@ def parseKernelLog(): 
		idx = line.find('[')

		if idx > 1:

			line = line[idx:]

		m = re.match('[ \t]*(\[ *)(?P<ktime>[0-9\.]*)(\]) (?P<msg>.*)', line)

		m = re.match(r'[ \t]*(\[ *)(?P<ktime>[0-9\.]*)(\]) (?P<msg>.*)', line)

		if(not m):

			continue

		ktime = float(m.group('ktime'))
@@ -332,24 +332,24 @@ def parseKernelLog(): 
			break

		msg = m.group('msg')

		data.dmesgtext.append(line)

		if(ktime == 0.0 and re.match('^Linux version .*', msg)):

		if(ktime == 0.0 and re.match(r'^Linux version .*', msg)):

			if(not sysvals.stamp['kernel']):

				sysvals.stamp['kernel'] = sysvals.kernelVersion(msg)

			continue

		m = re.match('.* setting system clock to (?P<d>[0-9\-]*)[ A-Z](?P<t>[0-9:]*) UTC.*', msg)

		m = re.match(r'.* setting system clock to (?P<d>[0-9\-]*)[ A-Z](?P<t>[0-9:]*) UTC.*', msg)

		if(m):

			bt = datetime.strptime(m.group('d')+' '+m.group('t'), '%Y-%m-%d %H:%M:%S')

			bt = bt - timedelta(seconds=int(ktime))

			data.boottime = bt.strftime('%Y-%m-%d_%H:%M:%S')

			sysvals.stamp['time'] = bt.strftime('%B %d %Y, %I:%M:%S %p')

			continue

		m = re.match('^calling *(?P<f>.*)\+.* @ (?P<p>[0-9]*)', msg)

		m = re.match(r'^calling *(?P<f>.*)\+.* @ (?P<p>[0-9]*)', msg)

		if(m):

			func = m.group('f')

			pid = int(m.group('p'))

			devtemp[func] = (ktime, pid)

			continue

		m = re.match('^initcall *(?P<f>.*)\+.* returned (?P<r>.*) after (?P<t>.*) usecs', msg)

		m = re.match(r'^initcall *(?P<f>.*)\+.* returned (?P<r>.*) after (?P<t>.*) usecs', msg)

		if(m):

			data.valid = True

			data.end = ktime
@@ -359,7 +359,7 @@ def parseKernelLog(): 
				data.newAction(phase, f, pid, start, ktime, int(r), int(t))

				del devtemp[f]

			continue

		if(re.match('^Freeing unused kernel .*', msg)):

		if(re.match(r'^Freeing unused kernel .*', msg)):

			data.tUserMode = ktime

			data.dmesg['kernel']['end'] = ktime

			data.dmesg['user']['start'] = ktime

tools/power/pm-graph/sleepgraph.py

+500 −500

File changed.

Preview size limit exceeded, changes collapsed.