Add class name to module name, if available

Author: bertwesarg

scorep/_instrumenters/utils.py

@@ -1,4 +1,5 @@
 from scorep._bindings import abspath
+from scorep.instrumenter import has_c_instrumenter
 
 
 def get_module_name(frame):
@@ -11,6 +12,12 @@ def get_module_name(frame):
             modulename = "numpy.__array_function__"
         else:
             modulename = "unkown"
+    typeobject = frame.f_locals.get("self", None)
+    if typeobject is not None:
+        if has_c_instrumenter():
+            return ".".join([modulename, type(typeobject).__name__])
+        else:
+            return ".".join([modulename, typeobject.__class__.__name__])
     return modulename
 
 

src/scorepy/compat.hpp

@@ -14,11 +14,13 @@ namespace compat
 {
     /// Region names that are known to have no region enter event and should not report an error
     /// on region exit
-    static const std::array<std::string, 2> exit_region_whitelist = {
+    static const std::array<std::string, 4> exit_region_whitelist = {
 #if PY_MAJOR_VERSION >= 3
-        "threading:_bootstrap_inner", "threading:_bootstrap"
+        "threading.Thread:_bootstrap_inner", "threading.Thread:_bootstrap",
+        "threading.TMonitor:_bootstrap_inner", "threading.TMonitor:_bootstrap"
 #else
-        "threading:__bootstrap_inner", "threading:__bootstrap"
+        "threading.Thread:__bootstrap_inner", "threading.Thread:__bootstrap",
+        "threading.TMonitor:__bootstrap_inner", "threading.TMonitor:__bootstrap"
 #endif
     };
 

src/scorepy/pythonHelpers.cpp

@@ -3,17 +3,36 @@
 #include "pathUtils.hpp"
 #include "pythoncapi_compat.h"
 
+#include <sstream>
 #include <stdlib.h>
 
 namespace scorepy
 {
 std::string get_module_name(PyFrameObject& frame)
 {
+    const char* self_name = nullptr;
+    PyObject* locals = PyFrame_GetLocals(&frame);
+    PyObject* self = PyDict_GetItemString(locals, "self");
+    if (self)
+    {
+        Py_INCREF(self);
+        PyTypeObject* type = Py_TYPE(self);
+        self_name = _PyType_Name(type);
+        Py_DECREF(self);
+    }
+    Py_DECREF(locals);
+
     PyObject* globals = PyFrame_GetGlobals(&frame);
     PyObject* module_name = PyDict_GetItemString(globals, "__name__");
     Py_DECREF(globals);
     if (module_name)
-        return std::move(std::string(compat::get_string_as_utf_8(module_name)));
+    {
+        std::stringstream result;
+        result << compat::get_string_as_utf_8(module_name);
+        if (self_name)
+            result << '.' << self_name;
+        return std::move(result).str();
+    }
 
     // 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

test/test_scorep.py

@@ -309,25 +309,9 @@ def test_classes(scorep_env, instrumenter):
 
     trace = OTF2_Trace(trace_path)
 
-    region_ids = []
-    foo_count = 0
-    for line in str(trace).split("\n"):
-        m = re.search('ENTER[ ]*[0-9 ]*[0-9 ]*Region: "__main__:foo" <([0-9]*)>', line)
-        if m is not None:
-            foo_count += 1
-            r_id = m.group(1)
-
-            if foo_count == 1:
-                region_ids.append(r_id)
-                continue
-
-            if foo_count < 4:
-                assert region_ids[-1] < r_id  # check if foo regions are different
-            else:
-                assert r_id == region_ids[0]  # check if last foo is fist foo
-            region_ids.append(r_id)
-
-    assert len(region_ids) == 4
+    assert OTF2_Region("__main__:foo") in trace
+    assert OTF2_Region("__main__.TestClass:foo") in trace
+    assert OTF2_Region("__main__.TestClass2:foo") in trace
 
 
 def test_dummy(scorep_env):