Alive monitor refactor cleanup

score/launch_manager/src/daemon/BUILD

@@ -27,9 +27,7 @@ cc_binary(
         "//score/launch_manager/src/daemon/src/configuration:flatbuffer_config_loader",
         "//score/launch_manager/src/daemon/src/osal:ipc_comms",
         "//score/launch_manager/src/daemon/src/process_group_manager",
-        "//score/launch_manager/src/daemon/src/process_group_manager:alive_monitor_thread",
         "//score/launch_manager/src/daemon/src/recovery_client",
-        "//score/launch_manager/src/daemon/src/supervision_control_client:supervision_control_notifier",
         "//score/launch_manager/src/daemon/src/watchdog:watchdog_factory",
         "@score_baselibs//score/language/futurecpp",
     ],

score/launch_manager/src/daemon/src/alive_monitor/BUILD

@@ -19,3 +19,74 @@ cc_library(
         "//score/launch_manager/src/daemon/src/alive_monitor/details/daemon:health_monitor_impl",
     ],
 )
+
+cc_library(
+    name = "i_alive_monitor",
+    hdrs = ["IAliveMonitor.hpp"],
+    include_prefix = "score/mw/launch_manager/alive_monitor",
+    strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor",
+    visibility = ["//score:__subpackages__"],
+    deps = [
+        "//score/launch_manager/src/daemon/src/alive_monitor:isupervision_factory",
+    ],
+)
+
+cc_library(
+    name = "mock_alive_monitor",
+    testonly = True,
+    hdrs = ["mock_alive_monitor.hpp"],
+    include_prefix = "score/mw/launch_manager/alive_monitor",
+    strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor",
+    visibility = ["//score:__subpackages__"],
+    deps = [
+        ":i_alive_monitor",
+        "@googletest//:gtest_main",
+    ],
+)
+
+cc_library(
+    name = "isupervision_event_publisher",
+    hdrs = ["isupervision_event_publisher.hpp"],
+    include_prefix = "score/mw/launch_manager/alive_monitor",
+    strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor",
+    visibility = ["//score:__subpackages__"],
+)
+
+cc_library(
+    name = "isupervision_factory",
+    hdrs = ["isupervision_factory.hpp"],
+    include_prefix = "score/mw/launch_manager/alive_monitor",
+    strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor",
+    visibility = ["//score:__subpackages__"],
+    deps = [
+        "//score/launch_manager/src/daemon/src/alive_monitor/details/ifexm:supervision_handle",
+        "//score/launch_manager/src/daemon/src/common:identifier_hash",
+        "//score/launch_manager/src/daemon/src/configuration:component_config",
+    ],
+)
+
+cc_library(
+    name = "mock_supervision_event_publisher",
+    testonly = True,
+    hdrs = ["mock_supervision_event_publisher.hpp"],
+    include_prefix = "score/mw/launch_manager/alive_monitor",
+    strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor",
+    visibility = ["//score:__subpackages__"],
+    deps = [
+        ":isupervision_event_publisher",
+        "@googletest//:gtest_main",
+    ],
+)
+
+cc_library(
+    name = "mock_supervision_factory",
+    testonly = True,
+    hdrs = ["mock_supervision_factory.hpp"],
+    include_prefix = "score/mw/launch_manager/alive_monitor",
+    strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor",
+    visibility = ["//score:__subpackages__"],
+    deps = [
+        ":isupervision_factory",
+        "@googletest//:gtest_main",
+    ],
+)

score/launch_manager/src/daemon/src/alive_monitor/details/daemon/IAliveMonitor.hpp → score/launch_manager/src/daemon/src/alive_monitor/IAliveMonitor.hpp

@@ -13,9 +13,7 @@
 #ifndef SAF_DAEMON_ALIVE_MONITOR_HPP_INCLUDED
 #define SAF_DAEMON_ALIVE_MONITOR_HPP_INCLUDED
 
-#include <atomic>
-
-#include "score/mw/launch_manager/alive_monitor/details/daemon/PhmDaemon.hpp"
+#include "score/mw/launch_manager/alive_monitor/isupervision_factory.hpp"
 
 namespace score
 {
@@ -32,13 +30,15 @@ class IAliveMonitor
   public:
     virtual ~IAliveMonitor() = default;
 
-    /// @brief Initialize the AliveMonitor functionality
-    /// @return kNoError if initialization was successful, otherwise an appropriate error code.
-    virtual EInitCode init() noexcept = 0;
+    /// @brief Start the monitor thread
+    /// @returns False if monitoring failed to start, true otherwise
+    virtual bool startMonitoring() = 0;
+
+    /// @brief Stop the monitor thread
+    virtual void stopMonitoring() = 0;
 
-    /// @brief Run the AliveMonitor functionality in a cyclic manner until cancellation is requested.
-    /// @param cancel_thread Atomic boolean flag to signal thread cancellation.
-    virtual bool run(std::atomic_bool& cancel_thread) noexcept = 0;
+    /// @brief Returns an interface for components to register their alive supervision
+    virtual ISupervisionFactory& getSupervisionFactory() const = 0;
 };
 
 }  // namespace daemon

score/launch_manager/src/daemon/src/alive_monitor/details/common/BUILD

@@ -30,6 +30,14 @@ cc_library(
     visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"],
 )
 
+cc_library(
+    name = "einitcode",
+    hdrs = ["EInitCode.hpp"],
+    include_prefix = "score/mw/launch_manager/alive_monitor/details/common",
+    strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/common",
+    visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"],
+)
+
 cc_library(
     name = "locked_vector",
     hdrs = ["LockedVector.hpp"],

score/launch_manager/src/daemon/src/alive_monitor/details/common/EInitCode.hpp

@@ -0,0 +1,34 @@
+/********************************************************************************
+ * 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 E_INIT_CODE_HPP_INCLUDED
+#define E_INIT_CODE_HPP_INCLUDED
+
+#include <cstdint>
+
+namespace score::mw::lifecycle::internal::saf::daemon
+{
+
+/// @brief Return codes for PhmDaemon Initialization
+enum class EInitCode : std::int8_t
+{
+    kNoError,                        ///< Init Successful (no error occurred)
+    kNotInitialized,                 ///< Init was not performed
+    kCycleTimeInitFailed,            ///< Cyclic Timer initialization failed
+    kConstructFlatCfgFactoryFailed,  ///< FlatCfgFactory failed loading SWCL configurations
+    kGeneralError                    ///< General error
+};
+
+}  // namespace score::mw::lifecycle::internal::saf::daemon
+
+#endif

score/launch_manager/src/daemon/src/alive_monitor/details/daemon/AliveMonitorImpl.cpp

@@ -11,34 +11,33 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 #include <sys/types.h>
-
 #include <iostream>
 
 #include <score/assert.hpp>
 
 #include "score/mw/launch_manager/alive_monitor/details/daemon/AliveMonitorImpl.hpp"
+#include "score/mw/launch_manager/alive_monitor/details/daemon/PhmDaemon.hpp"
 
 namespace score::mw::lifecycle::internal::saf::daemon
 {
 
 AliveMonitorImpl::AliveMonitorImpl(
     SptrIRecoveryClient recovery_client,
-    UptrISupervisionControlReceiver observable_event_receiver,
-    const Config& config)
-    : m_recovery_client(recovery_client),
-      m_observable_event_receiver(std::move(observable_event_receiver)),
-      m_config(config)
+    const AliveSupervisionConfig& config,
+    const std::size_t supervised_components)
+    : m_recovery_client(recovery_client), m_config(config)
 {
+    initResult = init(supervised_components);
 }
 
-EInitCode AliveMonitorImpl::init() noexcept
+EInitCode AliveMonitorImpl::init(const std::size_t supervised_components) noexcept
 {
     EInitCode initResult{EInitCode::kGeneralError};
     try
     {
         m_osClock.startMeasurement();
 
-        m_daemon = std::make_unique<PhmDaemon>(m_osClock, std::move(m_observable_event_receiver));
+        m_daemon = std::make_unique<PhmDaemon>(m_osClock, supervised_components);
         initResult = m_daemon->init(m_recovery_client, m_config);
 
         if (initResult == EInitCode::kNoError)
@@ -65,11 +64,39 @@ EInitCode AliveMonitorImpl::init() noexcept
     return initResult;
 }
 
-bool AliveMonitorImpl::run(std::atomic_bool& cancel_thread) noexcept
+bool AliveMonitorImpl::startMonitoring() noexcept
+{
+    if (initResult != EInitCode::kNoError)
+    {
+        return false;
+    }
+
+    alive_monitor_thread_ = std::thread([this]() {
+        threadFn(stop_thread_);
+    });
+
+    return true;
+}
+
+void AliveMonitorImpl::stopMonitoring() noexcept
+{
+    stop_thread_.store(true);
+    if (alive_monitor_thread_.joinable())
+    {
+        alive_monitor_thread_.join();
+    }
+}
+
+bool AliveMonitorImpl::threadFn(std::atomic_bool& cancel_thread) noexcept
 {
     SCORE_LANGUAGE_FUTURECPP_PRECONDITION_PRD_MESSAGE(
         m_daemon != nullptr, "HealthMonitor: Instance is not initialized!");
     return m_daemon->startCyclicExec(cancel_thread);
 }
 
+ISupervisionFactory& AliveMonitorImpl::getSupervisionFactory() const noexcept
+{
+    return *m_daemon;
+}
+
 }  // namespace score::mw::lifecycle::internal::saf::daemon

score/launch_manager/src/daemon/src/alive_monitor/details/daemon/AliveMonitorImpl.hpp

@@ -15,8 +15,10 @@
 
 #include <atomic>
 #include <memory>
+#include <thread>
 
-#include "score/mw/launch_manager/alive_monitor/details/daemon/IAliveMonitor.hpp"
+#include "score/mw/launch_manager/alive_monitor/IAliveMonitor.hpp"
+#include "score/mw/launch_manager/alive_monitor/details/daemon/PhmDaemon.hpp"
 #include "score/mw/launch_manager/configuration/config.hpp"
 
 namespace score
@@ -36,30 +38,44 @@ namespace daemon
 {
 
 using SptrIRecoveryClient = std::shared_ptr<score::mw::lifecycle::IRecoveryClient>;
-using UptrISupervisionControlReceiver = std::unique_ptr<score::mw::lifecycle::ISupervisionControlReceiver>;
 using UptrPhmDaemon = std::unique_ptr<score::mw::lifecycle::internal::saf::daemon::PhmDaemon>;
 using OsClock = score::mw::lifecycle::internal::saf::timers::OsClockInterface;
-using Config = score::mw::lifecycle::internal::configuration::Config;
-using score::mw::lifecycle::internal::configuration::AliveSupervisionConfig;
+using configuration::AliveSupervisionConfig;
 
 class AliveMonitorImpl : public IAliveMonitor
 {
   public:
     AliveMonitorImpl(
         SptrIRecoveryClient recovery_client,
-        UptrISupervisionControlReceiver observable_event_receiver,
-        const Config& config);
+        const AliveSupervisionConfig& config,
+        const std::size_t supervised_components);
 
-    EInitCode init() noexcept override;
+    /// @brief @see IAliveMonitor definition
+    bool startMonitoring() noexcept override;
 
-    bool run(std::atomic_bool& cancel_thread) noexcept override;
+    /// @brief @see IAliveMonitor definition
+    void stopMonitoring() noexcept override;
+
+    /// @brief @see IAliveMonitor definition
+    ISupervisionFactory& getSupervisionFactory() const noexcept override;
 
   private:
+    /// @brief Initialize the AliveMonitor functionality
+    /// @param supervised_components Number of components we expect to register alive supervision
+    /// @return kNoError if initialization was successful, otherwise an appropriate error code.
+    EInitCode init(const std::size_t supervised_components) noexcept;
+
+    /// @brief Run the AliveMonitor functionality in a cyclic manner until cancellation is requested.
+    /// @param cancel_thread Atomic boolean flag to signal thread cancellation.
+    bool threadFn(std::atomic_bool& cancel_thread) noexcept;
+
     SptrIRecoveryClient m_recovery_client{nullptr};
     UptrPhmDaemon m_daemon{nullptr};
     OsClock m_osClock{};
-    UptrISupervisionControlReceiver m_observable_event_receiver;
-    const Config& m_config;
+    const AliveSupervisionConfig& m_config;
+    std::thread alive_monitor_thread_{};
+    std::atomic_bool stop_thread_{false};
+    saf::daemon::EInitCode initResult{saf::daemon::EInitCode::kNotInitialized};
 };
 
 }  // namespace daemon

score/launch_manager/src/daemon/src/alive_monitor/details/daemon/BUILD

@@ -51,6 +51,8 @@ cc_library(
     deps = [
         ":phm_daemon_config",
         ":sw_cluster_handler",
+        "//score/launch_manager/src/daemon/src/alive_monitor:isupervision_factory",
+        "//score/launch_manager/src/daemon/src/alive_monitor/details/common:einitcode",
         "//score/launch_manager/src/daemon/src/alive_monitor/details/factory:flat_cfg_factory",
         "//score/launch_manager/src/daemon/src/alive_monitor/details/ifappl:monitor_if_daemon",
         "//score/launch_manager/src/daemon/src/alive_monitor/details/ifexm:observable_event_reader",
@@ -62,15 +64,6 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "i_health_monitor",
-    hdrs = ["IAliveMonitor.hpp"],
-    include_prefix = "score/mw/launch_manager/alive_monitor/details/daemon",
-    strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/daemon",
-    visibility = ["//score/launch_manager/src/daemon:__subpackages__"],
-    deps = [":phm_daemon"],
-)
-
 cc_library(
     name = "health_monitor_impl",
     srcs = ["AliveMonitorImpl.cpp"],
@@ -79,7 +72,8 @@ cc_library(
     strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/daemon",
     visibility = ["//score/launch_manager/src/daemon:__subpackages__"],
     deps = [
-        ":i_health_monitor",
+        ":phm_daemon",
+        "//score/launch_manager/src/daemon/src/alive_monitor:i_alive_monitor",
         "//score/launch_manager/src/daemon/src/configuration:config",
         "@score_baselibs//score/language/futurecpp",
     ],