Do not pass std::string_view as reference

Author: bertwesarg

src/scorepy/cInstrumenter.cpp

@@ -119,8 +119,8 @@ bool CInstrumenter::on_event(PyFrameObject& frame, int what, PyObject*)
         bool success = try_region_begin(code);
         if (!success)
         {
-            std::string_view name = compat::get_string_as_utf_8(code->co_name);
-            std::string_view module_name = get_module_name(frame);
+            const auto name = compat::get_string_as_utf_8(code->co_name);
+            const auto module_name = get_module_name(frame);
             if (name.compare("_unsetprofile") != 0 && module_name.compare(0, 6, "scorep") != 0)
             {
                 const int line_number = code->co_firstlineno;
@@ -137,10 +137,10 @@ bool CInstrumenter::on_event(PyFrameObject& frame, int what, PyObject*)
         bool success = try_region_end(code);
         if (!success)
         {
-            std::string_view name = compat::get_string_as_utf_8(code->co_name);
-            std::string_view module_name = get_module_name(frame);
+            const auto name = compat::get_string_as_utf_8(code->co_name);
+            const auto module_name = get_module_name(frame);
             // TODO: Use string_view/CString comparison?
-            if (std::string(name) != "_unsetprofile" && std::string(module_name, 0, 6) != "scorep")
+            if (name.compare("_unsetprofile") != 0 && module_name.compare(0, 6, "scorep") != 0)
             {
                 region_end(name, module_name, code);
             }

src/scorepy/events.cpp

@@ -28,15 +28,15 @@ static compat::RegisterCodeDealloc register_dealloc(on_dealloc);
 
 // Used for regions, that have an identifier, aka a code object id. (instrumenter regions and
 // some decorated regions)
-void region_begin(std::string_view& function_name, std::string_view& module,
+void region_begin(std::string_view function_name, std::string_view module,
                   const std::string& file_name, const std::uint64_t line_number,
                   compat::PyCodeObject* identifier)
 {
     region_handle& region = regions[identifier];
 
     if (region == uninitialised_region_handle)
     {
-        auto& region_name = make_region_name(module, function_name);
+        const auto region_name = make_region_name(module, function_name);
         SCOREP_User_RegionInit(&region.value, NULL, NULL, region_name.c_str(),
                                SCOREP_USER_REGION_TYPE_FUNCTION, file_name.c_str(), line_number);
 
@@ -47,10 +47,10 @@ void region_begin(std::string_view& function_name, std::string_view& module,
 
 // Used for regions, that only have a function name, a module, a file and a line number (user
 // regions)
-void region_begin(std::string_view& function_name, std::string_view& module,
+void region_begin(std::string_view function_name, std::string_view module,
                   const std::string& file_name, const std::uint64_t line_number)
 {
-    std::string region_name = make_region_name(module, function_name);
+    const auto region_name = make_region_name(module, function_name);
     region_handle& region = user_regions[region_name];
 
     if (region == uninitialised_region_handle)
@@ -65,7 +65,7 @@ void region_begin(std::string_view& function_name, std::string_view& module,
 
 // Used for regions, that have an identifier, aka a code object id. (instrumenter regions and
 // some decorated regions)
-void region_end(std::string_view& function_name, std::string_view& module,
+void region_end(std::string_view function_name, std::string_view module,
                 compat::PyCodeObject* identifier)
 {
     const auto it_region = regions.find(identifier);
@@ -75,15 +75,15 @@ void region_end(std::string_view& function_name, std::string_view& module,
     }
     else
     {
-        std::string region_name = make_region_name(module, function_name);
+        const auto region_name = make_region_name(module, function_name);
         region_end_error_handling(region_name);
     }
 }
 
 // Used for regions, that only have a function name, a module (user regions)
-void region_end(std::string_view& function_name, std::string_view& module)
+void region_end(std::string_view function_name, std::string_view module)
 {
-    std::string region_name = make_region_name(module, function_name);
+    const auto region_name = make_region_name(module, function_name);
     auto it_region = user_regions.find(region_name);
     if (it_region != user_regions.end())
     {

src/scorepy/events.hpp

@@ -30,14 +30,13 @@ struct region_handle
 constexpr region_handle uninitialised_region_handle = region_handle();
 
 /// Combine the arguments into a region name
-/// Return value is a statically allocated string to avoid memory (re)allocations
-inline const std::string& make_region_name(std::string_view& module_name, std::string_view& name)
+inline std::string make_region_name(std::string_view module_name, std::string_view name)
 {
-    static std::string region;
-    region = module_name;
+    std::string region;
+    region += module_name;
     region += ":";
     region += name;
-    return region;
+    return std::move(region);
 }
 
 extern std::unordered_map<compat::PyCodeObject*, region_handle> regions;
@@ -59,10 +58,10 @@ inline bool try_region_begin(compat::PyCodeObject* identifier)
     }
 }
 
-void region_begin(std::string_view& function_name, std::string_view& module,
+void region_begin(std::string_view function_name, std::string_view module,
                   const std::string& file_name, const std::uint64_t line_number,
                   compat::PyCodeObject* identifier);
-void region_begin(std::string_view& function_name, std::string_view& module,
+void region_begin(std::string_view function_name, std::string_view module,
                   const std::string& file_name, const std::uint64_t line_number);
 
 /** tries to end a region. Return true on success
@@ -82,9 +81,9 @@ inline bool try_region_end(compat::PyCodeObject* identifier)
     }
 }
 
-void region_end(std::string_view& function_name, std::string_view& module,
+void region_end(std::string_view function_name, std::string_view module,
                 compat::PyCodeObject* identifier);
-void region_end(std::string_view& function_name, std::string_view& module);
+void region_end(std::string_view function_name, std::string_view module);
 
 void region_end_error_handling(const std::string& region_name);