Commit8af8b2b

committed

Fix perf maps address format

1 parent4898415 commit8af8b2bCopy full SHA for 8af8b2b

File tree

+10

-4

lines changed

+10

-4

lines changed

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`importunittest`
	`2`	`+importstring`
`2`	`3`	`importsubprocess`
`3`	`4`	`importsys`
`4`	`5`	`importsysconfig`
`@@ -70,9 +71,14 @@ def baz():`
`70`	`71`	`perf_file=pathlib.Path(f"/tmp/perf-{process.pid}.map")`
`71`	`72`	`self.assertTrue(perf_file.exists())`
`72`	`73`	`perf_file_contents=perf_file.read_text()`
`73`		`-self.assertIn(f"py::foo:{script}",perf_file_contents)`
`74`		`-self.assertIn(f"py::bar:{script}",perf_file_contents)`
`75`		`-self.assertIn(f"py::baz:{script}",perf_file_contents)`
	`74`	`+perf_lines=perf_file_contents.splitlines();`
	`75`	`+expected_funcs= [f"py::foo:{script}",f"py::bar:{script}",f"py::baz:{script}"]`
	`76`	`+forexpected_funcinexpected_funcs:`
	`77`	`+perf_line=next((lineforlineinperf_linesifexpected_funcinline),None)`
	`78`	`+self.assertIsNotNone(perf_line,f"Could not find{expected_func} in perf file")`
	`79`	`+perf_addr=perf_line.split(" ")[0]`
	`80`	`+self.assertFalse(perf_addr.startswith("0x"),"Address should not be prefixed with 0x")`
	`81`	`+self.assertTrue(set(perf_addr).issubset(string.hexdigits),"Address should contain only hex characters")`
`76`	`82`
`77`	`83`	`deftest_trampoline_works_with_forks(self):`
`78`	`84`	`code="""if 1:`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ perf_map_write_entry(void state, const void code_addr,`
`253`	`253`	`NULL);`
`254`	`254`	`return;`
`255`	`255`	`}`
`256`		`-fprintf(method_file,"%p %x py::%s:%s\n",code_addr,code_size,entry,`
	`256`	`+fprintf(method_file,"%llx %x py::%s:%s\n",code_addr,code_size,entry,`
`257`	`257`	`filename);`
`258`	`258`	`fflush(method_file);`
`259`	`259`	`}`

Comments

(0)