Add flag to avoid filtering out native functions

src/config.rs

@@ -52,6 +52,8 @@ pub struct Config {
     pub full_filenames: bool,
     #[doc(hidden)]
     pub lineno: LineNo,
+    #[doc(hidden)]
+    pub native_unfiltered: bool,
 }
 
 #[allow(non_camel_case_types)]
@@ -116,7 +118,7 @@ impl Default for Config {
                duration: RecordDuration::Unlimited, native: false,
                gil_only: false, include_idle: false, include_thread_ids: false,
                hide_progress: false, capture_output: true, dump_json: false, dump_locals: 0, subprocesses: false,
-               full_filenames: false, lineno: LineNo::LastInstruction }
+               full_filenames: false, lineno: LineNo::LastInstruction, native_unfiltered: false }
     }
 }
 
@@ -143,6 +145,11 @@ impl Config {
                     .long("native")
                     .help("Collect stack traces from native extensions written in Cython, C or C++");
 
+        #[cfg(unwind)]
+        let native_unfiltered = Arg::new("native_unfiltered")
+                    .long("native-unfiltered")
+                    .help("Do not filter libpython native functions.");
+
         #[cfg(not(target_os="freebsd"))]
         let nonblocking = Arg::new("nonblocking")
                     .long("nonblocking")
@@ -265,11 +272,11 @@ impl Config {
 
         // add native unwinding if appropriate
         #[cfg(unwind)]
-        let record = record.arg(native.clone());
+        let record = record.arg(native.clone()).arg(native_unfiltered.clone());
         #[cfg(unwind)]
-        let top = top.arg(native.clone());
+        let top = top.arg(native.clone()).arg(native_unfiltered.clone());
         #[cfg(unwind)]
-        let dump = dump.arg(native.clone());
+        let dump = dump.arg(native.clone()).arg(native_unfiltered.clone());
 
         // Nonblocking isn't an option for freebsd, remove
         #[cfg(not(target_os="freebsd"))]
@@ -350,6 +357,7 @@ impl Config {
         config.full_filenames = matches.occurrences_of("full_filenames") > 0;
         if cfg!(unwind) {
             config.native = matches.occurrences_of("native") > 0;
+            config.native_unfiltered = matches.occurrences_of("native_unfiltered") > 0;
         }
 
         config.capture_output = config.command != "record" || matches.occurrences_of("capture") > 0;

src/native_stack_trace.rs

@@ -22,10 +22,11 @@ pub struct NativeStack {
     #[allow(dead_code)]
     process: remoteprocess::Process,
     symbol_cache: LruCache<u64, remoteprocess::StackFrame>,
+    native_unfiltered: bool,
 }
 
 impl NativeStack {
-    pub fn new(pid: Pid, python: Option<BinaryInfo>, libpython: Option<BinaryInfo>) -> Result<NativeStack, Error> {
+    pub fn new(pid: Pid, python: Option<BinaryInfo>, libpython: Option<BinaryInfo>, native_unfiltered: bool) -> Result<NativeStack, Error> {
         let cython_maps = cython::SourceMaps::new();
 
         let process = remoteprocess::Process::new(pid)?;
@@ -36,7 +37,8 @@ impl NativeStack {
                               python,
                               libpython,
                               process,
-                              symbol_cache: LruCache::new(65536)
+                              symbol_cache: LruCache::new(65536),
+                              native_unfiltered: native_unfiltered,
                               });
     }
 
@@ -189,6 +191,7 @@ impl NativeStack {
                             _ => MergeType::Ignore
                         }
                     },
+                    _ if self.native_unfiltered =>  MergeType::MergeNativeFrame,
                     Some(prefix) if WHITELISTED_PREFIXES.contains(prefix) => MergeType::MergeNativeFrame,
                     _ => MergeType::Ignore
                 }

src/python_spy.rs

@@ -124,7 +124,7 @@ impl PythonSpy {
 
         #[cfg(unwind)]
         let native = if config.native {
-            Some(NativeStack::new(pid, python_info.python_binary, python_info.libpython_binary)?)
+            Some(NativeStack::new(pid, python_info.python_binary, python_info.libpython_binary, config.native_unfiltered)?)
         } else {
             None
         };