Move make_region_name to events.hpp

Author: Flamefire

src/methods.cpp

@@ -35,10 +35,7 @@ extern "C"
         if (!PyArg_ParseTuple(args, "sssK", &module, &region_name, &file_name, &line_number))
             return NULL;
 
-        static std::string region = "";
-        region = module;
-        region += ":";
-        region += region_name;
+        const std::string& region = scorepy::make_region_name(module, region_name);
         scorepy::region_begin(region, module, file_name, line_number);
 
         Py_RETURN_NONE;
@@ -55,10 +52,7 @@ extern "C"
         if (!PyArg_ParseTuple(args, "ss", &module, &region_name))
             return NULL;
 
-        static std::string region = "";
-        region = module;
-        region += ":";
-        region += region_name;
+        const std::string& region = scorepy::make_region_name(module, region_name);
         scorepy::region_end(region);
 
         Py_RETURN_NONE;

src/scorepy/cInstrumenter.cpp

@@ -7,14 +7,6 @@
 
 namespace scorepy
 {
-static const std::string& make_region_name(const char* moduleName, const char* name)
-{
-    static std::string region;
-    region = moduleName;
-    region += ":";
-    region += name;
-    return region;
-}
 
 void CInstrumenter::enable_instrumenter()
 {

src/scorepy/events.hpp

@@ -5,6 +5,17 @@
 
 namespace scorepy
 {
+/// 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(const char* module_name, const char* name)
+{
+    static std::string region;
+    region = module_name;
+    region += ":";
+    region += name;
+    return region;
+}
+
 void region_begin(const std::string& region_name, std::string module, std::string file_name,
                   std::uint64_t line_number);
 void region_end(const std::string& region_name);