ctrlc is not built after rebasing

Author: ShoroukRamzy

Cargo.toml

@@ -64,6 +64,7 @@ tracing = { version = "0.1.41", features = [
     "attributes",
 ], default-features = false }
 tracing-subscriber = { version = "0.3.19", default-features = false }
+ctrlc = { version = "3.4", features = ["termination"] }
 
 [profile.profiling]
 inherits = "release"

examples/rust/cycle-benchmark/src/bin/cycle_bench.rs

@@ -236,7 +236,16 @@ mod direct_sockets {
             worker_assignments: app_config.worker_assignments().remove(&agent_id).unwrap(),
             timeout: Duration::from_secs(10),
             endpoint: endpoint(&app_config, signalling),
-            activity_agent_map: app_config.activity_worker_map().iter().map(|(act_id, w_id)| (*act_id, app_config.worker_agent_map().get(w_id).copied().unwrap())).collect(),
+            activity_agent_map: app_config
+                .activity_worker_map()
+                .iter()
+                .map(|(act_id, w_id)| {
+                    (
+                        *act_id,
+                        app_config.worker_agent_map().get(w_id).copied().unwrap(),
+                    )
+                })
+                .collect(),
         }
     }
 

examples/rust/mini-adas/BUILD.bazel

@@ -24,13 +24,8 @@ rust_library(
         "src/lib.rs",
     ],
     crate_features = [
-<<<<<<< HEAD
         "com_linux_shm",
         "signalling_relayed_tcp",
-=======
-        "com_iox2",
-        "signalling_direct_tcp",
->>>>>>> 9f85924 ( handling shutdown and termination signallingin all signalling modes)
     ],
     crate_name = "mini_adas",
     proc_macro_deps = [

examples/rust/mini-adas/src/activities/components.rs

@@ -335,7 +335,10 @@ impl Activity for EmergencyBraking {
 
     #[instrument(name = "EmergencyBraking shutdown")]
     fn shutdown(&mut self) {
-        debug!("Shutting down EmergencyBraking activity {}", self.activity_id);
+        debug!(
+            "Shutting down EmergencyBraking activity {}",
+            self.activity_id
+        );
     }
 }
 
@@ -387,7 +390,10 @@ impl Activity for BrakeController {
 
     #[instrument(name = "BrakeController shutdown")]
     fn shutdown(&mut self) {
-        debug!("Shutting down BrakeController activity {}", self.activity_id);
+        debug!(
+            "Shutting down BrakeController activity {}",
+            self.activity_id
+        );
     }
 }
 
@@ -433,7 +439,10 @@ impl Activity for EnvironmentRenderer {
 
     #[instrument(name = "EnvironmentRenderer shutdown")]
     fn shutdown(&mut self) {
-        debug!("Shutting down EnvironmentRenderer activity {}", self.activity_id);
+        debug!(
+            "Shutting down EnvironmentRenderer activity {}",
+            self.activity_id
+        );
     }
 }
 
@@ -483,7 +492,10 @@ impl Activity for SteeringController {
 
     #[instrument(name = "SteeringController shutdown")]
     fn shutdown(&mut self) {
-        debug!("Shutting down SteeringController activity {}", self.activity_id);
+        debug!(
+            "Shutting down SteeringController activity {}",
+            self.activity_id
+        );
     }
 }
 

feo-time/BUILD.bazel

@@ -11,7 +11,6 @@
 # SPDX-License-Identifier: Apache-2.0
 # *******************************************************************************
 
-
 load(
     "@rules_rust//rust:defs.bzl",
     "rust_binary",

feo/Cargo.toml

@@ -5,7 +5,6 @@ edition = "2021"
 
 [dependencies]
 feo-com = { workspace = true }
-ctrlc = { version = "3.4", features = ["termination"] }
 feo-log = { workspace = true }
 feo-time = { workspace = true }
 feo-tracing = { workspace = true }
@@ -15,6 +14,7 @@ postcard = { workspace = true, features = [
     "experimental-derive",
 ], optional = true }
 serde = { workspace = true, optional = true }
+ctrlc = { workspace = true}
 
 [dev-dependencies]
 feo-logger = { workspace = true }

feo/src/agent/direct/primary.rs

@@ -26,10 +26,11 @@ use crate::worker::Worker;
 use alloc::boxed::Box;
 use alloc::vec::Vec;
 use core::time::Duration;
+use ctrlc;
 use feo_log::info;
 use std::collections::HashMap;
-use std::thread::{self, JoinHandle};
 use std::sync::{atomic::AtomicBool, Arc};
+use std::thread::{self, JoinHandle};
 
 /// Configuration of the primary agent
 pub struct PrimaryConfig {
@@ -68,7 +69,8 @@ impl Primary {
             recorder_ids,
             endpoint,
             timeout,
-            activity_agent_map, ..
+            activity_agent_map,
+            ..
         } = config;
 
         // Create worker threads first so that the connector of the scheduler can connect
@@ -165,7 +167,10 @@ impl Primary {
         // We can now safely join our local worker threads.
         for th in self.worker_threads.drain(..) {
             if let Err(e) = th.join() {
-                feo_log::error!("A local worker thread in the primary agent panicked: {:?}", e);
+                feo_log::error!(
+                    "A local worker thread in the primary agent panicked: {:?}",
+                    e
+                );
             }
         }
 

feo/src/agent/direct/primary_mpsc.rs

@@ -24,10 +24,11 @@ use crate::worker::Worker;
 use alloc::boxed::Box;
 use alloc::vec::Vec;
 use core::time::Duration;
+use ctrlc;
 use feo_log::{debug, info};
 use std::collections::HashMap;
-use std::thread::{self, JoinHandle};
 use std::sync::{atomic::AtomicBool, Arc};
+use std::thread::{self, JoinHandle};
 
 /// Configuration of the primary agent
 pub struct PrimaryConfig {
@@ -136,7 +137,10 @@ impl Primary {
 
         for th in self.worker_threads.drain(..) {
             if let Err(e) = th.join() {
-                feo_log::error!("A local worker thread in the primary agent panicked: {:?}", e);
+                feo_log::error!(
+                    "A local worker thread in the primary agent panicked: {:?}",
+                    e
+                );
             }
         }
         debug!("Primary agent finished");

feo/src/agent/direct/secondary.rs

@@ -88,7 +88,10 @@ impl Secondary {
             })
             .collect();
 
-        Self { id: config.id, worker_threads }
+        Self {
+            id: config.id,
+            worker_threads,
+        }
     }
 
     /// Run the agent
@@ -101,7 +104,6 @@ impl Secondary {
             }
         }
 
-
         debug!("Secondary with ID {:?} finished", self.id);
     }
 }

feo/src/agent/relayed/primary.rs

@@ -25,10 +25,11 @@ use crate::worker::Worker;
 use alloc::boxed::Box;
 use alloc::vec::Vec;
 use core::time::Duration;
+use ctrlc;
 use feo_log::{debug, info};
 use std::collections::HashMap;
-use std::thread::{self, JoinHandle};
 use std::sync::{atomic::AtomicBool, Arc};
+use std::thread::{self, JoinHandle};
 
 /// Configuration of the primary agent
 pub struct PrimaryConfig {