Support Python 3.11 (#159)

Adds support for Python 3.11, since they changed their C-API (see #151 

fixes #159 fixes #158

Author: NanoNabla

.github/workflows/unit_tests.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ["2.7", "3.7", "3.8", "3.9", "3.10", "3.11", 'pypy-2.7', 'pypy-3.6', 'pypy-3.7', 'pypy-3.8']
+        python: ["2.7", "3.7", "3.8", "3.9", "3.10", "3.11", 'pypy-2.7', 'pypy-3.6', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9']
       fail-fast: false
 
     steps:

src/scorepy/cInstrumenter.cpp

@@ -1,6 +1,7 @@
 #include "cInstrumenter.hpp"
 #include "events.hpp"
 #include "pythonHelpers.hpp"
+#include "pythoncapi_compat.h"
 #include <algorithm>
 #include <array>
 #include <cstdint>
@@ -114,7 +115,7 @@ bool CInstrumenter::on_event(PyFrameObject& frame, int what, PyObject*)
     {
     case PyTrace_CALL:
     {
-        PyCodeObject* code = frame.f_code;
+        PyCodeObject* code = PyFrame_GetCode(&frame);
         bool success = try_region_begin(code);
         if (!success)
         {
@@ -127,11 +128,12 @@ bool CInstrumenter::on_event(PyFrameObject& frame, int what, PyObject*)
                 region_begin(name, module_name, file_name, line_number, code);
             }
         }
+        Py_DECREF(code);
         break;
     }
     case PyTrace_RETURN:
     {
-        PyCodeObject* code = frame.f_code;
+        PyCodeObject* code = PyFrame_GetCode(&frame);
         bool success = try_region_end(code);
         if (!success)
         {
@@ -143,6 +145,7 @@ bool CInstrumenter::on_event(PyFrameObject& frame, int what, PyObject*)
                 region_end(name, module_name, code);
             }
         }
+        Py_DECREF(code);
         break;
     }
     }

src/scorepy/pythonHelpers.cpp

@@ -1,29 +1,36 @@
 #include "pythonHelpers.hpp"
 #include "compat.hpp"
 #include "pathUtils.hpp"
+#include "pythoncapi_compat.h"
 
 #include <stdlib.h>
 
 namespace scorepy
 {
-std::string_view get_module_name(const PyFrameObject& frame)
+std::string_view get_module_name(PyFrameObject& frame)
 {
-    PyObject* module_name = PyDict_GetItemString(frame.f_globals, "__name__");
+    PyObject* globals = PyFrame_GetGlobals(&frame);
+    PyObject* module_name = PyDict_GetItemString(globals, "__name__");
+    Py_DECREF(globals);
     if (module_name)
         return compat::get_string_as_utf_8(module_name);
 
     // this is a NUMPY special situation, see NEP-18, and Score-P issue #63
     // TODO: Use string_view/C-String to avoid creating 2 std::strings
-    std::string_view filename = compat::get_string_as_utf_8(frame.f_code->co_filename);
+    PyCodeObject* code = PyFrame_GetCode(&frame);
+    std::string_view filename = compat::get_string_as_utf_8(code->co_filename);
+    Py_DECREF(code);
     if ((filename.size() > 0) && (filename == "<__array_function__ internals>"))
         return std::string_view("numpy.__array_function__");
     else
         return std::string_view("unkown");
 }
 
-std::string get_file_name(const PyFrameObject& frame)
+std::string get_file_name(PyFrameObject& frame)
 {
-    PyObject* filename = frame.f_code->co_filename;
+    PyCodeObject* code = PyFrame_GetCode(&frame);
+    PyObject* filename = code->co_filename;
+    Py_DECREF(code);
     if (filename == Py_None)
     {
         return "None";

src/scorepy/pythonHelpers.hpp

@@ -73,9 +73,9 @@ auto cast_to_PyFunc(TFunc* func) -> detail::ReplaceArgsToPyObject_t<TFunc>*
 
 /// Return the module name the frame belongs to.
 /// The pointer is valid for the lifetime of the frame
-std::string_view get_module_name(const PyFrameObject& frame);
+std::string_view get_module_name(PyFrameObject& frame);
 /// Return the file name the frame belongs to
-std::string get_file_name(const PyFrameObject& frame);
+std::string get_file_name(PyFrameObject& frame);
 
 // Implementation details
 namespace detail