chore: add orchestrator to run multiple mode (TO REVIEW)

Author: GuillaumeLagrange

src/cli/exec/mod.rs

@@ -7,11 +7,11 @@ use crate::prelude::*;
 use crate::project_config::ProjectConfig;
 use crate::project_config::merger::ConfigMerger;
 use crate::upload::UploadResult;
+use crate::upload::poll_results::{PollResultsOptions, poll_results};
 use clap::Args;
 use std::path::Path;
 
 pub mod multi_targets;
-mod poll_results;
 
 /// We temporarily force this name for all exec runs
 pub const DEFAULT_REPOSITORY_NAME: &str = "local-runs";
@@ -91,20 +91,19 @@ pub async fn run(
 /// result polling. It is used by both `codspeed exec` directly and by `codspeed run` when
 /// executing targets defined in codspeed.yaml.
 pub async fn execute_with_harness(
-    config: crate::executor::Config,
+    mut config: crate::executor::Config,
     api_client: &CodSpeedAPIClient,
     codspeed_config: &CodSpeedConfig,
     setup_cache_dir: Option<&Path>,
 ) -> Result<()> {
-    let mut execution_context =
-        executor::ExecutionContext::new(config, codspeed_config, api_client).await?;
+    let orchestrator =
+        executor::Orchestrator::new(&mut config, codspeed_config, api_client).await?;
 
-    if !execution_context.is_local() {
+    if !orchestrator.is_local() {
         super::show_banner();
     }
 
-    debug!("config: {:#?}", execution_context.config);
-    let executor = executor::get_executor_from_mode(&execution_context.config.mode);
+    debug!("config: {config:#?}");
 
     let get_exec_harness_installer_url = || {
         format!(
@@ -120,17 +119,14 @@ pub async fn execute_with_harness(
     )
     .await?;
 
+    let poll_opts = PollResultsOptions::for_exec();
     let poll_results_fn = async |upload_result: &UploadResult| {
-        poll_results::poll_results(api_client, upload_result).await
+        poll_results(api_client, upload_result, &poll_opts).await
     };
 
-    executor::execute_benchmarks(
-        executor.as_ref(),
-        &mut execution_context,
-        setup_cache_dir,
-        poll_results_fn,
-    )
-    .await?;
+    orchestrator
+        .execute(&mut config, setup_cache_dir, poll_results_fn)
+        .await?;
 
     Ok(())
 }

src/cli/exec/poll_results.rs

@@ -1,11 +1,10 @@
-use crate::executor::ExecutionContext;
 use crate::logger::{GROUP_TARGET, OPENED_GROUP_TARGET};
 use crate::prelude::*;
 use crate::run_environment::RunEnvironmentProvider;
 use log::LevelFilter;
 use simplelog::{CombinedLogger, WriteLogger};
 use std::fs::copy;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use tempfile::NamedTempFile;
 
 pub struct Logger {
@@ -34,11 +33,7 @@ impl Logger {
         Ok(Self { log_file_path })
     }
 
-    pub fn persist_log_to_profile_folder(
-        &self,
-        execution_context: &ExecutionContext,
-    ) -> Result<()> {
-        let profile_folder = execution_context.profile_folder.clone();
+    pub fn persist_log_to_profile_folder(&self, profile_folder: &Path) -> Result<()> {
         let dest_log_file_path = profile_folder.join("runner.log");
         debug!("Persisting log file to {}", dest_log_file_path.display());
         log::logger().flush();

src/cli/run/logger.rs

@@ -8,12 +8,12 @@ use crate::project_config::ProjectConfig;
 use crate::project_config::merger::ConfigMerger;
 use crate::run_environment::interfaces::RepositoryProvider;
 use crate::upload::UploadResult;
+use crate::upload::poll_results::{PollResultsOptions, poll_results};
 use clap::{Args, ValueEnum};
 use std::path::Path;
 
 pub mod helpers;
 pub mod logger;
-mod poll_results;
 
 #[derive(Args, Debug)]
 pub struct RunArgs {
@@ -70,7 +70,7 @@ impl RunArgs {
                 repository: None,
                 provider: None,
                 working_directory: None,
-                mode: Some(RunnerMode::Simulation),
+                mode: vec![RunnerMode::Simulation],
                 simulation_tool: None,
                 profile_folder: None,
                 skip_upload: false,
@@ -141,30 +141,23 @@ pub async fn run(
 
     match run_target {
         RunTarget::SingleCommand(args) => {
-            let config = Config::try_from(args)?;
+            let mut config = Config::try_from(args)?;
 
-            // Create execution context
-            let mut execution_context =
-                executor::ExecutionContext::new(config, codspeed_config, api_client).await?;
+            let orchestrator =
+                executor::Orchestrator::new(&mut config, codspeed_config, api_client).await?;
 
-            if !execution_context.is_local() {
+            if !orchestrator.is_local() {
                 super::show_banner();
             }
-            debug!("config: {:#?}", execution_context.config);
-
-            // Execute benchmarks
-            let executor = executor::get_executor_from_mode(&execution_context.config.mode);
+            debug!("config: {config:#?}");
 
+            let poll_opts = PollResultsOptions::for_run(output_json);
             let poll_results_fn = async |upload_result: &UploadResult| {
-                poll_results::poll_results(api_client, upload_result, output_json).await
+                poll_results(api_client, upload_result, &poll_opts).await
             };
-            executor::execute_benchmarks(
-                executor.as_ref(),
-                &mut execution_context,
-                setup_cache_dir,
-                poll_results_fn,
-            )
-            .await?;
+            orchestrator
+                .execute(&mut config, setup_cache_dir, poll_results_fn)
+                .await?;
         }
 
         RunTarget::ConfigTargets {

src/cli/run/mod.rs

@@ -1,12 +1,17 @@
 use crate::prelude::*;
 
 pub fn run() -> Result<()> {
-    let shell_session_mode = crate::runner_mode::load_shell_session_mode()?;
+    let modes = crate::runner_mode::load_shell_session_mode()?;
 
-    if let Some(mode) = shell_session_mode {
-        info!("{mode:?}");
-    } else {
+    if modes.is_empty() {
         info!("No mode set for this shell session");
+    } else {
+        let modes_str = modes
+            .iter()
+            .map(|m| format!("{m:?}"))
+            .collect::<Vec<_>>()
+            .join(", ");
+        info!("{modes_str}");
     }
 
     Ok(())

src/cli/run/poll_results.rs

@@ -6,9 +6,11 @@ use clap::Args;
 
 #[derive(Debug, Args)]
 pub struct UseArgs {
-    /// Set the CodSpeed runner mode for this shell session. If not provided, the current mode will
-    /// be displayed.
-    pub mode: RunnerMode,
+    /// Set the CodSpeed runner mode(s) for this shell session.
+    /// Multiple modes can be provided as separate arguments (e.g. `simulation walltime`)
+    /// or comma-separated (e.g. `simulation,walltime`).
+    #[arg(value_delimiter = ',', required = true)]
+    pub mode: Vec<RunnerMode>,
 }
 
 pub fn run(args: UseArgs) -> Result<()> {