Fix filtering of Score-P internal modules

* remove the filtering in scorep.cpp
* fix filtering in intrumenters
* change to std::unordered_map::at()

Author: AndreasGocht

scorep/instrumenters/scorep_profile.py

@@ -82,13 +82,13 @@ def globaltrace_lt(self, frame, why, arg):
             modulename = frame.f_globals.get('__name__', None)
             if modulename is None:
                 modulename = "None"
-            file_name = frame.f_globals.get('__file__', None)
-            if file_name is not None:
-                full_file_name = os.path.abspath(file_name)
-            else:
-                full_file_name = "None"
-            line_number = frame.f_lineno
             if not code.co_name == "_unsetprofile" and not modulename[:6] == "scorep":
+                file_name = frame.f_globals.get('__file__', None)
+                if file_name is not None:
+                    full_file_name = os.path.abspath(file_name)
+                else:
+                    full_file_name = "None"
+                line_number = frame.f_lineno
                 self.scorep_bindings.region_begin(
                     modulename, code.co_name, full_file_name, line_number)
             return
@@ -97,7 +97,8 @@ def globaltrace_lt(self, frame, why, arg):
             modulename = frame.f_globals.get('__name__', None)
             if modulename is None:
                 modulename = "None"
-            self.scorep_bindings.region_end(modulename, code.co_name)
+            if not code.co_name == "_unsetprofile" and not modulename[:6] == "scorep":
+                self.scorep_bindings.region_end(modulename, code.co_name)
         else:
             return
 

scorep/instrumenters/scorep_trace.py

@@ -74,27 +74,24 @@ def runfunc(self, func, *args, **kw):
 
     def globaltrace_lt(self, frame, why, arg):
         """Handler for call events.
-
-        If the code block being entered is to be ignored, returns `None',
-        else returns self.localtrace.
+        @return self.localtrace or None
         """
         if why == 'call':
             code = frame.f_code
             modulename = frame.f_globals.get('__name__', None)
             if modulename is None:
                 modulename = "None"
-            file_name = frame.f_globals.get('__file__', None)
-            if file_name is not None:
-                full_file_name = os.path.abspath(file_name)
-            else:
-                full_file_name = "None"
-            line_number = frame.f_lineno
             if not code.co_name == "_unsettrace" and not modulename[:6] == "scorep":
+                file_name = frame.f_globals.get('__file__', None)
+                if file_name is not None:
+                    full_file_name = os.path.abspath(file_name)
+                else:
+                    full_file_name = "None"
+                line_number = frame.f_lineno
                 self.scorep_bindings.region_begin(
                     modulename, code.co_name, full_file_name, line_number)
-            return self.localtrace
-        else:
-            return None
+                return self.localtrace
+        return None
 
     def localtrace_trace(self, frame, why, arg):
         if why == 'return':

src/scorep.cpp

@@ -38,7 +38,7 @@ void region_begin(const std::string& region_name, std::string module, std::strin
 
 void region_end(const std::string& region_name)
 {
-    auto& handle = regions[region_name];
+    auto& handle = regions.at(region_name);
     SCOREP_User_RegionEnd(handle.value);
 }
 
@@ -58,7 +58,7 @@ void rewind_begin(std::string region_name, std::string file_name, std::uint64_t
 
 void rewind_end(std::string region_name, bool value)
 {
-    auto& handle = rewind_regions[region_name];
+    auto& handle = rewind_regions.at(region_name);
     /* don't call SCOREP_ExitRewindRegion, as
      * SCOREP_User_RewindRegionEnd does some additional magic
      * */
@@ -97,10 +97,6 @@ void oa_region_end(std::string region_name)
     SCOREP_User_OaPhaseEnd(handle.value);
 }
 } // namespace scorep
-namespace scorep_python
-{
-std::set<std::string> filter_modules = { "scorep.user", "scorep.strace" };
-}
 
 extern "C"
 {
@@ -135,14 +131,11 @@ extern "C"
         if (!PyArg_ParseTuple(args, "sssK", &module, &region_name, &file_name, &line_number))
             return NULL;
 
-        if (scorep_python::filter_modules.find(module) == scorep_python::filter_modules.end())
-        {
-            static std::string region = "";
-            region = module;
-            region += ":";
-            region += region_name;
-            scorep::region_begin(region, module, file_name, line_number);
-        }
+        static std::string region = "";
+        region = module;
+        region += ":";
+        region += region_name;
+        scorep::region_begin(region, module, file_name, line_number);
 
         Py_INCREF(Py_None);
         return Py_None;
@@ -159,14 +152,11 @@ extern "C"
         if (!PyArg_ParseTuple(args, "ss", &module, &region_name))
             return NULL;
 
-        if (scorep_python::filter_modules.find(module) == scorep_python::filter_modules.end())
-        {
-            static std::string region = "";
-            region = module;
-            region += ":";
-            region += region_name;
-            scorep::region_end(region);
-        }
+        static std::string region = "";
+        region = module;
+        region += ":";
+        region += region_name;
+        scorep::region_end(region);
 
         Py_INCREF(Py_None);
         return Py_None;