Arkjedrz parametrizable thread 2

Cargo.toml

@@ -21,10 +21,11 @@ signal-hook = "0.3.18"
 
 monitor_rs = { path = "src/launch_manager_daemon/health_monitor_lib/rust_bindings" } # Temporary API
 health_monitoring_lib = { path = "src/health_monitoring_lib" }
-score_log = { git = "https://github.com/eclipse-score/baselibs_rust.git", tag = "v0.0.4" }
-score_testing_macros = { git = "https://github.com/eclipse-score/baselibs_rust.git", tag = "v0.0.4" }
-stdout_logger = { git = "https://github.com/eclipse-score/baselibs_rust.git", tag = "v0.0.4" }
-containers = { git = "https://github.com/eclipse-score/baselibs_rust.git", tag = "v0.0.4" }
+score_log = { git = "https://github.com/eclipse-score/baselibs_rust.git", tag = "v0.1.1" }
+score_testing_macros = { git = "https://github.com/eclipse-score/baselibs_rust.git", tag = "v0.1.1" }
+stdout_logger = { git = "https://github.com/eclipse-score/baselibs_rust.git", tag = "v0.1.1" }
+containers = { git = "https://github.com/eclipse-score/baselibs_rust.git", tag = "v0.1.1" }
+thread = { git = "https://github.com/eclipse-score/baselibs_rust.git", tag = "v0.1.1" }
 
 [workspace.lints.clippy]
 std_instead_of_core = "warn"

MODULE.bazel

@@ -133,7 +133,13 @@ pip.parse(
 )
 use_repo(pip, "score_lifecycle_pip")
 
-bazel_dep(name = "score_baselibs_rust", version = "0.1.0")
+bazel_dep(name = "score_baselibs_rust", version = "0.1.1")
+git_override(
+    module_name = "score_baselibs_rust",
+    remote = "https://github.com/eclipse-score/baselibs_rust.git",
+    tag = "v0.1.1",
+)
+
 bazel_dep(name = "score_baselibs", version = "0.2.4")
 bazel_dep(name = "score_logging", version = "0.1.0")
 

src/health_monitoring_lib/BUILD

@@ -17,6 +17,7 @@ load("@score_baselibs//:bazel/unit_tests.bzl", "cc_gtest_unit_test")
 
 COMMON_DEPS = [
     "@score_baselibs_rust//src/containers:containers",
+    "@score_baselibs_rust//src/thread:thread",
     "@score_baselibs_rust//src/log/score_log:score_log",
     "//src/launch_manager_daemon/health_monitor_lib/rust_bindings:monitor_rs",
 ]
@@ -31,11 +32,13 @@ CC_SOURCES = [
     "cpp/heartbeat_monitor.cpp",
     "cpp/logic_monitor.cpp",
     "cpp/health_monitor.cpp",
+    "cpp/thread.cpp",
 ]
 
 CC_HDRS = [
     "cpp/include/score/hm/common.h",
     "cpp/include/score/hm/tag.h",
+    "cpp/include/score/hm/thread.h",
     "cpp/include/score/hm/deadline/deadline_monitor.h",
     "cpp/include/score/hm/heartbeat/heartbeat_monitor.h",
     "cpp/include/score/hm/logic/logic_monitor.h",

src/health_monitoring_lib/Cargo.toml

@@ -14,6 +14,7 @@ path = "rust/lib.rs"
 workspace = true
 
 [dependencies]
+thread.workspace = true
 score_log.workspace = true
 score_testing_macros.workspace = true
 containers.workspace = true

src/health_monitoring_lib/cpp/health_monitor.cpp

@@ -28,6 +28,11 @@ FFICode health_monitor_builder_destroy(FFIHandle health_monitor_builder_handle);
 FFICode health_monitor_builder_build(FFIHandle health_monitor_builder_handle,
                                      uint32_t supervisor_cycle_ms,
                                      uint32_t internal_cycle_ms,
+                                     const SchedulerPolicy* scheduler_policy,
+                                     const int32_t* scheduler_priority,
+                                     const size_t* affinity,
+                                     size_t num_affinity,
+                                     const size_t* stack_size,
                                      FFIHandle* health_monitor_handle_out);
 FFICode health_monitor_builder_add_deadline_monitor(FFIHandle health_monitor_builder_handle,
                                                     const MonitorTag* monitor_tag,
@@ -125,17 +130,60 @@ HealthMonitorBuilder HealthMonitorBuilder::with_supervisor_api_cycle(std::chrono
     return std::move(*this);
 }
 
+HealthMonitorBuilder HealthMonitorBuilder::thread_parameters(score::hm::ThreadParameters&& thread_parameters) &&
+{
+    thread_parameters_ = std::move(thread_parameters);
+    return std::move(*this);
+}
+
 score::cpp::expected<HealthMonitor, Error> HealthMonitorBuilder::build() &&
 {
     auto health_monitor_builder_handle = health_monitor_builder_handle_.drop_by_rust();
     SCORE_LANGUAGE_FUTURECPP_PRECONDITION(health_monitor_builder_handle.has_value());
 
+    // Gather and set health monitor parameters.
     uint32_t supervisor_duration_ms = static_cast<uint32_t>(supervisor_api_cycle_duration_.count());
     uint32_t internal_duration_ms = static_cast<uint32_t>(internal_processing_cycle_duration_.count());
 
+    // Optional thread parameters.
+    const SchedulerPolicy* scheduler_policy{nullptr};
+    const int32_t* scheduler_priority{nullptr};
+    const size_t* affinity{nullptr};
+    size_t num_affinity{0};
+    const size_t* stack_size{nullptr};
+    if (thread_parameters_.has_value())
+    {
+        // Scheduler parameters.
+        if (thread_parameters_->scheduler_parameters_.has_value())
+        {
+            scheduler_policy = &thread_parameters_->scheduler_parameters_->policy();
+            scheduler_priority = &thread_parameters_->scheduler_parameters_->priority();
+        }
+
+        // Affinity.
+        if (thread_parameters_->affinity_.has_value())
+        {
+            affinity = thread_parameters_->affinity_->data();
+            num_affinity = thread_parameters_->affinity_->size();
+        }
+
+        // Stack size.
+        if (thread_parameters_->stack_size_.has_value())
+        {
+            stack_size = &thread_parameters_->stack_size_.value();
+        }
+    }
+
     FFIHandle health_monitor_handle{nullptr};
-    auto result{health_monitor_builder_build(
-        health_monitor_builder_handle.value(), supervisor_duration_ms, internal_duration_ms, &health_monitor_handle)};
+    auto result{health_monitor_builder_build(health_monitor_builder_handle.value(),
+                                             supervisor_duration_ms,
+                                             internal_duration_ms,
+                                             scheduler_policy,
+                                             scheduler_priority,
+                                             affinity,
+                                             num_affinity,
+                                             stack_size,
+                                             &health_monitor_handle)};
     if (result != kSuccess)
     {
         return score::cpp::unexpected(static_cast<Error>(result));

src/health_monitoring_lib/cpp/include/score/hm/health_monitor.h

@@ -18,6 +18,7 @@
 #include <score/hm/heartbeat/heartbeat_monitor.h>
 #include <score/hm/logic/logic_monitor.h>
 #include <score/hm/tag.h>
+#include <score/hm/thread.h>
 
 namespace score::hm
 {
@@ -59,6 +60,9 @@ class HealthMonitorBuilder final
     /// This duration determines how often the health monitor checks deadlines.
     HealthMonitorBuilder with_internal_processing_cycle(std::chrono::milliseconds cycle_duration) &&;
 
+    /// Sets the monitoring thread parameters.
+    HealthMonitorBuilder thread_parameters(score::hm::ThreadParameters&& thread_parameters) &&;
+
     /// Build a new `HealthMonitor` instance based on provided parameters.
     score::cpp::expected<HealthMonitor, Error> build() &&;
 
@@ -67,6 +71,7 @@ class HealthMonitorBuilder final
 
     std::chrono::milliseconds supervisor_api_cycle_duration_;
     std::chrono::milliseconds internal_processing_cycle_duration_;
+    std::optional<ThreadParameters> thread_parameters_;
 };
 
 class HealthMonitor final

src/health_monitoring_lib/cpp/include/score/hm/thread.h

@@ -0,0 +1,81 @@
+/********************************************************************************
+ * Copyright (c) 2026 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+#ifndef SCORE_HM_THREAD_H
+#define SCORE_HM_THREAD_H
+
+#include <cstdint>
+#include <optional>
+#include <vector>
+
+namespace score::hm
+{
+
+class HealthMonitorBuilder;
+
+/// Scheduler policy.
+enum class SchedulerPolicy : int32_t
+{
+    Other,
+    Fifo,
+    RoundRobin,
+};
+
+/// Get min thread priority for given policy.
+int32_t scheduler_policy_priority_min(SchedulerPolicy scheduler_policy);
+
+/// Get max thread priority for given policy.
+int32_t scheduler_policy_priority_max(SchedulerPolicy scheduler_policy);
+
+class SchedulerParameters final
+{
+  public:
+    /// Create a new `SchedulerParameters`.
+    /// Priority must be in allowed range for the scheduler policy.
+    SchedulerParameters(SchedulerPolicy policy, int32_t priority);
+
+    /// Scheduler policy.
+    const SchedulerPolicy& policy() const;
+
+    /// Thread priority.
+    const int32_t& priority() const;
+
+  private:
+    SchedulerPolicy policy_;
+    int32_t priority_;
+};
+
+/// Thread parameters.
+class ThreadParameters final
+{
+  public:
+    /// Scheduler parameters, including scheduler policy and thread priority.
+    ThreadParameters scheduler_parameters(SchedulerParameters scheduler_parameters) &&;
+
+    /// Set thread affinity - array of CPU core IDs that the thread can run on.
+    ThreadParameters affinity(const std::vector<size_t>& affinity) &&;
+
+    /// Set stack size.
+    ThreadParameters stack_size(size_t stack_size) &&;
+
+  private:
+    std::optional<SchedulerParameters> scheduler_parameters_;
+    std::optional<std::vector<size_t>> affinity_;
+    std::optional<size_t> stack_size_;
+
+    // Allow `HealthMonitorBuilder` to access fields.
+    friend class HealthMonitorBuilder;
+};
+
+}  // namespace score::hm
+
+#endif  // SCORE_HM_THREAD_H

src/health_monitoring_lib/cpp/tests/health_monitor_test.cpp

@@ -56,12 +56,16 @@ TEST_F(HealthMonitorTest, TestName)
     auto logic_monitor_builder =
         logic::LogicMonitorBuilder{from_state}.add_state(from_state, std::vector{to_state}).add_state(to_state, {});
 
+    // Thread parameters.
+    auto thread_parameters{ThreadParameters().affinity(std::vector<size_t>{0})};
+
     auto hmon_result{HealthMonitorBuilder()
                          .add_deadline_monitor(deadline_monitor_tag, std::move(deadline_monitor_builder))
                          .add_heartbeat_monitor(heartbeat_monitor_tag, std::move(heartbeat_monitor_builder))
                          .add_logic_monitor(logic_monitor_tag, std::move(logic_monitor_builder))
                          .with_internal_processing_cycle(std::chrono::milliseconds(50))
                          .with_supervisor_api_cycle(std::chrono::milliseconds(50))
+                         .thread_parameters(std::move(thread_parameters))
                          .build()};
     EXPECT_TRUE(hmon_result.has_value());
     auto hm{std::move(hmon_result.value())};