Skip to content

Proposal to manage visibility of subcomponents #612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
NicolasFussberger wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Proposal to manage visibility of subcomponents #612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a014167
Tighten alivemonitor visibility
NicolasFussberger Sep 8, 2026
abea71b
Reduce visibility of os_clock_interface
NicolasFussberger Sep 8, 2026
11820d1
Setting default visibility
NicolasFussberger Sep 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions score/launch_manager/src/daemon/src/alive_monitor/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,24 @@
# *******************************************************************************
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:__subpackages__"],
visibility = ["//score/launch_manager/src/daemon:__pkg__"],
deps = [
"//score/launch_manager/src/daemon/src/alive_monitor/details/daemon:health_monitor_impl",
],
Expand All @@ -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:__subpackages__"],
deps = [
"//score/launch_manager/src/daemon/src/alive_monitor:isupervision_factory",
],
Expand All @@ -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:__subpackages__"],
deps = [
":i_alive_monitor",
"@googletest//:gtest_main",
Expand All @@ -49,15 +62,13 @@ 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__"],
)

cc_library(
name = "isupervision_factory",
hdrs = ["isupervision_factory.hpp"],
include_prefix = "score/mw/launch_manager/alive_monitor",
strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor",
visibility = ["//score:__subpackages__"],
deps = [
"//score/launch_manager/src/daemon/src/alive_monitor/details/ifexm:supervision_handle",
"//score/launch_manager/src/daemon/src/common:identifier_hash",
Expand All @@ -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:__subpackages__"],
deps = [
":ialive_supervision_handle",
"@googletest//:gtest_main",
Expand All @@ -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:__subpackages__"],
deps = [
":isupervision_factory",
"@googletest//:gtest_main",
Expand Down
7 changes: 2 additions & 5 deletions score/launch_manager/src/daemon/src/alive_monitor/details/common/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)

Expand All @@ -27,23 +28,20 @@ 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(
name = "einitcode",
hdrs = ["EInitCode.hpp"],
include_prefix = "score/mw/launch_manager/alive_monitor/details/common",
strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/common",
visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"],
)

cc_library(
name = "locked_vector",
hdrs = ["LockedVector.hpp"],
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"],
)

Expand All @@ -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",
Expand Down
5 changes: 2 additions & 3 deletions score/launch_manager/src/daemon/src/alive_monitor/details/daemon/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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:__subpackages__"],
deps = [
":cyclic_executor",
"//score/launch_manager/src/daemon/src/alive_monitor:i_alive_monitor",
Expand Down
4 changes: 2 additions & 2 deletions score/launch_manager/src/daemon/src/alive_monitor/details/factory/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand All @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions score/launch_manager/src/daemon/src/alive_monitor/details/ifappl/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,16 @@
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"],
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/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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
5 changes: 2 additions & 3 deletions score/launch_manager/src/daemon/src/alive_monitor/details/ifexm/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 3 additions & 1 deletion score/launch_manager/src/daemon/src/alive_monitor/details/ipc/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand All @@ -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": [],
Expand Down
4 changes: 2 additions & 2 deletions score/launch_manager/src/daemon/src/alive_monitor/details/supervision/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
11 changes: 3 additions & 8 deletions score/launch_manager/src/daemon/src/alive_monitor/details/timers/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +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__",
"//score/launch_manager/src/daemon/src/watchdog:__subpackages__",
],
)

cc_library(
Expand All @@ -38,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(
Expand All @@ -63,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"],
)

Expand All @@ -73,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",
Expand Down
1 change: 0 additions & 1 deletion score/launch_manager/src/daemon/src/watchdog/details/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
11 changes: 5 additions & 6 deletions score/launch_manager/src/daemon/src/watchdog/details/WatchdogImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@

#include <score/assert.hpp>

#include "score/mw/launch_manager/alive_monitor/details/timers/OsClockInterface.hpp"
#include <chrono>
#include <thread>

#include "score/mw/launch_manager/configuration/config.hpp"
#include "score/mw/launch_manager/watchdog/details/Watchdog.hpp"

Expand Down Expand Up @@ -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<void>(clock.clockNanosleep(0, &sleeptime, NULL));
std::this_thread::sleep_for(1s);
}
}
#if defined(__CTC__) && defined(__CODE_COVERAGE_ANNOTATION__)
Expand Down
Loading