fix(samply): spawn in new thread to prevent tokio panic

Author: not-matthias

src/cli/samply.rs

@@ -16,16 +16,22 @@ pub fn run(args: SamplyArgs) -> Result<()> {
     let argv = std::iter::once(std::ffi::OsString::from("samply")).chain(args.args);
     let opt = cli::Opt::parse_from(argv);
 
-    match opt.action {
-        #[cfg(any(
-            target_os = "android",
-            target_os = "macos",
-            target_os = "linux",
-            target_os = "windows"
-        ))]
-        cli::Action::Record(a) => ::samply::do_record_action(a),
-        _ => unimplemented!("Only `samply record` is supported"),
-    }
+    // samply spins up its own tokio runtime internally, so it must run on a
+    // thread that isn't already inside our `#[tokio::main]` runtime.
+    std::thread::scope(|s| {
+        s.spawn(|| match opt.action {
+            #[cfg(any(
+                target_os = "android",
+                target_os = "macos",
+                target_os = "linux",
+                target_os = "windows"
+            ))]
+            cli::Action::Record(a) => ::samply::do_record_action(a),
+            _ => unimplemented!("Only `samply record` is supported"),
+        })
+        .join()
+        .map_err(|_| anyhow::anyhow!("samply thread panicked"))
+    })?;
 
     Ok(())
 }