Skip to content

Fix TimeDaemon component to meet S-CORE conventions #24

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

Open
BjoernAtBosch wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix TimeDaemon component to meet S-CORE conventions #24

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
48a2def
Fix TimeDaemon component to meet S-CORE conventions
BjoernAtBosch May 21, 2026
4fd57f9
Fix include guards
BjoernAtBosch May 22, 2026
97d3a05
Fix BUILD file formatting
BjoernAtBosch May 22, 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
6 changes: 3 additions & 3 deletions score/time/SynchronizedVehicleTime/details/tdr/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ load("@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER
False,
[
"//score/time/HighPrecisionLocalSteadyClock",
"//score/TimeDaemon/code/ipc:svt_receiver",
"//score/time_daemon/src/ipc:svt_receiver",
],
),
(
"for_unit_testing",
True,
[
"//score/TimeDaemon/code/ipc:svt_receiver_mock",
"//score/time_daemon/src/ipc:svt_receiver_mock",
"//score/time/HighPrecisionLocalSteadyClock:utest_mock",
],
),
Expand Down Expand Up @@ -95,7 +95,7 @@ cc_test(
":tdr",
"//score/time/HighPrecisionLocalSteadyClock:utest_mock",
#integration like test that uses real svt_publisher instead of mock receiver
"//score/TimeDaemon/code/ipc:svt_publisher",
"//score/time_daemon/src/ipc:svt_publisher",
"@score_baselibs//score/language/safecpp/coverage_termination_handler",
"@score_baselibs//score/mw/log:console_only_backend",
"@googletest//:gtest",
Expand Down
4 changes: 2 additions & 2 deletions score/time/SynchronizedVehicleTime/details/tdr/receiver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

#include "score/time/HighPrecisionLocalSteadyClock/details/factory_impl.h"

#include "score/TimeDaemon/code/ipc/svt/receiver/factory.h"
#include "score/TimeDaemon/code/ipc/svt/svt_time_info.h"
#include "score/time_daemon/src/ipc/svt/receiver/factory.h"
#include "score/time_daemon/src/ipc/svt/svt_time_info.h"

#include "score/mw/log/logging.h"

Expand Down
2 changes: 1 addition & 1 deletion score/time/SynchronizedVehicleTime/details/tdr/receiver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#include "score/time/SynchronizedVehicleTime/synchronized_vehicle_time.h"

#include "score/TimeDaemon/code/ipc/svt/receiver/svt_receiver.h"
#include "score/time_daemon/src/ipc/svt/receiver/svt_receiver.h"

#include "score/time/HighPrecisionLocalSteadyClock/details/factory_impl.h"
#include "score/time/HighPrecisionLocalSteadyClock/high_precision_local_steady_clock.h"
Expand Down
2 changes: 1 addition & 1 deletion score/time/SynchronizedVehicleTime/details/tdr/receiver_integration_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: Apache-2.0
********************************************************************************/
#include "score/TimeDaemon/code/ipc/svt/publisher/factory.h"
#include "score/time_daemon/src/ipc/svt/publisher/factory.h"
#include "score/time/HighPrecisionLocalSteadyClock/high_precision_local_steady_clock_mock.h"
#include "score/time/SynchronizedVehicleTime/details/tdr/receiver.h"

Expand Down
6 changes: 3 additions & 3 deletions score/time/SynchronizedVehicleTime/details/tdr/receiver_unit_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
********************************************************************************/
#include "score/time/SynchronizedVehicleTime/details/tdr/receiver.h"

#include "score/TimeDaemon/code/ipc/receiver_mock.h"
#include "score/time_daemon/src/ipc/receiver_mock.h"

#include "score/TimeDaemon/code/ipc/svt/receiver/factory.h"
#include "score/time_daemon/src/ipc/svt/receiver/factory.h"

#include "score/TimeDaemon/code/ipc/svt/receiver/svt_receiver.h"
#include "score/time_daemon/src/ipc/svt/receiver/svt_receiver.h"

#include "score/time/HighPrecisionLocalSteadyClock/high_precision_local_steady_clock_mock.h"

Expand Down
14 changes: 7 additions & 7 deletions score/TimeDaemon/BUILD → score/time_daemon/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ load("@score_baselibs//:bazel/unit_tests.bzl", "cc_unit_test_suites_for_host_and
cc_unit_test_suites_for_host_and_qnx(
name = "unit_test_suite",
test_suites_from_sub_packages = [
"//score/TimeDaemon/code/application:unit_test_suite",
"//score/TimeDaemon/code/common:unit_test_suite",
"//score/TimeDaemon/code/control_flow_divider:unit_test_suite",
"//score/TimeDaemon/code/ipc:unit_test_suite",
"//score/TimeDaemon/code/msg_broker:unit_test_suite",
"//score/TimeDaemon/code/ptp_machine:unit_test_suite",
"//score/TimeDaemon/code/verification_machine:unit_test_suite",
"//score/time_daemon/src/application:unit_test_suite",
"//score/time_daemon/src/common:unit_test_suite",
"//score/time_daemon/src/control_flow_divider:unit_test_suite",
"//score/time_daemon/src/ipc:unit_test_suite",
"//score/time_daemon/src/msg_broker:unit_test_suite",
"//score/time_daemon/src/ptp_machine:unit_test_suite",
"//score/time_daemon/src/verification_machine:unit_test_suite",
],
visibility = ["//score:__pkg__"],
)
18 changes: 9 additions & 9 deletions score/TimeDaemon/code/application/BUILD → score/time_daemon/src/application/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ cc_library(
"timebase_handler.h",
],
features = COMPILER_WARNING_FEATURES,
visibility = ["//score/TimeDaemon/code/application:__subpackages__"],
Copy link
Copy Markdown
Contributor

@lavrovvalera lavrovvalera May 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here and everywhere
do we need to treat all subcomponents like the "component" and also have the same structure: src, test inside?
see https://github.com/eclipse-score/score/blob/main/docs/contribute/general/folder.rst?plain=1#L182

Copy link
Copy Markdown
Contributor Author

@BjoernAtBosch BjoernAtBosch May 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know. I think we should not over-complicate things. Imho the sub-components of TimeDaemon (and TimeSlave, too) are not consisting of relevant sub-sub-components.

visibility = ["//score/time_daemon/src/application:__subpackages__"],
deps = [
"//score/TimeDaemon/code/common:logging_contexts",
"//score/time_daemon/src/common:logging_contexts",
"@score_baselibs//score/concurrency",
"@score_baselibs//score/mw/log:frontend",
],
Expand All @@ -31,15 +31,15 @@ cc_library(
cc_binary(
name = "TimeDaemon",
srcs = [
"TimeDaemon.cpp",
"TimeDaemon.h",
"main.cpp",
"time_daemon.cpp",
"time_daemon.h",
],
features = COMPILER_WARNING_FEATURES,
tags = ["QM"],
deps = [
"//score/TimeDaemon/code/application/svt:svt_handler",
"//score/TimeDaemon/code/common:logging_contexts",
"//score/time_daemon/src/application/svt:svt_handler",
"//score/time_daemon/src/common:logging_contexts",
"@score_baselibs//score/concurrency",
"@score_lifecycle_health//src/lifecycle_client_lib",
# "@score_logging//score/mw/log",
Expand All @@ -50,8 +50,8 @@ cc_binary(
cc_unit_test_suites_for_host_and_qnx(
name = "unit_test_suite",
test_suites_from_sub_packages = [
"//score/TimeDaemon/code/application/job_runner:unit_test_suite",
"//score/TimeDaemon/code/application/svt:unit_test_suite",
"//score/time_daemon/src/application/job_runner:unit_test_suite",
"//score/time_daemon/src/application/svt:unit_test_suite",
],
visibility = ["//score/TimeDaemon:__pkg__"],
visibility = ["//score/time_daemon:__pkg__"],
)
6 changes: 3 additions & 3 deletions ...eDaemon/code/application/job_runner/BUILD → ...e_daemon/src/application/job_runner/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ cc_library(
"job_runner.h",
],
features = COMPILER_WARNING_FEATURES,
visibility = ["//score/TimeDaemon/code:__subpackages__"],
visibility = ["//score/time_daemon/src:__subpackages__"],
deps = [
"//score/TimeDaemon/code/common:logging_contexts",
"//score/time_daemon/src/common:logging_contexts",
"@score_baselibs//score/concurrency",
"@score_baselibs//score/mw/log:frontend",
],
Expand All @@ -34,7 +34,7 @@ cc_unit_test_suites_for_host_and_qnx(
cc_unit_tests = [
":job_runner_test",
],
visibility = ["//score/TimeDaemon/code/application:__pkg__"],
visibility = ["//score/time_daemon/src/application:__pkg__"],
)

cc_test(
Expand Down
4 changes: 2 additions & 2 deletions ...ode/application/job_runner/job_runner.cpp → ...src/application/job_runner/job_runner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
*
* SPDX-License-Identifier: Apache-2.0
********************************************************************************/
#include "score/TimeDaemon/code/application/job_runner/job_runner.h"
#include "score/TimeDaemon/code/common/logging_contexts.h"
#include "score/time_daemon/src/application/job_runner/job_runner.h"
#include "score/time_daemon/src/common/logging_contexts.h"
#include "score/concurrency/interruptible_wait.h"
#include "score/mw/log/logging.h"

Expand Down
6 changes: 3 additions & 3 deletions .../code/application/job_runner/job_runner.h → ...n/src/application/job_runner/job_runner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
*
* SPDX-License-Identifier: Apache-2.0
********************************************************************************/
#ifndef SCORE_TIMEDAEMON_CODE_APPLICATION_JOB_RUNNER_JOB_RUNNER_H
#define SCORE_TIMEDAEMON_CODE_APPLICATION_JOB_RUNNER_JOB_RUNNER_H
#ifndef SCORE_TIME_DAEMON_SRC_APPLICATION_JOB_RUNNER_JOB_RUNNER_H
#define SCORE_TIME_DAEMON_SRC_APPLICATION_JOB_RUNNER_JOB_RUNNER_H

#include <score/jthread.hpp>
#include <score/stop_token.hpp>
Expand Down Expand Up @@ -97,4 +97,4 @@ class JobRunner
} // namespace td
} // namespace score

#endif // SCORE_TIMEDAEMON_CODE_APPLICATION_JOB_RUNNER_JOB_RUNNER_H
#endif // SCORE_TIME_DAEMON_SRC_APPLICATION_JOB_RUNNER_JOB_RUNNER_H
2 changes: 1 addition & 1 deletion ...pplication/job_runner/job_runner_test.cpp → ...pplication/job_runner/job_runner_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: Apache-2.0
********************************************************************************/
#include "score/TimeDaemon/code/application/job_runner/job_runner.h"
#include "score/time_daemon/src/application/job_runner/job_runner.h"

#include <gmock/gmock.h>
#include <gtest/gtest.h>
Expand Down
2 changes: 1 addition & 1 deletion score/TimeDaemon/code/application/main.cpp → score/time_daemon/src/application/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: Apache-2.0
********************************************************************************/
#include "score/TimeDaemon/code/application/TimeDaemon.h"
#include "score/time_daemon/src/application/time_daemon.h"

#include "src/lifecycle_client_lib/include/runapplication.h"

Expand Down
22 changes: 11 additions & 11 deletions score/TimeDaemon/code/application/svt/BUILD → score/time_daemon/src/application/svt/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,29 +27,29 @@ load("@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER
"svt_handler.h",
],
features = COMPILER_WARNING_FEATURES,
visibility = ["//score/TimeDaemon/code/application:__pkg__"],
visibility = ["//score/time_daemon/src/application:__pkg__"],
deps = [
"//score/TimeDaemon/code/application:timebase_handler",
"//score/TimeDaemon/code/application/job_runner",
"//score/TimeDaemon/code/control_flow_divider/ptp:ptp_control_flow_divider",
"//score/TimeDaemon/code/ipc/svt/publisher:factory",
"//score/TimeDaemon/code/msg_broker",
"//score/TimeDaemon/code/verification_machine/svt:svt_verification_machine",
"//score/time_daemon/src/application:timebase_handler",
"//score/time_daemon/src/application/job_runner",
"//score/time_daemon/src/control_flow_divider/ptp:ptp_control_flow_divider",
"//score/time_daemon/src/ipc/svt/publisher:factory",
"//score/time_daemon/src/msg_broker",
"//score/time_daemon/src/verification_machine/svt:svt_verification_machine",
] + deps,
)
for name, testonly, deps in [
(
"svt_handler",
False,
[
"//score/TimeDaemon/code/ptp_machine:stub_ptp_machine",
"//score/time_daemon/src/ptp_machine:stub_ptp_machine",
],
),
(
"svt_handler_for_utests",
True,
[
"//score/TimeDaemon/code/ptp_machine:stub_ptp_machine",
"//score/time_daemon/src/ptp_machine:stub_ptp_machine",
],
),
]
Expand All @@ -60,7 +60,7 @@ cc_unit_test_suites_for_host_and_qnx(
cc_unit_tests = [
# ":svt_handler_integration_test",
],
visibility = ["//score/TimeDaemon/code/application:__pkg__"],
visibility = ["//score/time_daemon/src/application:__pkg__"],
)

# TODO: fixme
Expand All @@ -75,7 +75,7 @@ cc_unit_test_suites_for_host_and_qnx(
# ],
# deps = [
# ":svt_handler_for_utests",
# "//score/TimeDaemon/code/ipc:svt_receiver",
# "//score/time_daemon/src/ipc:svt_receiver",
# "@googletest//:gtest",
# "@googletest//:gtest_main",
# ],
Expand Down
4 changes: 2 additions & 2 deletions ...meDaemon/code/application/svt/factory.cpp → ...me_daemon/src/application/svt/factory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
*
* SPDX-License-Identifier: Apache-2.0
********************************************************************************/
#include "score/TimeDaemon/code/application/svt/factory.h"
#include "score/time_daemon/src/application/svt/factory.h"

#include "score/TimeDaemon/code/application/svt/svt_handler.h"
#include "score/time_daemon/src/application/svt/svt_handler.h"

namespace score
{
Expand Down
8 changes: 4 additions & 4 deletions ...TimeDaemon/code/application/svt/factory.h → ...time_daemon/src/application/svt/factory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
*
* SPDX-License-Identifier: Apache-2.0
********************************************************************************/
#ifndef SCORE_TIMEDAEMON_CODE_APPLICATION_FACTORY_H
#define SCORE_TIMEDAEMON_CODE_APPLICATION_FACTORY_H
#ifndef SCORE_TIME_DAEMON_SRC_APPLICATION_FACTORY_H
#define SCORE_TIME_DAEMON_SRC_APPLICATION_FACTORY_H

#include "score/TimeDaemon/code/application/timebase_handler.h"
#include "score/time_daemon/src/application/timebase_handler.h"

#include <memory>

Expand All @@ -30,4 +30,4 @@ std::unique_ptr<TimebaseHandler> CreateSvtTimebase();
} // namespace td
} // namespace score

#endif // SCORE_TIMEDAEMON_CODE_APPLICATION_FACTORY_H
#endif // SCORE_TIME_DAEMON_SRC_APPLICATION_FACTORY_H
16 changes: 8 additions & 8 deletions ...emon/code/application/svt/svt_handler.cpp → ...aemon/src/application/svt/svt_handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
*
* SPDX-License-Identifier: Apache-2.0
********************************************************************************/
#include "score/TimeDaemon/code/application/svt/svt_handler.h"
#include "score/TimeDaemon/code/common/logging_contexts.h"
#include "score/TimeDaemon/code/control_flow_divider/ptp/factory.h"
#include "score/TimeDaemon/code/ipc/svt/publisher/factory.h"
#include "score/TimeDaemon/code/msg_broker/subscription.h"
#include "score/TimeDaemon/code/msg_broker/topic.h"
#include "score/TimeDaemon/code/ptp_machine/stub/factory.h"
#include "score/TimeDaemon/code/verification_machine/svt/factory.h"
#include "score/time_daemon/src/application/svt/svt_handler.h"
#include "score/time_daemon/src/common/logging_contexts.h"
#include "score/time_daemon/src/control_flow_divider/ptp/factory.h"
#include "score/time_daemon/src/ipc/svt/publisher/factory.h"
#include "score/time_daemon/src/msg_broker/subscription.h"
#include "score/time_daemon/src/msg_broker/topic.h"
#include "score/time_daemon/src/ptp_machine/stub/factory.h"
#include "score/time_daemon/src/verification_machine/svt/factory.h"
#include "score/concurrency/interruptible_wait.h"
#include "score/mw/log/logging.h"

Expand Down
20 changes: 10 additions & 10 deletions ...Daemon/code/application/svt/svt_handler.h → ..._daemon/src/application/svt/svt_handler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
*
* SPDX-License-Identifier: Apache-2.0
********************************************************************************/
#ifndef SCORE_TIMEDAEMON_CODE_APPLICATION_SVT_HANDLER_H
#define SCORE_TIMEDAEMON_CODE_APPLICATION_SVT_HANDLER_H
#ifndef SCORE_TIME_DAEMON_SRC_APPLICATION_SVT_HANDLER_H
#define SCORE_TIME_DAEMON_SRC_APPLICATION_SVT_HANDLER_H

#include "score/TimeDaemon/code/application/job_runner/job_runner.h"
#include "score/TimeDaemon/code/application/timebase_handler.h"
#include "score/TimeDaemon/code/control_flow_divider/ptp/ptp_control_flow_divider.h"
#include "score/TimeDaemon/code/ipc/svt/publisher/svt_publisher.h"
#include "score/TimeDaemon/code/msg_broker/msg_broker.h"
#include "score/TimeDaemon/code/ptp_machine/stub/gptp_stub_machine.h"
#include "score/TimeDaemon/code/verification_machine/svt/svt_verification_machine.h"
#include "score/time_daemon/src/application/job_runner/job_runner.h"
#include "score/time_daemon/src/application/timebase_handler.h"
#include "score/time_daemon/src/control_flow_divider/ptp/ptp_control_flow_divider.h"
#include "score/time_daemon/src/ipc/svt/publisher/svt_publisher.h"
#include "score/time_daemon/src/msg_broker/msg_broker.h"
#include "score/time_daemon/src/ptp_machine/stub/gptp_stub_machine.h"
#include "score/time_daemon/src/verification_machine/svt/svt_verification_machine.h"

#include <memory>

Expand Down Expand Up @@ -82,4 +82,4 @@ class SvtHandler : public TimebaseHandler
} // namespace td
} // namespace score

#endif // SCORE_TIMEDAEMON_CODE_APPLICATION_SVT_HANDLER_H
#endif // SCORE_TIME_DAEMON_SRC_APPLICATION_SVT_HANDLER_H
6 changes: 3 additions & 3 deletions ...tion/svt/svt_handler_integration_test.cpp → ...tion/svt/svt_handler_integration_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
*
* SPDX-License-Identifier: Apache-2.0
********************************************************************************/
#include "score/TimeDaemon/code/application/svt/svt_handler.h"
#include "score/TimeDaemon/code/ipc/core/shared_memory_handler.h"
#include "score/TimeDaemon/code/ipc/svt/receiver/factory.h"
#include "score/time_daemon/src/application/svt/svt_handler.h"
#include "score/time_daemon/src/ipc/core/shared_memory_handler.h"
#include "score/time_daemon/src/ipc/svt/receiver/factory.h"

#include <gmock/gmock.h>
#include <gtest/gtest.h>
Expand Down
6 changes: 3 additions & 3 deletions ...imeDaemon/code/application/TimeDaemon.cpp → ...me_daemon/src/application/time_daemon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
*
* SPDX-License-Identifier: Apache-2.0
********************************************************************************/
#include "score/TimeDaemon/code/application/TimeDaemon.h"
#include "score/TimeDaemon/code/application/svt/factory.h"
#include "score/TimeDaemon/code/common/logging_contexts.h"
#include "score/time_daemon/src/application/time_daemon.h"
#include "score/time_daemon/src/application/svt/factory.h"
#include "score/time_daemon/src/common/logging_contexts.h"

#include "score/mw/log/logging.h"
#include "score/concurrency/interruptible_wait.h"
Expand Down
8 changes: 4 additions & 4 deletions .../TimeDaemon/code/application/TimeDaemon.h → ...time_daemon/src/application/time_daemon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
*
* SPDX-License-Identifier: Apache-2.0
********************************************************************************/
#ifndef SCORE_TIMEDAEMON_CODE_APPLICATION_TIMEDAEMON_H
#define SCORE_TIMEDAEMON_CODE_APPLICATION_TIMEDAEMON_H
#ifndef SCORE_TIME_DAEMON_SRC_APPLICATION_TIME_DAEMON_H
#define SCORE_TIME_DAEMON_SRC_APPLICATION_TIME_DAEMON_H

#include "score/TimeDaemon/code/application/timebase_handler.h"
#include "score/time_daemon/src/application/timebase_handler.h"

#include "src/lifecycle_client_lib/include/application.h"

Expand Down Expand Up @@ -43,4 +43,4 @@ class TimeDaemon final : public score::mw::lifecycle::Application
} // namespace td
} // namespace score

#endif // SCORE_TIMEDAEMON_CODE_APPLICATION_TIMEDAEMON_H
#endif // SCORE_TIME_DAEMON_SRC_APPLICATION_TIME_DAEMON_H
Loading
Loading