Merge pull request #20 from jjs-dev/rewrite-wait

Rewrite waiting

Author: MikailBag

Cargo.lock

@@ -16,6 +16,9 @@ nix = { version = "0.19.0" }
 backtrace = "0.3.46"
 thiserror = "1.0.19"
 anyhow = "1.0.32"
+once_cell = "1.4.1"
+futures-util = "0.3.6"
+tokio = { version = "0.3.2", features = ["net"] }
 
 [workspace]
 members = ["minion-ffi", ".", "minion-tests", "minion-cli"]

Cargo.toml

@@ -8,3 +8,4 @@ edition = "2018"
 minion = {path = ".."}
 structopt = "0.3.13"
 libc = "0.2.68"
+tokio = { version = "0.3.2", features = ["macros", "rt"] }

minion-cli/Cargo.toml

@@ -99,7 +99,8 @@ struct ExecOpt {
     pwd: String,
 }
 
-fn main() {
+#[tokio::main(flavor = "current_thread")]
+async fn main() {
     let options: ExecOpt = ExecOpt::from_args();
     if options.dump_argv {
         println!("{:#?}", options);
@@ -152,9 +153,8 @@ fn main() {
     if options.dump_minion_params {
         println!("{:#?}", args);
     }
-    let cp = backend.spawn(args).unwrap();
-    cp.wait_for_exit(None).unwrap();
-    let exit_code = cp.get_exit_code().unwrap();
+    let mut cp = backend.spawn(args).unwrap();
+    let exit_code = cp.wait_for_exit().unwrap().await.unwrap();
     println!("---> Child process exited with code {:?} <---", exit_code);
     if sandbox.check_cpu_tle().unwrap() {
         println!("Note: CPU time limit was exceeded");

minion-cli/src/main.rs

@@ -9,6 +9,7 @@ crate-type = ["cdylib", "staticlib"]
 
 [dependencies]
 minion = {path = ".."}
+tokio = {version = "0.3.2", features = ["rt", "time"]}
 
 [build-dependencies]
 cbindgen = { version = "0.14.1", default-features = false }