Remove demangle option from collapsers

.cirrus.yml

@@ -11,7 +11,6 @@ task:
     - curl https://sh.rustup.rs -sSf --output rustup.sh
     - sh rustup.sh -y
     - . $HOME/.cargo/env
-    - rustup component add rustfmt
   submodule_script:
     - git submodule sync --recursive
     - git submodule update --init --recursive

Cargo.toml

@@ -40,7 +40,6 @@ rand = "0.7"
 rgb = "0.8.13"
 str_stack = "0.1"
 structopt = { version = "0.2", optional = true }
-symbolic-demangle = "6.1.3"
 
 [dev-dependencies]
 assert_cmd = "0.11"

src/bin/collapse-dtrace.rs

@@ -26,10 +26,6 @@ struct Opt {
     // ************* //
     // *** FLAGS *** //
     // ************* //
-    /// Demangle function names
-    #[structopt(long = "demangle")]
-    demangle: bool,
-
     /// Include offsets
     #[structopt(long = "includeoffset")]
     includeoffset: bool,
@@ -67,7 +63,6 @@ impl Opt {
         (
             self.infile,
             Options {
-                demangle: self.demangle,
                 includeoffset: self.includeoffset,
                 nthreads: self.nthreads,
             },

src/bin/collapse-perf.rs

@@ -34,10 +34,6 @@ struct Opt {
     #[structopt(long = "all")]
     all: bool,
 
-    /// Demangle function names
-    #[structopt(long = "demangle")]
-    demangle: bool,
-
     /// Annotate jit functions with a _[j]
     #[structopt(long = "jit")]
     jit: bool,
@@ -96,7 +92,6 @@ impl Opt {
                 include_addrs: self.addrs,
                 annotate_jit: self.jit || self.all,
                 annotate_kernel: self.kernel || self.all,
-                demangle: self.demangle,
                 event_filter: self.event_filter,
                 nthreads: self.nthreads,
             },

src/collapse/dtrace.rs

@@ -9,11 +9,6 @@ use crate::collapse::common::{self, CollapsePrivate, Occurrences};
 /// `dtrace` folder configuration options.
 #[derive(Clone, Debug)]
 pub struct Options {
-    /// Demangle function names.
-    ///
-    /// Default is `false`.
-    pub demangle: bool,
-
     /// Include function offset (except leafs).
     ///
     /// Default is `false`.
@@ -28,7 +23,6 @@ pub struct Options {
 impl Default for Options {
     fn default() -> Self {
         Self {
-            demangle: false,
             includeoffset: false,
             nthreads: *common::DEFAULT_NTHREADS,
         }
@@ -301,42 +295,31 @@ impl Folder {
         )
     }
 
-    // Transforms the function part of a frame with the given function.
-    fn transform_function_name<'a, F>(&self, frame: &'a str, transform: F) -> Cow<'a, str>
-    where
-        F: Fn(&'a str) -> Cow<'a, str>,
-    {
+    // DTrace doesn't properly demangle Rust function names, so fix those.
+    fn fix_rust_symbol<'a>(&self, frame: &'a str) -> Cow<'a, str> {
         let mut parts = frame.splitn(2, '`');
         if let (Some(pname), Some(func)) = (parts.next(), parts.next()) {
             if self.opt.includeoffset {
                 let mut parts = func.rsplitn(2, '+');
                 if let (Some(offset), Some(func)) = (parts.next(), parts.next()) {
-                    if let Cow::Owned(func) = transform(func.trim_end()) {
+                    if let Cow::Owned(func) =
+                        common::fix_partially_demangled_rust_symbol(func.trim_end())
+                    {
                         return Cow::Owned(format!("{}`{}+{}", pname, func, offset));
                     } else {
                         return Cow::Borrowed(frame);
                     }
                 }
             }
 
-            if let Cow::Owned(func) = transform(func.trim_end()) {
+            if let Cow::Owned(func) = common::fix_partially_demangled_rust_symbol(func.trim_end()) {
                 return Cow::Owned(format!("{}`{}", pname, func));
             }
         }
 
         Cow::Borrowed(frame)
     }
 
-    // Demangle the function name if it's mangled.
-    fn demangle<'a>(&self, frame: &'a str) -> Cow<'a, str> {
-        self.transform_function_name(frame, symbolic_demangle::demangle)
-    }
-
-    // DTrace doesn't properly demangle Rust function names, so fix those.
-    fn fix_rust_symbol<'a>(&self, frame: &'a str) -> Cow<'a, str> {
-        self.transform_function_name(frame, common::fix_partially_demangled_rust_symbol)
-    }
-
     // we have a stack line that shows one stack entry from the preceeding event, like:
     //
     //     unix`tsc_gethrtimeunscaled+0x21
@@ -357,8 +340,6 @@ impl Folder {
 
         let frame = if frame.is_empty() {
             Cow::Borrowed("-")
-        } else if self.opt.demangle {
-            self.demangle(frame)
         } else {
             self.fix_rust_symbol(frame)
         };
@@ -546,7 +527,6 @@ mod tests {
         loop {
             let nstacks_per_job = rng.gen_range(1, 500 + 1);
             let options = Options {
-                demangle: rng.gen(),
                 includeoffset: rng.gen(),
                 nthreads: rng.gen_range(2, 32 + 1),
             };

src/collapse/perf.rs

@@ -1,8 +1,6 @@
 use std::collections::VecDeque;
 use std::io::{self, BufRead};
 
-use symbolic_demangle::demangle;
-
 use crate::collapse::common::{self, CollapsePrivate, Occurrences};
 
 const TIDY_GENERIC: bool = true;
@@ -37,11 +35,6 @@ pub struct Options {
     /// Default is `false`.
     pub annotate_kernel: bool,
 
-    /// Demangle function names.
-    ///
-    /// Default is `false`.
-    pub demangle: bool,
-
     /// Only consider samples of the given event type (see `perf list`). If this option is
     /// set to `None`, it will be set to the first encountered event type.
     ///
@@ -75,7 +68,6 @@ impl Default for Options {
         Self {
             annotate_jit: false,
             annotate_kernel: false,
-            demangle: false,
             event_filter: None,
             include_addrs: false,
             include_pid: false,
@@ -443,13 +435,9 @@ impl Folder {
                 return;
             }
 
-            let rawfunc = if self.opt.demangle {
-                demangle(rawfunc)
-            } else {
-                // perf mostly demangles Rust symbols,
-                // but this will fix the things it gets wrong
-                common::fix_partially_demangled_rust_symbol(rawfunc)
-            };
+            // perf mostly demangles Rust symbols,
+            // but this will fix the things it gets wrong
+            let rawfunc = common::fix_partially_demangled_rust_symbol(rawfunc);
 
             // Support Java inlining by splitting on "->". After the first func, the
             // rest are annotated with "_[i]" to mark them as inlined.
@@ -705,7 +693,6 @@ mod tests {
             let options = Options {
                 annotate_jit: rng.gen(),
                 annotate_kernel: rng.gen(),
-                demangle: rng.gen(),
                 event_filter: None,
                 include_addrs: rng.gen(),
                 include_pid: rng.gen(),

tests/collapse-dtrace.rs

@@ -125,37 +125,6 @@ fn collapse_dtrace_rust_names() {
     test_collapse_dtrace(test_file, result_file, Options::default()).unwrap()
 }
 
-#[test]
-fn collapse_dtrace_demangle() {
-    let test_file = "./tests/data/collapse-dtrace/mangled.txt";
-    let result_file = "./tests/data/collapse-dtrace/results/demangled.txt";
-    test_collapse_dtrace(
-        test_file,
-        result_file,
-        Options {
-            demangle: true,
-            ..Default::default()
-        },
-    )
-    .unwrap()
-}
-
-#[test]
-fn collapse_dtrace_demangle_includeoffset() {
-    let test_file = "./tests/data/collapse-dtrace/mangled.txt";
-    let result_file = "./tests/data/collapse-dtrace/results/demangled_with_offsets.txt";
-    test_collapse_dtrace(
-        test_file,
-        result_file,
-        Options {
-            demangle: true,
-            includeoffset: true,
-            ..Default::default()
-        },
-    )
-    .unwrap()
-}
-
 #[test]
 fn collapse_dtrace_cli() {
     let input_file = "./flamegraph/example-dtrace-stacks.txt";

tests/collapse-perf.rs

@@ -283,22 +283,6 @@ fn collapse_perf_should_warn_about_weird_input_lines() {
     );
 }
 
-#[test]
-fn collapse_perf_demangle() {
-    let test_file = "./tests/data/collapse-perf/mangled.txt";
-    let result_file = "./tests/data/collapse-perf/results/demangled.txt";
-    test_collapse_perf(
-        test_file,
-        result_file,
-        Options {
-            demangle: true,
-            ..Default::default()
-        },
-        false,
-    )
-    .unwrap()
-}
-
 #[test]
 fn collapse_perf_cli() {
     let input_file = "./flamegraph/test/perf-vertx-stacks-01.txt";