From 73d3b021e654902a5cba7fb4cda7a42b1b114d8e Mon Sep 17 00:00:00 2001 From: Timo Steuerwald Date: Thu, 18 Jun 2026 14:29:44 +0200 Subject: [PATCH 1/4] Move files in score/launch_manager to src subdir --- score/launch_manager/BUILD | 12 ++++++------ .../{ => src}/exec_error_domain_UT.cpp | 0 score/launch_manager/{ => src}/execution_error.h | 0 .../launch_manager/{ => src}/execution_error_event.h | 0 4 files changed, 6 insertions(+), 6 deletions(-) rename score/launch_manager/{ => src}/exec_error_domain_UT.cpp (100%) rename score/launch_manager/{ => src}/execution_error.h (100%) rename score/launch_manager/{ => src}/execution_error_event.h (100%) diff --git a/score/launch_manager/BUILD b/score/launch_manager/BUILD index 44da3fc34..a3af91199 100644 --- a/score/launch_manager/BUILD +++ b/score/launch_manager/BUILD @@ -46,9 +46,9 @@ alias( cc_library( name = "error", - hdrs = ["execution_error.h"], + hdrs = ["src/execution_error.h"], include_prefix = "score/mw/lifecycle", - strip_include_prefix = "/score/launch_manager", + strip_include_prefix = "/score/launch_manager/src", visibility = ["//score/launch_manager:__subpackages__"], deps = [ "@score_baselibs//score/result", @@ -58,11 +58,11 @@ cc_library( cc_library( name = "error_event", hdrs = [ - "execution_error.h", - "execution_error_event.h", + "src/execution_error.h", + "src/execution_error_event.h", ], include_prefix = "score/mw/lifecycle", - strip_include_prefix = "/score/launch_manager", + strip_include_prefix = "/score/launch_manager/src", visibility = ["//score/launch_manager:__subpackages__"], deps = [ ":error", @@ -72,7 +72,7 @@ cc_library( cc_test( name = "exec_error_domain_UT", - srcs = ["exec_error_domain_UT.cpp"], + srcs = ["src/exec_error_domain_UT.cpp"], visibility = ["//visibility:private"], deps = [ ":error", diff --git a/score/launch_manager/exec_error_domain_UT.cpp b/score/launch_manager/src/exec_error_domain_UT.cpp similarity index 100% rename from score/launch_manager/exec_error_domain_UT.cpp rename to score/launch_manager/src/exec_error_domain_UT.cpp diff --git a/score/launch_manager/execution_error.h b/score/launch_manager/src/execution_error.h similarity index 100% rename from score/launch_manager/execution_error.h rename to score/launch_manager/src/execution_error.h diff --git a/score/launch_manager/execution_error_event.h b/score/launch_manager/src/execution_error_event.h similarity index 100% rename from score/launch_manager/execution_error_event.h rename to score/launch_manager/src/execution_error_event.h From d992002f6d7856e78ca528c593ed3f185d7215e6 Mon Sep 17 00:00:00 2001 From: Timo Steuerwald Date: Thu, 18 Jun 2026 15:02:39 +0200 Subject: [PATCH 2/4] Move everything else in launch_manager to src subdir --- BUILD | 2 +- Cargo.toml | 6 +- conf.py | 6 +- examples/rust_supervised_app/Cargo.toml | 4 +- score/launch_manager/BUILD | 32 ++-- .../src/alive_monitor/details/daemon/BUILD | 90 ------------ .../src/alive_monitor/details/factory/BUILD | 87 ----------- .../src/alive_monitor/details/ifexm/BUILD | 58 -------- .../alive_monitor/details/supervision/BUILD | 67 --------- .../src/process_group_manager/details/BUILD | 139 ------------------ .../{ => src}/control_client/BUILD | 6 +- .../control_client/src/control_client.cpp | 0 .../control_client/src/control_client.h | 0 .../control_client/src/details/BUILD | 14 +- .../src/details/control_client_impl.cpp | 0 .../src/details/control_client_impl.hpp | 0 score/launch_manager/{ => src}/daemon/BUILD | 14 +- .../{ => src}/daemon/src/alive_monitor/BUILD | 22 +-- .../daemon/src/alive_monitor/Monitor.cpp | 0 .../daemon/src/alive_monitor/Monitor.h | 0 .../src/alive_monitor/MonitorImplWrapper.cpp | 0 .../src/alive_monitor/MonitorImplWrapper.h | 0 .../src/alive_monitor/config/hm_flatcfg.fbs | 0 .../config/hm_flatcfg_generated.h | 0 .../alive_monitor/config/hmcore_flatcfg.fbs | 0 .../config/hmcore_flatcfg_generated.h | 0 .../daemon/src/alive_monitor/details/BUILD | 16 +- .../src/alive_monitor/details/MonitorImpl.cpp | 0 .../src/alive_monitor/details/MonitorImpl.h | 0 .../alive_monitor/details/MonitorImpl_UT.cpp | 0 .../src/alive_monitor/details/common/BUILD | 22 +-- .../details/common/FixedSizeVector.hpp | 0 .../details/common/LockedVector.hpp | 0 .../alive_monitor/details/common/Observer.hpp | 0 .../details/common/TimeSortingBuffer.hpp | 0 .../alive_monitor/details/common/Types.hpp | 0 .../details/daemon/AliveMonitorImpl.cpp | 0 .../details/daemon/AliveMonitorImpl.hpp | 0 .../src/alive_monitor/details/daemon/BUILD | 90 ++++++++++++ .../details/daemon/IAliveMonitor.hpp | 0 .../details/daemon/PhmDaemon.cpp | 0 .../details/daemon/PhmDaemon.hpp | 0 .../details/daemon/PhmDaemonConfig.hpp | 0 .../details/daemon/SwClusterHandler.cpp | 0 .../details/daemon/SwClusterHandler.hpp | 0 .../src/alive_monitor/details/factory/BUILD | 87 +++++++++++ .../details/factory/FlatCfgFactory.cpp | 0 .../details/factory/FlatCfgFactory.hpp | 0 .../details/factory/IPhmFactory.hpp | 0 .../details/factory/MachineConfigFactory.cpp | 0 .../details/factory/MachineConfigFactory.hpp | 0 .../details/factory/StaticConfig.hpp | 0 .../src/alive_monitor/details/ifappl/BUILD | 28 ++-- .../details/ifappl/Checkpoint.cpp | 0 .../details/ifappl/Checkpoint.hpp | 0 .../details/ifappl/DataStructures.hpp | 0 .../details/ifappl/MonitorIfDaemon.cpp | 0 .../details/ifappl/MonitorIfDaemon.hpp | 0 .../details/ifappl/MonitorIfDaemon_UT.cpp | 0 .../src/alive_monitor/details/ifexm/BUILD | 58 ++++++++ .../details/ifexm/ProcessCfg.hpp | 0 .../details/ifexm/ProcessState.cpp | 0 .../details/ifexm/ProcessState.hpp | 0 .../details/ifexm/ProcessStateReader.cpp | 0 .../details/ifexm/ProcessStateReader.hpp | 0 .../src/alive_monitor/details/ipc/BUILD | 4 +- .../src/alive_monitor/details/ipc/IpcBase.hpp | 0 .../alive_monitor/details/ipc/IpcClient.hpp | 0 .../alive_monitor/details/ipc/IpcServer.hpp | 0 .../src/alive_monitor/details/logging/BUILD | 4 +- .../details/logging/PhmLogger.cpp | 0 .../details/logging/PhmLogger.hpp | 0 .../details/supervision/Alive.cpp | 0 .../details/supervision/Alive.hpp | 0 .../details/supervision/Alive_UT.cpp | 0 .../alive_monitor/details/supervision/BUILD | 67 +++++++++ .../details/supervision/ISupervision.cpp | 0 .../details/supervision/ISupervision.hpp | 0 .../details/supervision/SupervisionCfg.hpp | 0 .../src/alive_monitor/details/timers/BUILD | 18 +-- .../details/timers/CycleTimeValidator.cpp | 0 .../details/timers/CycleTimeValidator.hpp | 0 .../details/timers/CycleTimer.cpp | 0 .../details/timers/CycleTimer.hpp | 0 .../details/timers/OsClockInterface.hpp | 0 .../details/timers/TimeConversion.cpp | 0 .../details/timers/TimeConversion.hpp | 0 .../details/timers/Timers_OsClock.cpp | 0 .../details/timers/Timers_OsClock.hpp | 0 .../src/alive_monitor/details/watchdog/BUILD | 24 +-- .../details/watchdog/DeviceIf.cpp | 0 .../details/watchdog/DeviceIf.hpp | 0 .../details/watchdog/IDeviceConfigFactory.hpp | 0 .../details/watchdog/IWatchdogIf.hpp | 0 .../details/watchdog/Watchdog.hpp | 0 .../details/watchdog/WatchdogImpl.cpp | 0 .../details/watchdog/WatchdogImpl.hpp | 0 .../daemon/src/alive_monitor/rust/BUILD | 0 .../daemon/src/alive_monitor/rust/Cargo.lock | 0 .../daemon/src/alive_monitor/rust/Cargo.toml | 0 .../src/alive_monitor/rust/src/errors.rs | 0 .../daemon/src/alive_monitor/rust/src/lib.rs | 0 .../src/alive_monitor/rust/src/monitor.rs | 0 .../{ => src}/daemon/src/common/BUILD | 8 +- .../daemon/src/common/concurrency/BUILD | 14 +- .../concurrency/concurrency_error_domain.hpp | 0 .../src/common/concurrency/details/BUILD | 2 +- .../details/helgrind_annotations.hpp | 0 .../concurrency/mpmc_concurrent_queue.hpp | 0 .../mpmc_concurrent_queue_test.cpp | 0 .../mpmc_concurrent_queue_test_helgrind.supp | 0 .../src/common/concurrency/workerthread.hpp | 0 .../{ => src}/daemon/src/common/constants.hpp | 0 .../daemon/src/common/identifier_hash.cpp | 0 .../daemon/src/common/identifier_hash.hpp | 0 .../daemon/src/common/identifier_hash_UT.cpp | 0 .../{ => src}/daemon/src/common/log.hpp | 0 .../src/common/process_group_state_id.hpp | 0 .../{ => src}/daemon/src/configuration/BUILD | 28 ++-- .../daemon/src/configuration/config.hpp | 0 .../src/configuration/config_loader.hpp | 0 .../src/configuration/config_schema/BUILD | 0 .../configuration/config_schema/README.rst | 0 .../alive_supervision_defaults.json | 0 .../component_properties_defaults.json | 0 .../deployment_config_defaults.json | 0 .../default_values/run_target_defaults.json | 0 .../default_values/watchdog_defaults.json | 0 .../config_schema/examples/example_conf.json | 0 .../config_schema/launch_manager.schema.json | 0 .../config_schema/scripts/validate.py | 0 .../configuration/configuration_manager.cpp | 0 .../configuration/configuration_manager.hpp | 0 .../src/configuration/details/config.cpp | 0 .../src/configuration/details/config_UT.cpp | 0 .../details/flatbuffer_config_loader.cpp | 4 +- .../details/flatbuffer_config_loader_UT.cpp | 2 +- .../details/flatbuffer_type_converters.cpp | 4 +- .../details/flatbuffer_type_converters.hpp | 2 +- .../details/flatbuffer_type_converters_UT.cpp | 4 +- .../configuration/details/new_lm_flatcfg.fbs | 0 .../flatbuffer_config_loader.hpp | 0 .../daemon/src/configuration/lm_flatcfg.fbs | 0 .../src/configuration/lm_flatcfg_generated.h | 0 .../{ => src}/daemon/src/control/BUILD | 10 +- .../src/control/control_client_channel.cpp | 0 .../src/control/control_client_channel.hpp | 0 .../{ => src}/daemon/src/main.cpp | 0 .../{ => src}/daemon/src/osal/BUILD | 18 +-- .../src/osal/details/linux/num_cores.cpp | 0 .../osal/details/linux/security_policy.cpp | 0 .../src/osal/details/linux/set_affinity.cpp | 0 .../src/osal/details/linux/set_groups.cpp | 0 .../src/osal/details/posix/semaphore.cpp | 0 .../src/osal/details/posix/sys_exit.cpp | 0 .../daemon/src/osal/details/qnx/num_cores.cpp | 0 .../src/osal/details/qnx/security_policy.cpp | 0 .../src/osal/details/qnx/set_affinity.cpp | 0 .../src/osal/details/qnx/set_groups.cpp | 0 .../{ => src}/daemon/src/osal/ipc_comms.hpp | 0 .../{ => src}/daemon/src/osal/num_cores.hpp | 0 .../daemon/src/osal/return_types.hpp | 0 .../daemon/src/osal/security_policy.hpp | 0 .../{ => src}/daemon/src/osal/semaphore.hpp | 0 .../daemon/src/osal/set_affinity.hpp | 0 .../{ => src}/daemon/src/osal/set_groups.hpp | 0 .../{ => src}/daemon/src/osal/sys_exit.hpp | 0 .../daemon/src/process_group_manager/BUILD | 42 +++--- .../alive_monitor_thread.cpp | 0 .../alive_monitor_thread.hpp | 0 .../src/process_group_manager/details/BUILD | 139 ++++++++++++++++++ .../process_group_manager/details/graph.cpp | 0 .../process_group_manager/details/graph.hpp | 0 .../details/os_handler.cpp | 0 .../details/os_handler.hpp | 0 .../details/oshandler_UT.cpp | 0 .../details/process_group_manager.cpp | 0 .../details/process_info_node.cpp | 0 .../details/process_info_node.hpp | 0 .../details/process_launcher.cpp | 0 .../details/safe_process_map.cpp | 0 .../details/safe_process_map.hpp | 0 .../details/safeprocessmap_UT.cpp | 0 .../ialive_monitor_thread.hpp | 0 .../src/process_group_manager/iprocess.hpp | 0 .../process_group_manager.hpp | 0 .../daemon/src/process_state_client/BUILD | 18 +-- .../src/process_state_client/details/BUILD | 8 +- .../details/process_state_receiver.cpp | 0 .../details/process_state_receiver.hpp | 0 .../iprocess_state_notifier.hpp | 0 .../iprocess_state_receiver.hpp | 0 .../process_state_client/posix_process.hpp | 0 .../process_state_client_ut.cpp | 0 .../process_state_notifier.cpp | 0 .../process_state_notifier.hpp | 0 .../daemon/src/recovery_client/BUILD | 4 +- .../src/recovery_client/irecovery_client.h | 0 .../src/recovery_client/recovery_client.cpp | 0 .../src/recovery_client/recovery_client.hpp | 0 .../recovery_client/recovery_client_UT.cpp | 0 .../{ => src}/lifecycle_client/BUILD | 22 +-- .../{ => src}/lifecycle_client/docs/index.rst | 0 .../lifecycle_client/docs/lifecycle.md | 0 .../lifecycle_client/docs/lifecyclemanager.md | 0 .../docs/model/app_lifecycle.svg | 0 .../docs/model/app_lifecycle.uxf | 0 .../docs/model/lifecycle_system_view.svg | 0 .../docs/model/lifecycle_system_view.uxf | 0 .../model/sequence_application_container.svg | 0 .../model/sequence_application_container.uxf | 0 .../docs/model/sequence_view.svg | 0 .../docs/model/sequence_view.uxf | 0 .../docs/model/structural_view.svg | 0 .../docs/model/structural_view.uxf | 0 .../src/aasapplicationcontainer.cpp | 0 .../src/aasapplicationcontainer.h | 0 .../lifecycle_client/src/application.cpp | 0 .../lifecycle_client/src/application.h | 0 .../src/applicationcontext.cpp | 0 .../lifecycle_client/src/applicationcontext.h | 0 .../src/applicationcontextmock.cpp | 0 .../src/applicationcontextmock.h | 0 .../lifecycle_client/src/details/BUILD | 10 +- .../src/details/report_running_impl.cpp | 0 .../src/details/report_running_impl.hpp | 0 .../lifecycle_client/src/lifecyclemanager.cpp | 0 .../lifecycle_client/src/lifecyclemanager.h | 0 .../src/lifecyclemanagermock.cpp | 0 .../src/lifecyclemanagermock.h | 0 .../lifecycle_client/src/report_running.cpp | 0 .../lifecycle_client/src/report_running.h | 0 .../src/report_running_mock.cpp | 0 .../src/report_running_mock.h | 0 .../lifecycle_client/src/runapplication.cpp | 0 .../lifecycle_client/src/runapplication.h | 0 .../src/runapplication_UT.cpp | 0 .../{ => src}/lifecycle_client/src/rust/BUILD | 2 +- .../lifecycle_client/src/rust/Cargo.lock | 0 .../lifecycle_client/src/rust/Cargo.toml | 0 .../lifecycle_client/src/rust/src/lib.rs | 0 .../src/rust/src/lifecycle.rs | 0 scripts/config_mapping/config.bzl | 8 +- scripts/config_mapping/tests/BUILD | 2 +- .../incorrect_config_non_reporting/BUILD | 2 +- 245 files changed, 659 insertions(+), 659 deletions(-) delete mode 100644 score/launch_manager/daemon/src/alive_monitor/details/daemon/BUILD delete mode 100644 score/launch_manager/daemon/src/alive_monitor/details/factory/BUILD delete mode 100644 score/launch_manager/daemon/src/alive_monitor/details/ifexm/BUILD delete mode 100644 score/launch_manager/daemon/src/alive_monitor/details/supervision/BUILD delete mode 100644 score/launch_manager/daemon/src/process_group_manager/details/BUILD rename score/launch_manager/{ => src}/control_client/BUILD (78%) rename score/launch_manager/{ => src}/control_client/src/control_client.cpp (100%) rename score/launch_manager/{ => src}/control_client/src/control_client.h (100%) rename score/launch_manager/{ => src}/control_client/src/details/BUILD (65%) rename score/launch_manager/{ => src}/control_client/src/details/control_client_impl.cpp (100%) rename score/launch_manager/{ => src}/control_client/src/details/control_client_impl.hpp (100%) rename score/launch_manager/{ => src}/daemon/BUILD (63%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/BUILD (69%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/Monitor.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/Monitor.h (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/MonitorImplWrapper.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/MonitorImplWrapper.h (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/config/hm_flatcfg.fbs (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/config/hm_flatcfg_generated.h (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/config/hmcore_flatcfg.fbs (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/config/hmcore_flatcfg_generated.h (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/BUILD (59%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/MonitorImpl.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/MonitorImpl.h (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/MonitorImpl_UT.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/common/BUILD (58%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/common/FixedSizeVector.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/common/LockedVector.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/common/Observer.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/common/TimeSortingBuffer.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/common/Types.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/daemon/AliveMonitorImpl.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/daemon/AliveMonitorImpl.hpp (100%) create mode 100644 score/launch_manager/src/daemon/src/alive_monitor/details/daemon/BUILD rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/daemon/IAliveMonitor.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/daemon/PhmDaemon.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/daemon/PhmDaemon.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/daemon/PhmDaemonConfig.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/daemon/SwClusterHandler.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/daemon/SwClusterHandler.hpp (100%) create mode 100644 score/launch_manager/src/daemon/src/alive_monitor/details/factory/BUILD rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/factory/FlatCfgFactory.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/factory/FlatCfgFactory.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/factory/IPhmFactory.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/factory/MachineConfigFactory.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/factory/MachineConfigFactory.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/factory/StaticConfig.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/ifappl/BUILD (52%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/ifappl/Checkpoint.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/ifappl/Checkpoint.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/ifappl/DataStructures.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/ifappl/MonitorIfDaemon.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/ifappl/MonitorIfDaemon.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/ifappl/MonitorIfDaemon_UT.cpp (100%) create mode 100644 score/launch_manager/src/daemon/src/alive_monitor/details/ifexm/BUILD rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/ifexm/ProcessCfg.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/ifexm/ProcessState.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/ifexm/ProcessState.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/ifexm/ProcessStateReader.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/ifexm/ProcessStateReader.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/ipc/BUILD (84%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/ipc/IpcBase.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/ipc/IpcClient.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/ipc/IpcServer.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/logging/BUILD (83%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/logging/PhmLogger.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/logging/PhmLogger.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/supervision/Alive.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/supervision/Alive.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/supervision/Alive_UT.cpp (100%) create mode 100644 score/launch_manager/src/daemon/src/alive_monitor/details/supervision/BUILD rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/supervision/ISupervision.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/supervision/ISupervision.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/supervision/SupervisionCfg.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/timers/BUILD (66%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/timers/CycleTimeValidator.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/timers/CycleTimeValidator.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/timers/CycleTimer.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/timers/CycleTimer.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/timers/OsClockInterface.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/timers/TimeConversion.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/timers/TimeConversion.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/timers/Timers_OsClock.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/timers/Timers_OsClock.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/watchdog/BUILD (58%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/watchdog/DeviceIf.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/watchdog/DeviceIf.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/watchdog/IDeviceConfigFactory.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/watchdog/IWatchdogIf.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/watchdog/Watchdog.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/watchdog/WatchdogImpl.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/details/watchdog/WatchdogImpl.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/rust/BUILD (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/rust/Cargo.lock (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/rust/Cargo.toml (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/rust/src/errors.rs (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/rust/src/lib.rs (100%) rename score/launch_manager/{ => src}/daemon/src/alive_monitor/rust/src/monitor.rs (100%) rename score/launch_manager/{ => src}/daemon/src/common/BUILD (87%) rename score/launch_manager/{ => src}/daemon/src/common/concurrency/BUILD (83%) rename score/launch_manager/{ => src}/daemon/src/common/concurrency/concurrency_error_domain.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/common/concurrency/details/BUILD (89%) rename score/launch_manager/{ => src}/daemon/src/common/concurrency/details/helgrind_annotations.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/common/concurrency/mpmc_concurrent_queue.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/common/concurrency/mpmc_concurrent_queue_test.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/common/concurrency/mpmc_concurrent_queue_test_helgrind.supp (100%) rename score/launch_manager/{ => src}/daemon/src/common/concurrency/workerthread.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/common/constants.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/common/identifier_hash.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/common/identifier_hash.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/common/identifier_hash_UT.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/common/log.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/common/process_group_state_id.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/configuration/BUILD (78%) rename score/launch_manager/{ => src}/daemon/src/configuration/config.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/configuration/config_loader.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/configuration/config_schema/BUILD (100%) rename score/launch_manager/{ => src}/daemon/src/configuration/config_schema/README.rst (100%) rename score/launch_manager/{ => src}/daemon/src/configuration/config_schema/default_values/alive_supervision_defaults.json (100%) rename score/launch_manager/{ => src}/daemon/src/configuration/config_schema/default_values/component_properties_defaults.json (100%) rename score/launch_manager/{ => src}/daemon/src/configuration/config_schema/default_values/deployment_config_defaults.json (100%) rename score/launch_manager/{ => src}/daemon/src/configuration/config_schema/default_values/run_target_defaults.json (100%) rename score/launch_manager/{ => src}/daemon/src/configuration/config_schema/default_values/watchdog_defaults.json (100%) rename score/launch_manager/{ => src}/daemon/src/configuration/config_schema/examples/example_conf.json (100%) rename score/launch_manager/{ => src}/daemon/src/configuration/config_schema/launch_manager.schema.json (100%) rename score/launch_manager/{ => src}/daemon/src/configuration/config_schema/scripts/validate.py (100%) rename score/launch_manager/{ => src}/daemon/src/configuration/configuration_manager.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/configuration/configuration_manager.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/configuration/details/config.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/configuration/details/config_UT.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/configuration/details/flatbuffer_config_loader.cpp (96%) rename score/launch_manager/{ => src}/daemon/src/configuration/details/flatbuffer_config_loader_UT.cpp (99%) rename score/launch_manager/{ => src}/daemon/src/configuration/details/flatbuffer_type_converters.cpp (99%) rename score/launch_manager/{ => src}/daemon/src/configuration/details/flatbuffer_type_converters.hpp (98%) rename score/launch_manager/{ => src}/daemon/src/configuration/details/flatbuffer_type_converters_UT.cpp (99%) rename score/launch_manager/{ => src}/daemon/src/configuration/details/new_lm_flatcfg.fbs (100%) rename score/launch_manager/{ => src}/daemon/src/configuration/flatbuffer_config_loader.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/configuration/lm_flatcfg.fbs (100%) rename score/launch_manager/{ => src}/daemon/src/configuration/lm_flatcfg_generated.h (100%) rename score/launch_manager/{ => src}/daemon/src/control/BUILD (72%) rename score/launch_manager/{ => src}/daemon/src/control/control_client_channel.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/control/control_client_channel.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/main.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/osal/BUILD (83%) rename score/launch_manager/{ => src}/daemon/src/osal/details/linux/num_cores.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/osal/details/linux/security_policy.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/osal/details/linux/set_affinity.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/osal/details/linux/set_groups.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/osal/details/posix/semaphore.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/osal/details/posix/sys_exit.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/osal/details/qnx/num_cores.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/osal/details/qnx/security_policy.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/osal/details/qnx/set_affinity.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/osal/details/qnx/set_groups.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/osal/ipc_comms.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/osal/num_cores.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/osal/return_types.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/osal/security_policy.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/osal/semaphore.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/osal/set_affinity.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/osal/set_groups.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/osal/sys_exit.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/process_group_manager/BUILD (52%) rename score/launch_manager/{ => src}/daemon/src/process_group_manager/alive_monitor_thread.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/process_group_manager/alive_monitor_thread.hpp (100%) create mode 100644 score/launch_manager/src/daemon/src/process_group_manager/details/BUILD rename score/launch_manager/{ => src}/daemon/src/process_group_manager/details/graph.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/process_group_manager/details/graph.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/process_group_manager/details/os_handler.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/process_group_manager/details/os_handler.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/process_group_manager/details/oshandler_UT.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/process_group_manager/details/process_group_manager.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/process_group_manager/details/process_info_node.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/process_group_manager/details/process_info_node.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/process_group_manager/details/process_launcher.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/process_group_manager/details/safe_process_map.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/process_group_manager/details/safe_process_map.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/process_group_manager/details/safeprocessmap_UT.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/process_group_manager/ialive_monitor_thread.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/process_group_manager/iprocess.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/process_group_manager/process_group_manager.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/process_state_client/BUILD (73%) rename score/launch_manager/{ => src}/daemon/src/process_state_client/details/BUILD (72%) rename score/launch_manager/{ => src}/daemon/src/process_state_client/details/process_state_receiver.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/process_state_client/details/process_state_receiver.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/process_state_client/iprocess_state_notifier.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/process_state_client/iprocess_state_receiver.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/process_state_client/posix_process.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/process_state_client/process_state_client_ut.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/process_state_client/process_state_notifier.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/process_state_client/process_state_notifier.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/recovery_client/BUILD (88%) rename score/launch_manager/{ => src}/daemon/src/recovery_client/irecovery_client.h (100%) rename score/launch_manager/{ => src}/daemon/src/recovery_client/recovery_client.cpp (100%) rename score/launch_manager/{ => src}/daemon/src/recovery_client/recovery_client.hpp (100%) rename score/launch_manager/{ => src}/daemon/src/recovery_client/recovery_client_UT.cpp (100%) rename score/launch_manager/{ => src}/lifecycle_client/BUILD (86%) rename score/launch_manager/{ => src}/lifecycle_client/docs/index.rst (100%) rename score/launch_manager/{ => src}/lifecycle_client/docs/lifecycle.md (100%) rename score/launch_manager/{ => src}/lifecycle_client/docs/lifecyclemanager.md (100%) rename score/launch_manager/{ => src}/lifecycle_client/docs/model/app_lifecycle.svg (100%) rename score/launch_manager/{ => src}/lifecycle_client/docs/model/app_lifecycle.uxf (100%) rename score/launch_manager/{ => src}/lifecycle_client/docs/model/lifecycle_system_view.svg (100%) rename score/launch_manager/{ => src}/lifecycle_client/docs/model/lifecycle_system_view.uxf (100%) rename score/launch_manager/{ => src}/lifecycle_client/docs/model/sequence_application_container.svg (100%) rename score/launch_manager/{ => src}/lifecycle_client/docs/model/sequence_application_container.uxf (100%) rename score/launch_manager/{ => src}/lifecycle_client/docs/model/sequence_view.svg (100%) rename score/launch_manager/{ => src}/lifecycle_client/docs/model/sequence_view.uxf (100%) rename score/launch_manager/{ => src}/lifecycle_client/docs/model/structural_view.svg (100%) rename score/launch_manager/{ => src}/lifecycle_client/docs/model/structural_view.uxf (100%) rename score/launch_manager/{ => src}/lifecycle_client/src/aasapplicationcontainer.cpp (100%) rename score/launch_manager/{ => src}/lifecycle_client/src/aasapplicationcontainer.h (100%) rename score/launch_manager/{ => src}/lifecycle_client/src/application.cpp (100%) rename score/launch_manager/{ => src}/lifecycle_client/src/application.h (100%) rename score/launch_manager/{ => src}/lifecycle_client/src/applicationcontext.cpp (100%) rename score/launch_manager/{ => src}/lifecycle_client/src/applicationcontext.h (100%) rename score/launch_manager/{ => src}/lifecycle_client/src/applicationcontextmock.cpp (100%) rename score/launch_manager/{ => src}/lifecycle_client/src/applicationcontextmock.h (100%) rename score/launch_manager/{ => src}/lifecycle_client/src/details/BUILD (72%) rename score/launch_manager/{ => src}/lifecycle_client/src/details/report_running_impl.cpp (100%) rename score/launch_manager/{ => src}/lifecycle_client/src/details/report_running_impl.hpp (100%) rename score/launch_manager/{ => src}/lifecycle_client/src/lifecyclemanager.cpp (100%) rename score/launch_manager/{ => src}/lifecycle_client/src/lifecyclemanager.h (100%) rename score/launch_manager/{ => src}/lifecycle_client/src/lifecyclemanagermock.cpp (100%) rename score/launch_manager/{ => src}/lifecycle_client/src/lifecyclemanagermock.h (100%) rename score/launch_manager/{ => src}/lifecycle_client/src/report_running.cpp (100%) rename score/launch_manager/{ => src}/lifecycle_client/src/report_running.h (100%) rename score/launch_manager/{ => src}/lifecycle_client/src/report_running_mock.cpp (100%) rename score/launch_manager/{ => src}/lifecycle_client/src/report_running_mock.h (100%) rename score/launch_manager/{ => src}/lifecycle_client/src/runapplication.cpp (100%) rename score/launch_manager/{ => src}/lifecycle_client/src/runapplication.h (100%) rename score/launch_manager/{ => src}/lifecycle_client/src/runapplication_UT.cpp (100%) rename score/launch_manager/{ => src}/lifecycle_client/src/rust/BUILD (92%) rename score/launch_manager/{ => src}/lifecycle_client/src/rust/Cargo.lock (100%) rename score/launch_manager/{ => src}/lifecycle_client/src/rust/Cargo.toml (100%) rename score/launch_manager/{ => src}/lifecycle_client/src/rust/src/lib.rs (100%) rename score/launch_manager/{ => src}/lifecycle_client/src/rust/src/lifecycle.rs (100%) diff --git a/BUILD b/BUILD index cd5c98221..ddb344904 100644 --- a/BUILD +++ b/BUILD @@ -94,7 +94,7 @@ alias( # Docs docs( data = [ - "//score/launch_manager/daemon/src/configuration/config_schema:config_schema_files", + "//score/launch_manager/src/daemon/src/configuration/config_schema:config_schema_files", "@score_platform//:needs_json", # This allows linking to feature requirements. "@score_process//:needs_json", # This allows linking to requirements (wp__requirements_comp, etc.) from the process_description repository. ], diff --git a/Cargo.toml b/Cargo.toml index 471a26ae3..c923ee5f4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,8 +1,8 @@ [workspace] resolver = "2" members = [ - "score/launch_manager/lifecycle_client/src/rust", - "score/launch_manager/daemon/src/alive_monitor/rust", + "score/launch_manager/src/lifecycle_client/src/rust", + "score/launch_manager/src/daemon/src/alive_monitor/rust", "score/health_monitor/src", "examples/rust_supervised_app", ] @@ -19,7 +19,7 @@ libc = "0.2.177" clap = { version = "4.5.49", features = ["derive"] } signal-hook = "0.3.18" -monitor_rs = { path = "score/launch_manager/daemon/src/alive_monitor/rust" } # Temporary API +monitor_rs = { path = "score/launch_manager/src/daemon/src/alive_monitor/rust" } # Temporary API health_monitoring_lib = { path = "score/health_monitor/src" } 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" } diff --git a/conf.py b/conf.py index 7864757b8..6f70bf190 100644 --- a/conf.py +++ b/conf.py @@ -54,7 +54,7 @@ "docs/**", "examples/docs/**", "score/launch_manager/docs/**", - "score/launch_manager/lifecycle_client/docs/**", + "score/launch_manager/src/lifecycle_client/docs/**", "score/health_monitor/docs/**", ] @@ -129,11 +129,11 @@ def setup(app): workspace_root = Path(os.getcwd()) src_json_dir = ( workspace_root - / "score/lifecycle/score/launch_manager/daemon/src/configuration/config_schema" + / "score/lifecycle/score/launch_manager/src/daemon/src/configuration/config_schema" ) dest_json_dir = ( srcdir.parent - / "score/lifecycle/score/launch_manager/daemon/src/configuration/config_schema" + / "score/lifecycle/score/launch_manager/src/daemon/src/configuration/config_schema" ) if src_json_dir.exists() and not dest_json_dir.exists(): dest_json_dir.parent.mkdir(parents=True, exist_ok=True) diff --git a/examples/rust_supervised_app/Cargo.toml b/examples/rust_supervised_app/Cargo.toml index ff16e1b2b..b4c7eb376 100644 --- a/examples/rust_supervised_app/Cargo.toml +++ b/examples/rust_supervised_app/Cargo.toml @@ -11,8 +11,8 @@ path = "src/main.rs" clap = { workspace = true } libc = { workspace = true } signal-hook = { workspace = true } -lifecycle_client_rs = { path = "../../score/launch_manager/lifecycle_client/src/rust" } -monitor_rs = { path = "../../score/launch_manager/daemon/src/alive_monitor/rust" } +lifecycle_client_rs = { path = "../../score/launch_manager/src/lifecycle_client/src/rust" } +monitor_rs = { path = "../../score/launch_manager/src/daemon/src/alive_monitor/rust" } health_monitoring_lib.workspace = true score_log.workspace = true stdout_logger.workspace = true diff --git a/score/launch_manager/BUILD b/score/launch_manager/BUILD index a3af91199..4f331aeb4 100644 --- a/score/launch_manager/BUILD +++ b/score/launch_manager/BUILD @@ -16,32 +16,32 @@ package(default_visibility = ["//visibility:public"]) alias( name = "control_cc", - actual = "//score/launch_manager/control_client:control_client", + actual = "//score/launch_manager/src/control_client:control_client", ) alias( name = "alive_cc", - actual = "//score/launch_manager/daemon/src/alive_monitor:am_shared_lib", + actual = "//score/launch_manager/src/daemon/src/alive_monitor:am_shared_lib", ) alias( name = "alive_rust", - actual = "//score/launch_manager/daemon/src/alive_monitor/rust:monitor_rs", + actual = "//score/launch_manager/src/daemon/src/alive_monitor/rust:monitor_rs", ) alias( name = "lifecycle_cc", - actual = "//score/launch_manager/lifecycle_client:lifecycle_client", + actual = "//score/launch_manager/src/lifecycle_client:lifecycle_client", ) alias( name = "lifecycle_rust", - actual = "//score/launch_manager/lifecycle_client/src/rust:lifecycle_client_rs", + actual = "//score/launch_manager/src/lifecycle_client/src/rust:lifecycle_client_rs", ) alias( name = "launch_manager", - actual = "//score/launch_manager/daemon:launch_manager", + actual = "//score/launch_manager/src/daemon:launch_manager", ) cc_library( @@ -66,7 +66,7 @@ cc_library( visibility = ["//score/launch_manager:__subpackages__"], deps = [ ":error", - "//score/launch_manager/daemon/src/common:identifier_hash", + "//score/launch_manager/src/daemon/src/common:identifier_hash", ], ) @@ -83,47 +83,47 @@ cc_test( alias( name = "applicationcontext_mock_cc", - actual = "//score/launch_manager/lifecycle_client:applicationcontext_mock", + actual = "//score/launch_manager/src/lifecycle_client:applicationcontext_mock", ) alias( name = "lifecycle_mock_cc", - actual = "//score/launch_manager/lifecycle_client:lifecycle_mock", + actual = "//score/launch_manager/src/lifecycle_client:lifecycle_mock", ) alias( name = "report_running_mock_cc", - actual = "//score/launch_manager/lifecycle_client:report_running_mock", + actual = "//score/launch_manager/src/lifecycle_client:report_running_mock", ) # BEGIN: Fine granular targets only needed for testing purposes alias( name = "aasapplicationcontainer_cc", - actual = "//score/launch_manager/lifecycle_client:aasapplicationcontainer", + actual = "//score/launch_manager/src/lifecycle_client:aasapplicationcontainer", ) alias( name = "application_cc", - actual = "//score/launch_manager/lifecycle_client:application", + actual = "//score/launch_manager/src/lifecycle_client:application", ) alias( name = "applicationcontext_cc", - actual = "//score/launch_manager/lifecycle_client:applicationcontext", + actual = "//score/launch_manager/src/lifecycle_client:applicationcontext", ) alias( name = "lifecyclemanager_cc", - actual = "//score/launch_manager/lifecycle_client:lifecyclemanager", + actual = "//score/launch_manager/src/lifecycle_client:lifecyclemanager", ) alias( name = "report_running_cc", - actual = "//score/launch_manager/lifecycle_client:report_running", + actual = "//score/launch_manager/src/lifecycle_client:report_running", ) alias( name = "runapplication_cc", - actual = "//score/launch_manager/lifecycle_client:runapplication", + actual = "//score/launch_manager/src/lifecycle_client:runapplication", ) # END: Fine granular targets only needed for testing purposes diff --git a/score/launch_manager/daemon/src/alive_monitor/details/daemon/BUILD b/score/launch_manager/daemon/src/alive_monitor/details/daemon/BUILD deleted file mode 100644 index 5b767374c..000000000 --- a/score/launch_manager/daemon/src/alive_monitor/details/daemon/BUILD +++ /dev/null @@ -1,90 +0,0 @@ -# ******************************************************************************* -# 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 -# ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") - -cc_library( - name = "phm_daemon_config", - hdrs = ["PhmDaemonConfig.hpp"], - include_prefix = "score/mw/launch_manager/alive_monitor/details/daemon", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/daemon", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], -) - -cc_library( - name = "sw_cluster_handler", - srcs = ["SwClusterHandler.cpp"], - hdrs = ["SwClusterHandler.hpp"], - include_prefix = "score/mw/launch_manager/alive_monitor/details/daemon", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/daemon", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], - deps = [ - "//score/launch_manager/daemon/src/alive_monitor/details/factory:flat_cfg_factory", - "//score/launch_manager/daemon/src/alive_monitor/details/factory:machine_config_factory", - "//score/launch_manager/daemon/src/alive_monitor/details/ifappl:checkpoint", - "//score/launch_manager/daemon/src/alive_monitor/details/ifappl:data_structures", - "//score/launch_manager/daemon/src/alive_monitor/details/ifappl:monitor_if_daemon", - "//score/launch_manager/daemon/src/alive_monitor/details/ifexm:process_state", - "//score/launch_manager/daemon/src/alive_monitor/details/ifexm:process_state_reader", - "//score/launch_manager/daemon/src/alive_monitor/details/logging:phm_logging", - "//score/launch_manager/daemon/src/alive_monitor/details/supervision:alive", - "//score/launch_manager/daemon/src/alive_monitor/details/timers:timers_os_clock", - ], -) - -cc_library( - name = "phm_daemon", - srcs = ["PhmDaemon.cpp"], - hdrs = ["PhmDaemon.hpp"], - include_prefix = "score/mw/launch_manager/alive_monitor/details/daemon", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/daemon", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], - deps = [ - ":phm_daemon_config", - ":sw_cluster_handler", - "//score/launch_manager/control_client", - "//score/launch_manager/daemon/src/alive_monitor/details/factory:flat_cfg_factory", - "//score/launch_manager/daemon/src/alive_monitor/details/factory:machine_config_factory", - "//score/launch_manager/daemon/src/alive_monitor/details/ifappl:monitor_if_daemon", - "//score/launch_manager/daemon/src/alive_monitor/details/ifexm:process_state_reader", - "//score/launch_manager/daemon/src/alive_monitor/details/logging:phm_logging", - "//score/launch_manager/daemon/src/alive_monitor/details/supervision:alive", - "//score/launch_manager/daemon/src/alive_monitor/details/timers:cycle_time_validator", - "//score/launch_manager/daemon/src/alive_monitor/details/timers:cycle_timer", - "//score/launch_manager/daemon/src/alive_monitor/details/timers:timers_os_clock", - "//score/launch_manager/daemon/src/alive_monitor/details/watchdog:i_watchdog_if", - "//score/launch_manager/lifecycle_client", - ], -) - -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/daemon/src/alive_monitor/details/daemon", - visibility = ["//score/launch_manager/daemon:__subpackages__"], - deps = [":phm_daemon"], -) - -cc_library( - name = "health_monitor_impl", - srcs = ["AliveMonitorImpl.cpp"], - hdrs = ["AliveMonitorImpl.hpp"], - include_prefix = "score/mw/launch_manager/alive_monitor/details/daemon", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/daemon", - visibility = ["//score/launch_manager/daemon:__subpackages__"], - deps = [ - ":i_health_monitor", - "//score/launch_manager/daemon/src/alive_monitor/details/logging:phm_logging", - "//score/launch_manager/daemon/src/alive_monitor/details/watchdog:watchdog_impl", - ], -) diff --git a/score/launch_manager/daemon/src/alive_monitor/details/factory/BUILD b/score/launch_manager/daemon/src/alive_monitor/details/factory/BUILD deleted file mode 100644 index 8ecfb62cd..000000000 --- a/score/launch_manager/daemon/src/alive_monitor/details/factory/BUILD +++ /dev/null @@ -1,87 +0,0 @@ -# ******************************************************************************* -# 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 -# ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") - -cc_library( - name = "i_phm_factory", - hdrs = ["IPhmFactory.hpp"], - include_prefix = "score/mw/launch_manager/alive_monitor/details/factory", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/factory", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], - deps = [ - "//score/launch_manager/daemon/src/alive_monitor/details/ifappl:data_structures", - ], -) - -cc_library( - name = "static_config", - hdrs = ["StaticConfig.hpp"], - include_prefix = "score/mw/launch_manager/alive_monitor/details/factory", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/factory", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], - deps = [ - "//score/launch_manager/daemon/src/alive_monitor/details/ifappl:data_structures", - "//score/launch_manager/daemon/src/alive_monitor/details/timers:timers_os_clock", - "//score/launch_manager/daemon/src/alive_monitor/details/watchdog:i_device_config_factory", - ], -) - -cc_library( - name = "machine_config_factory", - srcs = ["MachineConfigFactory.cpp"], - hdrs = ["MachineConfigFactory.hpp"], - include_prefix = "score/mw/launch_manager/alive_monitor/details/factory", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/factory", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], - deps = [ - ":static_config", - "//score/launch_manager/daemon/src/alive_monitor:config", - "//score/launch_manager/daemon/src/alive_monitor/details/logging:phm_logging", - "//score/launch_manager/daemon/src/alive_monitor/details/timers:time_conversion", - "//score/launch_manager/daemon/src/alive_monitor/details/timers:timers_os_clock", - "//score/launch_manager/daemon/src/alive_monitor/details/watchdog:i_device_config_factory", - "@flatbuffers", - ] + select({ - "@platforms//os:qnx": [], - "@platforms//os:linux": ["//externals/acl"], - }), -) - -cc_library( - name = "flat_cfg_factory", - srcs = ["FlatCfgFactory.cpp"], - hdrs = ["FlatCfgFactory.hpp"], - include_prefix = "score/mw/launch_manager/alive_monitor/details/factory", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/factory", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], - deps = [ - ":i_phm_factory", - ":machine_config_factory", - "//score/launch_manager/daemon/src/alive_monitor:config", - "//score/launch_manager/daemon/src/alive_monitor/details/common:types", - "//score/launch_manager/daemon/src/alive_monitor/details/ifappl:checkpoint", - "//score/launch_manager/daemon/src/alive_monitor/details/ifappl:monitor_if_daemon", - "//score/launch_manager/daemon/src/alive_monitor/details/ifexm:process_state", - "//score/launch_manager/daemon/src/alive_monitor/details/ifexm:process_state_reader", - "//score/launch_manager/daemon/src/alive_monitor/details/logging:phm_logging", - "//score/launch_manager/daemon/src/alive_monitor/details/supervision:alive", - "//score/launch_manager/daemon/src/alive_monitor/details/supervision:supervision_cfg", - "//score/launch_manager/daemon/src/alive_monitor/details/timers:time_conversion", - "//score/launch_manager/daemon/src/alive_monitor/details/timers:timers_os_clock", - "//score/launch_manager/daemon/src/common:identifier_hash", - "@flatbuffers", - ] + select({ - "@platforms//os:qnx": [], - "@platforms//os:linux": ["//externals/acl"], - }), -) diff --git a/score/launch_manager/daemon/src/alive_monitor/details/ifexm/BUILD b/score/launch_manager/daemon/src/alive_monitor/details/ifexm/BUILD deleted file mode 100644 index 08a811318..000000000 --- a/score/launch_manager/daemon/src/alive_monitor/details/ifexm/BUILD +++ /dev/null @@ -1,58 +0,0 @@ -# ******************************************************************************* -# 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 -# ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") - -cc_library( - name = "process_cfg", - srcs = [], - hdrs = ["ProcessCfg.hpp"], - include_prefix = "score/mw/launch_manager/alive_monitor/details/ifexm", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/ifexm", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], - deps = [ - "//score/launch_manager/daemon/src/alive_monitor/details/common:types", - ], -) - -cc_library( - name = "process_state", - srcs = ["ProcessState.cpp"], - hdrs = ["ProcessState.hpp"], - include_prefix = "score/mw/launch_manager/alive_monitor/details/ifexm", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/ifexm", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], - deps = [ - ":process_cfg", - "//score/launch_manager/daemon/src/alive_monitor/details/common:observer", - "//score/launch_manager/daemon/src/alive_monitor/details/common:types", - "//score/launch_manager/daemon/src/alive_monitor/details/timers:timers_os_clock", - "//score/launch_manager/daemon/src/process_state_client", - ], -) - -cc_library( - name = "process_state_reader", - srcs = ["ProcessStateReader.cpp"], - hdrs = ["ProcessStateReader.hpp"], - include_prefix = "score/mw/launch_manager/alive_monitor/details/ifexm", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/ifexm", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], - deps = [ - ":process_state", - "//score/launch_manager/daemon/src/alive_monitor/details/common:types", - "//score/launch_manager/daemon/src/alive_monitor/details/logging:phm_logging", - "//score/launch_manager/daemon/src/alive_monitor/details/timers:time_conversion", - "//score/launch_manager/daemon/src/alive_monitor/details/timers:timers_os_clock", - "//score/launch_manager/daemon/src/process_state_client", - ], -) diff --git a/score/launch_manager/daemon/src/alive_monitor/details/supervision/BUILD b/score/launch_manager/daemon/src/alive_monitor/details/supervision/BUILD deleted file mode 100644 index 34ec488e6..000000000 --- a/score/launch_manager/daemon/src/alive_monitor/details/supervision/BUILD +++ /dev/null @@ -1,67 +0,0 @@ -# ******************************************************************************* -# 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 -# ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") - -cc_library( - name = "supervision_cfg", - hdrs = ["SupervisionCfg.hpp"], - include_prefix = "score/mw/launch_manager/alive_monitor/details/supervision", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/supervision", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], - deps = [ - "//score/launch_manager/daemon/src/alive_monitor/details/common:types", - "//score/launch_manager/daemon/src/alive_monitor/details/ifexm:process_state", - "//score/launch_manager/daemon/src/alive_monitor/details/timers:timers_os_clock", - ], -) - -cc_library( - name = "i_supervision", - srcs = ["ISupervision.cpp"], - hdrs = ["ISupervision.hpp"], - include_prefix = "score/mw/launch_manager/alive_monitor/details/supervision", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/supervision", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], - deps = [ - "//score/launch_manager/daemon/src/alive_monitor/details/timers:timers_os_clock", - ], -) - -cc_library( - name = "alive", - srcs = ["Alive.cpp"], - hdrs = ["Alive.hpp"], - include_prefix = "score/mw/launch_manager/alive_monitor/details/supervision", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/supervision", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], - deps = [ - ":i_supervision", - ":supervision_cfg", - "//score/launch_manager/daemon/src/alive_monitor:alive_monitor_h", - "//score/launch_manager/daemon/src/alive_monitor/details/common:time_sorting_buffer", - "//score/launch_manager/daemon/src/alive_monitor/details/ifappl:checkpoint", - "//score/launch_manager/daemon/src/alive_monitor/details/ifexm:process_state", - "//score/launch_manager/daemon/src/alive_monitor/details/logging:phm_logging", - "//score/launch_manager/daemon/src/alive_monitor/details/timers:timers_os_clock", - "//score/launch_manager/daemon/src/recovery_client", - ], -) - -cc_test( - name = "Alive_UT", - srcs = ["Alive_UT.cpp"], - deps = [ - ":alive", - "@googletest//:gtest_main", - ], -) diff --git a/score/launch_manager/daemon/src/process_group_manager/details/BUILD b/score/launch_manager/daemon/src/process_group_manager/details/BUILD deleted file mode 100644 index 679ab14ca..000000000 --- a/score/launch_manager/daemon/src/process_group_manager/details/BUILD +++ /dev/null @@ -1,139 +0,0 @@ -# ******************************************************************************* -# 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 -# ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") - -cc_library( - name = "process_info_node", - hdrs = ["process_info_node.hpp"], - include_prefix = "score/mw/launch_manager/process_group_manager/details", - strip_include_prefix = "/score/launch_manager/daemon/src/process_group_manager/details", - visibility = ["//score/launch_manager/daemon/src/process_group_manager:__pkg__"], - deps = [ - ":safe_process_map", - "//score/launch_manager/daemon/src/configuration:configuration_manager", - "//score/launch_manager/daemon/src/control:control_client_channel", - "//score/launch_manager/daemon/src/osal:ipc_comms", - "//score/launch_manager/daemon/src/osal:semaphore", - "//score/launch_manager/daemon/src/process_group_manager:iprocess", - ], -) - -cc_library( - name = "graph", - hdrs = ["graph.hpp"], - include_prefix = "score/mw/launch_manager/process_group_manager/details", - strip_include_prefix = "/score/launch_manager/daemon/src/process_group_manager/details", - visibility = ["//score/launch_manager/daemon/src/process_group_manager:__pkg__"], - deps = [ - ":process_info_node", - ":safe_process_map", - "//score/launch_manager/daemon/src/common:identifier_hash", - "//score/launch_manager/daemon/src/configuration:configuration_manager", - "//score/launch_manager/daemon/src/control:control_client_channel", - "//score/launch_manager/daemon/src/osal:semaphore", - "//score/launch_manager/daemon/src/process_group_manager:iprocess", - ], -) - -cc_library( - name = "safe_process_map", - srcs = ["safe_process_map.cpp"], - hdrs = ["safe_process_map.hpp"], - include_prefix = "score/mw/launch_manager/process_group_manager/details", - strip_include_prefix = "/score/launch_manager/daemon/src/process_group_manager/details", - visibility = ["//score/launch_manager/daemon/src/process_group_manager:__pkg__"], - deps = [ - "//score/launch_manager/daemon/src/process_group_manager:iprocess", - ], -) - -cc_test( - name = "safeprocessmap_UT", - srcs = ["safeprocessmap_UT.cpp"], - deps = [ - ":safe_process_map", - "@googletest//:gtest_main", - ], -) - -cc_library( - name = "os_handler", - srcs = ["os_handler.cpp"], - hdrs = ["os_handler.hpp"], - include_prefix = "score/mw/launch_manager/process_group_manager/details", - strip_include_prefix = "/score/launch_manager/daemon/src/process_group_manager/details", - visibility = ["//score/launch_manager/daemon/src/process_group_manager:__pkg__"], - deps = [ - ":safe_process_map", - "//score/launch_manager/daemon/src/common:log", - "//score/launch_manager/daemon/src/process_group_manager:iprocess", - "@score_baselibs//score/os:sys_wait", - ], -) - -cc_test( - name = "oshandler_UT", - srcs = ["oshandler_UT.cpp"], - deps = [ - ":os_handler", - ":safe_process_map", - "@googletest//:gtest_main", - "@score_baselibs//score/os/mocklib:sys_wait_mock", - ], -) - -cc_library( - name = "process_launcher", - srcs = ["process_launcher.cpp"], - visibility = ["//score/launch_manager/daemon/src/process_group_manager:__pkg__"], - deps = [ - "//score/launch_manager/daemon/src/common:log", - "//score/launch_manager/daemon/src/control:control_client_channel", - "//score/launch_manager/daemon/src/osal:ipc_comms", - "//score/launch_manager/daemon/src/osal:security_policy", - "//score/launch_manager/daemon/src/osal:set_affinity", - "//score/launch_manager/daemon/src/osal:set_groups", - "//score/launch_manager/daemon/src/osal:sys_exit", - "//score/launch_manager/daemon/src/process_group_manager:iprocess", - ], -) - -# graph.cpp, process_info_node.cpp, and process_group_manager.cpp include -# process_group_manager.hpp which in turn includes graph.hpp and process_info_node.hpp — -# circular at link time, so all three must share a target. -cc_library( - name = "process_group_manager_impl", - srcs = [ - "graph.cpp", - "process_group_manager.cpp", - "process_info_node.cpp", - ], - visibility = ["//score/launch_manager/daemon/src/process_group_manager:__pkg__"], - deps = [ - ":graph", - ":os_handler", - ":process_info_node", - ":process_launcher", - ":safe_process_map", - "//score/launch_manager/daemon/src/common:log", - "//score/launch_manager/daemon/src/common/concurrency:mpmc_concurrent_queue", - "//score/launch_manager/daemon/src/common/concurrency:workerthread", - "//score/launch_manager/daemon/src/configuration:configuration_manager", - "//score/launch_manager/daemon/src/osal:ipc_comms", - "//score/launch_manager/daemon/src/osal:semaphore", - "//score/launch_manager/daemon/src/process_group_manager:process_group_manager_hdrs", - "//score/launch_manager/daemon/src/process_state_client", - "//score/launch_manager/daemon/src/recovery_client", - "@score_baselibs//score/language/futurecpp", - ], -) diff --git a/score/launch_manager/control_client/BUILD b/score/launch_manager/src/control_client/BUILD similarity index 78% rename from score/launch_manager/control_client/BUILD rename to score/launch_manager/src/control_client/BUILD index 87e8c48f1..370c6c123 100644 --- a/score/launch_manager/control_client/BUILD +++ b/score/launch_manager/src/control_client/BUILD @@ -21,10 +21,10 @@ cc_library( "src/control_client.h", ], include_prefix = "score/mw/lifecycle", - strip_include_prefix = "/score/launch_manager/control_client/src", + strip_include_prefix = "/score/launch_manager/src/control_client/src", visibility = ["//score:__subpackages__"], deps = [ - "//score/launch_manager/control_client/src/details:control_client_impl", - "//score/launch_manager/daemon/src/common:identifier_hash", + "//score/launch_manager/src/control_client/src/details:control_client_impl", + "//score/launch_manager/src/daemon/src/common:identifier_hash", ], ) diff --git a/score/launch_manager/control_client/src/control_client.cpp b/score/launch_manager/src/control_client/src/control_client.cpp similarity index 100% rename from score/launch_manager/control_client/src/control_client.cpp rename to score/launch_manager/src/control_client/src/control_client.cpp diff --git a/score/launch_manager/control_client/src/control_client.h b/score/launch_manager/src/control_client/src/control_client.h similarity index 100% rename from score/launch_manager/control_client/src/control_client.h rename to score/launch_manager/src/control_client/src/control_client.h diff --git a/score/launch_manager/control_client/src/details/BUILD b/score/launch_manager/src/control_client/src/details/BUILD similarity index 65% rename from score/launch_manager/control_client/src/details/BUILD rename to score/launch_manager/src/control_client/src/details/BUILD index a147e4c56..9f1fdf825 100644 --- a/score/launch_manager/control_client/src/details/BUILD +++ b/score/launch_manager/src/control_client/src/details/BUILD @@ -21,15 +21,15 @@ cc_library( "control_client_impl.hpp", ], include_prefix = "score/mw/lifecycle/control_client/details", - strip_include_prefix = "/score/launch_manager/control_client/src/details", - visibility = ["//score/launch_manager/control_client:__subpackages__"], + strip_include_prefix = "/score/launch_manager/src/control_client/src/details", + visibility = ["//score/launch_manager/src/control_client:__subpackages__"], deps = [ "//score/launch_manager:error_event", - "//score/launch_manager/daemon/src/common:constants", - "//score/launch_manager/daemon/src/common:identifier_hash", - "//score/launch_manager/daemon/src/common:log", - "//score/launch_manager/daemon/src/control:control_client_channel", - "//score/launch_manager/daemon/src/osal:semaphore", + "//score/launch_manager/src/daemon/src/common:constants", + "//score/launch_manager/src/daemon/src/common:identifier_hash", + "//score/launch_manager/src/daemon/src/common:log", + "//score/launch_manager/src/daemon/src/control:control_client_channel", + "//score/launch_manager/src/daemon/src/osal:semaphore", "@score_baselibs//score/concurrency/future", ], ) diff --git a/score/launch_manager/control_client/src/details/control_client_impl.cpp b/score/launch_manager/src/control_client/src/details/control_client_impl.cpp similarity index 100% rename from score/launch_manager/control_client/src/details/control_client_impl.cpp rename to score/launch_manager/src/control_client/src/details/control_client_impl.cpp diff --git a/score/launch_manager/control_client/src/details/control_client_impl.hpp b/score/launch_manager/src/control_client/src/details/control_client_impl.hpp similarity index 100% rename from score/launch_manager/control_client/src/details/control_client_impl.hpp rename to score/launch_manager/src/control_client/src/details/control_client_impl.hpp diff --git a/score/launch_manager/daemon/BUILD b/score/launch_manager/src/daemon/BUILD similarity index 63% rename from score/launch_manager/daemon/BUILD rename to score/launch_manager/src/daemon/BUILD index c91020a10..3dd29afdc 100644 --- a/score/launch_manager/daemon/BUILD +++ b/score/launch_manager/src/daemon/BUILD @@ -21,12 +21,12 @@ cc_binary( }), visibility = ["//score/launch_manager:__subpackages__"], deps = [ - "//score/launch_manager/daemon/src/alive_monitor", - "//score/launch_manager/daemon/src/common:log", - "//score/launch_manager/daemon/src/osal:ipc_comms", - "//score/launch_manager/daemon/src/process_group_manager", - "//score/launch_manager/daemon/src/process_group_manager:alive_monitor_thread", - "//score/launch_manager/daemon/src/process_state_client:process_state_notifier", - "//score/launch_manager/daemon/src/recovery_client", + "//score/launch_manager/src/daemon/src/alive_monitor", + "//score/launch_manager/src/daemon/src/common:log", + "//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/process_state_client:process_state_notifier", + "//score/launch_manager/src/daemon/src/recovery_client", ], ) diff --git a/score/launch_manager/daemon/src/alive_monitor/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/BUILD similarity index 69% rename from score/launch_manager/daemon/src/alive_monitor/BUILD rename to score/launch_manager/src/daemon/src/alive_monitor/BUILD index 1f208d17b..b899c4bdc 100644 --- a/score/launch_manager/daemon/src/alive_monitor/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/BUILD @@ -33,8 +33,8 @@ cc_library( "config/hmcore_flatcfg_generated.h", ], include_prefix = "score/mw/launch_manager/alive_monitor", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], ) cc_library( @@ -44,8 +44,8 @@ cc_library( "MonitorImplWrapper.h", ], include_prefix = "score/mw/launch_manager/alive_monitor", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], ) cc_library( @@ -59,11 +59,11 @@ cc_library( "MonitorImplWrapper.h", ], include_prefix = "score/mw/launch_manager/alive_monitor", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor", + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor", visibility = ["//score:__subpackages__"], deps = [ ":alive_monitor_h", - "//score/launch_manager/daemon/src/alive_monitor/details:monitor_impl", + "//score/launch_manager/src/daemon/src/alive_monitor/details:monitor_impl", ] + select({ "@platforms//os:qnx": [], "@platforms//os:linux": ["//externals/acl"], @@ -74,7 +74,7 @@ cc_library( name = "alive_monitor", visibility = ["//score:__subpackages__"], deps = [ - "//score/launch_manager/daemon/src/alive_monitor/details/daemon:health_monitor_impl", + "//score/launch_manager/src/daemon/src/alive_monitor/details/daemon:health_monitor_impl", ], ) @@ -85,13 +85,13 @@ cc_library( "MonitorImplWrapper.h", ], include_prefix = "score/mw/launch_manager/alive_monitor", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor", + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor", visibility = ["//score:__subpackages__"], deps = [ ":am-lib", - "//score/launch_manager/daemon/src/alive_monitor/details/ipc:ipc_if", - "//score/launch_manager/daemon/src/alive_monitor/details/logging:phm_logging", - "//score/launch_manager/daemon/src/alive_monitor/details/timers:timers_os_clock", + "//score/launch_manager/src/daemon/src/alive_monitor/details/ipc:ipc_if", + "//score/launch_manager/src/daemon/src/alive_monitor/details/logging:phm_logging", + "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:timers_os_clock", ], alwayslink = True, ) diff --git a/score/launch_manager/daemon/src/alive_monitor/Monitor.cpp b/score/launch_manager/src/daemon/src/alive_monitor/Monitor.cpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/Monitor.cpp rename to score/launch_manager/src/daemon/src/alive_monitor/Monitor.cpp diff --git a/score/launch_manager/daemon/src/alive_monitor/Monitor.h b/score/launch_manager/src/daemon/src/alive_monitor/Monitor.h similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/Monitor.h rename to score/launch_manager/src/daemon/src/alive_monitor/Monitor.h diff --git a/score/launch_manager/daemon/src/alive_monitor/MonitorImplWrapper.cpp b/score/launch_manager/src/daemon/src/alive_monitor/MonitorImplWrapper.cpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/MonitorImplWrapper.cpp rename to score/launch_manager/src/daemon/src/alive_monitor/MonitorImplWrapper.cpp diff --git a/score/launch_manager/daemon/src/alive_monitor/MonitorImplWrapper.h b/score/launch_manager/src/daemon/src/alive_monitor/MonitorImplWrapper.h similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/MonitorImplWrapper.h rename to score/launch_manager/src/daemon/src/alive_monitor/MonitorImplWrapper.h diff --git a/score/launch_manager/daemon/src/alive_monitor/config/hm_flatcfg.fbs b/score/launch_manager/src/daemon/src/alive_monitor/config/hm_flatcfg.fbs similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/config/hm_flatcfg.fbs rename to score/launch_manager/src/daemon/src/alive_monitor/config/hm_flatcfg.fbs diff --git a/score/launch_manager/daemon/src/alive_monitor/config/hm_flatcfg_generated.h b/score/launch_manager/src/daemon/src/alive_monitor/config/hm_flatcfg_generated.h similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/config/hm_flatcfg_generated.h rename to score/launch_manager/src/daemon/src/alive_monitor/config/hm_flatcfg_generated.h diff --git a/score/launch_manager/daemon/src/alive_monitor/config/hmcore_flatcfg.fbs b/score/launch_manager/src/daemon/src/alive_monitor/config/hmcore_flatcfg.fbs similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/config/hmcore_flatcfg.fbs rename to score/launch_manager/src/daemon/src/alive_monitor/config/hmcore_flatcfg.fbs diff --git a/score/launch_manager/daemon/src/alive_monitor/config/hmcore_flatcfg_generated.h b/score/launch_manager/src/daemon/src/alive_monitor/config/hmcore_flatcfg_generated.h similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/config/hmcore_flatcfg_generated.h rename to score/launch_manager/src/daemon/src/alive_monitor/config/hmcore_flatcfg_generated.h diff --git a/score/launch_manager/daemon/src/alive_monitor/details/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/BUILD similarity index 59% rename from score/launch_manager/daemon/src/alive_monitor/details/BUILD rename to score/launch_manager/src/daemon/src/alive_monitor/details/BUILD index 686d49b18..ae73fd79a 100644 --- a/score/launch_manager/daemon/src/alive_monitor/details/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/BUILD @@ -26,15 +26,15 @@ cc_library( srcs = ["MonitorImpl.cpp"], hdrs = ["MonitorImpl.h"], include_prefix = "score/mw/launch_manager/alive_monitor/details", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], deps = [ - "//score/launch_manager/daemon/src/alive_monitor:alive_monitor_h", - "//score/launch_manager/daemon/src/alive_monitor:config", - "//score/launch_manager/daemon/src/alive_monitor/details/ifappl:data_structures", - "//score/launch_manager/daemon/src/alive_monitor/details/ipc:ipc_if", - "//score/launch_manager/daemon/src/alive_monitor/details/logging:phm_logging", - "//score/launch_manager/daemon/src/alive_monitor/details/timers:timers_os_clock", + "//score/launch_manager/src/daemon/src/alive_monitor:alive_monitor_h", + "//score/launch_manager/src/daemon/src/alive_monitor:config", + "//score/launch_manager/src/daemon/src/alive_monitor/details/ifappl:data_structures", + "//score/launch_manager/src/daemon/src/alive_monitor/details/ipc:ipc_if", + "//score/launch_manager/src/daemon/src/alive_monitor/details/logging:phm_logging", + "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:timers_os_clock", "@flatbuffers", ], ) diff --git a/score/launch_manager/daemon/src/alive_monitor/details/MonitorImpl.cpp b/score/launch_manager/src/daemon/src/alive_monitor/details/MonitorImpl.cpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/MonitorImpl.cpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/MonitorImpl.cpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/MonitorImpl.h b/score/launch_manager/src/daemon/src/alive_monitor/details/MonitorImpl.h similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/MonitorImpl.h rename to score/launch_manager/src/daemon/src/alive_monitor/details/MonitorImpl.h diff --git a/score/launch_manager/daemon/src/alive_monitor/details/MonitorImpl_UT.cpp b/score/launch_manager/src/daemon/src/alive_monitor/details/MonitorImpl_UT.cpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/MonitorImpl_UT.cpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/MonitorImpl_UT.cpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/common/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/common/BUILD similarity index 58% rename from score/launch_manager/daemon/src/alive_monitor/details/common/BUILD rename to score/launch_manager/src/daemon/src/alive_monitor/details/common/BUILD index add506e68..777a8a434 100644 --- a/score/launch_manager/daemon/src/alive_monitor/details/common/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/common/BUILD @@ -16,32 +16,32 @@ cc_library( name = "types", hdrs = ["Types.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/common", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/common", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], + 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 = "observer", hdrs = ["Observer.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/common", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/common", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], + 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 = "fixed_size_vector", hdrs = ["FixedSizeVector.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/common", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/common", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], + 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"], include_prefix = "score/mw/launch_manager/alive_monitor/details/common", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/common", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/common", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], deps = [":fixed_size_vector"], ) @@ -49,10 +49,10 @@ cc_library( name = "time_sorting_buffer", hdrs = ["TimeSortingBuffer.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/common", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/common", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/common", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], deps = [ ":fixed_size_vector", - "//score/launch_manager/daemon/src/alive_monitor/details/timers:timers_os_clock", + "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:timers_os_clock", ], ) diff --git a/score/launch_manager/daemon/src/alive_monitor/details/common/FixedSizeVector.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/common/FixedSizeVector.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/common/FixedSizeVector.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/common/FixedSizeVector.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/common/LockedVector.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/common/LockedVector.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/common/LockedVector.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/common/LockedVector.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/common/Observer.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/common/Observer.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/common/Observer.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/common/Observer.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/common/TimeSortingBuffer.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/common/TimeSortingBuffer.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/common/TimeSortingBuffer.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/common/TimeSortingBuffer.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/common/Types.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/common/Types.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/common/Types.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/common/Types.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/daemon/AliveMonitorImpl.cpp b/score/launch_manager/src/daemon/src/alive_monitor/details/daemon/AliveMonitorImpl.cpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/daemon/AliveMonitorImpl.cpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/daemon/AliveMonitorImpl.cpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/daemon/AliveMonitorImpl.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/daemon/AliveMonitorImpl.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/daemon/AliveMonitorImpl.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/daemon/AliveMonitorImpl.hpp diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/daemon/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/daemon/BUILD new file mode 100644 index 000000000..d0c82cc90 --- /dev/null +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/daemon/BUILD @@ -0,0 +1,90 @@ +# ******************************************************************************* +# 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 +# ******************************************************************************* +load("@rules_cc//cc:defs.bzl", "cc_library") + +cc_library( + name = "phm_daemon_config", + hdrs = ["PhmDaemonConfig.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/src/alive_monitor:__subpackages__"], +) + +cc_library( + name = "sw_cluster_handler", + srcs = ["SwClusterHandler.cpp"], + hdrs = ["SwClusterHandler.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/src/alive_monitor:__subpackages__"], + deps = [ + "//score/launch_manager/src/daemon/src/alive_monitor/details/factory:flat_cfg_factory", + "//score/launch_manager/src/daemon/src/alive_monitor/details/factory:machine_config_factory", + "//score/launch_manager/src/daemon/src/alive_monitor/details/ifappl:checkpoint", + "//score/launch_manager/src/daemon/src/alive_monitor/details/ifappl:data_structures", + "//score/launch_manager/src/daemon/src/alive_monitor/details/ifappl:monitor_if_daemon", + "//score/launch_manager/src/daemon/src/alive_monitor/details/ifexm:process_state", + "//score/launch_manager/src/daemon/src/alive_monitor/details/ifexm:process_state_reader", + "//score/launch_manager/src/daemon/src/alive_monitor/details/logging:phm_logging", + "//score/launch_manager/src/daemon/src/alive_monitor/details/supervision:alive", + "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:timers_os_clock", + ], +) + +cc_library( + name = "phm_daemon", + srcs = ["PhmDaemon.cpp"], + hdrs = ["PhmDaemon.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/src/alive_monitor:__subpackages__"], + deps = [ + ":phm_daemon_config", + ":sw_cluster_handler", + "//score/launch_manager/src/control_client", + "//score/launch_manager/src/daemon/src/alive_monitor/details/factory:flat_cfg_factory", + "//score/launch_manager/src/daemon/src/alive_monitor/details/factory:machine_config_factory", + "//score/launch_manager/src/daemon/src/alive_monitor/details/ifappl:monitor_if_daemon", + "//score/launch_manager/src/daemon/src/alive_monitor/details/ifexm:process_state_reader", + "//score/launch_manager/src/daemon/src/alive_monitor/details/logging:phm_logging", + "//score/launch_manager/src/daemon/src/alive_monitor/details/supervision:alive", + "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:cycle_time_validator", + "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:cycle_timer", + "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:timers_os_clock", + "//score/launch_manager/src/daemon/src/alive_monitor/details/watchdog:i_watchdog_if", + "//score/launch_manager/src/lifecycle_client", + ], +) + +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"], + hdrs = ["AliveMonitorImpl.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 = [ + ":i_health_monitor", + "//score/launch_manager/src/daemon/src/alive_monitor/details/logging:phm_logging", + "//score/launch_manager/src/daemon/src/alive_monitor/details/watchdog:watchdog_impl", + ], +) diff --git a/score/launch_manager/daemon/src/alive_monitor/details/daemon/IAliveMonitor.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/daemon/IAliveMonitor.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/daemon/IAliveMonitor.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/daemon/IAliveMonitor.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/daemon/PhmDaemon.cpp b/score/launch_manager/src/daemon/src/alive_monitor/details/daemon/PhmDaemon.cpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/daemon/PhmDaemon.cpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/daemon/PhmDaemon.cpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/daemon/PhmDaemon.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/daemon/PhmDaemon.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/daemon/PhmDaemon.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/daemon/PhmDaemon.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/daemon/PhmDaemonConfig.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/daemon/PhmDaemonConfig.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/daemon/PhmDaemonConfig.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/daemon/PhmDaemonConfig.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/daemon/SwClusterHandler.cpp b/score/launch_manager/src/daemon/src/alive_monitor/details/daemon/SwClusterHandler.cpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/daemon/SwClusterHandler.cpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/daemon/SwClusterHandler.cpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/daemon/SwClusterHandler.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/daemon/SwClusterHandler.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/daemon/SwClusterHandler.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/daemon/SwClusterHandler.hpp diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/factory/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/factory/BUILD new file mode 100644 index 000000000..2e0c5f5df --- /dev/null +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/factory/BUILD @@ -0,0 +1,87 @@ +# ******************************************************************************* +# 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 +# ******************************************************************************* +load("@rules_cc//cc:defs.bzl", "cc_library") + +cc_library( + name = "i_phm_factory", + hdrs = ["IPhmFactory.hpp"], + include_prefix = "score/mw/launch_manager/alive_monitor/details/factory", + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/factory", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], + deps = [ + "//score/launch_manager/src/daemon/src/alive_monitor/details/ifappl:data_structures", + ], +) + +cc_library( + name = "static_config", + hdrs = ["StaticConfig.hpp"], + include_prefix = "score/mw/launch_manager/alive_monitor/details/factory", + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/factory", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], + deps = [ + "//score/launch_manager/src/daemon/src/alive_monitor/details/ifappl:data_structures", + "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:timers_os_clock", + "//score/launch_manager/src/daemon/src/alive_monitor/details/watchdog:i_device_config_factory", + ], +) + +cc_library( + name = "machine_config_factory", + srcs = ["MachineConfigFactory.cpp"], + hdrs = ["MachineConfigFactory.hpp"], + include_prefix = "score/mw/launch_manager/alive_monitor/details/factory", + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/factory", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], + deps = [ + ":static_config", + "//score/launch_manager/src/daemon/src/alive_monitor:config", + "//score/launch_manager/src/daemon/src/alive_monitor/details/logging:phm_logging", + "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:time_conversion", + "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:timers_os_clock", + "//score/launch_manager/src/daemon/src/alive_monitor/details/watchdog:i_device_config_factory", + "@flatbuffers", + ] + select({ + "@platforms//os:qnx": [], + "@platforms//os:linux": ["//externals/acl"], + }), +) + +cc_library( + name = "flat_cfg_factory", + srcs = ["FlatCfgFactory.cpp"], + hdrs = ["FlatCfgFactory.hpp"], + include_prefix = "score/mw/launch_manager/alive_monitor/details/factory", + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/factory", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], + deps = [ + ":i_phm_factory", + ":machine_config_factory", + "//score/launch_manager/src/daemon/src/alive_monitor:config", + "//score/launch_manager/src/daemon/src/alive_monitor/details/common:types", + "//score/launch_manager/src/daemon/src/alive_monitor/details/ifappl:checkpoint", + "//score/launch_manager/src/daemon/src/alive_monitor/details/ifappl:monitor_if_daemon", + "//score/launch_manager/src/daemon/src/alive_monitor/details/ifexm:process_state", + "//score/launch_manager/src/daemon/src/alive_monitor/details/ifexm:process_state_reader", + "//score/launch_manager/src/daemon/src/alive_monitor/details/logging:phm_logging", + "//score/launch_manager/src/daemon/src/alive_monitor/details/supervision:alive", + "//score/launch_manager/src/daemon/src/alive_monitor/details/supervision:supervision_cfg", + "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:time_conversion", + "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:timers_os_clock", + "//score/launch_manager/src/daemon/src/common:identifier_hash", + "@flatbuffers", + ] + select({ + "@platforms//os:qnx": [], + "@platforms//os:linux": ["//externals/acl"], + }), +) diff --git a/score/launch_manager/daemon/src/alive_monitor/details/factory/FlatCfgFactory.cpp b/score/launch_manager/src/daemon/src/alive_monitor/details/factory/FlatCfgFactory.cpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/factory/FlatCfgFactory.cpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/factory/FlatCfgFactory.cpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/factory/FlatCfgFactory.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/factory/FlatCfgFactory.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/factory/FlatCfgFactory.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/factory/FlatCfgFactory.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/factory/IPhmFactory.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/factory/IPhmFactory.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/factory/IPhmFactory.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/factory/IPhmFactory.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/factory/MachineConfigFactory.cpp b/score/launch_manager/src/daemon/src/alive_monitor/details/factory/MachineConfigFactory.cpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/factory/MachineConfigFactory.cpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/factory/MachineConfigFactory.cpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/factory/MachineConfigFactory.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/factory/MachineConfigFactory.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/factory/MachineConfigFactory.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/factory/MachineConfigFactory.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/factory/StaticConfig.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/factory/StaticConfig.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/factory/StaticConfig.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/factory/StaticConfig.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/ifappl/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/ifappl/BUILD similarity index 52% rename from score/launch_manager/daemon/src/alive_monitor/details/ifappl/BUILD rename to score/launch_manager/src/daemon/src/alive_monitor/details/ifappl/BUILD index a74946711..7f8f8cf57 100644 --- a/score/launch_manager/daemon/src/alive_monitor/details/ifappl/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/ifappl/BUILD @@ -16,11 +16,11 @@ cc_library( name = "data_structures", hdrs = ["DataStructures.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/ifappl", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/ifappl", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/ifappl", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], deps = [ - "//score/launch_manager/daemon/src/alive_monitor/details/ipc:ipc_if", - "//score/launch_manager/daemon/src/alive_monitor/details/timers:timers_os_clock", + "//score/launch_manager/src/daemon/src/alive_monitor/details/ipc:ipc_if", + "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:timers_os_clock", ], ) @@ -29,12 +29,12 @@ cc_library( srcs = ["Checkpoint.cpp"], hdrs = ["Checkpoint.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/ifappl", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/ifappl", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/ifappl", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], deps = [ - "//score/launch_manager/daemon/src/alive_monitor/details/common:observer", - "//score/launch_manager/daemon/src/alive_monitor/details/ifexm:process_state", - "//score/launch_manager/daemon/src/alive_monitor/details/timers:timers_os_clock", + "//score/launch_manager/src/daemon/src/alive_monitor/details/common:observer", + "//score/launch_manager/src/daemon/src/alive_monitor/details/ifexm:process_state", + "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:timers_os_clock", ], ) @@ -43,14 +43,14 @@ cc_library( srcs = ["MonitorIfDaemon.cpp"], hdrs = ["MonitorIfDaemon.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/ifappl", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/ifappl", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/ifappl", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], deps = [ ":checkpoint", ":data_structures", - "//score/launch_manager/daemon/src/alive_monitor/details/ifexm:process_state", - "//score/launch_manager/daemon/src/alive_monitor/details/logging:phm_logging", - "//score/launch_manager/daemon/src/alive_monitor/details/timers:timers_os_clock", + "//score/launch_manager/src/daemon/src/alive_monitor/details/ifexm:process_state", + "//score/launch_manager/src/daemon/src/alive_monitor/details/logging:phm_logging", + "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:timers_os_clock", ], ) diff --git a/score/launch_manager/daemon/src/alive_monitor/details/ifappl/Checkpoint.cpp b/score/launch_manager/src/daemon/src/alive_monitor/details/ifappl/Checkpoint.cpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/ifappl/Checkpoint.cpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/ifappl/Checkpoint.cpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/ifappl/Checkpoint.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/ifappl/Checkpoint.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/ifappl/Checkpoint.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/ifappl/Checkpoint.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/ifappl/DataStructures.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/ifappl/DataStructures.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/ifappl/DataStructures.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/ifappl/DataStructures.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/ifappl/MonitorIfDaemon.cpp b/score/launch_manager/src/daemon/src/alive_monitor/details/ifappl/MonitorIfDaemon.cpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/ifappl/MonitorIfDaemon.cpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/ifappl/MonitorIfDaemon.cpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/ifappl/MonitorIfDaemon.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/ifappl/MonitorIfDaemon.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/ifappl/MonitorIfDaemon.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/ifappl/MonitorIfDaemon.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/ifappl/MonitorIfDaemon_UT.cpp b/score/launch_manager/src/daemon/src/alive_monitor/details/ifappl/MonitorIfDaemon_UT.cpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/ifappl/MonitorIfDaemon_UT.cpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/ifappl/MonitorIfDaemon_UT.cpp diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/ifexm/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/ifexm/BUILD new file mode 100644 index 000000000..9e3c1836f --- /dev/null +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/ifexm/BUILD @@ -0,0 +1,58 @@ +# ******************************************************************************* +# 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 +# ******************************************************************************* +load("@rules_cc//cc:defs.bzl", "cc_library") + +cc_library( + name = "process_cfg", + srcs = [], + hdrs = ["ProcessCfg.hpp"], + include_prefix = "score/mw/launch_manager/alive_monitor/details/ifexm", + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/ifexm", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], + deps = [ + "//score/launch_manager/src/daemon/src/alive_monitor/details/common:types", + ], +) + +cc_library( + name = "process_state", + srcs = ["ProcessState.cpp"], + hdrs = ["ProcessState.hpp"], + include_prefix = "score/mw/launch_manager/alive_monitor/details/ifexm", + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/ifexm", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], + deps = [ + ":process_cfg", + "//score/launch_manager/src/daemon/src/alive_monitor/details/common:observer", + "//score/launch_manager/src/daemon/src/alive_monitor/details/common:types", + "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:timers_os_clock", + "//score/launch_manager/src/daemon/src/process_state_client", + ], +) + +cc_library( + name = "process_state_reader", + srcs = ["ProcessStateReader.cpp"], + hdrs = ["ProcessStateReader.hpp"], + include_prefix = "score/mw/launch_manager/alive_monitor/details/ifexm", + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/ifexm", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], + deps = [ + ":process_state", + "//score/launch_manager/src/daemon/src/alive_monitor/details/common:types", + "//score/launch_manager/src/daemon/src/alive_monitor/details/logging:phm_logging", + "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:time_conversion", + "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:timers_os_clock", + "//score/launch_manager/src/daemon/src/process_state_client", + ], +) diff --git a/score/launch_manager/daemon/src/alive_monitor/details/ifexm/ProcessCfg.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/ifexm/ProcessCfg.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/ifexm/ProcessCfg.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/ifexm/ProcessCfg.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/ifexm/ProcessState.cpp b/score/launch_manager/src/daemon/src/alive_monitor/details/ifexm/ProcessState.cpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/ifexm/ProcessState.cpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/ifexm/ProcessState.cpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/ifexm/ProcessState.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/ifexm/ProcessState.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/ifexm/ProcessState.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/ifexm/ProcessState.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/ifexm/ProcessStateReader.cpp b/score/launch_manager/src/daemon/src/alive_monitor/details/ifexm/ProcessStateReader.cpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/ifexm/ProcessStateReader.cpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/ifexm/ProcessStateReader.cpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/ifexm/ProcessStateReader.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/ifexm/ProcessStateReader.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/ifexm/ProcessStateReader.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/ifexm/ProcessStateReader.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/ipc/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/ipc/BUILD similarity index 84% rename from score/launch_manager/daemon/src/alive_monitor/details/ipc/BUILD rename to score/launch_manager/src/daemon/src/alive_monitor/details/ipc/BUILD index d5914443c..23ef688f7 100644 --- a/score/launch_manager/daemon/src/alive_monitor/details/ipc/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/ipc/BUILD @@ -20,8 +20,8 @@ cc_library( "IpcServer.hpp", ], include_prefix = "score/mw/launch_manager/alive_monitor/details/ipc", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/ipc", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/ipc", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], deps = ["//externals/ipc_dropin"] + select({ "@platforms//os:qnx": [], "@platforms//os:linux": ["//externals/acl"], diff --git a/score/launch_manager/daemon/src/alive_monitor/details/ipc/IpcBase.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/ipc/IpcBase.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/ipc/IpcBase.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/ipc/IpcBase.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/ipc/IpcClient.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/ipc/IpcClient.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/ipc/IpcClient.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/ipc/IpcClient.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/ipc/IpcServer.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/ipc/IpcServer.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/ipc/IpcServer.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/ipc/IpcServer.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/logging/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/logging/BUILD similarity index 83% rename from score/launch_manager/daemon/src/alive_monitor/details/logging/BUILD rename to score/launch_manager/src/daemon/src/alive_monitor/details/logging/BUILD index 4da571eea..a78f3cf3d 100644 --- a/score/launch_manager/daemon/src/alive_monitor/details/logging/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/logging/BUILD @@ -21,7 +21,7 @@ cc_library( "//conditions:default": ["LC_LOG_SCORE_MW_LOG"], }), include_prefix = "score/mw/launch_manager/alive_monitor/details/logging", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/logging", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/logging", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], deps = ["@score_baselibs//score/mw/log"], ) diff --git a/score/launch_manager/daemon/src/alive_monitor/details/logging/PhmLogger.cpp b/score/launch_manager/src/daemon/src/alive_monitor/details/logging/PhmLogger.cpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/logging/PhmLogger.cpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/logging/PhmLogger.cpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/logging/PhmLogger.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/logging/PhmLogger.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/logging/PhmLogger.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/logging/PhmLogger.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/supervision/Alive.cpp b/score/launch_manager/src/daemon/src/alive_monitor/details/supervision/Alive.cpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/supervision/Alive.cpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/supervision/Alive.cpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/supervision/Alive.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/supervision/Alive.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/supervision/Alive.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/supervision/Alive.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/supervision/Alive_UT.cpp b/score/launch_manager/src/daemon/src/alive_monitor/details/supervision/Alive_UT.cpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/supervision/Alive_UT.cpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/supervision/Alive_UT.cpp diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/supervision/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/supervision/BUILD new file mode 100644 index 000000000..2fad2d869 --- /dev/null +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/supervision/BUILD @@ -0,0 +1,67 @@ +# ******************************************************************************* +# 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 +# ******************************************************************************* +load("@rules_cc//cc:defs.bzl", "cc_library") + +cc_library( + name = "supervision_cfg", + hdrs = ["SupervisionCfg.hpp"], + include_prefix = "score/mw/launch_manager/alive_monitor/details/supervision", + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/supervision", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], + deps = [ + "//score/launch_manager/src/daemon/src/alive_monitor/details/common:types", + "//score/launch_manager/src/daemon/src/alive_monitor/details/ifexm:process_state", + "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:timers_os_clock", + ], +) + +cc_library( + name = "i_supervision", + srcs = ["ISupervision.cpp"], + hdrs = ["ISupervision.hpp"], + include_prefix = "score/mw/launch_manager/alive_monitor/details/supervision", + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/supervision", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], + deps = [ + "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:timers_os_clock", + ], +) + +cc_library( + name = "alive", + srcs = ["Alive.cpp"], + hdrs = ["Alive.hpp"], + include_prefix = "score/mw/launch_manager/alive_monitor/details/supervision", + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/supervision", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], + deps = [ + ":i_supervision", + ":supervision_cfg", + "//score/launch_manager/src/daemon/src/alive_monitor:alive_monitor_h", + "//score/launch_manager/src/daemon/src/alive_monitor/details/common:time_sorting_buffer", + "//score/launch_manager/src/daemon/src/alive_monitor/details/ifappl:checkpoint", + "//score/launch_manager/src/daemon/src/alive_monitor/details/ifexm:process_state", + "//score/launch_manager/src/daemon/src/alive_monitor/details/logging:phm_logging", + "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:timers_os_clock", + "//score/launch_manager/src/daemon/src/recovery_client", + ], +) + +cc_test( + name = "Alive_UT", + srcs = ["Alive_UT.cpp"], + deps = [ + ":alive", + "@googletest//:gtest_main", + ], +) diff --git a/score/launch_manager/daemon/src/alive_monitor/details/supervision/ISupervision.cpp b/score/launch_manager/src/daemon/src/alive_monitor/details/supervision/ISupervision.cpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/supervision/ISupervision.cpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/supervision/ISupervision.cpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/supervision/ISupervision.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/supervision/ISupervision.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/supervision/ISupervision.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/supervision/ISupervision.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/supervision/SupervisionCfg.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/supervision/SupervisionCfg.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/supervision/SupervisionCfg.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/supervision/SupervisionCfg.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/timers/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/timers/BUILD similarity index 66% rename from score/launch_manager/daemon/src/alive_monitor/details/timers/BUILD rename to score/launch_manager/src/daemon/src/alive_monitor/details/timers/BUILD index ab3a95670..05cd4e4e4 100644 --- a/score/launch_manager/daemon/src/alive_monitor/details/timers/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/timers/BUILD @@ -16,8 +16,8 @@ cc_library( name = "os_clock_interface", hdrs = ["OsClockInterface.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/timers", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/timers", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/timers", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], ) cc_library( @@ -31,14 +31,14 @@ cc_library( "Timers_OsClock.hpp", ], include_prefix = "score/mw/launch_manager/alive_monitor/details/timers", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/timers", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/timers", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], ) alias( name = "time_conversion", actual = ":timers_os_clock", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], ) cc_library( @@ -46,8 +46,8 @@ cc_library( srcs = ["CycleTimeValidator.cpp"], hdrs = ["CycleTimeValidator.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/timers", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/timers", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/timers", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], deps = [":os_clock_interface"], ) @@ -56,8 +56,8 @@ cc_library( srcs = ["CycleTimer.cpp"], hdrs = ["CycleTimer.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/timers", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/timers", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/timers", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], deps = [ ":os_clock_interface", ":timers_os_clock", diff --git a/score/launch_manager/daemon/src/alive_monitor/details/timers/CycleTimeValidator.cpp b/score/launch_manager/src/daemon/src/alive_monitor/details/timers/CycleTimeValidator.cpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/timers/CycleTimeValidator.cpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/timers/CycleTimeValidator.cpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/timers/CycleTimeValidator.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/timers/CycleTimeValidator.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/timers/CycleTimeValidator.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/timers/CycleTimeValidator.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/timers/CycleTimer.cpp b/score/launch_manager/src/daemon/src/alive_monitor/details/timers/CycleTimer.cpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/timers/CycleTimer.cpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/timers/CycleTimer.cpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/timers/CycleTimer.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/timers/CycleTimer.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/timers/CycleTimer.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/timers/CycleTimer.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/timers/OsClockInterface.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/timers/OsClockInterface.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/timers/OsClockInterface.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/timers/OsClockInterface.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/timers/TimeConversion.cpp b/score/launch_manager/src/daemon/src/alive_monitor/details/timers/TimeConversion.cpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/timers/TimeConversion.cpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/timers/TimeConversion.cpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/timers/TimeConversion.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/timers/TimeConversion.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/timers/TimeConversion.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/timers/TimeConversion.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/timers/Timers_OsClock.cpp b/score/launch_manager/src/daemon/src/alive_monitor/details/timers/Timers_OsClock.cpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/timers/Timers_OsClock.cpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/timers/Timers_OsClock.cpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/timers/Timers_OsClock.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/timers/Timers_OsClock.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/timers/Timers_OsClock.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/timers/Timers_OsClock.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/watchdog/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/BUILD similarity index 58% rename from score/launch_manager/daemon/src/alive_monitor/details/watchdog/BUILD rename to score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/BUILD index e4876ad35..0cb1a612e 100644 --- a/score/launch_manager/daemon/src/alive_monitor/details/watchdog/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/BUILD @@ -16,16 +16,16 @@ cc_library( name = "i_device_config_factory", hdrs = ["IDeviceConfigFactory.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/watchdog", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/watchdog", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], ) cc_library( name = "i_watchdog_if", hdrs = ["IWatchdogIf.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/watchdog", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/watchdog", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], deps = [":i_device_config_factory"], ) @@ -33,8 +33,8 @@ cc_library( name = "watchdog", hdrs = ["Watchdog.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/watchdog", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/watchdog", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], ) cc_library( @@ -42,8 +42,8 @@ cc_library( srcs = ["DeviceIf.cpp"], hdrs = ["DeviceIf.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/watchdog", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/watchdog", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], ) cc_library( @@ -51,14 +51,14 @@ cc_library( srcs = ["WatchdogImpl.cpp"], hdrs = ["WatchdogImpl.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/watchdog", - strip_include_prefix = "/score/launch_manager/daemon/src/alive_monitor/details/watchdog", - visibility = ["//score/launch_manager/daemon/src/alive_monitor:__subpackages__"], + strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog", + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], deps = [ ":device_if", ":i_device_config_factory", ":i_watchdog_if", ":watchdog", - "//score/launch_manager/daemon/src/alive_monitor/details/logging:phm_logging", - "//score/launch_manager/daemon/src/alive_monitor/details/timers:os_clock_interface", + "//score/launch_manager/src/daemon/src/alive_monitor/details/logging:phm_logging", + "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:os_clock_interface", ], ) diff --git a/score/launch_manager/daemon/src/alive_monitor/details/watchdog/DeviceIf.cpp b/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/DeviceIf.cpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/watchdog/DeviceIf.cpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/DeviceIf.cpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/watchdog/DeviceIf.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/DeviceIf.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/watchdog/DeviceIf.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/DeviceIf.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/watchdog/IDeviceConfigFactory.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/IDeviceConfigFactory.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/watchdog/IDeviceConfigFactory.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/IDeviceConfigFactory.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/watchdog/IWatchdogIf.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/IWatchdogIf.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/watchdog/IWatchdogIf.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/IWatchdogIf.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/watchdog/Watchdog.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/Watchdog.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/watchdog/Watchdog.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/Watchdog.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/watchdog/WatchdogImpl.cpp b/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/WatchdogImpl.cpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/watchdog/WatchdogImpl.cpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/WatchdogImpl.cpp diff --git a/score/launch_manager/daemon/src/alive_monitor/details/watchdog/WatchdogImpl.hpp b/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/WatchdogImpl.hpp similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/details/watchdog/WatchdogImpl.hpp rename to score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/WatchdogImpl.hpp diff --git a/score/launch_manager/daemon/src/alive_monitor/rust/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/rust/BUILD similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/rust/BUILD rename to score/launch_manager/src/daemon/src/alive_monitor/rust/BUILD diff --git a/score/launch_manager/daemon/src/alive_monitor/rust/Cargo.lock b/score/launch_manager/src/daemon/src/alive_monitor/rust/Cargo.lock similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/rust/Cargo.lock rename to score/launch_manager/src/daemon/src/alive_monitor/rust/Cargo.lock diff --git a/score/launch_manager/daemon/src/alive_monitor/rust/Cargo.toml b/score/launch_manager/src/daemon/src/alive_monitor/rust/Cargo.toml similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/rust/Cargo.toml rename to score/launch_manager/src/daemon/src/alive_monitor/rust/Cargo.toml diff --git a/score/launch_manager/daemon/src/alive_monitor/rust/src/errors.rs b/score/launch_manager/src/daemon/src/alive_monitor/rust/src/errors.rs similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/rust/src/errors.rs rename to score/launch_manager/src/daemon/src/alive_monitor/rust/src/errors.rs diff --git a/score/launch_manager/daemon/src/alive_monitor/rust/src/lib.rs b/score/launch_manager/src/daemon/src/alive_monitor/rust/src/lib.rs similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/rust/src/lib.rs rename to score/launch_manager/src/daemon/src/alive_monitor/rust/src/lib.rs diff --git a/score/launch_manager/daemon/src/alive_monitor/rust/src/monitor.rs b/score/launch_manager/src/daemon/src/alive_monitor/rust/src/monitor.rs similarity index 100% rename from score/launch_manager/daemon/src/alive_monitor/rust/src/monitor.rs rename to score/launch_manager/src/daemon/src/alive_monitor/rust/src/monitor.rs diff --git a/score/launch_manager/daemon/src/common/BUILD b/score/launch_manager/src/daemon/src/common/BUILD similarity index 87% rename from score/launch_manager/daemon/src/common/BUILD rename to score/launch_manager/src/daemon/src/common/BUILD index 9aa2ba0d2..db23911e2 100644 --- a/score/launch_manager/daemon/src/common/BUILD +++ b/score/launch_manager/src/daemon/src/common/BUILD @@ -22,7 +22,7 @@ cc_library( "identifier_hash.hpp", ], include_prefix = "score/mw/launch_manager/common", - strip_include_prefix = "/score/launch_manager/daemon/src/common", + strip_include_prefix = "/score/launch_manager/src/daemon/src/common", visibility = ["//score:__subpackages__"], ) @@ -43,7 +43,7 @@ cc_library( "//conditions:default": ["LC_LOG_SCORE_MW_LOG"], }), include_prefix = "score/mw/launch_manager/common", - strip_include_prefix = "/score/launch_manager/daemon/src/common", + strip_include_prefix = "/score/launch_manager/src/daemon/src/common", visibility = ["//score:__subpackages__"], deps = select({ "//config:lm_use_cout_log": [], @@ -55,7 +55,7 @@ cc_library( name = "constants", hdrs = ["constants.hpp"], include_prefix = "score/mw/launch_manager/common", - strip_include_prefix = "/score/launch_manager/daemon/src/common", + strip_include_prefix = "/score/launch_manager/src/daemon/src/common", visibility = [ "//score:__subpackages__", "//src:__subpackages__", @@ -68,7 +68,7 @@ cc_library( "process_group_state_id.hpp", ], include_prefix = "score/mw/launch_manager/common", - strip_include_prefix = "/score/launch_manager/daemon/src/common", + strip_include_prefix = "/score/launch_manager/src/daemon/src/common", visibility = ["//score:__subpackages__"], deps = [":identifier_hash"], ) diff --git a/score/launch_manager/daemon/src/common/concurrency/BUILD b/score/launch_manager/src/daemon/src/common/concurrency/BUILD similarity index 83% rename from score/launch_manager/daemon/src/common/concurrency/BUILD rename to score/launch_manager/src/daemon/src/common/concurrency/BUILD index e2d8ae86a..956995b0f 100644 --- a/score/launch_manager/daemon/src/common/concurrency/BUILD +++ b/score/launch_manager/src/daemon/src/common/concurrency/BUILD @@ -16,12 +16,12 @@ cc_library( name = "workerthread", hdrs = ["workerthread.hpp"], include_prefix = "score/mw/launch_manager/common/concurrency", - strip_include_prefix = "/score/launch_manager/daemon/src/common/concurrency", + strip_include_prefix = "/score/launch_manager/src/daemon/src/common/concurrency", visibility = ["//score:__subpackages__"], deps = [ ":mpmc_concurrent_queue", - "//score/launch_manager/daemon/src/common:constants", - "//score/launch_manager/daemon/src/common:log", + "//score/launch_manager/src/daemon/src/common:constants", + "//score/launch_manager/src/daemon/src/common:log", ], ) @@ -35,12 +35,12 @@ cc_library( linkopts = [ "-l:libatomic.a", ], - strip_include_prefix = "/score/launch_manager/daemon/src/common/concurrency", + strip_include_prefix = "/score/launch_manager/src/daemon/src/common/concurrency", visibility = ["//score:__subpackages__"], deps = [ - "//score/launch_manager/daemon/src/common/concurrency/details:helgrind_annotations", - "//score/launch_manager/daemon/src/osal:return_types", - "//score/launch_manager/daemon/src/osal:semaphore", + "//score/launch_manager/src/daemon/src/common/concurrency/details:helgrind_annotations", + "//score/launch_manager/src/daemon/src/osal:return_types", + "//score/launch_manager/src/daemon/src/osal:semaphore", "@score_baselibs//score/language/futurecpp", "@score_baselibs//score/mw/log", ], diff --git a/score/launch_manager/daemon/src/common/concurrency/concurrency_error_domain.hpp b/score/launch_manager/src/daemon/src/common/concurrency/concurrency_error_domain.hpp similarity index 100% rename from score/launch_manager/daemon/src/common/concurrency/concurrency_error_domain.hpp rename to score/launch_manager/src/daemon/src/common/concurrency/concurrency_error_domain.hpp diff --git a/score/launch_manager/daemon/src/common/concurrency/details/BUILD b/score/launch_manager/src/daemon/src/common/concurrency/details/BUILD similarity index 89% rename from score/launch_manager/daemon/src/common/concurrency/details/BUILD rename to score/launch_manager/src/daemon/src/common/concurrency/details/BUILD index c4ff443a5..a4a517f98 100644 --- a/score/launch_manager/daemon/src/common/concurrency/details/BUILD +++ b/score/launch_manager/src/daemon/src/common/concurrency/details/BUILD @@ -16,6 +16,6 @@ cc_library( name = "helgrind_annotations", hdrs = ["helgrind_annotations.hpp"], include_prefix = "score/mw/launch_manager/common/concurrency/details", - strip_include_prefix = "/score/launch_manager/daemon/src/common/concurrency/details", + strip_include_prefix = "/score/launch_manager/src/daemon/src/common/concurrency/details", visibility = ["//score:__subpackages__"], ) diff --git a/score/launch_manager/daemon/src/common/concurrency/details/helgrind_annotations.hpp b/score/launch_manager/src/daemon/src/common/concurrency/details/helgrind_annotations.hpp similarity index 100% rename from score/launch_manager/daemon/src/common/concurrency/details/helgrind_annotations.hpp rename to score/launch_manager/src/daemon/src/common/concurrency/details/helgrind_annotations.hpp diff --git a/score/launch_manager/daemon/src/common/concurrency/mpmc_concurrent_queue.hpp b/score/launch_manager/src/daemon/src/common/concurrency/mpmc_concurrent_queue.hpp similarity index 100% rename from score/launch_manager/daemon/src/common/concurrency/mpmc_concurrent_queue.hpp rename to score/launch_manager/src/daemon/src/common/concurrency/mpmc_concurrent_queue.hpp diff --git a/score/launch_manager/daemon/src/common/concurrency/mpmc_concurrent_queue_test.cpp b/score/launch_manager/src/daemon/src/common/concurrency/mpmc_concurrent_queue_test.cpp similarity index 100% rename from score/launch_manager/daemon/src/common/concurrency/mpmc_concurrent_queue_test.cpp rename to score/launch_manager/src/daemon/src/common/concurrency/mpmc_concurrent_queue_test.cpp diff --git a/score/launch_manager/daemon/src/common/concurrency/mpmc_concurrent_queue_test_helgrind.supp b/score/launch_manager/src/daemon/src/common/concurrency/mpmc_concurrent_queue_test_helgrind.supp similarity index 100% rename from score/launch_manager/daemon/src/common/concurrency/mpmc_concurrent_queue_test_helgrind.supp rename to score/launch_manager/src/daemon/src/common/concurrency/mpmc_concurrent_queue_test_helgrind.supp diff --git a/score/launch_manager/daemon/src/common/concurrency/workerthread.hpp b/score/launch_manager/src/daemon/src/common/concurrency/workerthread.hpp similarity index 100% rename from score/launch_manager/daemon/src/common/concurrency/workerthread.hpp rename to score/launch_manager/src/daemon/src/common/concurrency/workerthread.hpp diff --git a/score/launch_manager/daemon/src/common/constants.hpp b/score/launch_manager/src/daemon/src/common/constants.hpp similarity index 100% rename from score/launch_manager/daemon/src/common/constants.hpp rename to score/launch_manager/src/daemon/src/common/constants.hpp diff --git a/score/launch_manager/daemon/src/common/identifier_hash.cpp b/score/launch_manager/src/daemon/src/common/identifier_hash.cpp similarity index 100% rename from score/launch_manager/daemon/src/common/identifier_hash.cpp rename to score/launch_manager/src/daemon/src/common/identifier_hash.cpp diff --git a/score/launch_manager/daemon/src/common/identifier_hash.hpp b/score/launch_manager/src/daemon/src/common/identifier_hash.hpp similarity index 100% rename from score/launch_manager/daemon/src/common/identifier_hash.hpp rename to score/launch_manager/src/daemon/src/common/identifier_hash.hpp diff --git a/score/launch_manager/daemon/src/common/identifier_hash_UT.cpp b/score/launch_manager/src/daemon/src/common/identifier_hash_UT.cpp similarity index 100% rename from score/launch_manager/daemon/src/common/identifier_hash_UT.cpp rename to score/launch_manager/src/daemon/src/common/identifier_hash_UT.cpp diff --git a/score/launch_manager/daemon/src/common/log.hpp b/score/launch_manager/src/daemon/src/common/log.hpp similarity index 100% rename from score/launch_manager/daemon/src/common/log.hpp rename to score/launch_manager/src/daemon/src/common/log.hpp diff --git a/score/launch_manager/daemon/src/common/process_group_state_id.hpp b/score/launch_manager/src/daemon/src/common/process_group_state_id.hpp similarity index 100% rename from score/launch_manager/daemon/src/common/process_group_state_id.hpp rename to score/launch_manager/src/daemon/src/common/process_group_state_id.hpp diff --git a/score/launch_manager/daemon/src/configuration/BUILD b/score/launch_manager/src/daemon/src/configuration/BUILD similarity index 78% rename from score/launch_manager/daemon/src/configuration/BUILD rename to score/launch_manager/src/daemon/src/configuration/BUILD index 5fd650671..acb27133a 100644 --- a/score/launch_manager/daemon/src/configuration/BUILD +++ b/score/launch_manager/src/daemon/src/configuration/BUILD @@ -41,7 +41,7 @@ cc_library( srcs = ["details/config.cpp"], hdrs = ["config.hpp"], include_prefix = "score/mw/launch_manager/configuration", - strip_include_prefix = "/score/launch_manager/daemon/src/configuration", + strip_include_prefix = "/score/launch_manager/src/daemon/src/configuration", visibility = ["//score:__subpackages__"], ) @@ -59,7 +59,7 @@ cc_library( name = "config_loader", hdrs = ["config_loader.hpp"], include_prefix = "score/mw/launch_manager/configuration", - strip_include_prefix = "/score/launch_manager/daemon/src/configuration", + strip_include_prefix = "/score/launch_manager/src/daemon/src/configuration", visibility = ["//score:__subpackages__"], deps = [ ":config", @@ -78,7 +78,7 @@ cc_library( visibility = ["//score:__subpackages__"], deps = [ ":config_loader", - "//score/launch_manager/daemon/src/common:log", + "//score/launch_manager/src/daemon/src/common:log", "@flatbuffers", ], ) @@ -91,12 +91,12 @@ cc_library( ], hdrs = ["flatbuffer_config_loader.hpp"], include_prefix = "score/mw/launch_manager/configuration", - strip_include_prefix = "/score/launch_manager/daemon/src/configuration", + strip_include_prefix = "/score/launch_manager/src/daemon/src/configuration", visibility = ["//score:__subpackages__"], deps = [ ":config_loader", ":flatbuffer_type_converters", - "//score/launch_manager/daemon/src/common:log", + "//score/launch_manager/src/daemon/src/common:log", "@flatbuffers", "@score_baselibs//score/flatbuffers:flatbufferutils", ], @@ -128,7 +128,7 @@ cc_library( name = "lm_flatcfg", hdrs = ["lm_flatcfg_generated.h"], include_prefix = "score/mw/launch_manager/configuration", - strip_include_prefix = "/score/launch_manager/daemon/src/configuration", + strip_include_prefix = "/score/launch_manager/src/daemon/src/configuration", visibility = ["//score:__subpackages__"], deps = ["@flatbuffers"], ) @@ -138,18 +138,18 @@ cc_library( srcs = ["configuration_manager.cpp"], hdrs = ["configuration_manager.hpp"], include_prefix = "score/mw/launch_manager/configuration", - strip_include_prefix = "/score/launch_manager/daemon/src/configuration", + strip_include_prefix = "/score/launch_manager/src/daemon/src/configuration", visibility = ["//score:__subpackages__"], deps = [ ":lm_flatcfg", "//score/launch_manager:error", - "//score/launch_manager/daemon/src/common:constants", - "//score/launch_manager/daemon/src/common:identifier_hash", - "//score/launch_manager/daemon/src/common:log", - "//score/launch_manager/daemon/src/common:process_group_state_id", - "//score/launch_manager/daemon/src/osal:num_cores", - "//score/launch_manager/daemon/src/process_group_manager:iprocess", - "//score/launch_manager/daemon/src/process_state_client:posix_process", + "//score/launch_manager/src/daemon/src/common:constants", + "//score/launch_manager/src/daemon/src/common:identifier_hash", + "//score/launch_manager/src/daemon/src/common:log", + "//score/launch_manager/src/daemon/src/common:process_group_state_id", + "//score/launch_manager/src/daemon/src/osal:num_cores", + "//score/launch_manager/src/daemon/src/process_group_manager:iprocess", + "//score/launch_manager/src/daemon/src/process_state_client:posix_process", "@flatbuffers", ], ) diff --git a/score/launch_manager/daemon/src/configuration/config.hpp b/score/launch_manager/src/daemon/src/configuration/config.hpp similarity index 100% rename from score/launch_manager/daemon/src/configuration/config.hpp rename to score/launch_manager/src/daemon/src/configuration/config.hpp diff --git a/score/launch_manager/daemon/src/configuration/config_loader.hpp b/score/launch_manager/src/daemon/src/configuration/config_loader.hpp similarity index 100% rename from score/launch_manager/daemon/src/configuration/config_loader.hpp rename to score/launch_manager/src/daemon/src/configuration/config_loader.hpp diff --git a/score/launch_manager/daemon/src/configuration/config_schema/BUILD b/score/launch_manager/src/daemon/src/configuration/config_schema/BUILD similarity index 100% rename from score/launch_manager/daemon/src/configuration/config_schema/BUILD rename to score/launch_manager/src/daemon/src/configuration/config_schema/BUILD diff --git a/score/launch_manager/daemon/src/configuration/config_schema/README.rst b/score/launch_manager/src/daemon/src/configuration/config_schema/README.rst similarity index 100% rename from score/launch_manager/daemon/src/configuration/config_schema/README.rst rename to score/launch_manager/src/daemon/src/configuration/config_schema/README.rst diff --git a/score/launch_manager/daemon/src/configuration/config_schema/default_values/alive_supervision_defaults.json b/score/launch_manager/src/daemon/src/configuration/config_schema/default_values/alive_supervision_defaults.json similarity index 100% rename from score/launch_manager/daemon/src/configuration/config_schema/default_values/alive_supervision_defaults.json rename to score/launch_manager/src/daemon/src/configuration/config_schema/default_values/alive_supervision_defaults.json diff --git a/score/launch_manager/daemon/src/configuration/config_schema/default_values/component_properties_defaults.json b/score/launch_manager/src/daemon/src/configuration/config_schema/default_values/component_properties_defaults.json similarity index 100% rename from score/launch_manager/daemon/src/configuration/config_schema/default_values/component_properties_defaults.json rename to score/launch_manager/src/daemon/src/configuration/config_schema/default_values/component_properties_defaults.json diff --git a/score/launch_manager/daemon/src/configuration/config_schema/default_values/deployment_config_defaults.json b/score/launch_manager/src/daemon/src/configuration/config_schema/default_values/deployment_config_defaults.json similarity index 100% rename from score/launch_manager/daemon/src/configuration/config_schema/default_values/deployment_config_defaults.json rename to score/launch_manager/src/daemon/src/configuration/config_schema/default_values/deployment_config_defaults.json diff --git a/score/launch_manager/daemon/src/configuration/config_schema/default_values/run_target_defaults.json b/score/launch_manager/src/daemon/src/configuration/config_schema/default_values/run_target_defaults.json similarity index 100% rename from score/launch_manager/daemon/src/configuration/config_schema/default_values/run_target_defaults.json rename to score/launch_manager/src/daemon/src/configuration/config_schema/default_values/run_target_defaults.json diff --git a/score/launch_manager/daemon/src/configuration/config_schema/default_values/watchdog_defaults.json b/score/launch_manager/src/daemon/src/configuration/config_schema/default_values/watchdog_defaults.json similarity index 100% rename from score/launch_manager/daemon/src/configuration/config_schema/default_values/watchdog_defaults.json rename to score/launch_manager/src/daemon/src/configuration/config_schema/default_values/watchdog_defaults.json diff --git a/score/launch_manager/daemon/src/configuration/config_schema/examples/example_conf.json b/score/launch_manager/src/daemon/src/configuration/config_schema/examples/example_conf.json similarity index 100% rename from score/launch_manager/daemon/src/configuration/config_schema/examples/example_conf.json rename to score/launch_manager/src/daemon/src/configuration/config_schema/examples/example_conf.json diff --git a/score/launch_manager/daemon/src/configuration/config_schema/launch_manager.schema.json b/score/launch_manager/src/daemon/src/configuration/config_schema/launch_manager.schema.json similarity index 100% rename from score/launch_manager/daemon/src/configuration/config_schema/launch_manager.schema.json rename to score/launch_manager/src/daemon/src/configuration/config_schema/launch_manager.schema.json diff --git a/score/launch_manager/daemon/src/configuration/config_schema/scripts/validate.py b/score/launch_manager/src/daemon/src/configuration/config_schema/scripts/validate.py similarity index 100% rename from score/launch_manager/daemon/src/configuration/config_schema/scripts/validate.py rename to score/launch_manager/src/daemon/src/configuration/config_schema/scripts/validate.py diff --git a/score/launch_manager/daemon/src/configuration/configuration_manager.cpp b/score/launch_manager/src/daemon/src/configuration/configuration_manager.cpp similarity index 100% rename from score/launch_manager/daemon/src/configuration/configuration_manager.cpp rename to score/launch_manager/src/daemon/src/configuration/configuration_manager.cpp diff --git a/score/launch_manager/daemon/src/configuration/configuration_manager.hpp b/score/launch_manager/src/daemon/src/configuration/configuration_manager.hpp similarity index 100% rename from score/launch_manager/daemon/src/configuration/configuration_manager.hpp rename to score/launch_manager/src/daemon/src/configuration/configuration_manager.hpp diff --git a/score/launch_manager/daemon/src/configuration/details/config.cpp b/score/launch_manager/src/daemon/src/configuration/details/config.cpp similarity index 100% rename from score/launch_manager/daemon/src/configuration/details/config.cpp rename to score/launch_manager/src/daemon/src/configuration/details/config.cpp diff --git a/score/launch_manager/daemon/src/configuration/details/config_UT.cpp b/score/launch_manager/src/daemon/src/configuration/details/config_UT.cpp similarity index 100% rename from score/launch_manager/daemon/src/configuration/details/config_UT.cpp rename to score/launch_manager/src/daemon/src/configuration/details/config_UT.cpp diff --git a/score/launch_manager/daemon/src/configuration/details/flatbuffer_config_loader.cpp b/score/launch_manager/src/daemon/src/configuration/details/flatbuffer_config_loader.cpp similarity index 96% rename from score/launch_manager/daemon/src/configuration/details/flatbuffer_config_loader.cpp rename to score/launch_manager/src/daemon/src/configuration/details/flatbuffer_config_loader.cpp index b2d4c04e2..dd1180fe8 100644 --- a/score/launch_manager/daemon/src/configuration/details/flatbuffer_config_loader.cpp +++ b/score/launch_manager/src/daemon/src/configuration/details/flatbuffer_config_loader.cpp @@ -13,8 +13,8 @@ #include "score/mw/launch_manager/configuration/flatbuffer_config_loader.hpp" -#include "score/launch_manager/daemon/src/configuration/details/flatbuffer_type_converters.hpp" -#include "score/launch_manager/daemon/src/configuration/details/new_lm_flatcfg_generated.h" +#include "score/launch_manager/src/daemon/src/configuration/details/flatbuffer_type_converters.hpp" +#include "score/launch_manager/src/daemon/src/configuration/details/new_lm_flatcfg_generated.h" #include "score/os/errno.h" diff --git a/score/launch_manager/daemon/src/configuration/details/flatbuffer_config_loader_UT.cpp b/score/launch_manager/src/daemon/src/configuration/details/flatbuffer_config_loader_UT.cpp similarity index 99% rename from score/launch_manager/daemon/src/configuration/details/flatbuffer_config_loader_UT.cpp rename to score/launch_manager/src/daemon/src/configuration/details/flatbuffer_config_loader_UT.cpp index 74eeebbb9..f5877b710 100644 --- a/score/launch_manager/daemon/src/configuration/details/flatbuffer_config_loader_UT.cpp +++ b/score/launch_manager/src/daemon/src/configuration/details/flatbuffer_config_loader_UT.cpp @@ -11,7 +11,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ #include "score/mw/launch_manager/configuration/flatbuffer_config_loader.hpp" -#include "score/launch_manager/daemon/src/configuration/details/new_lm_flatcfg_generated.h" +#include "score/launch_manager/src/daemon/src/configuration/details/new_lm_flatcfg_generated.h" #include "score/filesystem/path.h" #include "score/os/errno.h" diff --git a/score/launch_manager/daemon/src/configuration/details/flatbuffer_type_converters.cpp b/score/launch_manager/src/daemon/src/configuration/details/flatbuffer_type_converters.cpp similarity index 99% rename from score/launch_manager/daemon/src/configuration/details/flatbuffer_type_converters.cpp rename to score/launch_manager/src/daemon/src/configuration/details/flatbuffer_type_converters.cpp index f5e76b3bb..496bed59e 100644 --- a/score/launch_manager/daemon/src/configuration/details/flatbuffer_type_converters.cpp +++ b/score/launch_manager/src/daemon/src/configuration/details/flatbuffer_type_converters.cpp @@ -11,9 +11,9 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/launch_manager/daemon/src/configuration/details/flatbuffer_type_converters.hpp" +#include "score/launch_manager/src/daemon/src/configuration/details/flatbuffer_type_converters.hpp" -#include "score/launch_manager/daemon/src/configuration/details/new_lm_flatcfg_generated.h" +#include "score/launch_manager/src/daemon/src/configuration/details/new_lm_flatcfg_generated.h" #include "score/mw/launch_manager/common/log.hpp" diff --git a/score/launch_manager/daemon/src/configuration/details/flatbuffer_type_converters.hpp b/score/launch_manager/src/daemon/src/configuration/details/flatbuffer_type_converters.hpp similarity index 98% rename from score/launch_manager/daemon/src/configuration/details/flatbuffer_type_converters.hpp rename to score/launch_manager/src/daemon/src/configuration/details/flatbuffer_type_converters.hpp index 77a532fe6..5273f8c26 100644 --- a/score/launch_manager/daemon/src/configuration/details/flatbuffer_type_converters.hpp +++ b/score/launch_manager/src/daemon/src/configuration/details/flatbuffer_type_converters.hpp @@ -16,7 +16,7 @@ #include "score/mw/launch_manager/configuration/config.hpp" #include "score/mw/launch_manager/configuration/config_loader.hpp" -#include "score/launch_manager/daemon/src/configuration/details/new_lm_flatcfg_generated.h" +#include "score/launch_manager/src/daemon/src/configuration/details/new_lm_flatcfg_generated.h" #include "score/mw/launch_manager/common/log.hpp" diff --git a/score/launch_manager/daemon/src/configuration/details/flatbuffer_type_converters_UT.cpp b/score/launch_manager/src/daemon/src/configuration/details/flatbuffer_type_converters_UT.cpp similarity index 99% rename from score/launch_manager/daemon/src/configuration/details/flatbuffer_type_converters_UT.cpp rename to score/launch_manager/src/daemon/src/configuration/details/flatbuffer_type_converters_UT.cpp index 4daca97d2..2c62fef23 100644 --- a/score/launch_manager/daemon/src/configuration/details/flatbuffer_type_converters_UT.cpp +++ b/score/launch_manager/src/daemon/src/configuration/details/flatbuffer_type_converters_UT.cpp @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/launch_manager/daemon/src/configuration/details/flatbuffer_type_converters.hpp" -#include "score/launch_manager/daemon/src/configuration/details/new_lm_flatcfg_generated.h" +#include "score/launch_manager/src/daemon/src/configuration/details/flatbuffer_type_converters.hpp" +#include "score/launch_manager/src/daemon/src/configuration/details/new_lm_flatcfg_generated.h" #include #include diff --git a/score/launch_manager/daemon/src/configuration/details/new_lm_flatcfg.fbs b/score/launch_manager/src/daemon/src/configuration/details/new_lm_flatcfg.fbs similarity index 100% rename from score/launch_manager/daemon/src/configuration/details/new_lm_flatcfg.fbs rename to score/launch_manager/src/daemon/src/configuration/details/new_lm_flatcfg.fbs diff --git a/score/launch_manager/daemon/src/configuration/flatbuffer_config_loader.hpp b/score/launch_manager/src/daemon/src/configuration/flatbuffer_config_loader.hpp similarity index 100% rename from score/launch_manager/daemon/src/configuration/flatbuffer_config_loader.hpp rename to score/launch_manager/src/daemon/src/configuration/flatbuffer_config_loader.hpp diff --git a/score/launch_manager/daemon/src/configuration/lm_flatcfg.fbs b/score/launch_manager/src/daemon/src/configuration/lm_flatcfg.fbs similarity index 100% rename from score/launch_manager/daemon/src/configuration/lm_flatcfg.fbs rename to score/launch_manager/src/daemon/src/configuration/lm_flatcfg.fbs diff --git a/score/launch_manager/daemon/src/configuration/lm_flatcfg_generated.h b/score/launch_manager/src/daemon/src/configuration/lm_flatcfg_generated.h similarity index 100% rename from score/launch_manager/daemon/src/configuration/lm_flatcfg_generated.h rename to score/launch_manager/src/daemon/src/configuration/lm_flatcfg_generated.h diff --git a/score/launch_manager/daemon/src/control/BUILD b/score/launch_manager/src/daemon/src/control/BUILD similarity index 72% rename from score/launch_manager/daemon/src/control/BUILD rename to score/launch_manager/src/daemon/src/control/BUILD index 530cf51fe..2fb0d9f0e 100644 --- a/score/launch_manager/daemon/src/control/BUILD +++ b/score/launch_manager/src/daemon/src/control/BUILD @@ -21,12 +21,12 @@ cc_library( "control_client_channel.hpp", ], include_prefix = "score/mw/launch_manager/control", - strip_include_prefix = "/score/launch_manager/daemon/src/control", + strip_include_prefix = "/score/launch_manager/src/daemon/src/control", visibility = ["//score:__subpackages__"], deps = [ - "//score/launch_manager/daemon/src/common:constants", - "//score/launch_manager/daemon/src/common:log", - "//score/launch_manager/daemon/src/common:process_group_state_id", - "//score/launch_manager/daemon/src/osal:ipc_comms", + "//score/launch_manager/src/daemon/src/common:constants", + "//score/launch_manager/src/daemon/src/common:log", + "//score/launch_manager/src/daemon/src/common:process_group_state_id", + "//score/launch_manager/src/daemon/src/osal:ipc_comms", ], ) diff --git a/score/launch_manager/daemon/src/control/control_client_channel.cpp b/score/launch_manager/src/daemon/src/control/control_client_channel.cpp similarity index 100% rename from score/launch_manager/daemon/src/control/control_client_channel.cpp rename to score/launch_manager/src/daemon/src/control/control_client_channel.cpp diff --git a/score/launch_manager/daemon/src/control/control_client_channel.hpp b/score/launch_manager/src/daemon/src/control/control_client_channel.hpp similarity index 100% rename from score/launch_manager/daemon/src/control/control_client_channel.hpp rename to score/launch_manager/src/daemon/src/control/control_client_channel.hpp diff --git a/score/launch_manager/daemon/src/main.cpp b/score/launch_manager/src/daemon/src/main.cpp similarity index 100% rename from score/launch_manager/daemon/src/main.cpp rename to score/launch_manager/src/daemon/src/main.cpp diff --git a/score/launch_manager/daemon/src/osal/BUILD b/score/launch_manager/src/daemon/src/osal/BUILD similarity index 83% rename from score/launch_manager/daemon/src/osal/BUILD rename to score/launch_manager/src/daemon/src/osal/BUILD index 64971e3bf..8c4b45587 100644 --- a/score/launch_manager/daemon/src/osal/BUILD +++ b/score/launch_manager/src/daemon/src/osal/BUILD @@ -16,7 +16,7 @@ cc_library( name = "return_types", hdrs = ["return_types.hpp"], include_prefix = "score/mw/launch_manager/osal", - strip_include_prefix = "/score/launch_manager/daemon/src/osal", + strip_include_prefix = "/score/launch_manager/src/daemon/src/osal", visibility = ["//score:__subpackages__"], ) @@ -28,7 +28,7 @@ cc_library( "semaphore.hpp", ], include_prefix = "score/mw/launch_manager/osal", - strip_include_prefix = "/score/launch_manager/daemon/src/osal", + strip_include_prefix = "/score/launch_manager/src/daemon/src/osal", visibility = ["//score:__subpackages__"], deps = [":return_types"], ) @@ -38,7 +38,7 @@ cc_library( srcs = ["details/posix/sys_exit.cpp"], hdrs = ["sys_exit.hpp"], include_prefix = "score/mw/launch_manager/osal", - strip_include_prefix = "/score/launch_manager/daemon/src/osal", + strip_include_prefix = "/score/launch_manager/src/daemon/src/osal", visibility = ["//score:__subpackages__"], ) @@ -50,7 +50,7 @@ cc_library( }), hdrs = ["num_cores.hpp"], include_prefix = "score/mw/launch_manager/osal", - strip_include_prefix = "/score/launch_manager/daemon/src/osal", + strip_include_prefix = "/score/launch_manager/src/daemon/src/osal", visibility = ["//score:__subpackages__"], ) @@ -62,7 +62,7 @@ cc_library( }), hdrs = ["security_policy.hpp"], include_prefix = "score/mw/launch_manager/osal", - strip_include_prefix = "/score/launch_manager/daemon/src/osal", + strip_include_prefix = "/score/launch_manager/src/daemon/src/osal", visibility = ["//score:__subpackages__"], ) @@ -74,7 +74,7 @@ cc_library( }), hdrs = ["set_affinity.hpp"], include_prefix = "score/mw/launch_manager/osal", - strip_include_prefix = "/score/launch_manager/daemon/src/osal", + strip_include_prefix = "/score/launch_manager/src/daemon/src/osal", visibility = ["//score:__subpackages__"], ) @@ -86,7 +86,7 @@ cc_library( }), hdrs = ["set_groups.hpp"], include_prefix = "score/mw/launch_manager/osal", - strip_include_prefix = "/score/launch_manager/daemon/src/osal", + strip_include_prefix = "/score/launch_manager/src/daemon/src/osal", visibility = ["//score:__subpackages__"], ) @@ -98,14 +98,14 @@ cc_library( "semaphore.hpp", ], include_prefix = "score/mw/launch_manager/osal", - strip_include_prefix = "/score/launch_manager/daemon/src/osal", + strip_include_prefix = "/score/launch_manager/src/daemon/src/osal", visibility = [ "//score:__subpackages__", "//tests:__subpackages__", ], deps = [ ":semaphore", - "//score/launch_manager/daemon/src/common:log", + "//score/launch_manager/src/daemon/src/common:log", ], ) diff --git a/score/launch_manager/daemon/src/osal/details/linux/num_cores.cpp b/score/launch_manager/src/daemon/src/osal/details/linux/num_cores.cpp similarity index 100% rename from score/launch_manager/daemon/src/osal/details/linux/num_cores.cpp rename to score/launch_manager/src/daemon/src/osal/details/linux/num_cores.cpp diff --git a/score/launch_manager/daemon/src/osal/details/linux/security_policy.cpp b/score/launch_manager/src/daemon/src/osal/details/linux/security_policy.cpp similarity index 100% rename from score/launch_manager/daemon/src/osal/details/linux/security_policy.cpp rename to score/launch_manager/src/daemon/src/osal/details/linux/security_policy.cpp diff --git a/score/launch_manager/daemon/src/osal/details/linux/set_affinity.cpp b/score/launch_manager/src/daemon/src/osal/details/linux/set_affinity.cpp similarity index 100% rename from score/launch_manager/daemon/src/osal/details/linux/set_affinity.cpp rename to score/launch_manager/src/daemon/src/osal/details/linux/set_affinity.cpp diff --git a/score/launch_manager/daemon/src/osal/details/linux/set_groups.cpp b/score/launch_manager/src/daemon/src/osal/details/linux/set_groups.cpp similarity index 100% rename from score/launch_manager/daemon/src/osal/details/linux/set_groups.cpp rename to score/launch_manager/src/daemon/src/osal/details/linux/set_groups.cpp diff --git a/score/launch_manager/daemon/src/osal/details/posix/semaphore.cpp b/score/launch_manager/src/daemon/src/osal/details/posix/semaphore.cpp similarity index 100% rename from score/launch_manager/daemon/src/osal/details/posix/semaphore.cpp rename to score/launch_manager/src/daemon/src/osal/details/posix/semaphore.cpp diff --git a/score/launch_manager/daemon/src/osal/details/posix/sys_exit.cpp b/score/launch_manager/src/daemon/src/osal/details/posix/sys_exit.cpp similarity index 100% rename from score/launch_manager/daemon/src/osal/details/posix/sys_exit.cpp rename to score/launch_manager/src/daemon/src/osal/details/posix/sys_exit.cpp diff --git a/score/launch_manager/daemon/src/osal/details/qnx/num_cores.cpp b/score/launch_manager/src/daemon/src/osal/details/qnx/num_cores.cpp similarity index 100% rename from score/launch_manager/daemon/src/osal/details/qnx/num_cores.cpp rename to score/launch_manager/src/daemon/src/osal/details/qnx/num_cores.cpp diff --git a/score/launch_manager/daemon/src/osal/details/qnx/security_policy.cpp b/score/launch_manager/src/daemon/src/osal/details/qnx/security_policy.cpp similarity index 100% rename from score/launch_manager/daemon/src/osal/details/qnx/security_policy.cpp rename to score/launch_manager/src/daemon/src/osal/details/qnx/security_policy.cpp diff --git a/score/launch_manager/daemon/src/osal/details/qnx/set_affinity.cpp b/score/launch_manager/src/daemon/src/osal/details/qnx/set_affinity.cpp similarity index 100% rename from score/launch_manager/daemon/src/osal/details/qnx/set_affinity.cpp rename to score/launch_manager/src/daemon/src/osal/details/qnx/set_affinity.cpp diff --git a/score/launch_manager/daemon/src/osal/details/qnx/set_groups.cpp b/score/launch_manager/src/daemon/src/osal/details/qnx/set_groups.cpp similarity index 100% rename from score/launch_manager/daemon/src/osal/details/qnx/set_groups.cpp rename to score/launch_manager/src/daemon/src/osal/details/qnx/set_groups.cpp diff --git a/score/launch_manager/daemon/src/osal/ipc_comms.hpp b/score/launch_manager/src/daemon/src/osal/ipc_comms.hpp similarity index 100% rename from score/launch_manager/daemon/src/osal/ipc_comms.hpp rename to score/launch_manager/src/daemon/src/osal/ipc_comms.hpp diff --git a/score/launch_manager/daemon/src/osal/num_cores.hpp b/score/launch_manager/src/daemon/src/osal/num_cores.hpp similarity index 100% rename from score/launch_manager/daemon/src/osal/num_cores.hpp rename to score/launch_manager/src/daemon/src/osal/num_cores.hpp diff --git a/score/launch_manager/daemon/src/osal/return_types.hpp b/score/launch_manager/src/daemon/src/osal/return_types.hpp similarity index 100% rename from score/launch_manager/daemon/src/osal/return_types.hpp rename to score/launch_manager/src/daemon/src/osal/return_types.hpp diff --git a/score/launch_manager/daemon/src/osal/security_policy.hpp b/score/launch_manager/src/daemon/src/osal/security_policy.hpp similarity index 100% rename from score/launch_manager/daemon/src/osal/security_policy.hpp rename to score/launch_manager/src/daemon/src/osal/security_policy.hpp diff --git a/score/launch_manager/daemon/src/osal/semaphore.hpp b/score/launch_manager/src/daemon/src/osal/semaphore.hpp similarity index 100% rename from score/launch_manager/daemon/src/osal/semaphore.hpp rename to score/launch_manager/src/daemon/src/osal/semaphore.hpp diff --git a/score/launch_manager/daemon/src/osal/set_affinity.hpp b/score/launch_manager/src/daemon/src/osal/set_affinity.hpp similarity index 100% rename from score/launch_manager/daemon/src/osal/set_affinity.hpp rename to score/launch_manager/src/daemon/src/osal/set_affinity.hpp diff --git a/score/launch_manager/daemon/src/osal/set_groups.hpp b/score/launch_manager/src/daemon/src/osal/set_groups.hpp similarity index 100% rename from score/launch_manager/daemon/src/osal/set_groups.hpp rename to score/launch_manager/src/daemon/src/osal/set_groups.hpp diff --git a/score/launch_manager/daemon/src/osal/sys_exit.hpp b/score/launch_manager/src/daemon/src/osal/sys_exit.hpp similarity index 100% rename from score/launch_manager/daemon/src/osal/sys_exit.hpp rename to score/launch_manager/src/daemon/src/osal/sys_exit.hpp diff --git a/score/launch_manager/daemon/src/process_group_manager/BUILD b/score/launch_manager/src/daemon/src/process_group_manager/BUILD similarity index 52% rename from score/launch_manager/daemon/src/process_group_manager/BUILD rename to score/launch_manager/src/daemon/src/process_group_manager/BUILD index b5fa09543..4faa2b991 100644 --- a/score/launch_manager/daemon/src/process_group_manager/BUILD +++ b/score/launch_manager/src/daemon/src/process_group_manager/BUILD @@ -16,11 +16,11 @@ cc_library( name = "iprocess", hdrs = ["iprocess.hpp"], include_prefix = "score/mw/launch_manager/process_group_manager", - strip_include_prefix = "/score/launch_manager/daemon/src/process_group_manager", + strip_include_prefix = "/score/launch_manager/src/daemon/src/process_group_manager", visibility = ["//score:__subpackages__"], deps = [ - "//score/launch_manager/daemon/src/common:constants", - "//score/launch_manager/daemon/src/osal:ipc_comms", + "//score/launch_manager/src/daemon/src/common:constants", + "//score/launch_manager/src/daemon/src/osal:ipc_comms", ], ) @@ -28,7 +28,7 @@ cc_library( name = "ialive_monitor_thread", hdrs = ["ialive_monitor_thread.hpp"], include_prefix = "score/mw/launch_manager/process_group_manager", - strip_include_prefix = "/score/launch_manager/daemon/src/process_group_manager", + strip_include_prefix = "/score/launch_manager/src/daemon/src/process_group_manager", visibility = ["//score:__subpackages__"], ) @@ -37,11 +37,11 @@ cc_library( srcs = ["alive_monitor_thread.cpp"], hdrs = ["alive_monitor_thread.hpp"], include_prefix = "score/mw/launch_manager/process_group_manager", - strip_include_prefix = "/score/launch_manager/daemon/src/process_group_manager", + strip_include_prefix = "/score/launch_manager/src/daemon/src/process_group_manager", visibility = ["//score:__subpackages__"], deps = [ ":ialive_monitor_thread", - "//score/launch_manager/daemon/src/alive_monitor", + "//score/launch_manager/src/daemon/src/alive_monitor", ], ) @@ -51,23 +51,23 @@ cc_library( name = "process_group_manager_hdrs", hdrs = ["process_group_manager.hpp"], include_prefix = "score/mw/launch_manager/process_group_manager", - strip_include_prefix = "/score/launch_manager/daemon/src/process_group_manager", - visibility = ["//score/launch_manager/daemon/src/process_group_manager/details:__pkg__"], + strip_include_prefix = "/score/launch_manager/src/daemon/src/process_group_manager", + visibility = ["//score/launch_manager/src/daemon/src/process_group_manager/details:__pkg__"], deps = [ ":ialive_monitor_thread", ":iprocess", - "//score/launch_manager/daemon/src/common:identifier_hash", - "//score/launch_manager/daemon/src/common/concurrency:mpmc_concurrent_queue", - "//score/launch_manager/daemon/src/common/concurrency:workerthread", - "//score/launch_manager/daemon/src/configuration:configuration_manager", - "//score/launch_manager/daemon/src/control:control_client_channel", - "//score/launch_manager/daemon/src/osal:ipc_comms", - "//score/launch_manager/daemon/src/process_group_manager/details:graph", - "//score/launch_manager/daemon/src/process_group_manager/details:os_handler", - "//score/launch_manager/daemon/src/process_group_manager/details:process_info_node", - "//score/launch_manager/daemon/src/process_group_manager/details:safe_process_map", - "//score/launch_manager/daemon/src/process_state_client:iprocess_state_notifier", - "//score/launch_manager/daemon/src/recovery_client", + "//score/launch_manager/src/daemon/src/common:identifier_hash", + "//score/launch_manager/src/daemon/src/common/concurrency:mpmc_concurrent_queue", + "//score/launch_manager/src/daemon/src/common/concurrency:workerthread", + "//score/launch_manager/src/daemon/src/configuration:configuration_manager", + "//score/launch_manager/src/daemon/src/control:control_client_channel", + "//score/launch_manager/src/daemon/src/osal:ipc_comms", + "//score/launch_manager/src/daemon/src/process_group_manager/details:graph", + "//score/launch_manager/src/daemon/src/process_group_manager/details:os_handler", + "//score/launch_manager/src/daemon/src/process_group_manager/details:process_info_node", + "//score/launch_manager/src/daemon/src/process_group_manager/details:safe_process_map", + "//score/launch_manager/src/daemon/src/process_state_client:iprocess_state_notifier", + "//score/launch_manager/src/daemon/src/recovery_client", "@score_baselibs//score/language/futurecpp", ], ) @@ -77,6 +77,6 @@ cc_library( visibility = ["//score:__subpackages__"], deps = [ ":process_group_manager_hdrs", - "//score/launch_manager/daemon/src/process_group_manager/details:process_group_manager_impl", + "//score/launch_manager/src/daemon/src/process_group_manager/details:process_group_manager_impl", ], ) diff --git a/score/launch_manager/daemon/src/process_group_manager/alive_monitor_thread.cpp b/score/launch_manager/src/daemon/src/process_group_manager/alive_monitor_thread.cpp similarity index 100% rename from score/launch_manager/daemon/src/process_group_manager/alive_monitor_thread.cpp rename to score/launch_manager/src/daemon/src/process_group_manager/alive_monitor_thread.cpp diff --git a/score/launch_manager/daemon/src/process_group_manager/alive_monitor_thread.hpp b/score/launch_manager/src/daemon/src/process_group_manager/alive_monitor_thread.hpp similarity index 100% rename from score/launch_manager/daemon/src/process_group_manager/alive_monitor_thread.hpp rename to score/launch_manager/src/daemon/src/process_group_manager/alive_monitor_thread.hpp diff --git a/score/launch_manager/src/daemon/src/process_group_manager/details/BUILD b/score/launch_manager/src/daemon/src/process_group_manager/details/BUILD new file mode 100644 index 000000000..6bc81a375 --- /dev/null +++ b/score/launch_manager/src/daemon/src/process_group_manager/details/BUILD @@ -0,0 +1,139 @@ +# ******************************************************************************* +# 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 +# ******************************************************************************* +load("@rules_cc//cc:defs.bzl", "cc_library") + +cc_library( + name = "process_info_node", + hdrs = ["process_info_node.hpp"], + include_prefix = "score/mw/launch_manager/process_group_manager/details", + strip_include_prefix = "/score/launch_manager/src/daemon/src/process_group_manager/details", + visibility = ["//score/launch_manager/src/daemon/src/process_group_manager:__pkg__"], + deps = [ + ":safe_process_map", + "//score/launch_manager/src/daemon/src/configuration:configuration_manager", + "//score/launch_manager/src/daemon/src/control:control_client_channel", + "//score/launch_manager/src/daemon/src/osal:ipc_comms", + "//score/launch_manager/src/daemon/src/osal:semaphore", + "//score/launch_manager/src/daemon/src/process_group_manager:iprocess", + ], +) + +cc_library( + name = "graph", + hdrs = ["graph.hpp"], + include_prefix = "score/mw/launch_manager/process_group_manager/details", + strip_include_prefix = "/score/launch_manager/src/daemon/src/process_group_manager/details", + visibility = ["//score/launch_manager/src/daemon/src/process_group_manager:__pkg__"], + deps = [ + ":process_info_node", + ":safe_process_map", + "//score/launch_manager/src/daemon/src/common:identifier_hash", + "//score/launch_manager/src/daemon/src/configuration:configuration_manager", + "//score/launch_manager/src/daemon/src/control:control_client_channel", + "//score/launch_manager/src/daemon/src/osal:semaphore", + "//score/launch_manager/src/daemon/src/process_group_manager:iprocess", + ], +) + +cc_library( + name = "safe_process_map", + srcs = ["safe_process_map.cpp"], + hdrs = ["safe_process_map.hpp"], + include_prefix = "score/mw/launch_manager/process_group_manager/details", + strip_include_prefix = "/score/launch_manager/src/daemon/src/process_group_manager/details", + visibility = ["//score/launch_manager/src/daemon/src/process_group_manager:__pkg__"], + deps = [ + "//score/launch_manager/src/daemon/src/process_group_manager:iprocess", + ], +) + +cc_test( + name = "safeprocessmap_UT", + srcs = ["safeprocessmap_UT.cpp"], + deps = [ + ":safe_process_map", + "@googletest//:gtest_main", + ], +) + +cc_library( + name = "os_handler", + srcs = ["os_handler.cpp"], + hdrs = ["os_handler.hpp"], + include_prefix = "score/mw/launch_manager/process_group_manager/details", + strip_include_prefix = "/score/launch_manager/src/daemon/src/process_group_manager/details", + visibility = ["//score/launch_manager/src/daemon/src/process_group_manager:__pkg__"], + deps = [ + ":safe_process_map", + "//score/launch_manager/src/daemon/src/common:log", + "//score/launch_manager/src/daemon/src/process_group_manager:iprocess", + "@score_baselibs//score/os:sys_wait", + ], +) + +cc_test( + name = "oshandler_UT", + srcs = ["oshandler_UT.cpp"], + deps = [ + ":os_handler", + ":safe_process_map", + "@googletest//:gtest_main", + "@score_baselibs//score/os/mocklib:sys_wait_mock", + ], +) + +cc_library( + name = "process_launcher", + srcs = ["process_launcher.cpp"], + visibility = ["//score/launch_manager/src/daemon/src/process_group_manager:__pkg__"], + deps = [ + "//score/launch_manager/src/daemon/src/common:log", + "//score/launch_manager/src/daemon/src/control:control_client_channel", + "//score/launch_manager/src/daemon/src/osal:ipc_comms", + "//score/launch_manager/src/daemon/src/osal:security_policy", + "//score/launch_manager/src/daemon/src/osal:set_affinity", + "//score/launch_manager/src/daemon/src/osal:set_groups", + "//score/launch_manager/src/daemon/src/osal:sys_exit", + "//score/launch_manager/src/daemon/src/process_group_manager:iprocess", + ], +) + +# graph.cpp, process_info_node.cpp, and process_group_manager.cpp include +# process_group_manager.hpp which in turn includes graph.hpp and process_info_node.hpp — +# circular at link time, so all three must share a target. +cc_library( + name = "process_group_manager_impl", + srcs = [ + "graph.cpp", + "process_group_manager.cpp", + "process_info_node.cpp", + ], + visibility = ["//score/launch_manager/src/daemon/src/process_group_manager:__pkg__"], + deps = [ + ":graph", + ":os_handler", + ":process_info_node", + ":process_launcher", + ":safe_process_map", + "//score/launch_manager/src/daemon/src/common:log", + "//score/launch_manager/src/daemon/src/common/concurrency:mpmc_concurrent_queue", + "//score/launch_manager/src/daemon/src/common/concurrency:workerthread", + "//score/launch_manager/src/daemon/src/configuration:configuration_manager", + "//score/launch_manager/src/daemon/src/osal:ipc_comms", + "//score/launch_manager/src/daemon/src/osal:semaphore", + "//score/launch_manager/src/daemon/src/process_group_manager:process_group_manager_hdrs", + "//score/launch_manager/src/daemon/src/process_state_client", + "//score/launch_manager/src/daemon/src/recovery_client", + "@score_baselibs//score/language/futurecpp", + ], +) diff --git a/score/launch_manager/daemon/src/process_group_manager/details/graph.cpp b/score/launch_manager/src/daemon/src/process_group_manager/details/graph.cpp similarity index 100% rename from score/launch_manager/daemon/src/process_group_manager/details/graph.cpp rename to score/launch_manager/src/daemon/src/process_group_manager/details/graph.cpp diff --git a/score/launch_manager/daemon/src/process_group_manager/details/graph.hpp b/score/launch_manager/src/daemon/src/process_group_manager/details/graph.hpp similarity index 100% rename from score/launch_manager/daemon/src/process_group_manager/details/graph.hpp rename to score/launch_manager/src/daemon/src/process_group_manager/details/graph.hpp diff --git a/score/launch_manager/daemon/src/process_group_manager/details/os_handler.cpp b/score/launch_manager/src/daemon/src/process_group_manager/details/os_handler.cpp similarity index 100% rename from score/launch_manager/daemon/src/process_group_manager/details/os_handler.cpp rename to score/launch_manager/src/daemon/src/process_group_manager/details/os_handler.cpp diff --git a/score/launch_manager/daemon/src/process_group_manager/details/os_handler.hpp b/score/launch_manager/src/daemon/src/process_group_manager/details/os_handler.hpp similarity index 100% rename from score/launch_manager/daemon/src/process_group_manager/details/os_handler.hpp rename to score/launch_manager/src/daemon/src/process_group_manager/details/os_handler.hpp diff --git a/score/launch_manager/daemon/src/process_group_manager/details/oshandler_UT.cpp b/score/launch_manager/src/daemon/src/process_group_manager/details/oshandler_UT.cpp similarity index 100% rename from score/launch_manager/daemon/src/process_group_manager/details/oshandler_UT.cpp rename to score/launch_manager/src/daemon/src/process_group_manager/details/oshandler_UT.cpp diff --git a/score/launch_manager/daemon/src/process_group_manager/details/process_group_manager.cpp b/score/launch_manager/src/daemon/src/process_group_manager/details/process_group_manager.cpp similarity index 100% rename from score/launch_manager/daemon/src/process_group_manager/details/process_group_manager.cpp rename to score/launch_manager/src/daemon/src/process_group_manager/details/process_group_manager.cpp diff --git a/score/launch_manager/daemon/src/process_group_manager/details/process_info_node.cpp b/score/launch_manager/src/daemon/src/process_group_manager/details/process_info_node.cpp similarity index 100% rename from score/launch_manager/daemon/src/process_group_manager/details/process_info_node.cpp rename to score/launch_manager/src/daemon/src/process_group_manager/details/process_info_node.cpp diff --git a/score/launch_manager/daemon/src/process_group_manager/details/process_info_node.hpp b/score/launch_manager/src/daemon/src/process_group_manager/details/process_info_node.hpp similarity index 100% rename from score/launch_manager/daemon/src/process_group_manager/details/process_info_node.hpp rename to score/launch_manager/src/daemon/src/process_group_manager/details/process_info_node.hpp diff --git a/score/launch_manager/daemon/src/process_group_manager/details/process_launcher.cpp b/score/launch_manager/src/daemon/src/process_group_manager/details/process_launcher.cpp similarity index 100% rename from score/launch_manager/daemon/src/process_group_manager/details/process_launcher.cpp rename to score/launch_manager/src/daemon/src/process_group_manager/details/process_launcher.cpp diff --git a/score/launch_manager/daemon/src/process_group_manager/details/safe_process_map.cpp b/score/launch_manager/src/daemon/src/process_group_manager/details/safe_process_map.cpp similarity index 100% rename from score/launch_manager/daemon/src/process_group_manager/details/safe_process_map.cpp rename to score/launch_manager/src/daemon/src/process_group_manager/details/safe_process_map.cpp diff --git a/score/launch_manager/daemon/src/process_group_manager/details/safe_process_map.hpp b/score/launch_manager/src/daemon/src/process_group_manager/details/safe_process_map.hpp similarity index 100% rename from score/launch_manager/daemon/src/process_group_manager/details/safe_process_map.hpp rename to score/launch_manager/src/daemon/src/process_group_manager/details/safe_process_map.hpp diff --git a/score/launch_manager/daemon/src/process_group_manager/details/safeprocessmap_UT.cpp b/score/launch_manager/src/daemon/src/process_group_manager/details/safeprocessmap_UT.cpp similarity index 100% rename from score/launch_manager/daemon/src/process_group_manager/details/safeprocessmap_UT.cpp rename to score/launch_manager/src/daemon/src/process_group_manager/details/safeprocessmap_UT.cpp diff --git a/score/launch_manager/daemon/src/process_group_manager/ialive_monitor_thread.hpp b/score/launch_manager/src/daemon/src/process_group_manager/ialive_monitor_thread.hpp similarity index 100% rename from score/launch_manager/daemon/src/process_group_manager/ialive_monitor_thread.hpp rename to score/launch_manager/src/daemon/src/process_group_manager/ialive_monitor_thread.hpp diff --git a/score/launch_manager/daemon/src/process_group_manager/iprocess.hpp b/score/launch_manager/src/daemon/src/process_group_manager/iprocess.hpp similarity index 100% rename from score/launch_manager/daemon/src/process_group_manager/iprocess.hpp rename to score/launch_manager/src/daemon/src/process_group_manager/iprocess.hpp diff --git a/score/launch_manager/daemon/src/process_group_manager/process_group_manager.hpp b/score/launch_manager/src/daemon/src/process_group_manager/process_group_manager.hpp similarity index 100% rename from score/launch_manager/daemon/src/process_group_manager/process_group_manager.hpp rename to score/launch_manager/src/daemon/src/process_group_manager/process_group_manager.hpp diff --git a/score/launch_manager/daemon/src/process_state_client/BUILD b/score/launch_manager/src/daemon/src/process_state_client/BUILD similarity index 73% rename from score/launch_manager/daemon/src/process_state_client/BUILD rename to score/launch_manager/src/daemon/src/process_state_client/BUILD index a2c720fb6..368838fd6 100644 --- a/score/launch_manager/daemon/src/process_state_client/BUILD +++ b/score/launch_manager/src/daemon/src/process_state_client/BUILD @@ -16,10 +16,10 @@ cc_library( name = "posix_process", hdrs = ["posix_process.hpp"], include_prefix = "score/mw/launch_manager/process_state_client", - strip_include_prefix = "/score/launch_manager/daemon/src/process_state_client", + strip_include_prefix = "/score/launch_manager/src/daemon/src/process_state_client", visibility = ["//score:__subpackages__"], deps = [ - "//score/launch_manager/daemon/src/common:identifier_hash", + "//score/launch_manager/src/daemon/src/common:identifier_hash", ], ) @@ -27,7 +27,7 @@ cc_library( name = "iprocess_state_receiver", hdrs = ["iprocess_state_receiver.hpp"], include_prefix = "score/mw/launch_manager/process_state_client", - strip_include_prefix = "/score/launch_manager/daemon/src/process_state_client", + strip_include_prefix = "/score/launch_manager/src/daemon/src/process_state_client", visibility = ["//score:__subpackages__"], deps = [ ":posix_process", @@ -40,7 +40,7 @@ cc_library( name = "iprocess_state_notifier", hdrs = ["iprocess_state_notifier.hpp"], include_prefix = "score/mw/launch_manager/process_state_client", - strip_include_prefix = "/score/launch_manager/daemon/src/process_state_client", + strip_include_prefix = "/score/launch_manager/src/daemon/src/process_state_client", visibility = ["//score:__subpackages__"], deps = [ ":iprocess_state_receiver", @@ -53,13 +53,13 @@ cc_library( srcs = ["process_state_notifier.cpp"], hdrs = ["process_state_notifier.hpp"], include_prefix = "score/mw/launch_manager/process_state_client", - strip_include_prefix = "/score/launch_manager/daemon/src/process_state_client", + strip_include_prefix = "/score/launch_manager/src/daemon/src/process_state_client", visibility = ["//score:__subpackages__"], deps = [ ":iprocess_state_notifier", "//externals/ipc_dropin", - "//score/launch_manager/daemon/src/common:log", - "//score/launch_manager/daemon/src/process_state_client/details:process_state_receiver", + "//score/launch_manager/src/daemon/src/common:log", + "//score/launch_manager/src/daemon/src/process_state_client/details:process_state_receiver", ], ) @@ -68,7 +68,7 @@ cc_library( visibility = ["//score:__subpackages__"], deps = [ ":process_state_notifier", - "//score/launch_manager/daemon/src/process_state_client/details:process_state_receiver", + "//score/launch_manager/src/daemon/src/process_state_client/details:process_state_receiver", ], ) @@ -77,7 +77,7 @@ cc_test( srcs = ["process_state_client_ut.cpp"], deps = [ ":process_state_client", - "//score/launch_manager/daemon/src/process_state_client/details:process_state_receiver", + "//score/launch_manager/src/daemon/src/process_state_client/details:process_state_receiver", "@googletest//:gtest_main", ], ) diff --git a/score/launch_manager/daemon/src/process_state_client/details/BUILD b/score/launch_manager/src/daemon/src/process_state_client/details/BUILD similarity index 72% rename from score/launch_manager/daemon/src/process_state_client/details/BUILD rename to score/launch_manager/src/daemon/src/process_state_client/details/BUILD index b18fa646b..b002d0690 100644 --- a/score/launch_manager/daemon/src/process_state_client/details/BUILD +++ b/score/launch_manager/src/daemon/src/process_state_client/details/BUILD @@ -17,11 +17,11 @@ cc_library( srcs = ["process_state_receiver.cpp"], hdrs = ["process_state_receiver.hpp"], include_prefix = "score/mw/launch_manager/process_state_client/details", - strip_include_prefix = "/score/launch_manager/daemon/src/process_state_client/details", - visibility = ["//score/launch_manager/daemon/src/process_state_client:__pkg__"], + strip_include_prefix = "/score/launch_manager/src/daemon/src/process_state_client/details", + visibility = ["//score/launch_manager/src/daemon/src/process_state_client:__pkg__"], deps = [ "//externals/ipc_dropin", - "//score/launch_manager/daemon/src/common:log", - "//score/launch_manager/daemon/src/process_state_client:iprocess_state_receiver", + "//score/launch_manager/src/daemon/src/common:log", + "//score/launch_manager/src/daemon/src/process_state_client:iprocess_state_receiver", ], ) diff --git a/score/launch_manager/daemon/src/process_state_client/details/process_state_receiver.cpp b/score/launch_manager/src/daemon/src/process_state_client/details/process_state_receiver.cpp similarity index 100% rename from score/launch_manager/daemon/src/process_state_client/details/process_state_receiver.cpp rename to score/launch_manager/src/daemon/src/process_state_client/details/process_state_receiver.cpp diff --git a/score/launch_manager/daemon/src/process_state_client/details/process_state_receiver.hpp b/score/launch_manager/src/daemon/src/process_state_client/details/process_state_receiver.hpp similarity index 100% rename from score/launch_manager/daemon/src/process_state_client/details/process_state_receiver.hpp rename to score/launch_manager/src/daemon/src/process_state_client/details/process_state_receiver.hpp diff --git a/score/launch_manager/daemon/src/process_state_client/iprocess_state_notifier.hpp b/score/launch_manager/src/daemon/src/process_state_client/iprocess_state_notifier.hpp similarity index 100% rename from score/launch_manager/daemon/src/process_state_client/iprocess_state_notifier.hpp rename to score/launch_manager/src/daemon/src/process_state_client/iprocess_state_notifier.hpp diff --git a/score/launch_manager/daemon/src/process_state_client/iprocess_state_receiver.hpp b/score/launch_manager/src/daemon/src/process_state_client/iprocess_state_receiver.hpp similarity index 100% rename from score/launch_manager/daemon/src/process_state_client/iprocess_state_receiver.hpp rename to score/launch_manager/src/daemon/src/process_state_client/iprocess_state_receiver.hpp diff --git a/score/launch_manager/daemon/src/process_state_client/posix_process.hpp b/score/launch_manager/src/daemon/src/process_state_client/posix_process.hpp similarity index 100% rename from score/launch_manager/daemon/src/process_state_client/posix_process.hpp rename to score/launch_manager/src/daemon/src/process_state_client/posix_process.hpp diff --git a/score/launch_manager/daemon/src/process_state_client/process_state_client_ut.cpp b/score/launch_manager/src/daemon/src/process_state_client/process_state_client_ut.cpp similarity index 100% rename from score/launch_manager/daemon/src/process_state_client/process_state_client_ut.cpp rename to score/launch_manager/src/daemon/src/process_state_client/process_state_client_ut.cpp diff --git a/score/launch_manager/daemon/src/process_state_client/process_state_notifier.cpp b/score/launch_manager/src/daemon/src/process_state_client/process_state_notifier.cpp similarity index 100% rename from score/launch_manager/daemon/src/process_state_client/process_state_notifier.cpp rename to score/launch_manager/src/daemon/src/process_state_client/process_state_notifier.cpp diff --git a/score/launch_manager/daemon/src/process_state_client/process_state_notifier.hpp b/score/launch_manager/src/daemon/src/process_state_client/process_state_notifier.hpp similarity index 100% rename from score/launch_manager/daemon/src/process_state_client/process_state_notifier.hpp rename to score/launch_manager/src/daemon/src/process_state_client/process_state_notifier.hpp diff --git a/score/launch_manager/daemon/src/recovery_client/BUILD b/score/launch_manager/src/daemon/src/recovery_client/BUILD similarity index 88% rename from score/launch_manager/daemon/src/recovery_client/BUILD rename to score/launch_manager/src/daemon/src/recovery_client/BUILD index f521400e3..0944da271 100644 --- a/score/launch_manager/daemon/src/recovery_client/BUILD +++ b/score/launch_manager/src/daemon/src/recovery_client/BUILD @@ -22,13 +22,13 @@ cc_library( "recovery_client.hpp", ], include_prefix = "score/mw/launch_manager/recovery_client", - strip_include_prefix = "/score/launch_manager/daemon/src/recovery_client", + strip_include_prefix = "/score/launch_manager/src/daemon/src/recovery_client", visibility = [ "//score:__subpackages__", ], deps = [ "//externals/ipc_dropin", - "//score/launch_manager/daemon/src/common:identifier_hash", + "//score/launch_manager/src/daemon/src/common:identifier_hash", ], ) diff --git a/score/launch_manager/daemon/src/recovery_client/irecovery_client.h b/score/launch_manager/src/daemon/src/recovery_client/irecovery_client.h similarity index 100% rename from score/launch_manager/daemon/src/recovery_client/irecovery_client.h rename to score/launch_manager/src/daemon/src/recovery_client/irecovery_client.h diff --git a/score/launch_manager/daemon/src/recovery_client/recovery_client.cpp b/score/launch_manager/src/daemon/src/recovery_client/recovery_client.cpp similarity index 100% rename from score/launch_manager/daemon/src/recovery_client/recovery_client.cpp rename to score/launch_manager/src/daemon/src/recovery_client/recovery_client.cpp diff --git a/score/launch_manager/daemon/src/recovery_client/recovery_client.hpp b/score/launch_manager/src/daemon/src/recovery_client/recovery_client.hpp similarity index 100% rename from score/launch_manager/daemon/src/recovery_client/recovery_client.hpp rename to score/launch_manager/src/daemon/src/recovery_client/recovery_client.hpp diff --git a/score/launch_manager/daemon/src/recovery_client/recovery_client_UT.cpp b/score/launch_manager/src/daemon/src/recovery_client/recovery_client_UT.cpp similarity index 100% rename from score/launch_manager/daemon/src/recovery_client/recovery_client_UT.cpp rename to score/launch_manager/src/daemon/src/recovery_client/recovery_client_UT.cpp diff --git a/score/launch_manager/lifecycle_client/BUILD b/score/launch_manager/src/lifecycle_client/BUILD similarity index 86% rename from score/launch_manager/lifecycle_client/BUILD rename to score/launch_manager/src/lifecycle_client/BUILD index d9f1a5673..72a9c9cc7 100644 --- a/score/launch_manager/lifecycle_client/BUILD +++ b/score/launch_manager/src/lifecycle_client/BUILD @@ -16,7 +16,7 @@ load("@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER cc_library( name = "lifecycle_client", include_prefix = "score/mw/lifecycle", - strip_include_prefix = "/score/launch_manager/lifecycle_client/src", + strip_include_prefix = "/score/launch_manager/src/lifecycle_client/src", visibility = ["//score/launch_manager:__subpackages__"], deps = [ ":aasapplicationcontainer", @@ -37,7 +37,7 @@ cc_library( ], features = COMPILER_WARNING_FEATURES, include_prefix = "score/mw/lifecycle", - strip_include_prefix = "/score/launch_manager/lifecycle_client/src", + strip_include_prefix = "/score/launch_manager/src/lifecycle_client/src", tags = ["FUSA"], visibility = ["//score/launch_manager:__subpackages__"], deps = [ @@ -58,7 +58,7 @@ cc_library( ], features = COMPILER_WARNING_FEATURES, include_prefix = "score/mw/lifecycle", - strip_include_prefix = "/score/launch_manager/lifecycle_client/src", + strip_include_prefix = "/score/launch_manager/src/lifecycle_client/src", tags = ["FUSA"], visibility = ["//score/launch_manager:__subpackages__"], deps = [ @@ -78,7 +78,7 @@ cc_library( ], features = COMPILER_WARNING_FEATURES, include_prefix = "score/mw/lifecycle", - strip_include_prefix = "/score/launch_manager/lifecycle_client/src", + strip_include_prefix = "/score/launch_manager/src/lifecycle_client/src", visibility = ["//score/launch_manager:__subpackages__"], deps = [ ":applicationcontext", @@ -97,7 +97,7 @@ cc_library( ], features = COMPILER_WARNING_FEATURES, include_prefix = "score/mw/lifecycle", - strip_include_prefix = "/score/launch_manager/lifecycle_client/src", + strip_include_prefix = "/score/launch_manager/src/lifecycle_client/src", tags = ["FUSA"], visibility = ["//score/launch_manager:__subpackages__"], deps = [ @@ -123,7 +123,7 @@ cc_library( ], features = COMPILER_WARNING_FEATURES, include_prefix = "score/mw/lifecycle", - strip_include_prefix = "/score/launch_manager/lifecycle_client/src", + strip_include_prefix = "/score/launch_manager/src/lifecycle_client/src", tags = ["FUSA"], visibility = ["//score/launch_manager:__subpackages__"], deps = [ @@ -140,11 +140,11 @@ cc_library( hdrs = ["src/report_running.h"], features = COMPILER_WARNING_FEATURES, include_prefix = "score/mw/lifecycle", - strip_include_prefix = "/score/launch_manager/lifecycle_client/src", + strip_include_prefix = "/score/launch_manager/src/lifecycle_client/src", tags = ["FUSA"], visibility = ["//score/launch_manager:__subpackages__"], deps = [ - "//score/launch_manager/lifecycle_client/src/details:report_running_impl", + "//score/launch_manager/src/lifecycle_client/src/details:report_running_impl", ], ) @@ -160,7 +160,7 @@ cc_library( ], features = COMPILER_WARNING_FEATURES, include_prefix = "score/mw/lifecycle", - strip_include_prefix = "/score/launch_manager/lifecycle_client/src", + strip_include_prefix = "/score/launch_manager/src/lifecycle_client/src", visibility = ["//score/launch_manager:__subpackages__"], deps = [ "@googletest//:gtest", @@ -182,7 +182,7 @@ cc_library( ], features = COMPILER_WARNING_FEATURES, include_prefix = "score/mw/lifecycle", - strip_include_prefix = "/score/launch_manager/lifecycle_client/src", + strip_include_prefix = "/score/launch_manager/src/lifecycle_client/src", visibility = ["//score/launch_manager:__subpackages__"], deps = [ ":applicationcontext_mock", @@ -202,7 +202,7 @@ cc_library( ], features = COMPILER_WARNING_FEATURES, include_prefix = "score/mw/lifecycle", - strip_include_prefix = "/score/launch_manager/lifecycle_client/src", + strip_include_prefix = "/score/launch_manager/src/lifecycle_client/src", visibility = ["//score/launch_manager:__subpackages__"], deps = [ "@googletest//:gtest", diff --git a/score/launch_manager/lifecycle_client/docs/index.rst b/score/launch_manager/src/lifecycle_client/docs/index.rst similarity index 100% rename from score/launch_manager/lifecycle_client/docs/index.rst rename to score/launch_manager/src/lifecycle_client/docs/index.rst diff --git a/score/launch_manager/lifecycle_client/docs/lifecycle.md b/score/launch_manager/src/lifecycle_client/docs/lifecycle.md similarity index 100% rename from score/launch_manager/lifecycle_client/docs/lifecycle.md rename to score/launch_manager/src/lifecycle_client/docs/lifecycle.md diff --git a/score/launch_manager/lifecycle_client/docs/lifecyclemanager.md b/score/launch_manager/src/lifecycle_client/docs/lifecyclemanager.md similarity index 100% rename from score/launch_manager/lifecycle_client/docs/lifecyclemanager.md rename to score/launch_manager/src/lifecycle_client/docs/lifecyclemanager.md diff --git a/score/launch_manager/lifecycle_client/docs/model/app_lifecycle.svg b/score/launch_manager/src/lifecycle_client/docs/model/app_lifecycle.svg similarity index 100% rename from score/launch_manager/lifecycle_client/docs/model/app_lifecycle.svg rename to score/launch_manager/src/lifecycle_client/docs/model/app_lifecycle.svg diff --git a/score/launch_manager/lifecycle_client/docs/model/app_lifecycle.uxf b/score/launch_manager/src/lifecycle_client/docs/model/app_lifecycle.uxf similarity index 100% rename from score/launch_manager/lifecycle_client/docs/model/app_lifecycle.uxf rename to score/launch_manager/src/lifecycle_client/docs/model/app_lifecycle.uxf diff --git a/score/launch_manager/lifecycle_client/docs/model/lifecycle_system_view.svg b/score/launch_manager/src/lifecycle_client/docs/model/lifecycle_system_view.svg similarity index 100% rename from score/launch_manager/lifecycle_client/docs/model/lifecycle_system_view.svg rename to score/launch_manager/src/lifecycle_client/docs/model/lifecycle_system_view.svg diff --git a/score/launch_manager/lifecycle_client/docs/model/lifecycle_system_view.uxf b/score/launch_manager/src/lifecycle_client/docs/model/lifecycle_system_view.uxf similarity index 100% rename from score/launch_manager/lifecycle_client/docs/model/lifecycle_system_view.uxf rename to score/launch_manager/src/lifecycle_client/docs/model/lifecycle_system_view.uxf diff --git a/score/launch_manager/lifecycle_client/docs/model/sequence_application_container.svg b/score/launch_manager/src/lifecycle_client/docs/model/sequence_application_container.svg similarity index 100% rename from score/launch_manager/lifecycle_client/docs/model/sequence_application_container.svg rename to score/launch_manager/src/lifecycle_client/docs/model/sequence_application_container.svg diff --git a/score/launch_manager/lifecycle_client/docs/model/sequence_application_container.uxf b/score/launch_manager/src/lifecycle_client/docs/model/sequence_application_container.uxf similarity index 100% rename from score/launch_manager/lifecycle_client/docs/model/sequence_application_container.uxf rename to score/launch_manager/src/lifecycle_client/docs/model/sequence_application_container.uxf diff --git a/score/launch_manager/lifecycle_client/docs/model/sequence_view.svg b/score/launch_manager/src/lifecycle_client/docs/model/sequence_view.svg similarity index 100% rename from score/launch_manager/lifecycle_client/docs/model/sequence_view.svg rename to score/launch_manager/src/lifecycle_client/docs/model/sequence_view.svg diff --git a/score/launch_manager/lifecycle_client/docs/model/sequence_view.uxf b/score/launch_manager/src/lifecycle_client/docs/model/sequence_view.uxf similarity index 100% rename from score/launch_manager/lifecycle_client/docs/model/sequence_view.uxf rename to score/launch_manager/src/lifecycle_client/docs/model/sequence_view.uxf diff --git a/score/launch_manager/lifecycle_client/docs/model/structural_view.svg b/score/launch_manager/src/lifecycle_client/docs/model/structural_view.svg similarity index 100% rename from score/launch_manager/lifecycle_client/docs/model/structural_view.svg rename to score/launch_manager/src/lifecycle_client/docs/model/structural_view.svg diff --git a/score/launch_manager/lifecycle_client/docs/model/structural_view.uxf b/score/launch_manager/src/lifecycle_client/docs/model/structural_view.uxf similarity index 100% rename from score/launch_manager/lifecycle_client/docs/model/structural_view.uxf rename to score/launch_manager/src/lifecycle_client/docs/model/structural_view.uxf diff --git a/score/launch_manager/lifecycle_client/src/aasapplicationcontainer.cpp b/score/launch_manager/src/lifecycle_client/src/aasapplicationcontainer.cpp similarity index 100% rename from score/launch_manager/lifecycle_client/src/aasapplicationcontainer.cpp rename to score/launch_manager/src/lifecycle_client/src/aasapplicationcontainer.cpp diff --git a/score/launch_manager/lifecycle_client/src/aasapplicationcontainer.h b/score/launch_manager/src/lifecycle_client/src/aasapplicationcontainer.h similarity index 100% rename from score/launch_manager/lifecycle_client/src/aasapplicationcontainer.h rename to score/launch_manager/src/lifecycle_client/src/aasapplicationcontainer.h diff --git a/score/launch_manager/lifecycle_client/src/application.cpp b/score/launch_manager/src/lifecycle_client/src/application.cpp similarity index 100% rename from score/launch_manager/lifecycle_client/src/application.cpp rename to score/launch_manager/src/lifecycle_client/src/application.cpp diff --git a/score/launch_manager/lifecycle_client/src/application.h b/score/launch_manager/src/lifecycle_client/src/application.h similarity index 100% rename from score/launch_manager/lifecycle_client/src/application.h rename to score/launch_manager/src/lifecycle_client/src/application.h diff --git a/score/launch_manager/lifecycle_client/src/applicationcontext.cpp b/score/launch_manager/src/lifecycle_client/src/applicationcontext.cpp similarity index 100% rename from score/launch_manager/lifecycle_client/src/applicationcontext.cpp rename to score/launch_manager/src/lifecycle_client/src/applicationcontext.cpp diff --git a/score/launch_manager/lifecycle_client/src/applicationcontext.h b/score/launch_manager/src/lifecycle_client/src/applicationcontext.h similarity index 100% rename from score/launch_manager/lifecycle_client/src/applicationcontext.h rename to score/launch_manager/src/lifecycle_client/src/applicationcontext.h diff --git a/score/launch_manager/lifecycle_client/src/applicationcontextmock.cpp b/score/launch_manager/src/lifecycle_client/src/applicationcontextmock.cpp similarity index 100% rename from score/launch_manager/lifecycle_client/src/applicationcontextmock.cpp rename to score/launch_manager/src/lifecycle_client/src/applicationcontextmock.cpp diff --git a/score/launch_manager/lifecycle_client/src/applicationcontextmock.h b/score/launch_manager/src/lifecycle_client/src/applicationcontextmock.h similarity index 100% rename from score/launch_manager/lifecycle_client/src/applicationcontextmock.h rename to score/launch_manager/src/lifecycle_client/src/applicationcontextmock.h diff --git a/score/launch_manager/lifecycle_client/src/details/BUILD b/score/launch_manager/src/lifecycle_client/src/details/BUILD similarity index 72% rename from score/launch_manager/lifecycle_client/src/details/BUILD rename to score/launch_manager/src/lifecycle_client/src/details/BUILD index 4d98609c1..539fefca7 100644 --- a/score/launch_manager/lifecycle_client/src/details/BUILD +++ b/score/launch_manager/src/lifecycle_client/src/details/BUILD @@ -17,13 +17,13 @@ cc_library( srcs = ["report_running_impl.cpp"], hdrs = ["report_running_impl.hpp"], include_prefix = "score/mw/lifecycle/lifecycle_client/details", - strip_include_prefix = "/score/launch_manager/lifecycle_client/src/details", - visibility = ["//score/launch_manager/lifecycle_client:__pkg__"], + strip_include_prefix = "/score/launch_manager/src/lifecycle_client/src/details", + visibility = ["//score/launch_manager/src/lifecycle_client:__pkg__"], deps = [ "//score/launch_manager:error_event", - "//score/launch_manager/daemon/src/common:constants", - "//score/launch_manager/daemon/src/common:log", - "//score/launch_manager/daemon/src/osal:ipc_comms", + "//score/launch_manager/src/daemon/src/common:constants", + "//score/launch_manager/src/daemon/src/common:log", + "//score/launch_manager/src/daemon/src/osal:ipc_comms", "@score_baselibs//score/result", ], ) diff --git a/score/launch_manager/lifecycle_client/src/details/report_running_impl.cpp b/score/launch_manager/src/lifecycle_client/src/details/report_running_impl.cpp similarity index 100% rename from score/launch_manager/lifecycle_client/src/details/report_running_impl.cpp rename to score/launch_manager/src/lifecycle_client/src/details/report_running_impl.cpp diff --git a/score/launch_manager/lifecycle_client/src/details/report_running_impl.hpp b/score/launch_manager/src/lifecycle_client/src/details/report_running_impl.hpp similarity index 100% rename from score/launch_manager/lifecycle_client/src/details/report_running_impl.hpp rename to score/launch_manager/src/lifecycle_client/src/details/report_running_impl.hpp diff --git a/score/launch_manager/lifecycle_client/src/lifecyclemanager.cpp b/score/launch_manager/src/lifecycle_client/src/lifecyclemanager.cpp similarity index 100% rename from score/launch_manager/lifecycle_client/src/lifecyclemanager.cpp rename to score/launch_manager/src/lifecycle_client/src/lifecyclemanager.cpp diff --git a/score/launch_manager/lifecycle_client/src/lifecyclemanager.h b/score/launch_manager/src/lifecycle_client/src/lifecyclemanager.h similarity index 100% rename from score/launch_manager/lifecycle_client/src/lifecyclemanager.h rename to score/launch_manager/src/lifecycle_client/src/lifecyclemanager.h diff --git a/score/launch_manager/lifecycle_client/src/lifecyclemanagermock.cpp b/score/launch_manager/src/lifecycle_client/src/lifecyclemanagermock.cpp similarity index 100% rename from score/launch_manager/lifecycle_client/src/lifecyclemanagermock.cpp rename to score/launch_manager/src/lifecycle_client/src/lifecyclemanagermock.cpp diff --git a/score/launch_manager/lifecycle_client/src/lifecyclemanagermock.h b/score/launch_manager/src/lifecycle_client/src/lifecyclemanagermock.h similarity index 100% rename from score/launch_manager/lifecycle_client/src/lifecyclemanagermock.h rename to score/launch_manager/src/lifecycle_client/src/lifecyclemanagermock.h diff --git a/score/launch_manager/lifecycle_client/src/report_running.cpp b/score/launch_manager/src/lifecycle_client/src/report_running.cpp similarity index 100% rename from score/launch_manager/lifecycle_client/src/report_running.cpp rename to score/launch_manager/src/lifecycle_client/src/report_running.cpp diff --git a/score/launch_manager/lifecycle_client/src/report_running.h b/score/launch_manager/src/lifecycle_client/src/report_running.h similarity index 100% rename from score/launch_manager/lifecycle_client/src/report_running.h rename to score/launch_manager/src/lifecycle_client/src/report_running.h diff --git a/score/launch_manager/lifecycle_client/src/report_running_mock.cpp b/score/launch_manager/src/lifecycle_client/src/report_running_mock.cpp similarity index 100% rename from score/launch_manager/lifecycle_client/src/report_running_mock.cpp rename to score/launch_manager/src/lifecycle_client/src/report_running_mock.cpp diff --git a/score/launch_manager/lifecycle_client/src/report_running_mock.h b/score/launch_manager/src/lifecycle_client/src/report_running_mock.h similarity index 100% rename from score/launch_manager/lifecycle_client/src/report_running_mock.h rename to score/launch_manager/src/lifecycle_client/src/report_running_mock.h diff --git a/score/launch_manager/lifecycle_client/src/runapplication.cpp b/score/launch_manager/src/lifecycle_client/src/runapplication.cpp similarity index 100% rename from score/launch_manager/lifecycle_client/src/runapplication.cpp rename to score/launch_manager/src/lifecycle_client/src/runapplication.cpp diff --git a/score/launch_manager/lifecycle_client/src/runapplication.h b/score/launch_manager/src/lifecycle_client/src/runapplication.h similarity index 100% rename from score/launch_manager/lifecycle_client/src/runapplication.h rename to score/launch_manager/src/lifecycle_client/src/runapplication.h diff --git a/score/launch_manager/lifecycle_client/src/runapplication_UT.cpp b/score/launch_manager/src/lifecycle_client/src/runapplication_UT.cpp similarity index 100% rename from score/launch_manager/lifecycle_client/src/runapplication_UT.cpp rename to score/launch_manager/src/lifecycle_client/src/runapplication_UT.cpp diff --git a/score/launch_manager/lifecycle_client/src/rust/BUILD b/score/launch_manager/src/lifecycle_client/src/rust/BUILD similarity index 92% rename from score/launch_manager/lifecycle_client/src/rust/BUILD rename to score/launch_manager/src/lifecycle_client/src/rust/BUILD index 86416973a..863da3736 100644 --- a/score/launch_manager/lifecycle_client/src/rust/BUILD +++ b/score/launch_manager/src/lifecycle_client/src/rust/BUILD @@ -20,7 +20,7 @@ rust_library( ], visibility = ["//score/launch_manager:__subpackages__"], deps = [ - "//score/launch_manager/lifecycle_client:report_running", + "//score/launch_manager/src/lifecycle_client:report_running", "@score_crates//:libc", ], ) diff --git a/score/launch_manager/lifecycle_client/src/rust/Cargo.lock b/score/launch_manager/src/lifecycle_client/src/rust/Cargo.lock similarity index 100% rename from score/launch_manager/lifecycle_client/src/rust/Cargo.lock rename to score/launch_manager/src/lifecycle_client/src/rust/Cargo.lock diff --git a/score/launch_manager/lifecycle_client/src/rust/Cargo.toml b/score/launch_manager/src/lifecycle_client/src/rust/Cargo.toml similarity index 100% rename from score/launch_manager/lifecycle_client/src/rust/Cargo.toml rename to score/launch_manager/src/lifecycle_client/src/rust/Cargo.toml diff --git a/score/launch_manager/lifecycle_client/src/rust/src/lib.rs b/score/launch_manager/src/lifecycle_client/src/rust/src/lib.rs similarity index 100% rename from score/launch_manager/lifecycle_client/src/rust/src/lib.rs rename to score/launch_manager/src/lifecycle_client/src/rust/src/lib.rs diff --git a/score/launch_manager/lifecycle_client/src/rust/src/lifecycle.rs b/score/launch_manager/src/lifecycle_client/src/rust/src/lifecycle.rs similarity index 100% rename from score/launch_manager/lifecycle_client/src/rust/src/lifecycle.rs rename to score/launch_manager/src/lifecycle_client/src/rust/src/lifecycle.rs diff --git a/scripts/config_mapping/config.bzl b/scripts/config_mapping/config.bzl index e2a22293e..fe90cbc85 100644 --- a/scripts/config_mapping/config.bzl +++ b/scripts/config_mapping/config.bzl @@ -89,7 +89,7 @@ launch_manager_config = rule( doc = "Json file to convert. Note that the binary file will have the same name as the json (minus the suffix)", ), "schema": attr.label( - default = Label("//score/launch_manager/daemon/src/configuration/config_schema:launch_manager.schema.json"), + default = Label("//score/launch_manager/src/daemon/src/configuration/config_schema:launch_manager.schema.json"), allow_single_file = [".json"], doc = "Json schema file to validate the input json against", ), @@ -115,17 +115,17 @@ launch_manager_config = rule( ), "lm_schema": attr.label( allow_single_file = [".fbs"], - default = Label("//score/launch_manager/daemon/src/configuration:lm_flatcfg_fbs"), + default = Label("//score/launch_manager/src/daemon/src/configuration:lm_flatcfg_fbs"), doc = "Launch Manager fbs file to use", ), "hm_schema": attr.label( allow_single_file = [".fbs"], - default = Label("//score/launch_manager/daemon/src/alive_monitor:am_flatcfg_fbs"), + default = Label("//score/launch_manager/src/daemon/src/alive_monitor:am_flatcfg_fbs"), doc = "HealthMonitor fbs file to use", ), "hmcore_schema": attr.label( allow_single_file = [".fbs"], - default = Label("//score/launch_manager/daemon/src/alive_monitor:am_core_flatcfg_fbs"), + default = Label("//score/launch_manager/src/daemon/src/alive_monitor:am_core_flatcfg_fbs"), doc = "HealthMonitor core fbs file to use", ), }, diff --git a/scripts/config_mapping/tests/BUILD b/scripts/config_mapping/tests/BUILD index 6fe6320c2..9bffa7a74 100644 --- a/scripts/config_mapping/tests/BUILD +++ b/scripts/config_mapping/tests/BUILD @@ -16,7 +16,7 @@ score_py_pytest( ], data = [ ":integration_test_files", - "//score/launch_manager/daemon/src/configuration/config_schema:launch_manager.schema.json", + "//score/launch_manager/src/daemon/src/configuration/config_schema:launch_manager.schema.json", "//scripts/config_mapping:lifecycle_config.py", ], tags = ["manual"], diff --git a/tests/integration/incorrect_config_non_reporting/BUILD b/tests/integration/incorrect_config_non_reporting/BUILD index 883d631ac..491b16d90 100644 --- a/tests/integration/incorrect_config_non_reporting/BUILD +++ b/tests/integration/incorrect_config_non_reporting/BUILD @@ -31,7 +31,7 @@ cc_binary( srcs = ["non_reporting_process.cpp"], deps = [ "//score/launch_manager:lifecycle_cc", - "//score/launch_manager/daemon/src/osal:ipc_comms", + "//score/launch_manager/src/daemon/src/osal:ipc_comms", "//tests/utils/test_helper", "@googletest//:gtest_main", ], From 8c6797c7e71df398e51050ee277c5fe64aaeaa52 Mon Sep 17 00:00:00 2001 From: Timo Steuerwald Date: Thu, 18 Jun 2026 15:51:12 +0200 Subject: [PATCH 3/4] Fix docu build --- score/launch_manager/docs/index.rst | 2 +- score/launch_manager/docs/user_guide/configuration.rst | 10 +++++----- score/launch_manager/docs/user_guide/examples.rst | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/score/launch_manager/docs/index.rst b/score/launch_manager/docs/index.rst index 086b376bd..5995ea5ee 100644 --- a/score/launch_manager/docs/index.rst +++ b/score/launch_manager/docs/index.rst @@ -26,4 +26,4 @@ Subcomponents .. toctree:: :titlesonly: - ../lifecycle_client/docs/index.rst + ../src/lifecycle_client/docs/index.rst diff --git a/score/launch_manager/docs/user_guide/configuration.rst b/score/launch_manager/docs/user_guide/configuration.rst index 0ca74b9a5..b6499c423 100644 --- a/score/launch_manager/docs/user_guide/configuration.rst +++ b/score/launch_manager/docs/user_guide/configuration.rst @@ -428,7 +428,7 @@ alive_supervision .. dropdown:: alive_supervision_defaults.json - .. literalinclude:: ../../../../score/launch_manager/daemon/src/configuration/config_schema/default_values/alive_supervision_defaults.json + .. literalinclude:: ../../../../score/launch_manager/src/daemon/src/configuration/config_schema/default_values/alive_supervision_defaults.json :language: json watchdog @@ -438,7 +438,7 @@ watchdog .. dropdown:: watchdog_defaults.json - .. literalinclude:: ../../../../score/launch_manager/daemon/src/configuration/config_schema/default_values/watchdog_defaults.json + .. literalinclude:: ../../../../score/launch_manager/src/daemon/src/configuration/config_schema/default_values/watchdog_defaults.json :language: json run_target @@ -446,7 +446,7 @@ run_target .. dropdown:: run_target_defaults.json - .. literalinclude:: ../../../../score/launch_manager/daemon/src/configuration/config_schema/default_values/run_target_defaults.json + .. literalinclude:: ../../../../score/launch_manager/src/daemon/src/configuration/config_schema/default_values/run_target_defaults.json :language: json component_properties @@ -454,7 +454,7 @@ component_properties .. dropdown:: component_properties_defaults.json - .. literalinclude:: ../../../../score/launch_manager/daemon/src/configuration/config_schema/default_values/component_properties_defaults.json + .. literalinclude:: ../../../../score/launch_manager/src/daemon/src/configuration/config_schema/default_values/component_properties_defaults.json :language: json deployment_config @@ -462,7 +462,7 @@ deployment_config .. dropdown:: deployment_config_defaults.json - .. literalinclude:: ../../../../score/launch_manager/daemon/src/configuration/config_schema/default_values/deployment_config_defaults.json + .. literalinclude:: ../../../../score/launch_manager/src/daemon/src/configuration/config_schema/default_values/deployment_config_defaults.json :language: json fallback_run_target diff --git a/score/launch_manager/docs/user_guide/examples.rst b/score/launch_manager/docs/user_guide/examples.rst index 7138c000f..b2531f8d3 100644 --- a/score/launch_manager/docs/user_guide/examples.rst +++ b/score/launch_manager/docs/user_guide/examples.rst @@ -26,7 +26,7 @@ apply various features effectively. .. dropdown:: example_conf.json - .. literalinclude:: ../../../../score/launch_manager/daemon/src/configuration/config_schema/examples/example_conf.json + .. literalinclude:: ../../../../score/launch_manager/src/daemon/src/configuration/config_schema/examples/example_conf.json :language: json The `example_conf.json` file is a fundamental example within the **Launch From eea42d0bd43296acdea6e3a2e1955d8f5ce519c6 Mon Sep 17 00:00:00 2001 From: Timo Steuerwald Date: Thu, 18 Jun 2026 16:04:23 +0200 Subject: [PATCH 4/4] Misc changes to align to report_running() instead of LifecycleClient --- score/launch_manager/src/daemon/src/common/constants.hpp | 4 +--- score/launch_manager/src/daemon/src/common/log.hpp | 2 +- .../src/lifecycle_client/src/details/report_running_impl.cpp | 2 +- .../test_incorrect_config_non_reporting.py | 2 +- .../process_simple_rep_failure/process_simple_rep_failure.py | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/score/launch_manager/src/daemon/src/common/constants.hpp b/score/launch_manager/src/daemon/src/common/constants.hpp index 8046c6f77..22843d1c7 100644 --- a/score/launch_manager/src/daemon/src/common/constants.hpp +++ b/score/launch_manager/src/daemon/src/common/constants.hpp @@ -42,13 +42,11 @@ constexpr std::chrono::milliseconds kMaxSigKillDelay{500}; ///< The maximum tim constexpr std::chrono::milliseconds kControlClientPollingDelay{1}; ///< Time Control Client will wait during polling for acknowledgement -constexpr std::chrono::milliseconds kMaxKRunningDelay{1000}; ///< Time Lifecycle Client will wait for Launch Manager to respond +constexpr std::chrono::milliseconds kMaxRunningDelay{1000}; ///< report_running() API will wait for Launch Manager to respond constexpr std::chrono::milliseconds kControlClientMaxIpcDelay{500}; ///< The maximum time to wait, when trying to communicate with LCM. When this time is exceeded kCommunicationError will be returned constexpr std::chrono::milliseconds kControlClientBgThreadSleepTime{100}; -constexpr std::chrono::milliseconds kLifecycleClientBgThreadSleepTime{10}; ///< The time for which Lifecycle Client background thread sleeps after polling the SIGTERM flag - enum class ControlClientLimits : uint16_t { kControlClientMaxInstances = 256U, ///< Maximum number of ControlClient instances that should be created by state manager. If state manager create more instances than kMaxInstances, those instances will always return kCommunicationError when used diff --git a/score/launch_manager/src/daemon/src/common/log.hpp b/score/launch_manager/src/daemon/src/common/log.hpp index 1c6accaa9..560a978c9 100644 --- a/score/launch_manager/src/daemon/src/common/log.hpp +++ b/score/launch_manager/src/daemon/src/common/log.hpp @@ -17,7 +17,7 @@ #include // Compile time switch to use different logging subsystems. -// Parts of LM code will be compiled into different binaries, think IPC between LifecycleClient and LM daemon. +// Parts of LM code will be compiled into different binaries, think IPC between Lifecycle client library and LM daemon. // In this situation, this code will need to inherit logging mechanism of the binary file. #ifdef LC_LOG_SCORE_MW_LOG diff --git a/score/launch_manager/src/lifecycle_client/src/details/report_running_impl.cpp b/score/launch_manager/src/lifecycle_client/src/details/report_running_impl.cpp index a52cfb6ad..57b548c44 100644 --- a/score/launch_manager/src/lifecycle_client/src/details/report_running_impl.cpp +++ b/score/launch_manager/src/lifecycle_client/src/details/report_running_impl.cpp @@ -97,7 +97,7 @@ namespace score::mw::lifecycle { return comms_error; } - if (sync->reply_sync_.timedWait(score::lcm::internal::kMaxKRunningDelay) == OsalReturnType::kFail) + if (sync->reply_sync_.timedWait(score::lcm::internal::kMaxRunningDelay) == OsalReturnType::kFail) { LM_LOG_ERROR() << "[Lifecycle Client] Launch Manager failed to acknowledge kRunning report."; diff --git a/tests/integration/incorrect_config_non_reporting/test_incorrect_config_non_reporting.py b/tests/integration/incorrect_config_non_reporting/test_incorrect_config_non_reporting.py index 80aa42dc2..342987054 100644 --- a/tests/integration/incorrect_config_non_reporting/test_incorrect_config_non_reporting.py +++ b/tests/integration/incorrect_config_non_reporting/test_incorrect_config_non_reporting.py @@ -26,7 +26,7 @@ def test_incorrect_config_non_reporting( target, setup_test, assert_test_results, remote_test_dir ): """ - Objective: Test robustness of LifecycleClient API + Objective: Test robustness of report_running() API Input: Component wrongly configured as `native` application type, acquires a file descriptor ordinarily used by LM communication, and reports the Running state to LaunchManager. Expected Outcome: Process does not crash. """ diff --git a/tests/integration/process_simple_rep_failure/process_simple_rep_failure.py b/tests/integration/process_simple_rep_failure/process_simple_rep_failure.py index 98e4497d5..d890228ab 100644 --- a/tests/integration/process_simple_rep_failure/process_simple_rep_failure.py +++ b/tests/integration/process_simple_rep_failure/process_simple_rep_failure.py @@ -31,7 +31,7 @@ def test_recovery_action_simple_rep_failure( target, setup_test, assert_test_results, remote_test_dir ): """ - Objective: Verifies that recovery action is executed when the reporting of running via LifecycleClient API (named "simple reporting" in the following) is not happening in time and vice versa. + Objective: Verifies that recovery action is executed when the reporting of running via report_running() API (named "simple reporting" in the following) is not happening in time and vice versa. Case 1: Using simple reporting, the process does report running in time (500ms below boundary) Expected Behaviour: Reporting running is successful, recovery action is not executed.