More explicit thread error handling in player

JasonLG1979 · Jun 20, 2023 · c109386 · c109386
1 parent 105cdb6
commit c109386
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 8 deletions.
diff --git a/playback/src/player.rs b/playback/src/player.rs
@@ -258,9 +258,11 @@ impl Player {
         let (cmd_tx, cmd_rx) = mpsc::unbounded_channel();
         let (event_sender, event_receiver) = mpsc::unbounded_channel();
 
-        let handle = thread::spawn(move || {
-            debug!("new Player[{}]", session.session_id());
+        let thread_name = format!("librespot-player:{}", session.session_id());
 
+        let builder = thread::Builder::new().name(thread_name.clone());
+
+        let handle = match builder.spawn(move || {
             let sample_pipeline = SamplePipeline::new(&config, sink_builder(), volume_getter);
 
             let internal = PlayerInternal {
@@ -281,8 +283,21 @@ impl Player {
             // While PlayerInternal is written as a future, it still contains blocking code.
             // It must be run by using block_on() in a dedicated thread.
             futures_executor::block_on(internal);
-            debug!("PlayerInternal thread finished.");
-        });
+
+            match thread::current().name() {
+                Some(name) => debug!("<PlayerInternal> [{name}] thread finished"),
+                None => debug!("<PlayerInternal> thread finished"),
+            }
+        }) {
+            Ok(handle) => {
+                debug!("Created <PlayerInternal> [{thread_name}] thread");
+                handle
+            }
+            Err(e) => {
+                error!("Error creating <PlayerInternal> [{thread_name}] thread: {e}");
+                exit(1);
+            }
+        };
 
         (
             Player {
@@ -1744,12 +1759,30 @@ impl PlayerInternal {
 
         let (result_tx, result_rx) = oneshot::channel();
 
-        std::thread::spawn(move || {
+        let thread_name = format!(
+            "librespot-loader:{}",
+            spotify_id.to_uri().unwrap_or_default()
+        );
+
+        let builder = thread::Builder::new().name(thread_name.clone());
+
+        match builder.spawn(move || {
             let data = futures_executor::block_on(loader.load_track(spotify_id, position_ms));
             if let Some(data) = data {
                 let _ = result_tx.send(data);
+
+                match thread::current().name() {
+                    Some(name) => debug!("<PlayerInternal> [{name}] thread finished"),
+                    None => debug!("<PlayerInternal> [librespot-loader] thread finished"),
+                }
             }
-        });
+        }) {
+            Ok(_) => debug!("Created <PlayerInternal> [{thread_name}] thread"),
+            Err(e) => {
+                error!("Error creating <PlayerInternal> [{thread_name}] thread: {e}");
+                exit(1);
+            }
+        }
 
         result_rx.map_err(|_| ())
     }

diff --git a/playback/src/resampler.rs b/playback/src/resampler.rs
@@ -594,8 +594,8 @@ impl StereoInterleavedResampler {
             _ => {
                 debug!("Interpolation Quality: {interpolation_quality}");
 
-                let left_thread_name = "librespot-left-resampler".to_string();
-                let right_thread_name = "librespot-right-resampler".to_string();
+                let left_thread_name = "librespot-resampler:left".to_string();
+                let right_thread_name = "librespot-resampler:right".to_string();
 
                 match interpolation_quality {
                     InterpolationQuality::Low => {