Include length in CString

Author: Flamefire

src/methods.cpp

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

src/scorepy/cInstrumenter.cpp

@@ -115,7 +115,7 @@ bool CInstrumenter::on_event(PyFrameObject& frame, int what, PyObject*)
     case PyTrace_CALL:
     {
         const PyCodeObject& code = *frame.f_code;
-        const CString name = PyUnicode_AsUTF8(code.co_name);
+        const CString name = get_string_from_python(*code.co_name);
         const CString module_name = get_module_name(frame);
         if (name != "_unsetprofile" && !module_name.starts_with("scorep"))
         {
@@ -129,7 +129,7 @@ bool CInstrumenter::on_event(PyFrameObject& frame, int what, PyObject*)
     case PyTrace_RETURN:
     {
         const PyCodeObject& code = *frame.f_code;
-        const CString name = PyUnicode_AsUTF8(code.co_name);
+        const CString name = get_string_from_python(*code.co_name);
         const CString module_name = get_module_name(frame);
         if (name != "_unsetprofile" && !module_name.starts_with("scorep"))
         {

src/scorepy/cstring.h

@@ -10,9 +10,21 @@ namespace scorepy
 class CString
 {
     const char* s_;
+    size_t len_;
 
 public:
-    CString(const char* s) : s_(s)
+    template <size_t N>
+    constexpr CString(const char (&s)[N]) : s_(s), len_(N - 1u)
+    {
+        static_assert(N > 0, "Cannot handle empty char array");
+    }
+
+    explicit CString(const char* s, size_t len) : s_(s), len_(len)
+    {
+        assert(s_);
+    }
+
+    explicit CString(const char* s) : s_(s), len_(std::strlen(s_))
     {
         assert(s_);
     }
@@ -29,12 +41,12 @@ class CString
     template <size_t N>
     bool starts_with(const char (&prefix)[N]) const
     {
-        return std::strncmp(s_, prefix, N - 1u) == 0;
+        return (len_ >= N - 1u) && (std::strncmp(s_, prefix, N - 1u) == 0);
     }
 
     friend bool operator==(const CString& lhs, const CString& rhs)
     {
-        return std::strcmp(lhs.s_, rhs.s_) == 0;
+        return (lhs.len_ == rhs.len_) && (std::memcmp(lhs.s_, rhs.s_, rhs.len_) == 0);
     }
     friend bool operator!=(const CString& lhs, const CString& rhs)
     {

src/scorepy/pythonHelpers.cpp

@@ -7,10 +7,10 @@ CString get_module_name(const PyFrameObject& frame)
 {
     PyObject* module_name = PyDict_GetItemString(frame.f_globals, "__name__");
     if (module_name)
-        return PyUnicode_AsUTF8(module_name);
+        return get_string_from_python(*module_name);
 
     // this is a NUMPY special situation, see NEP-18, and Score-P issue #63
-    const CString filename = PyUnicode_AsUTF8(frame.f_code->co_filename);
+    const CString filename = get_string_from_python(*frame.f_code->co_filename);
     if (filename == "<__array_function__ internals>")
     {
         return "numpy.__array_function__";
@@ -30,6 +30,6 @@ CString get_file_name(const PyFrameObject& frame)
     }
     static char actual_path[PATH_MAX];
     const char* full_file_name = realpath(PyUnicode_AsUTF8(filename), actual_path);
-    return full_file_name ? full_file_name : "ErrorPath";
+    return full_file_name ? CString(full_file_name) : CString("ErrorPath");
 }
 } // namespace scorepy

src/scorepy/pythonHelpers.hpp

@@ -72,6 +72,13 @@ auto cast_to_PyFunc(TFunc* func) -> detail::ReplaceArgsToPyObject_t<TFunc>*
     return reinterpret_cast<detail::ReplaceArgsToPyObject_t<TFunc>*>(func);
 }
 
+inline CString get_string_from_python(PyObject& o)
+{
+    Py_ssize_t len;
+    const char* s = PyUnicode_AsUTF8AndSize(&o, &len);
+    return CString(s, len);
+}
+
 /// Return the module name the frame belongs to.
 /// The pointer is valid for the lifetime of the frame
 CString get_module_name(const PyFrameObject& frame);