Python: CG trace: Nicer logging

RasmusWL · RasmusWL · commit 79c2c682d7d5 · 2020-07-21T21:34:20.000+02:00
diff --git a/python/tools/recorded-call-graph-metrics/src/cg_trace/bytecode_reconstructor.py b/python/tools/recorded-call-graph-metrics/src/cg_trace/bytecode_reconstructor.py
@@ -176,7 +176,9 @@ def expr_from_instruction(instructions: List[Instruction], index: int) -> Byteco
 def expr_from_frame(frame: FrameType) -> BytecodeExpr:
     bytecode = dis.Bytecode(frame.f_code, current_offset=frame.f_lasti)
 
-    LOGGER.debug(f"bytecode: \n{bytecode.dis()}")
+    LOGGER.debug(
+        f"{frame.f_code.co_filename}:{frame.f_lineno}: bytecode: \n{bytecode.dis()}"
+    )
 
     instructions = list(iter(bytecode))
     last_instruction_index = [inst.offset for inst in instructions].index(frame.f_lasti)
diff --git a/python/tools/recorded-call-graph-metrics/src/cg_trace/tracer.py b/python/tools/recorded-call-graph-metrics/src/cg_trace/tracer.py
@@ -50,7 +50,7 @@ def __str__(self):
         del d["bytecode_expr"]
         normal_fields = ", ".join(f"{k}={v!r}" for k, v in d.items())
 
-        return f"{type(self).__name__}({normal_fields}, bytecode_expr≈{repr(str(self.bytecode_expr))})"
+        return f"{type(self).__name__}({normal_fields}, bytecode_expr≈{str(self.bytecode_expr)})"
 
     @classmethod
     def from_frame(cls, frame: FrameType):
