From a01416785ed9ee080fb076b808e3939bcb920b0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Fu=C3=9Fberger?= Date: Tue, 8 Sep 2026 07:53:25 +0200 Subject: [PATCH 1/3] Tighten alivemonitor visibility --- .../src/daemon/src/alive_monitor/BUILD | 14 +++++++------- .../daemon/src/alive_monitor/details/daemon/BUILD | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/score/launch_manager/src/daemon/src/alive_monitor/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/BUILD index 90c1c2bbb..852aae2f2 100644 --- a/score/launch_manager/src/daemon/src/alive_monitor/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/BUILD @@ -14,7 +14,7 @@ load("@rules_cc//cc:defs.bzl", "cc_library") cc_library( name = "alive_monitor", - visibility = ["//score:__subpackages__"], + visibility = ["//score/launch_manager/src/daemon:__pkg__"], deps = [ "//score/launch_manager/src/daemon/src/alive_monitor/details/daemon:health_monitor_impl", ], @@ -25,7 +25,7 @@ cc_library( hdrs = ["IAliveMonitor.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor", strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor", - visibility = ["//score:__subpackages__"], + visibility = ["//score/launch_manager/src/daemon:__subpackages__"], deps = [ "//score/launch_manager/src/daemon/src/alive_monitor:isupervision_factory", ], @@ -37,7 +37,7 @@ cc_library( hdrs = ["mock_alive_monitor.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor", strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor", - visibility = ["//score:__subpackages__"], + visibility = ["//score/launch_manager/src/daemon:__subpackages__"], deps = [ ":i_alive_monitor", "@googletest//:gtest_main", @@ -49,7 +49,7 @@ cc_library( hdrs = ["ialive_supervision_handle.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor", strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor", - visibility = ["//score:__subpackages__"], + visibility = ["//score/launch_manager/src/daemon:__subpackages__"], ) cc_library( @@ -57,7 +57,7 @@ cc_library( hdrs = ["isupervision_factory.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor", strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor", - visibility = ["//score:__subpackages__"], + visibility = ["//score/launch_manager/src/daemon:__subpackages__"], deps = [ "//score/launch_manager/src/daemon/src/alive_monitor/details/ifexm:supervision_handle", "//score/launch_manager/src/daemon/src/common:identifier_hash", @@ -71,7 +71,7 @@ cc_library( hdrs = ["mock_alive_supervision_handle.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor", strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor", - visibility = ["//score:__subpackages__"], + visibility = ["//score/launch_manager/src/daemon:__subpackages__"], deps = [ ":ialive_supervision_handle", "@googletest//:gtest_main", @@ -84,7 +84,7 @@ cc_library( hdrs = ["mock_supervision_factory.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor", strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor", - visibility = ["//score:__subpackages__"], + visibility = ["//score/launch_manager/src/daemon:__subpackages__"], deps = [ ":isupervision_factory", "@googletest//:gtest_main", 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 index d00835530..0104b071f 100644 --- a/score/launch_manager/src/daemon/src/alive_monitor/details/daemon/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/daemon/BUILD @@ -61,7 +61,7 @@ cc_library( 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__"], + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], deps = [ ":cyclic_executor", "//score/launch_manager/src/daemon/src/alive_monitor:i_alive_monitor", From abea71b57e96f8d9ed765e277b7046523ce95a01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Fu=C3=9Fberger?= Date: Tue, 8 Sep 2026 08:03:48 +0200 Subject: [PATCH 2/3] Reduce visibility of os_clock_interface --- .../src/daemon/src/alive_monitor/details/timers/BUILD | 5 +---- .../src/daemon/src/watchdog/details/BUILD | 1 - .../src/daemon/src/watchdog/details/WatchdogImpl.cpp | 11 +++++------ 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/timers/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/timers/BUILD index c2e96d289..fc4b8e207 100644 --- a/score/launch_manager/src/daemon/src/alive_monitor/details/timers/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/timers/BUILD @@ -18,10 +18,7 @@ cc_library( hdrs = ["OsClockInterface.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/timers", strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/timers", - visibility = [ - "//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__", - "//score/launch_manager/src/daemon/src/watchdog:__subpackages__", - ], + visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], ) cc_library( diff --git a/score/launch_manager/src/daemon/src/watchdog/details/BUILD b/score/launch_manager/src/daemon/src/watchdog/details/BUILD index 8f1b5c446..6de652736 100644 --- a/score/launch_manager/src/daemon/src/watchdog/details/BUILD +++ b/score/launch_manager/src/daemon/src/watchdog/details/BUILD @@ -30,7 +30,6 @@ cc_library( visibility = ["//score/launch_manager/src/daemon/src/watchdog:__subpackages__"], deps = [ ":watchdog", - "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:os_clock_interface", "//score/launch_manager/src/daemon/src/common:log", "//score/launch_manager/src/daemon/src/configuration:config", "//score/launch_manager/src/daemon/src/watchdog:i_watchdog_if", diff --git a/score/launch_manager/src/daemon/src/watchdog/details/WatchdogImpl.cpp b/score/launch_manager/src/daemon/src/watchdog/details/WatchdogImpl.cpp index f477c02ea..0813cac25 100644 --- a/score/launch_manager/src/daemon/src/watchdog/details/WatchdogImpl.cpp +++ b/score/launch_manager/src/daemon/src/watchdog/details/WatchdogImpl.cpp @@ -15,7 +15,9 @@ #include -#include "score/mw/launch_manager/alive_monitor/details/timers/OsClockInterface.hpp" +#include +#include + #include "score/mw/launch_manager/configuration/config.hpp" #include "score/mw/launch_manager/watchdog/details/Watchdog.hpp" @@ -448,14 +450,11 @@ bool WatchdogImpl::validateTimeoutWithCycleTime(std::int64_t f_cycleTimeInNs, co * true_no_defect) */ void WatchdogImpl::waitForever() const noexcept { + using namespace std::chrono_literals; // This code cannot be covered in tests, as it blocks execution forever - const score::mw::lifecycle::internal::saf::timers::OsClockInterface clock{}; - struct timespec sleeptime = {}; - sleeptime.tv_sec = 1; - sleeptime.tv_nsec = 0; while (true) { - static_cast(clock.clockNanosleep(0, &sleeptime, NULL)); + std::this_thread::sleep_for(1s); } } #if defined(__CTC__) && defined(__CODE_COVERAGE_ANNOTATION__) From 11820d1b35b26263c9a27d08f3cc3ce587d9aa47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Fu=C3=9Fberger?= Date: Tue, 8 Sep 2026 08:12:10 +0200 Subject: [PATCH 3/3] Setting default visibility --- .../src/daemon/src/alive_monitor/BUILD | 21 +++++++++++++------ .../src/alive_monitor/details/common/BUILD | 7 ++----- .../src/alive_monitor/details/daemon/BUILD | 5 ++--- .../src/alive_monitor/details/factory/BUILD | 4 ++-- .../src/alive_monitor/details/ifappl/BUILD | 6 +++--- .../src/alive_monitor/details/ifexm/BUILD | 5 ++--- .../src/alive_monitor/details/ipc/BUILD | 4 +++- .../alive_monitor/details/supervision/BUILD | 4 ++-- .../src/alive_monitor/details/timers/BUILD | 8 +++---- 9 files changed, 34 insertions(+), 30 deletions(-) diff --git a/score/launch_manager/src/daemon/src/alive_monitor/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/BUILD index 852aae2f2..90cf3dad4 100644 --- a/score/launch_manager/src/daemon/src/alive_monitor/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/BUILD @@ -12,6 +12,21 @@ # ******************************************************************************* load("@rules_cc//cc:defs.bzl", "cc_library") +# Packages allows to use the alive_monitor component API. +package_group( + name = "api", + packages = ["//score/launch_manager/src/daemon/..."], +) + +# Everything else in this package is internal to the alive_monitor component. +# Visibility for everything in 'details' shall be :internal by default. +package_group( + name = "internal", + packages = ["//score/launch_manager/src/daemon/src/alive_monitor/..."], +) + +package(default_visibility = [":api"]) + cc_library( name = "alive_monitor", visibility = ["//score/launch_manager/src/daemon:__pkg__"], @@ -25,7 +40,6 @@ cc_library( hdrs = ["IAliveMonitor.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor", strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor", - visibility = ["//score/launch_manager/src/daemon:__subpackages__"], deps = [ "//score/launch_manager/src/daemon/src/alive_monitor:isupervision_factory", ], @@ -37,7 +51,6 @@ cc_library( hdrs = ["mock_alive_monitor.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor", strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor", - visibility = ["//score/launch_manager/src/daemon:__subpackages__"], deps = [ ":i_alive_monitor", "@googletest//:gtest_main", @@ -49,7 +62,6 @@ cc_library( hdrs = ["ialive_supervision_handle.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor", strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor", - visibility = ["//score/launch_manager/src/daemon:__subpackages__"], ) cc_library( @@ -57,7 +69,6 @@ cc_library( hdrs = ["isupervision_factory.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor", strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor", - visibility = ["//score/launch_manager/src/daemon:__subpackages__"], deps = [ "//score/launch_manager/src/daemon/src/alive_monitor/details/ifexm:supervision_handle", "//score/launch_manager/src/daemon/src/common:identifier_hash", @@ -71,7 +82,6 @@ cc_library( hdrs = ["mock_alive_supervision_handle.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor", strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor", - visibility = ["//score/launch_manager/src/daemon:__subpackages__"], deps = [ ":ialive_supervision_handle", "@googletest//:gtest_main", @@ -84,7 +94,6 @@ cc_library( hdrs = ["mock_supervision_factory.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor", strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor", - visibility = ["//score/launch_manager/src/daemon:__subpackages__"], deps = [ ":isupervision_factory", "@googletest//:gtest_main", diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/common/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/common/BUILD index 99b2cc282..aa991b816 100644 --- a/score/launch_manager/src/daemon/src/alive_monitor/details/common/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/common/BUILD @@ -13,12 +13,13 @@ load("@rules_cc//cc:defs.bzl", "cc_library") load("//tests/utils/bazel:unit_test.bzl", "lm_cc_test") +package(default_visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:internal"]) + cc_library( name = "observer", hdrs = ["Observer.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/common", strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/common", - visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], deps = ["@score_baselibs//score/language/futurecpp"], ) @@ -27,7 +28,6 @@ cc_library( hdrs = ["FixedSizeVector.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/common", strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/common", - visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], ) cc_library( @@ -35,7 +35,6 @@ cc_library( hdrs = ["EInitCode.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/common", strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/common", - visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], ) cc_library( @@ -43,7 +42,6 @@ cc_library( hdrs = ["LockedVector.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/common", strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/common", - visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], deps = [":fixed_size_vector"], ) @@ -52,7 +50,6 @@ cc_library( hdrs = ["TimeSortingBuffer.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/common", strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/common", - visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], deps = [ ":fixed_size_vector", "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:timers_os_clock", 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 index 0104b071f..4f7d52658 100644 --- a/score/launch_manager/src/daemon/src/alive_monitor/details/daemon/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/daemon/BUILD @@ -12,13 +12,14 @@ # ******************************************************************************* load("@rules_cc//cc:defs.bzl", "cc_library") +package(default_visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:internal"]) + cc_library( name = "sw_cluster_handler", srcs = ["SupervisionManager.cpp"], hdrs = ["SupervisionManager.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:alive_worker_factory", "//score/launch_manager/src/daemon/src/alive_monitor/details/ifappl:checkpoint", @@ -39,7 +40,6 @@ cc_library( hdrs = ["CyclicExecutor.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 = [ ":sw_cluster_handler", "//score/launch_manager/src/daemon/src/alive_monitor:isupervision_factory", @@ -61,7 +61,6 @@ cc_library( 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/src/alive_monitor:__subpackages__"], deps = [ ":cyclic_executor", "//score/launch_manager/src/daemon/src/alive_monitor:i_alive_monitor", 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 index 39b7bdc33..f1a4d6856 100644 --- a/score/launch_manager/src/daemon/src/alive_monitor/details/factory/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/factory/BUILD @@ -12,12 +12,13 @@ # ******************************************************************************* load("@rules_cc//cc:defs.bzl", "cc_library") +package(default_visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:internal"]) + cc_library( name = "i_alive_worker_factory", hdrs = ["IAliveWorkerFactory.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", ], @@ -29,7 +30,6 @@ cc_library( hdrs = ["AliveWorkerFactory.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_alive_worker_factory", "//score/launch_manager/src/daemon/src/alive_monitor/details/ifappl:checkpoint", diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/ifappl/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/ifappl/BUILD index 73fd72d0e..9361f2ec7 100644 --- a/score/launch_manager/src/daemon/src/alive_monitor/details/ifappl/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/ifappl/BUILD @@ -13,6 +13,8 @@ load("@rules_cc//cc:defs.bzl", "cc_library") load("//tests/utils/bazel:unit_test.bzl", "lm_cc_test") +package(default_visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:internal"]) + cc_library( name = "data_structures", hdrs = ["DataStructures.hpp"], @@ -20,7 +22,7 @@ cc_library( strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/ifappl", visibility = [ "//score/launch_manager/src/alive:__subpackages__", - "//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__", + "//score/launch_manager/src/daemon/src/alive_monitor:internal", ], deps = [ "//score/launch_manager/src/daemon/src/alive_monitor/details/ipc:ipc_if", @@ -34,7 +36,6 @@ cc_library( hdrs = ["Checkpoint.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/ifappl", 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/src/daemon/src/alive_monitor/details/common:observer", "//score/launch_manager/src/daemon/src/alive_monitor/details/ifexm:observable_event", @@ -48,7 +49,6 @@ cc_library( hdrs = ["MonitorIfDaemon.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/ifappl", 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", 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 index 0ab3f030b..2e0a8f5d9 100644 --- a/score/launch_manager/src/daemon/src/alive_monitor/details/ifexm/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/ifexm/BUILD @@ -13,13 +13,14 @@ load("@rules_cc//cc:defs.bzl", "cc_library") load("//tests/utils/bazel:unit_test.bzl", "lm_cc_test") +package(default_visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:internal"]) + cc_library( name = "observable_event", srcs = ["ObservableEvent.cpp"], hdrs = ["ObservableEvent.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 = [ ":supervision_event", "//score/launch_manager/src/daemon/src/alive_monitor/details/common:observer", @@ -33,7 +34,6 @@ cc_library( hdrs = ["ObservableEventReader.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 = [ ":observable_event", ":supervision_event", @@ -61,7 +61,6 @@ cc_library( hdrs = ["supervision_handle.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 = [ ":supervision_event", "//score/launch_manager/src/daemon/src/alive_monitor:ialive_supervision_handle", diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/ipc/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/ipc/BUILD index 083fee615..64529d606 100644 --- a/score/launch_manager/src/daemon/src/alive_monitor/details/ipc/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/ipc/BUILD @@ -12,6 +12,8 @@ # ******************************************************************************* load("@rules_cc//cc:defs.bzl", "cc_library") +package(default_visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:internal"]) + cc_library( name = "ipc_if", hdrs = [ @@ -23,7 +25,7 @@ cc_library( strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/ipc", visibility = [ "//score/launch_manager/src/alive:__subpackages__", - "//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__", + "//score/launch_manager/src/daemon/src/alive_monitor:internal", ], deps = ["//externals/ipc_dropin"] + select({ "@platforms//os:qnx": [], 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 index 7c578c074..219a029a5 100644 --- a/score/launch_manager/src/daemon/src/alive_monitor/details/supervision/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/supervision/BUILD @@ -13,13 +13,14 @@ load("@rules_cc//cc:defs.bzl", "cc_library") load("//tests/utils/bazel:unit_test.bzl", "lm_cc_test") +package(default_visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:internal"]) + 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", "//score/launch_manager/src/daemon/src/common:identifier_hash", @@ -32,7 +33,6 @@ cc_library( 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", "//score/launch_manager/src/daemon/src/alive_monitor/details/common:time_sorting_buffer", diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/timers/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/timers/BUILD index fc4b8e207..1458310e7 100644 --- a/score/launch_manager/src/daemon/src/alive_monitor/details/timers/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/timers/BUILD @@ -13,12 +13,13 @@ load("@rules_cc//cc:defs.bzl", "cc_library") load("//tests/utils/bazel:unit_test.bzl", "lm_cc_test") +package(default_visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:internal"]) + 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/src/daemon/src/alive_monitor/details/timers", - visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], ) cc_library( @@ -35,14 +36,13 @@ cc_library( strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/timers", visibility = [ "//score/launch_manager/src/alive:__subpackages__", - "//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__", + "//score/launch_manager/src/daemon/src/alive_monitor:internal", ], ) alias( name = "time_conversion", actual = ":timers_os_clock", - visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], ) lm_cc_test( @@ -60,7 +60,6 @@ cc_library( hdrs = ["CycleTimeValidator.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/timers", 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"], ) @@ -70,7 +69,6 @@ cc_library( hdrs = ["CycleTimer.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/timers", 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",