Call threading functions in C

Author: Flamefire

scorep/_instrumenters/scorep_cProfile.py

@@ -6,13 +6,3 @@ class ScorepCProfile(scorep._bindings.CInstrumenter, ScorepInstrumenter):
     def __init__(self, enable_instrumenter):
         scorep._bindings.CInstrumenter.__init__(self, interface='Profile')
         ScorepInstrumenter.__init__(self, enable_instrumenter)
-
-    def _enable_instrumenter(self):
-        if self._threading:
-            self._threading.setprofile(self)
-        super()._enable_instrumenter()
-
-    def _disable_instrumenter(self):
-        super()._disable_instrumenter()
-        if self._threading:
-            self._threading.setprofile(None)

scorep/_instrumenters/scorep_cTrace.py

@@ -6,13 +6,3 @@ class ScorepCTrace(scorep._bindings.CInstrumenter, ScorepInstrumenter):
     def __init__(self, enable_instrumenter):
         scorep._bindings.CInstrumenter.__init__(self, interface='Trace')
         ScorepInstrumenter.__init__(self, enable_instrumenter)
-
-    def _enable_instrumenter(self):
-        if self._threading:
-            self._threading.settrace(self)
-        super()._enable_instrumenter()
-
-    def _disable_instrumenter(self):
-        super()._disable_instrumenter()
-        if self._threading:
-            self._threading.settrace(None)

scorep/_instrumenters/scorep_instrumenter.py

@@ -15,12 +15,6 @@ def __init__(self, enable_instrumenter=True):
         """
         self._tracer_registered = False
         self._enabled = enable_instrumenter
-        # TODO: Support other threading libs, e.g. greenlet?
-        try:
-            import threading
-            self._threading = threading
-        except ImportError:
-            self._threading = None
 
     @abc.abstractmethod
     def _enable_instrumenter(self):

src/classes.cpp

@@ -24,6 +24,12 @@ extern "C"
         return PyBaseObject_Type.tp_new(type, empty_tuple, empty_dict);
     }
 
+    static void CInstrumenter_dealloc(scorepy::CInstrumenter* self)
+    {
+        self->deinit();
+        Py_TYPE(self)->tp_free(self->to_PyObject());
+    }
+
     static int CInstrumenter_init(scorepy::CInstrumenter* self, PyObject* args, PyObject* kwds)
     {
         static const char* kwlist[] = { "interface", nullptr };
@@ -110,6 +116,7 @@ PyTypeObject& getCInstrumenterType()
     };
     type.tp_new = call_object_new;
     type.tp_init = scorepy::cast_to_PyFunc(CInstrumenter_init);
+    type.tp_dealloc = scorepy::cast_to_PyFunc(CInstrumenter_dealloc);
     type.tp_methods = methods;
     type.tp_call = scorepy::cast_to_PyFunc(CInstrumenter_call);
     type.tp_getset = getseters;

src/scorepy/cInstrumenter.cpp

@@ -8,11 +8,33 @@
 namespace scorepy
 {
 
+void CInstrumenter::init(InstrumenterInterface interface)
+{
+    this->interface = interface;
+    threading_module = PyImport_ImportModule("threading");
+    if (threading_module)
+    {
+        const char* name = (interface == InstrumenterInterface::Trace) ? "settrace" : "setprofile";
+        threading_set_instrumenter = PyObject_GetAttrString(threading_module, name);
+    }
+}
+
+void CInstrumenter::deinit()
+{
+    Py_CLEAR(threading_module);
+    Py_CLEAR(threading_set_instrumenter);
+}
+
 void CInstrumenter::enable_instrumenter()
 {
     const auto callback = [](PyObject* obj, PyFrameObject* frame, int what, PyObject* arg) -> int {
         return from_PyObject(obj)->on_event(*frame, what, arg) ? 0 : -1;
     };
+    if (threading_set_instrumenter)
+    {
+        PyRefObject result(PyObject_CallFunction(threading_set_instrumenter, "O", to_PyObject()),
+                           adopt_object);
+    }
     if (interface == InstrumenterInterface::Trace)
         PyEval_SetTrace(callback, to_PyObject());
     else
@@ -25,6 +47,11 @@ void CInstrumenter::disable_instrumenter()
         PyEval_SetTrace(nullptr, nullptr);
     else
         PyEval_SetProfile(nullptr, nullptr);
+    if (threading_set_instrumenter)
+    {
+        PyRefObject result(PyObject_CallFunction(threading_set_instrumenter, "O", Py_None),
+                           adopt_object);
+    }
 }
 
 /// Mapping of PyTrace_* to it's string representations

src/scorepy/cInstrumenter.hpp

@@ -17,11 +17,11 @@ struct CInstrumenter
 {
     PyObject_HEAD;
     InstrumenterInterface interface;
+    PyObject* threading_module;
+    PyObject* threading_set_instrumenter;
 
-    void init(InstrumenterInterface interface)
-    {
-        this->interface = interface;
-    }
+    void init(InstrumenterInterface interface);
+    void deinit();
     void enable_instrumenter();
     void disable_instrumenter();