fix: tokio spawn with outer is native thread

libnyanpasu · Jul 20, 2024 · a2cf8ea · a2cf8ea
1 parent 47ceb83
commit a2cf8ea
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/nyanpasu-utils/src/core/utils.rs b/nyanpasu-utils/src/core/utils.rs
@@ -6,6 +6,8 @@ use parking_lot::RwLock;
 use tokio::sync::mpsc::Sender;
 use tracing_attributes::instrument;
 
+use crate::runtime;
+
 use super::CommandEvent;
 
 #[instrument]
@@ -60,7 +62,7 @@ pub(super) fn spawn_pipe_reader<F: Fn(String) -> CommandEvent + Send + Copy + 's
                         Some(encoding) => Ok(encoding.decode_with_bom_removal(&buf).0.into()),
                         None => String::from_utf8(buf.clone()),
                     };
-                    tokio::spawn(async move {
+                    runtime::spawn(async move {
                         let _ = match line {
                             Ok(line) => tx_.send(wrapper(line)).await,
                             Err(e) => tx_.send(CommandEvent::Error(e.to_string())).await,
@@ -69,7 +71,9 @@ pub(super) fn spawn_pipe_reader<F: Fn(String) -> CommandEvent + Send + Copy + 's
                 }
                 Err(e) => {
                     let tx_ = tx.clone();
-                    tokio::spawn(async move { tx_.send(CommandEvent::Error(e.to_string())).await });
+                    runtime::spawn(
+                        async move { tx_.send(CommandEvent::Error(e.to_string())).await },
+                    );
                     break;
                 }
             }

diff --git a/nyanpasu-utils/src/runtime/mod.rs b/nyanpasu-utils/src/runtime/mod.rs
@@ -13,3 +13,12 @@ pub fn block_on<F: Future>(task: F) -> F::Output {
     let runtime = RUNTIME.get_or_init(default_runtime);
     runtime.block_on(task)
 }
+
+pub fn spawn<F>(task: F)
+where
+    F: Future + Send + 'static,
+    F::Output: Send + 'static,
+{
+    let runtime = RUNTIME.get_or_init(default_runtime);
+    runtime.spawn(task);
+}