WIP - start tracking frame depth

Author: rocky

test/unit/lib/test_lib_stack.py

@@ -3,15 +3,16 @@
 import pytest
 import platform
 
-from trepan.lib.stack import count_frames, is_eval_or_exec_stmt
+from trepan.lib.stack import FrameInfo, count_frames, is_eval_or_exec_stmt
 
 
 def test_count_frames():
     f = inspect.currentframe()
     frame_count = count_frames(f)
+    assert frame_count == count_frames(f)
+    assert len(FrameInfo) > 0
     assert count_frames(f) > 2
     assert frame_count - 1 == count_frames(f.f_back)
-    assert frame_count - 1 == count_frames(f, 1)
     return
 
 

trepan/lib/core.py

@@ -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 count_frames
+from trepan.lib.stack import ExtraFrameInfo, FrameInfo, count_frames
 from trepan.misc import option_set
 from trepan.processor.cmdproc import CommandProcessor
 from trepan.processor.trace import PrintProcessor
@@ -447,6 +447,12 @@ def trace_dispatch(self, frame, event: str, arg):
                 # make sure we don't turn off breapoints 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]
 
         self.event = event
 

trepan/lib/stack.py

@@ -23,10 +23,11 @@
 import os
 import os.path as osp
 import re
+from dataclasses import dataclass
 from opcode import opname
 from reprlib import repr
 from types import CodeType, FrameType
-from typing import Optional, Tuple
+from typing import Dict, List, Optional, Tuple
 import xdis
 from xdis.version_info import PYTHON_IMPLEMENTATION, PYTHON_VERSION_TRIPLE
 
@@ -66,18 +67,41 @@ 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.
 
-def count_frames(frame: FrameType, count_start=0) -> int:
+
+# A mapping frame to its ExtraFrameInfo. This is a weak dictionary so that
+# frames are automatically removed.
+FrameInfo: Dict[FrameType, ExtraFrameInfo] = {}
+
+def count_frames(frame: FrameType) -> int:
     """Return a count of the number of frames"""
-    count = -count_start
+    count = 0
+    # Bottommost frame depth is 1
+    depth = 1
+    frames: List[FrameType] = []
     for _ in range(1000):
         if frame is None:
             break
+        elif frame_info := FrameInfo.get(frame):
+            depth = frame_info.depth
+            count += depth
+            break
         else:
+            frames.append(frame)
             count += 1
             frame = frame.f_back
     else:
         return 1000
+
+    # 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)
+        depth += 1
     return count
 
 
@@ -317,9 +341,16 @@ def format_stack_entry(
 
 def frame2file(core_obj, frame, canonic=True):
     if canonic:
-        return core_obj.filename(core_obj.canonic_filename(frame))
+        filename = core_obj.filename(core_obj.canonic_filename(frame))
     else:
-        return core_obj.filename(frame.f_code.co_filename)
+        filename = core_obj.filename(frame.f_code.co_filename)
+
+    # if frame_info := FrameInfo.get(frame):
+    #     if canonic:
+    #         return core_obj.filename(frame_info.filename)
+    #     return frame_info.filename
+
+    return filename
 
 
 def frame2filesize(frame):
@@ -631,9 +662,10 @@ def __init__(self):
         )
     )
 
-    # print("frame count: %d" % count_frames(frame))
-    # print("frame count: %d" % count_frames(frame.f_back))
-    # print("frame count: %d" % count_frames(frame, 1))
+    count1 = count_frames(frame)
+    print("frame count: %d" % count1)
+    assert count1 == count_frames(frame)
+    print("frame count: %d" % count_frames(frame.f_back))
     # print("def statement: x=5?: %s" % repr(is_def_stmt("x=5", frame)))
     # # Not a "def" statement because frame is wrong spot
     # print(is_def_stmt("def foo():", frame))
@@ -657,6 +689,7 @@ def fn(x):
         _, mess = format_function_and_parameters(frame, dd, style="tango")
         print(mess)
         print(get_call_function_name(frame))
+        print("frame count: %d" % count_frames(frame))
         return
 
     print("=" * 30)