Merge branch 'callstack-of-ints' into 'master'

Callstack of ints

See merge request pythonspeed/memory-profiler!3

Author: itamarst

Cargo.lock

@@ -4,6 +4,7 @@
 from ctypes import CDLL, RTLD_GLOBAL
 
 from ._utils import library_path
+
 # Load with RTLD_GLOBAL so _profiler.so has access to those symbols; explicit
 # linking may be possible but haven't done that yet, oh well.
 pymemprofile = CDLL(library_path("libpymemprofile_api"), mode=RTLD_GLOBAL)
@@ -15,10 +16,18 @@ def start_tracing():
     preload.fil_reset()
     _profiler.start_tracing()
 
+
 def stop_tracing(svg_output_path: str):
     sys.settrace(None)
     path = svg_output_path.encode("utf-8")
     preload.fil_dump_peak_to_flamegraph(path)
+    with open(path) as f:
+        data = f.read().replace(
+            "SUBTITLE-HERE",
+            """Made with the Fil memory profiler. <a href="https://pythonspeed.com/products/filmemoryprofiler/" style="text-decoration: underline;" target="_parent">Try it on your code!</a>""",
+        )
+    with open(path, "w") as f:
+        f.write(data)
 
 
 def trace(code, globals_, svg_output_path: str):

filprofiler/_tracer.py

@@ -7,6 +7,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+im = "14.2.0"
 libc = "0.2"
 itertools = "0.8.2"
 lazy_static = "1.4.0"
@@ -16,9 +17,17 @@ rustc-hash = "1.0.1"
 version = "0.9.4"
 default-features = false
 
+[dependencies.smallstr]
+version = "0.2.0"
+features = ["ffi"]
+
 [dev-dependencies]
 proptest = "0.9.5"
 
+[profile.release]
+# Needed for profiling, disable for real release:
+#debug = true
+
 [lib]
 name = "pymemprofile_api"
 crate_type = ["cdylib"]

memapi/Cargo.toml

@@ -1,5 +1,7 @@
+use smallstr::SmallString;
 use std::ffi::CStr;
 use std::os::raw::c_char;
+use std::str;
 
 #[macro_use]
 extern crate lazy_static;
@@ -23,16 +25,17 @@ pub unsafe extern "C" fn pymemprofile_start_call(
     file_name: *const c_char,
     func_name: *const c_char,
 ) {
-    let name = format!(
-        "{}:{}",
-        CStr::from_ptr(file_name)
-            .to_str()
-            .expect("Function name wasn't UTF-8"),
-        CStr::from_ptr(func_name)
-            .to_str()
-            .expect("Function name wasn't UTF-8")
-    );
-    memorytracking::start_call(name);
+    let function_name = SmallString::from_str(str::from_utf8_unchecked(
+        CStr::from_ptr(func_name).to_bytes(),
+    ));
+    let module_name = SmallString::from_str(str::from_utf8_unchecked(
+        CStr::from_ptr(file_name).to_bytes(),
+    ));
+    let call_site = memorytracking::CallSite {
+        function_name,
+        module_name,
+    };
+    memorytracking::start_call(call_site);
 }
 
 #[no_mangle]