Minor bazel config improvements (eclipse-score#4)

Remove redundant configuration statements:
- rules_cc module and loading of cc_binary and cc_library rules
- explicit rules_rust hashes
- rust_analyzer extension

Change-Id: Ie7f54063cffe6ca5426caf2de8fab1d732fc09f9

Co-authored-by: Dominik Fischer <dominik.a.fischer@accenture.com>

Author: 2 people

BUILD

@@ -23,7 +23,6 @@ setup_starpls(
 copyright_checker(
     name = "copyright",
     srcs = [
-        "src",
         "tests",
         "//:BUILD",
         "//:MODULE.bazel",

Cargo.lock

@@ -35,6 +35,19 @@ bazel_dep(name = "rules_rust", version = "0.63.0")
 # C/C++ rules for Bazel
 bazel_dep(name = "rules_cc", version = "0.2.1")
 
+# LLVM Toolchains Rules - host configuration
+bazel_dep(name = "toolchains_llvm", version = "1.4.0")
+
+llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm")
+llvm.toolchain(
+    cxx_standard = {"": "c++17"},
+    llvm_version = "19.1.0",
+)
+use_repo(llvm, "llvm_toolchain")
+use_repo(llvm, "llvm_toolchain_llvm")
+
+register_toolchains("@llvm_toolchain//:all")
+
 # tooling
 bazel_dep(name = "score_tooling", version = "1.0.1")
 bazel_dep(name = "aspect_rules_lint", version = "1.5.3")
@@ -51,6 +64,13 @@ RUST_VERSION = "1.83.0"
 rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
 rust.toolchain(
     edition = RUST_EDITION,
+    sha256s = {
+        "rustc-1.83.0-x86_64-unknown-linux-gnu.tar.xz": "6ec40e0405c8cbed3b786a97d374c144b012fc831b7c22b535f8ecb524f495ad",
+        "clippy-1.83.0-x86_64-unknown-linux-gnu.tar.xz": "ef6c05abcfd861ff0bca41d408e126dda195dc966ee35abee57645a12d418f5b",
+        "cargo-1.83.0-x86_64-unknown-linux-gnu.tar.xz": "de834a4062d9cd200f8e0cdca894c0b98afe26f1396d80765df828880a39b98c",
+        "llvm-tools-1.83.0-x86_64-unknown-linux-gnu.tar.xz": "b931673b309c229e234f03271aaa777ea149c3c41f0fb43f3ef13a272540299a",
+        "rust-std-1.83.0-x86_64-unknown-linux-gnu.tar.xz": "c88fe6cb22f9d2721f26430b6bdd291e562da759e8629e2b4c7eb2c7cad705f2",
+    },
     versions = [RUST_VERSION],
 )
 use_repo(rust, "rust_toolchains")
@@ -77,3 +97,7 @@ crate.from_cargo(
     ],
 )
 use_repo(crate, "cargo")
+
+# To update, run `bazel run @rules_rust//tools/rust_analyzer:gen_rust_project`.
+rust_analyzer = use_extension("@rules_rust//tools/rust_analyzer:deps.bzl", "rust")
+rust_analyzer.rust_analyzer_dependencies()

MODULE.bazel

@@ -89,7 +89,7 @@ Install *bytehound* with the following commands:
 
 ```sh
 wget https://github.com/koute/bytehound/releases/download/0.11.0/bytehound-x86_64-unknown-linux-gnu.tgz
-tar xzf bytehound-x86_64-unknown-linux-gnu.tgz bytehound libbytehound.so 
+tar xzf bytehound-x86_64-unknown-linux-gnu.tgz bytehound libbytehound.so
 mv bytehound libbytehound.so $HOME/.cargo/bin
 ```
 
@@ -113,5 +113,3 @@ bytehound server memory-profiling_*.dat
 
 Click on the [link](http://127.0.0.1:8080) in the output to open the browser and
 see the results. Setup ssh port forwarding if needed when working remote (`ssh -L 8080:localhost:8080 host`).
-
-

README.md

@@ -179,6 +179,7 @@ mod direct_mpsc {
 
         let agent_id = params.agent_id;
         PrimaryConfig {
+            id: agent_id,
             cycle_time: params.feo_cycle_time,
             activity_dependencies: app_config.activity_dependencies(),
             // With only one agent, we cannot attach a recorder
@@ -228,12 +229,14 @@ mod direct_sockets {
     ) -> PrimaryConfig {
         let agent_id = params.agent_id;
         PrimaryConfig {
+            id: agent_id,
             cycle_time: params.feo_cycle_time,
             activity_dependencies: app_config.activity_dependencies(),
             recorder_ids: app_config.recorders(),
             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(),
         }
     }
 

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

@@ -26,7 +26,7 @@ rust_library(
     ],
     crate_features = [
         "com_iox2",
-        "signalling_relayed_tcp",
+        "signalling_direct_tcp",
     ],
     crate_name = "mini_adas",
     proc_macro_deps = [
@@ -59,7 +59,7 @@ rust_library(
     crate_features = [
         "com_iox2",
         "recording",
-        "signalling_relayed_tcp",
+        "signalling_direct_tcp",
     ],
     crate_name = "mini_adas",
     proc_macro_deps = [
@@ -87,7 +87,7 @@ rust_binary(
     srcs = [
         "src/bin/adas_primary.rs",
     ],
-    crate_features = ["signalling_relayed_tcp"],
+    crate_features = ["signalling_direct_tcp"],
     visibility = ["//visibility:public"],
     deps = [
         ":libmini_adas_rust",
@@ -104,7 +104,7 @@ rust_binary(
     srcs = [
         "src/bin/adas_secondary.rs",
     ],
-    crate_features = ["signalling_relayed_tcp"],
+    crate_features = ["signalling_direct_tcp"],
     visibility = ["//visibility:public"],
     deps = [
         ":libmini_adas_rust",
@@ -123,7 +123,7 @@ rust_binary(
     ],
     crate_features = [
         "recording",
-        "signalling_relayed_tcp",
+        "signalling_direct_tcp",
     ],
     visibility = ["//visibility:public"],
     deps = [

examples/rust/mini-adas/BUILD.bazel

@@ -33,7 +33,7 @@ com_iox2 = ["feo-com/ipc_iceoryx2"]
 com_linux_shm = ["feo-com/ipc_linux_shm"]
 default = ["com_iox2", "signalling_relayed_tcp"]
 signalling_direct_mpsc = []
-signalling_direct_tcp = []
+signalling_direct_tcp = ["com_iox2"]
 signalling_direct_unix = []
 signalling_relayed_tcp = []
 signalling_relayed_unix = []

examples/rust/mini-adas/Cargo.toml

@@ -93,5 +93,19 @@ cargo run --no-default-features --features signalling_direct_tcp --bin adas_seco
 cargo run --no-default-features --features signalling_direct_tcp --bin adas_secondary 2
 ```
 
+### Direct Mode with a Recorder
+
+To run with a recorder in direct mode.
+
+```sh
+# Use 400ms cycle time and wait for recorder 900
+cargo run --no-default-features --features "signalling_direct_tcp,com_iox2" --bin adas_primary -- 400 900
+```
+
+```sh
+# Start recorder with ID 900 in direct mode
+cargo run --no-default-features --features "signalling_direct_tcp,recording,com_iox2" --bin adas_recorder -- 900
+```
+
 Note that for mpsc-only signalling, there can be only a primary process without
-any secondaries or recorders, because mpsc does not support inter-process signalling.
+any secondaries or recorders, because mpsc does not support inter-process signalling.

examples/rust/mini-adas/README.md

@@ -98,7 +98,9 @@ impl Activity for Camera {
     }
 
     #[instrument(name = "Camera shutdown")]
-    fn shutdown(&mut self) {}
+    fn shutdown(&mut self) {
+        debug!("Shutting down Camera activity {}", self.activity_id);
+    }
 }
 
 /// Radar activity
@@ -161,7 +163,9 @@ impl Activity for Radar {
     }
 
     #[instrument(name = "Radar shutdown")]
-    fn shutdown(&mut self) {}
+    fn shutdown(&mut self) {
+        debug!("Shutting down Radar activity {}", self.activity_id);
+    }
 }
 
 /// Neural network activity
@@ -251,7 +255,9 @@ impl Activity for NeuralNet {
     }
 
     #[instrument(name = "NeuralNet shutdown")]
-    fn shutdown(&mut self) {}
+    fn shutdown(&mut self) {
+        debug!("Shutting down NeuralNet activity {}", self.activity_id);
+    }
 }
 
 /// Emergency braking activity
@@ -328,7 +334,9 @@ impl Activity for EmergencyBraking {
     }
 
     #[instrument(name = "EmergencyBraking shutdown")]
-    fn shutdown(&mut self) {}
+    fn shutdown(&mut self) {
+        debug!("Shutting down EmergencyBraking activity {}", self.activity_id);
+    }
 }
 
 /// Brake controller activity
@@ -378,7 +386,9 @@ impl Activity for BrakeController {
     }
 
     #[instrument(name = "BrakeController shutdown")]
-    fn shutdown(&mut self) {}
+    fn shutdown(&mut self) {
+        debug!("Shutting down BrakeController activity {}", self.activity_id);
+    }
 }
 
 /// Environment renderer activity
@@ -422,7 +432,9 @@ impl Activity for EnvironmentRenderer {
     }
 
     #[instrument(name = "EnvironmentRenderer shutdown")]
-    fn shutdown(&mut self) {}
+    fn shutdown(&mut self) {
+        debug!("Shutting down EnvironmentRenderer activity {}", self.activity_id);
+    }
 }
 
 /// Steering controller activity
@@ -470,7 +482,9 @@ impl Activity for SteeringController {
     }
 
     #[instrument(name = "SteeringController shutdown")]
-    fn shutdown(&mut self) {}
+    fn shutdown(&mut self) {
+        debug!("Shutting down SteeringController activity {}", self.activity_id);
+    }
 }
 
 /// Create an activity input.