Disable sysmonitoring support (added in cython 3.1, apparently it causes segfaults). Move around some declarations.

Author: ionelmc

setup.py

@@ -22,11 +22,12 @@
 except ImportError:
     Cython = None
 
+
 # Enable code coverage for C code: we cannot use CFLAGS=-coverage in tox.ini, since that may mess with compiling
 # dependencies (e.g. numpy). Therefore, we set SETUPPY_CFLAGS=-coverage in tox.ini and copy it to CFLAGS here (after
 # deps have been safely installed).
 if 'TOX_ENV_NAME' in os.environ and os.environ.get('SETUPPY_EXT_COVERAGE') == 'yes':
-    CFLAGS = os.environ['CFLAGS'] = '-DCYTHON_TRACE=1'
+    CFLAGS = os.environ['CFLAGS'] = '-DCYTHON_TRACE=1 -DCYTHON_USE_SYS_MONITORING=0'
     LFLAGS = os.environ['LFLAGS'] = ''
 else:
     CFLAGS = ''

src/hunter/_event.pxd

@@ -1,10 +1,39 @@
 cimport cython
 
-from ._tracer cimport *
 
+ctypedef extern FrameType
 
 cdef extern from *:
-    int PyFrame_GetLineNumber(PyFrameObject *frame)
+    ctypedef extern class types.CodeType[object PyCodeObject, check_size ignore]:
+        cdef object co_filename
+        cdef object co_name
+        cdef int co_argcount
+
+cdef extern from "vendor/_compat.h":
+    """
+    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)
+    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)
 
 
 @cython.final

src/hunter/_tracer.pxd

@@ -1,37 +1,10 @@
 # cython: language_level=3str
 cimport cython
 from cpython.pystate cimport Py_tracefunc
-from cpython.pystate cimport PyFrameObject
 from cpython.ref cimport PyObject
 
-ctypedef extern FrameType
-
-cdef extern from "vendor/_compat.h":
-    """
-    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)
-    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)
 
+ctypedef extern FrameType
 
 cdef extern from *:
     void PyEval_SetTrace(Py_tracefunc, PyObject*)

src/hunter/_tracer.pyx

@@ -3,6 +3,7 @@ import threading
 import traceback
 
 from cpython.pystate cimport PyThreadState_Get
+from cpython.pystate cimport PyFrameObject
 from ._event cimport Event
 from ._predicates cimport fast_call
 
@@ -20,7 +21,7 @@ cdef dict KIND_INTS = {
     'c_return': 6,
 }
 
-cdef inline int trace_func(PyObject* tracer, PyFrameObject* frame, int kind, PyObject* arg) noexcept:
+cdef int trace_func(PyObject* tracer, PyFrameObject* frame, int kind, PyObject* arg) noexcept:
     cdef Tracer self = <Tracer?> tracer
 
     handler = self.handler