Add some shims from the FrameType/PyFrameObject* typechecks. Replace some type castings with some others. The Event doesn't need a Tracer instance anymore.

Author: ionelmc

src/hunter/_event.pxd

@@ -1,4 +1,3 @@
-# cython: language_level=3str
 cimport cython
 
 from ._tracer cimport *
@@ -9,6 +8,7 @@ cdef extern from *:
 
 
 @cython.final
+@cython.auto_pickle(False)
 cdef class Event:
     cdef:
         readonly FrameType frame

src/hunter/_event.pyx

@@ -11,15 +11,11 @@ from tokenize import generate_tokens
 
 from cpython.pythread cimport PyThread_get_thread_ident
 from cpython.ref cimport PyObject
-from cython cimport auto_pickle
-
-from ._tracer cimport Tracer
 
 from .const import SITE_PACKAGES_PATHS
 from .const import SYS_PREFIX_PATHS
 from .util import CYTHON_SUFFIX_RE
 from .util import LEADING_WHITESPACE_RE
-from .util import MISSING
 from .util import get_func_in_mro
 from .util import get_main_thread
 from .util import if_same_code
@@ -45,7 +41,6 @@ cdef const PyObject** KIND_NAMES = [
 ]
 
 
-@auto_pickle(False)
 cdef class Event:
     """
     A wrapper object for Frame objects. Instances of this are passed to your custom functions or predicates.
@@ -57,23 +52,8 @@ cdef class Event:
         kind (str): A string like ``'call'``, ``'line'``, ``'return'`` or ``'exception'``.
         arg: A value that depends on ``kind``. Usually is ``None`` but for ``'return'`` or ``'exception'`` other values
             may be expected.
-        tracer (:class:`hunter.tracer.Tracer`): The :class:`~hunter.tracer.Tracer` instance that created the event.
-            Needed for the ``calls`` and ``depth`` fields.
     """
-    def __init__(self, FrameType frame, int kind, object arg, Tracer tracer=None, object depth=None, object calls=None,
-                 object threading_support=MISSING):
-        if tracer is None:
-            if depth is None:
-                raise TypeError('Missing argument: depth (required because tracer was not given).')
-            if calls is None:
-                raise TypeError('Missing argument: calls (required because tracer was not given).')
-            if threading_support is MISSING:
-                raise TypeError('Missing argument: threading_support (required because tracer was not given).')
-        else:
-            depth = tracer.depth
-            calls = tracer.calls
-            threading_support = tracer.threading_support
-
+    def __init__(self, FrameType frame, int kind, object arg, int depth, int calls, bint threading_support):
         self.arg = arg
         self.frame = frame
         self.kind = <str> KIND_NAMES[kind]
@@ -117,7 +97,7 @@ cdef class Event:
         cdef int position
 
         if self._instruction is UNSET:
-            position = PyFrame_GetLasti(<PyFrameObject*> self.frame)
+            position = Hunter_PyFrame_GetLasti(self.frame)
             co_code = PyCode_GetCode(self.code_getter())
             if co_code and position >= 0:
                 self._instruction = co_code[position]
@@ -161,7 +141,7 @@ cdef class Event:
             if self.builtin:
                 self._locals = {}
             else:
-                self._locals = PyFrame_GetLocals(<PyFrameObject*> self.frame)
+                self._locals = Hunter_PyFrame_GetLocals(self.frame)
         return self._locals
 
     @property
@@ -173,7 +153,7 @@ cdef class Event:
             if self.builtin:
                 self._locals = {}
             else:
-                self._globals = PyFrame_GetGlobals(<PyFrameObject*> self.frame)
+                self._globals = Hunter_PyFrame_GetGlobals(self.frame)
         return self._globals
 
     @property
@@ -266,7 +246,7 @@ cdef class Event:
 
     cdef inline lineno_getter(self):
         if self._lineno is UNSET:
-            self._lineno = PyFrame_GetLineNumber(<PyFrameObject*> self.frame)
+            self._lineno = Hunter_PyFrame_GetLineNumber(self.frame)
         return self._lineno
 
     @property
@@ -275,7 +255,7 @@ cdef class Event:
 
     cdef inline CodeType code_getter(self):
         if self._code is UNSET:
-            return PyFrame_GetCode(<PyFrameObject*> self.frame)
+            return Hunter_PyFrame_GetCode(self.frame)
         else:
             return self._code
 

src/hunter/_tracer.pxd

@@ -7,12 +7,31 @@ from cpython.ref cimport PyObject
 ctypedef extern FrameType
 
 cdef extern from "vendor/_compat.h":
-    CodeType PyFrame_GetCode(PyFrameObject *frame)
-    int PyFrame_GetLasti(PyFrameObject *frame)
+    """
+    static inline PyCodeObject* Hunter_PyFrame_GetCode(PyObject* frame) {
+        return PyFrame_GetCode((PyFrameObject*) frame);
+    }
+    static inline int Hunter_PyFrame_GetLasti(PyObject* frame) {
+        return PyFrame_GetLasti((PyFrameObject*) frame);
+    }
+    static inline int Hunter_PyFrame_GetLineNumber(PyObject* frame) {
+        return PyFrame_GetLineNumber((PyFrameObject*) frame);
+    }
+    static inline PyObject* Hunter_PyFrame_GetGlobals(PyObject* frame) {
+        return PyFrame_GetGlobals((PyFrameObject*) frame);
+    }
+    static inline PyObject* Hunter_PyFrame_GetLocals(PyObject* frame) {
+        return PyFrame_GetLocals((PyFrameObject*) frame);
+    }
+    """
     object PyCode_GetCode(CodeType)
     object PyCode_GetVarnames(CodeType)
-    object PyFrame_GetGlobals(PyFrameObject *frame)
-    object PyFrame_GetLocals(PyFrameObject *frame)
+    CodeType Hunter_PyFrame_GetCode(FrameType frame)
+    int Hunter_PyFrame_GetLasti(FrameType frame)
+    int Hunter_PyFrame_GetLineNumber(FrameType frame)
+    object Hunter_PyFrame_GetGlobals(FrameType frame)
+    object Hunter_PyFrame_GetLocals(FrameType frame)
+
 
 cdef extern from *:
     void PyEval_SetTrace(Py_tracefunc, PyObject*)

src/hunter/_tracer.pyx

@@ -2,9 +2,7 @@
 import threading
 import traceback
 
-from cpython cimport pystate
 from cpython.pystate cimport PyThreadState_Get
-
 from ._event cimport Event
 from ._predicates cimport fast_call
 
@@ -22,9 +20,8 @@ cdef dict KIND_INTS = {
     'c_return': 6,
 }
 
-cdef inline int trace_func(Tracer self, FrameType frame, int kind, PyObject* arg) except -1:
-    if frame.f_trace is not self:
-        frame.f_trace = self
+cdef inline int trace_func(PyObject* tracer, PyFrameObject* frame, int kind, PyObject* arg) noexcept:
+    cdef Tracer self = <Tracer?> tracer
 
     handler = self.handler
 
@@ -39,8 +36,7 @@ cdef inline int trace_func(Tracer self, FrameType frame, int kind, PyObject* arg
     if kind == 3 and self.depth > 0:
         self.depth -= 1
 
-    cdef Event event = Event(frame, kind, None if arg is NULL else <object> arg, self)
-
+    cdef Event event = Event(<FrameType> frame, kind, None, self.depth, self.calls, self.threading_support)
     try:
         fast_call(handler, event)
     except Exception as exc:
@@ -53,6 +49,7 @@ cdef inline int trace_func(Tracer self, FrameType frame, int kind, PyObject* arg
     if kind == 0:
         self.depth += 1
         self.calls += 1
+    return 0
 
 
 cdef class Tracer:
@@ -82,9 +79,9 @@ cdef class Tracer:
         )
 
     def __call__(self, frame, str kind, arg):
-        trace_func(self, frame, KIND_INTS[kind], <PyObject*> arg)
+        trace_func(<PyObject*> self, <PyFrameObject*> frame, KIND_INTS[kind], <PyObject*> arg)
         if kind == 0:
-            PyEval_SetTrace(<pystate.Py_tracefunc> trace_func, <PyObject*> self)
+            PyEval_SetTrace(trace_func, <PyObject*> self)
         return self
 
     def trace(self, predicate):
@@ -101,7 +98,7 @@ cdef class Tracer:
             else:
                 self.previous = <object>(state.c_profileobj)
                 self._previousfunc = state.c_profilefunc
-            PyEval_SetProfile(<pystate.Py_tracefunc> trace_func, <PyObject*> self)
+            PyEval_SetProfile(trace_func, <PyObject*> self)
         else:
             if self.threading_support is None or self.threading_support:
                 self._threading_previous = getattr(threading, '_trace_hook', None)
@@ -112,7 +109,7 @@ cdef class Tracer:
             else:
                 self.previous = <object>(state.c_traceobj)
                 self._previousfunc = state.c_tracefunc
-            PyEval_SetTrace(<pystate.Py_tracefunc> trace_func, <PyObject*> self)
+            PyEval_SetTrace(trace_func, <PyObject*> self)
         return self
 
     def stop(self):