Simplify FrameInfo

Author: rocky

trepan/lib/core.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#   Copyright (C) 2008-2010, 2013-2016, 2020 2023-2025
+#   Copyright (C) 2008-2010, 2013-2016, 2020 2023-2026
 #   Rocky Bernstein <rocky@gnu.org>
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -40,7 +40,7 @@
 from trepan.clifns import search_file
 from trepan.lib.breakpoint import BreakpointManager
 from trepan.lib.default import START_OPTS, STOP_OPTS
-from trepan.lib.stack import ExtraFrameInfo, FrameInfo, count_frames
+from trepan.lib.stack import FrameInfo, count_frames
 from trepan.misc import option_set
 from trepan.processor.cmdproc import CommandProcessor
 from trepan.processor.trace import PrintProcessor
@@ -422,14 +422,18 @@ def trace_dispatch(self, frame, event: str, arg):
         processor-specific I think it best to distribute the checks."""
 
         # for debugging
-        # print("XXX+ trace dispatch:", frame.f_code.co_name, frame.f_lineno, event, arg)
+        # print("XXX+ trace dispatch:", frame.f_code.co_name, frame.f_lineno, event, arg, frame.f_trace)
 
         # Check to see if are in a call but we should be stepping over the call
         # using "next" of "finish". If so, then we can speed tracing by
         # removing further tracing. Not though that we *also* must make sure
         # that we don't have any breakpoint set, since we have to check
         # for breakpoints in a kind of slow way of checking all events.
 
+        remove_frame_on_return = False
+        # FIXME:
+        # instead of self.bpmgr.bplist == 0, we should be counting on
+        # per breakpoints in code object.
         if event == "call":
             if (self.last_frame != frame
                 and len(self.bpmgr.bplist) == 0
@@ -439,20 +443,22 @@ def trace_dispatch(self, frame, event: str, arg):
                 ):
                 # We are "finish"ing or "next"ing and should not be tracing into this call
                 # or any other calls from this. Return None to not trace further.
-                # print("""trace_dispatch: "finish"ing or "next"ing from call event""")
+                # print("""XXX+  trace_dispatch: "finish"ing or "next"ing from call event""")
+                frame.f_trace = None
                 return None
-            elif not self.is_stop_here(frame, event):
+
+            if frame not in FrameInfo:
+                count_frames(frame)
+
+            if not self.is_stop_here(frame, event):
                 # We might have a stop here as a result of a breakpoint set inside
                 # this function. In this case we need to ignore this stop, but
-                # make sure we don't turn off breapoints inside this function which
+                # make sure we don't turn off breakpoints inside this function which
                 # we do by returning "self".
                 return self
-            if frame not in FrameInfo:
-                FrameInfo[frame] = ExtraFrameInfo(-1, frame.f_code.co_filename)
-        elif event == "return":
-            if frame in FrameInfo:
-                print("XXX deleting {frame}")
-                del FrameInfo[frame]
+
+        elif event == "return" and frame in FrameInfo:
+            remove_frame_on_return = True
 
         self.event = event
 
@@ -465,10 +471,14 @@ def trace_dispatch(self, frame, event: str, arg):
         #   f_lineno can only be set by a trace function
         if self.ignore_filter and self.ignore_filter.is_excluded(frame):
             # print("trace_dispatch: ignore_filter", self.ignore_filter, frame, frame.f_lineno, event, arg) # for debugging
+            if remove_frame_on_return:
+                del FrameInfo[frame]
             return self
 
         if self.trace_hook_suspend:
             # print("XXX trace_dispatch: hook suspended")
+            if remove_frame_on_return:
+                del FrameInfo[frame]
             return None
 
         # print("XXX+ trace dispatch", frame, frame.f_lineno, event, arg) # for debugging
@@ -483,6 +493,8 @@ def trace_dispatch(self, frame, event: str, arg):
         if self.until_condition:
             if not self.matches_condition(frame):
                 # print(f"XXX trace until condition not met for {frame}") # for debugging
+                if remove_frame_on_return:
+                    del FrameInfo[frame]
                 return self
             pass
 
@@ -494,6 +506,8 @@ def trace_dispatch(self, frame, event: str, arg):
             trace_event_set = self.debugger.settings["events"]
             if trace_event_set is None or self.event not in trace_event_set:
                 # print(f"trace_dispatch: self.event not in {trace_event_set}")
+                if remove_frame_on_return:
+                    del FrameInfo[frame]
                 return self
 
             # I think we *have* to run is_stop_here() before
@@ -514,7 +528,8 @@ def trace_dispatch(self, frame, event: str, arg):
             except Exception:
                 pass
             pass
-
+            if remove_frame_on_return:
+                del FrameInfo[frame]
     pass
 
 

trepan/lib/stack.py

@@ -67,15 +67,9 @@ def deparse_offset(_code, _name: str, _list_i: int, _) -> tuple:
 
 opc = xdis.get_opcode_module(PYTHON_VERSION_TRIPLE, PYTHON_IMPLEMENTATION)
 
-@dataclass
-class ExtraFrameInfo:
-    depth: int = -1
-    filename: str = "" # Note frame filenames can be remapped.
-
-
 # A mapping frame to its ExtraFrameInfo. This is a weak dictionary so that
 # frames are automatically removed.
-FrameInfo: Dict[FrameType, ExtraFrameInfo] = {}
+FrameInfo: Dict[FrameType, int] = {}
 
 def count_frames(frame: FrameType) -> int:
     """Return a count of the number of frames"""
@@ -86,8 +80,8 @@ def count_frames(frame: FrameType) -> int:
     for _ in range(1000):
         if frame is None:
             break
-        elif frame_info := FrameInfo.get(frame):
-            depth = frame_info.depth
+        elif depth_or_None := FrameInfo.get(frame):
+            depth = depth_or_None
             count += depth
             break
         else:
@@ -100,7 +94,7 @@ def count_frames(frame: FrameType) -> int:
     # Populate or update FrameInfo
     while len(frames) > 0 and frame not in FrameInfo:
         frame = frames.pop()
-        FrameInfo[frame] = ExtraFrameInfo(depth, frame.f_code.co_filename)
+        FrameInfo[frame] = depth
         depth += 1
     return count
 
@@ -345,6 +339,7 @@ def frame2file(core_obj, frame, canonic=True):
     else:
         filename = core_obj.filename(frame.f_code.co_filename)
 
+    print("WOOT")
     # if frame_info := FrameInfo.get(frame):
     #     if canonic:
     #         return core_obj.filename(frame_info.filename)
@@ -632,7 +627,8 @@ def __init__(self):
         pass
 
     frame = inspect.currentframe()
-    # print(frame2filesize(frame))
+    print(frame2filesize(frame))
+
     pyc_file = osp.join(
         osp.dirname(__file__), "__pycache__", osp.basename(__file__)[:-3] + ".pyc"
     )
@@ -649,6 +645,7 @@ def __init__(self):
     dd.core.processor.stack = [(my_frame, 100, 1)]
     dd.core.processor.curframe = my_frame
     print_stack_entry(dd.core.processor, 0, "fruity")
+    print(frame2file(dd.core, frame))
 
     print(
         format_stack_entry(