Runtime framework start with '--model' arg.

golemfactory · Oct 27, 2023 · ec0886e · ec0886e
1 parent 09fc708
commit ec0886e
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 8 deletions.
diff --git a/runtimes/dummy/src/main.rs b/runtimes/dummy/src/main.rs
@@ -1,9 +1,11 @@
+use std::env;
 use std::io;
 
 fn main() {
     let mut input = String::new();
+    let args: Vec<String> = env::args().collect();
 
-    println!("Dummy");
+    println!("Dummy runtime. Args: {args:?}");
 
     loop {
         input.clear();

diff --git a/src/main.rs b/src/main.rs
@@ -238,10 +238,11 @@ async fn run<T: process::Runtime + Clone + Unpin + 'static>(cli: Cli) -> anyhow:
                             });
                         }
                         ExeScriptCommand::Start { args, .. } => {
-                            log::debug!("Start cmd args: {args:?}");
-                            let args = process::RuntimeArgs::new(args).map_err(|e| {
+                            log::debug!("Raw Start cmd args: {args:?}");
+                            let args = T::parse_args(args).map_err(|e| {
                                 RpcMessageError::Activity(format!("invalid args: {}", e))
                             })?;
+                            log::debug!("Start cmd model: {}", args.model);
 
                             send_state(
                                 &report_url,
@@ -255,6 +256,7 @@ async fn run<T: process::Runtime + Clone + Unpin + 'static>(cli: Cli) -> anyhow:
                                 .start(&args)
                                 .await
                                 .map_err(|e| RpcMessageError::Activity(e.to_string()))?;
+                            log::debug!("Started process");
 
                             send_state(
                                 &report_url,
@@ -337,3 +339,14 @@ async fn run<T: process::Runtime + Clone + Unpin + 'static>(cli: Cli) -> anyhow:
 
     Ok(())
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::process::{self, RuntimeArgs};
+
+    #[test]
+    fn arg_test() {
+        let args = vec!["--model".into(), "dummy".into()];
+        process::RuntimeArgs::new(&args).unwrap();
+    }
+}
diff --git a/src/process.rs b/src/process.rs
@@ -20,6 +20,8 @@ pub struct Shares {
 }
 
 pub trait Runtime {
+    fn parse_args(args: &[String]) -> anyhow::Result<RuntimeArgs>;
+
     fn start(args: &RuntimeArgs) -> anyhow::Result<Child>;
 
     fn run<ReportFn: Fn(Shares) + 'static>(stdout: ChildStdout, report_fn: ReportFn);
@@ -33,8 +35,8 @@ pub struct RuntimeArgs {
 }
 
 impl RuntimeArgs {
-    pub fn new(args: &[String]) -> anyhow::Result<Self> {
-        Ok(Self::try_parse_from(args)?)
+    pub fn new(cmd: &String, args: &[String]) -> anyhow::Result<Self> {
+        Ok(Self::try_parse_from(std::iter::once(cmd).chain(args))?)
     }
 }
 

diff --git a/src/process/dummy.rs b/src/process/dummy.rs
@@ -11,14 +11,19 @@ pub struct Dummy {}
 impl Unpin for Dummy {}
 
 impl Runtime for Dummy {
-    fn start(_args: &RuntimeArgs) -> anyhow::Result<Child> {
+    fn parse_args(args: &[String]) -> anyhow::Result<RuntimeArgs> {
+        RuntimeArgs::new(&"dummy.exe".into(), args)
+    }
+
+    fn start(args: &RuntimeArgs) -> anyhow::Result<Child> {
         let exe = super::find_exe("dummy.exe")?;
         let mut cmd = Command::new(&exe);
         let work_dir = exe.parent().unwrap();
         cmd.stdout(Stdio::piped())
             .stdin(Stdio::null())
-            .current_dir(work_dir);
-
+            .current_dir(work_dir)
+            .arg("--model")
+            .arg(&args.model);
         Ok(cmd.kill_on_drop(true).spawn()?)
     }
 

diff --git a/src/process/win.rs b/src/process/win.rs
@@ -7,6 +7,7 @@ use winapi::um::handleapi::INVALID_HANDLE_VALUE;
 #[cfg(target_os = "windows")]
 use winapi::um::winnt::HANDLE;
 
+#[cfg(target_os = "windows")]
 use std::{mem, ptr};
 
 #[cfg(target_os = "windows")]