From 48a2def987334443db04fadf996700add936ed7f Mon Sep 17 00:00:00 2001 From: "Hornburg Bjoern (ETAS-ECM XPC-Hi)" Date: Thu, 21 May 2026 15:35:22 +0200 Subject: [PATCH 1/3] Fix TimeDaemon component to meet S-CORE conventions --- .../SynchronizedVehicleTime/details/tdr/BUILD | 6 ++--- .../details/tdr/receiver.cpp | 4 +-- .../details/tdr/receiver.h | 2 +- .../details/tdr/receiver_integration_test.cpp | 2 +- .../details/tdr/receiver_unit_test.cpp | 6 ++--- score/{TimeDaemon => time_daemon}/BUILD | 14 +++++----- .../src}/application/BUILD | 18 ++++++------- .../src}/application/job_runner/BUILD | 6 ++--- .../application/job_runner/job_runner.cpp | 4 +-- .../src}/application/job_runner/job_runner.h | 0 .../job_runner/job_runner_test.cpp | 2 +- .../src}/application/main.cpp | 2 +- .../src}/application/svt/BUILD | 22 ++++++++-------- .../src}/application/svt/factory.cpp | 4 +-- .../src}/application/svt/factory.h | 2 +- .../src}/application/svt/svt_handler.cpp | 16 ++++++------ .../src}/application/svt/svt_handler.h | 14 +++++----- .../svt/svt_handler_integration_test.cpp | 6 ++--- .../src/application/time_daemon.cpp} | 6 ++--- .../src/application/time_daemon.h} | 2 +- .../src}/application/timebase_handler.h | 0 .../code => time_daemon/src}/common/BUILD | 10 +++---- .../src}/common/data_flow/BUILD | 4 +-- .../src}/common/data_flow/consumer.h | 0 .../src}/common/data_flow/producer.h | 0 .../data_flow/producer_consumer_test.cpp | 4 +-- .../src}/common/data_types/BUILD | 4 +-- .../src}/common/data_types/ptp_time_info.cpp | 2 +- .../src}/common/data_types/ptp_time_info.h | 0 .../common/data_types/ptp_time_info_test.cpp | 2 +- .../src}/common/logging_contexts.h | 0 .../src}/common/machines/BUILD | 6 ++--- .../src}/common/machines/base_machine.cpp | 2 +- .../src}/common/machines/base_machine.h | 0 .../common/machines/base_machine_test.cpp | 2 +- .../common/machines/event_driven_machine.cpp | 2 +- .../common/machines/event_driven_machine.h | 2 +- .../machines/event_driven_machine_test.cpp | 2 +- .../src}/common/machines/periodic_machine.cpp | 2 +- .../src}/common/machines/periodic_machine.h | 2 +- .../common/machines/periodic_machine_test.cpp | 2 +- .../src}/common/machines/proactive_machine.h | 2 +- .../src}/common/machines/reactive_machine.h | 2 +- .../src}/control_flow_divider/BUILD | 6 ++--- .../src}/control_flow_divider/core/BUILD | 8 +++--- .../core/control_flow_divider.h | 8 +++--- .../core/control_flow_divider_test.cpp | 2 +- .../src}/control_flow_divider/ptp/BUILD | 10 +++---- .../src}/control_flow_divider/ptp/factory.cpp | 4 +-- .../src}/control_flow_divider/ptp/factory.h | 2 +- .../control_flow_divider/ptp/factory_test.cpp | 4 +-- .../ptp/ptp_control_flow_divider.h | 4 +-- .../ptp/ptp_control_flow_divider_test.cpp | 4 +-- .../code => time_daemon/src}/ipc/BUILD | 22 ++++++++-------- .../code => time_daemon/src}/ipc/core/BUILD | 26 +++++++++---------- .../src}/ipc/core/publisher_impl.h | 10 +++---- .../src}/ipc/core/publisher_impl_test.cpp | 6 ++--- .../src}/ipc/core/receiver_impl.h | 4 +-- .../src}/ipc/core/receiver_impl_test.cpp | 6 ++--- .../src}/ipc/core/shared_memory_handler.h | 2 +- .../ipc/core/shared_memory_handler_test.cpp | 4 +-- .../src}/ipc/core/test_types.h | 2 +- .../src}/ipc/data_converter.h | 0 .../code => time_daemon/src}/ipc/receiver.h | 0 .../src}/ipc/receiver_mock.h | 2 +- .../code => time_daemon/src}/ipc/svt/BUILD | 18 ++++++------- .../src}/ipc/svt/common_factory_test.cpp | 4 +-- .../code => time_daemon/src}/ipc/svt/config.h | 0 .../src}/ipc/svt/publisher/BUILD | 10 +++---- .../src}/ipc/svt/publisher/factory.cpp | 4 +-- .../src}/ipc/svt/publisher/factory.h | 2 +- .../src}/ipc/svt/publisher/svt_publisher.h | 6 ++--- .../src}/ipc/svt/receiver/BUILD | 16 ++++++------ .../src}/ipc/svt/receiver/factory.cpp | 6 ++--- .../src}/ipc/svt/receiver/factory.h | 2 +- .../src}/ipc/svt/receiver/factory_stub.cpp | 6 ++--- .../src}/ipc/svt/receiver/svt_receiver.h | 4 +-- .../src}/ipc/svt/svt_time_info.cpp | 2 +- .../src}/ipc/svt/svt_time_info.h | 4 +-- .../src}/ipc/svt/svt_time_info_test.cpp | 2 +- .../code => time_daemon/src}/msg_broker/BUILD | 8 +++--- .../src}/msg_broker/msg_broker.h | 8 +++--- .../src}/msg_broker/msg_broker_test.cpp | 6 ++--- .../src}/msg_broker/subscription.h | 0 .../src}/msg_broker/topic.cpp | 2 +- .../src}/msg_broker/topic.h | 0 .../src}/ptp_machine/BUILD | 12 ++++----- .../src}/ptp_machine/core/BUILD | 10 +++---- .../src}/ptp_machine/core/ptp_engine_mock.h | 2 +- .../src}/ptp_machine/core/ptp_machine.h | 8 +++--- .../ptp_machine/core/ptp_machine_test.cpp | 4 +-- .../src}/ptp_machine/shm/BUILD | 10 +++---- .../src}/ptp_machine/shm/details/BUILD | 8 +++--- .../shm/details/shm_ptp_engine.cpp | 4 +-- .../ptp_machine/shm/details/shm_ptp_engine.h | 2 +- .../shm/details/shm_ptp_engine_test.cpp | 2 +- .../src}/ptp_machine/shm/factory.cpp | 2 +- .../src}/ptp_machine/shm/factory.h | 2 +- .../src}/ptp_machine/shm/gptp_shm_machine.h | 4 +-- .../ptp_machine/shm/gptp_shm_machine_test.cpp | 4 +-- .../src}/ptp_machine/stub/BUILD | 12 ++++----- .../src}/ptp_machine/stub/details/BUILD | 6 ++--- .../stub/details/stub_ptp_engine.cpp | 4 +-- .../stub/details/stub_ptp_engine.h | 2 +- .../src}/ptp_machine/stub/factory.cpp | 2 +- .../src}/ptp_machine/stub/factory.h | 2 +- .../src}/ptp_machine/stub/gptp_stub_machine.h | 4 +-- .../gptp_stub_machine_integration_test.cpp | 4 +-- .../src}/verification_machine/BUILD | 6 ++--- .../src}/verification_machine/core/BUILD | 8 +++--- .../core/verification_machine.h | 10 +++---- .../core/verification_machine_test.cpp | 4 +-- .../core/verification_stage.h | 0 .../core/verification_stage_mock.h | 2 +- .../src}/verification_machine/svt/BUILD | 14 +++++----- .../src}/verification_machine/svt/factory.cpp | 8 +++--- .../src}/verification_machine/svt/factory.h | 2 +- .../svt/svt_verification_machine.h | 10 +++---- .../svt/svt_verification_machine_test.cpp | 4 +-- .../verification_machine/svt/validators/BUILD | 10 +++---- .../validators/synchronization_validator.cpp | 4 +-- .../validators/synchronization_validator.h | 4 +-- .../synchronization_validator_test.cpp | 2 +- .../svt/validators/time_jumps_validator.cpp | 4 +-- .../svt/validators/time_jumps_validator.h | 4 +-- .../validators/time_jumps_validator_test.cpp | 2 +- .../svt/validators/timeout_validator.cpp | 4 +-- .../svt/validators/timeout_validator.h | 4 +-- .../svt/validators/timeout_validator_test.cpp | 2 +- 129 files changed, 327 insertions(+), 327 deletions(-) rename score/{TimeDaemon => time_daemon}/BUILD (65%) rename score/{TimeDaemon/code => time_daemon/src}/application/BUILD (76%) rename score/{TimeDaemon/code => time_daemon/src}/application/job_runner/BUILD (88%) rename score/{TimeDaemon/code => time_daemon/src}/application/job_runner/job_runner.cpp (96%) rename score/{TimeDaemon/code => time_daemon/src}/application/job_runner/job_runner.h (100%) rename score/{TimeDaemon/code => time_daemon/src}/application/job_runner/job_runner_test.cpp (98%) rename score/{TimeDaemon/code => time_daemon/src}/application/main.cpp (92%) rename score/{TimeDaemon/code => time_daemon/src}/application/svt/BUILD (73%) rename score/{TimeDaemon/code => time_daemon/src}/application/svt/factory.cpp (86%) rename score/{TimeDaemon/code => time_daemon/src}/application/svt/factory.h (94%) rename score/{TimeDaemon/code => time_daemon/src}/application/svt/svt_handler.cpp (91%) rename score/{TimeDaemon/code => time_daemon/src}/application/svt/svt_handler.h (88%) rename score/{TimeDaemon/code => time_daemon/src}/application/svt/svt_handler_integration_test.cpp (96%) rename score/{TimeDaemon/code/application/TimeDaemon.cpp => time_daemon/src/application/time_daemon.cpp} (89%) rename score/{TimeDaemon/code/application/TimeDaemon.h => time_daemon/src/application/time_daemon.h} (95%) rename score/{TimeDaemon/code => time_daemon/src}/application/timebase_handler.h (100%) rename score/{TimeDaemon/code => time_daemon/src}/common/BUILD (78%) rename score/{TimeDaemon/code => time_daemon/src}/common/data_flow/BUILD (92%) rename score/{TimeDaemon/code => time_daemon/src}/common/data_flow/consumer.h (100%) rename score/{TimeDaemon/code => time_daemon/src}/common/data_flow/producer.h (100%) rename score/{TimeDaemon/code => time_daemon/src}/common/data_flow/producer_consumer_test.cpp (98%) rename score/{TimeDaemon/code => time_daemon/src}/common/data_types/BUILD (92%) rename score/{TimeDaemon/code => time_daemon/src}/common/data_types/ptp_time_info.cpp (98%) rename score/{TimeDaemon/code => time_daemon/src}/common/data_types/ptp_time_info.h (100%) rename score/{TimeDaemon/code => time_daemon/src}/common/data_types/ptp_time_info_test.cpp (98%) rename score/{TimeDaemon/code => time_daemon/src}/common/logging_contexts.h (100%) rename score/{TimeDaemon/code => time_daemon/src}/common/machines/BUILD (90%) rename score/{TimeDaemon/code => time_daemon/src}/common/machines/base_machine.cpp (91%) rename score/{TimeDaemon/code => time_daemon/src}/common/machines/base_machine.h (100%) rename score/{TimeDaemon/code => time_daemon/src}/common/machines/base_machine_test.cpp (94%) rename score/{TimeDaemon/code => time_daemon/src}/common/machines/event_driven_machine.cpp (97%) rename score/{TimeDaemon/code => time_daemon/src}/common/machines/event_driven_machine.h (98%) rename score/{TimeDaemon/code => time_daemon/src}/common/machines/event_driven_machine_test.cpp (98%) rename score/{TimeDaemon/code => time_daemon/src}/common/machines/periodic_machine.cpp (96%) rename score/{TimeDaemon/code => time_daemon/src}/common/machines/periodic_machine.h (98%) rename score/{TimeDaemon/code => time_daemon/src}/common/machines/periodic_machine_test.cpp (98%) rename score/{TimeDaemon/code => time_daemon/src}/common/machines/proactive_machine.h (97%) rename score/{TimeDaemon/code => time_daemon/src}/common/machines/reactive_machine.h (96%) rename score/{TimeDaemon/code => time_daemon/src}/control_flow_divider/BUILD (81%) rename score/{TimeDaemon/code => time_daemon/src}/control_flow_divider/core/BUILD (86%) rename score/{TimeDaemon/code => time_daemon/src}/control_flow_divider/core/control_flow_divider.h (96%) rename score/{TimeDaemon/code => time_daemon/src}/control_flow_divider/core/control_flow_divider_test.cpp (98%) rename score/{TimeDaemon/code => time_daemon/src}/control_flow_divider/ptp/BUILD (86%) rename score/{TimeDaemon/code => time_daemon/src}/control_flow_divider/ptp/factory.cpp (88%) rename score/{TimeDaemon/code => time_daemon/src}/control_flow_divider/ptp/factory.h (96%) rename score/{TimeDaemon/code => time_daemon/src}/control_flow_divider/ptp/factory_test.cpp (93%) rename score/{TimeDaemon/code => time_daemon/src}/control_flow_divider/ptp/ptp_control_flow_divider.h (90%) rename score/{TimeDaemon/code => time_daemon/src}/control_flow_divider/ptp/ptp_control_flow_divider_test.cpp (97%) rename score/{TimeDaemon/code => time_daemon/src}/ipc/BUILD (77%) rename score/{TimeDaemon/code => time_daemon/src}/ipc/core/BUILD (78%) rename score/{TimeDaemon/code => time_daemon/src}/ipc/core/publisher_impl.h (86%) rename score/{TimeDaemon/code => time_daemon/src}/ipc/core/publisher_impl_test.cpp (93%) rename score/{TimeDaemon/code => time_daemon/src}/ipc/core/receiver_impl.h (94%) rename score/{TimeDaemon/code => time_daemon/src}/ipc/core/receiver_impl_test.cpp (92%) rename score/{TimeDaemon/code => time_daemon/src}/ipc/core/shared_memory_handler.h (99%) rename score/{TimeDaemon/code => time_daemon/src}/ipc/core/shared_memory_handler_test.cpp (94%) rename score/{TimeDaemon/code => time_daemon/src}/ipc/core/test_types.h (98%) rename score/{TimeDaemon/code => time_daemon/src}/ipc/data_converter.h (100%) rename score/{TimeDaemon/code => time_daemon/src}/ipc/receiver.h (100%) rename score/{TimeDaemon/code => time_daemon/src}/ipc/receiver_mock.h (96%) rename score/{TimeDaemon/code => time_daemon/src}/ipc/svt/BUILD (75%) rename score/{TimeDaemon/code => time_daemon/src}/ipc/svt/common_factory_test.cpp (92%) rename score/{TimeDaemon/code => time_daemon/src}/ipc/svt/config.h (100%) rename score/{TimeDaemon/code => time_daemon/src}/ipc/svt/publisher/BUILD (75%) rename score/{TimeDaemon/code => time_daemon/src}/ipc/svt/publisher/factory.cpp (87%) rename score/{TimeDaemon/code => time_daemon/src}/ipc/svt/publisher/factory.h (94%) rename score/{TimeDaemon/code => time_daemon/src}/ipc/svt/publisher/svt_publisher.h (83%) rename score/{TimeDaemon/code => time_daemon/src}/ipc/svt/receiver/BUILD (70%) rename score/{TimeDaemon/code => time_daemon/src}/ipc/svt/receiver/factory.cpp (82%) rename score/{TimeDaemon/code => time_daemon/src}/ipc/svt/receiver/factory.h (94%) rename score/{TimeDaemon/code => time_daemon/src}/ipc/svt/receiver/factory_stub.cpp (82%) rename score/{TimeDaemon/code => time_daemon/src}/ipc/svt/receiver/svt_receiver.h (89%) rename score/{TimeDaemon/code => time_daemon/src}/ipc/svt/svt_time_info.cpp (99%) rename score/{TimeDaemon/code => time_daemon/src}/ipc/svt/svt_time_info.h (98%) rename score/{TimeDaemon/code => time_daemon/src}/ipc/svt/svt_time_info_test.cpp (99%) rename score/{TimeDaemon/code => time_daemon/src}/msg_broker/BUILD (86%) rename score/{TimeDaemon/code => time_daemon/src}/msg_broker/msg_broker.h (93%) rename score/{TimeDaemon/code => time_daemon/src}/msg_broker/msg_broker_test.cpp (95%) rename score/{TimeDaemon/code => time_daemon/src}/msg_broker/subscription.h (100%) rename score/{TimeDaemon/code => time_daemon/src}/msg_broker/topic.cpp (96%) rename score/{TimeDaemon/code => time_daemon/src}/msg_broker/topic.h (100%) rename score/{TimeDaemon/code => time_daemon/src}/ptp_machine/BUILD (69%) rename score/{TimeDaemon/code => time_daemon/src}/ptp_machine/core/BUILD (84%) rename score/{TimeDaemon/code => time_daemon/src}/ptp_machine/core/ptp_engine_mock.h (97%) rename score/{TimeDaemon/code => time_daemon/src}/ptp_machine/core/ptp_machine.h (96%) rename score/{TimeDaemon/code => time_daemon/src}/ptp_machine/core/ptp_machine_test.cpp (96%) rename score/{TimeDaemon/code => time_daemon/src}/ptp_machine/shm/BUILD (83%) rename score/{TimeDaemon/code => time_daemon/src}/ptp_machine/shm/details/BUILD (86%) rename score/{TimeDaemon/code => time_daemon/src}/ptp_machine/shm/details/shm_ptp_engine.cpp (96%) rename score/{TimeDaemon/code => time_daemon/src}/ptp_machine/shm/details/shm_ptp_engine.h (96%) rename score/{TimeDaemon/code => time_daemon/src}/ptp_machine/shm/details/shm_ptp_engine_test.cpp (99%) rename score/{TimeDaemon/code => time_daemon/src}/ptp_machine/shm/factory.cpp (93%) rename score/{TimeDaemon/code => time_daemon/src}/ptp_machine/shm/factory.h (96%) rename score/{TimeDaemon/code => time_daemon/src}/ptp_machine/shm/gptp_shm_machine.h (90%) rename score/{TimeDaemon/code => time_daemon/src}/ptp_machine/shm/gptp_shm_machine_test.cpp (96%) rename score/{TimeDaemon/code => time_daemon/src}/ptp_machine/stub/BUILD (84%) rename score/{TimeDaemon/code => time_daemon/src}/ptp_machine/stub/details/BUILD (85%) rename score/{TimeDaemon/code => time_daemon/src}/ptp_machine/stub/details/stub_ptp_engine.cpp (97%) rename score/{TimeDaemon/code => time_daemon/src}/ptp_machine/stub/details/stub_ptp_engine.h (98%) rename score/{TimeDaemon/code => time_daemon/src}/ptp_machine/stub/factory.cpp (94%) rename score/{TimeDaemon/code => time_daemon/src}/ptp_machine/stub/factory.h (94%) rename score/{TimeDaemon/code => time_daemon/src}/ptp_machine/stub/gptp_stub_machine.h (89%) rename score/{TimeDaemon/code => time_daemon/src}/ptp_machine/stub/gptp_stub_machine_integration_test.cpp (97%) rename score/{TimeDaemon/code => time_daemon/src}/verification_machine/BUILD (81%) rename score/{TimeDaemon/code => time_daemon/src}/verification_machine/core/BUILD (87%) rename score/{TimeDaemon/code => time_daemon/src}/verification_machine/core/verification_machine.h (95%) rename score/{TimeDaemon/code => time_daemon/src}/verification_machine/core/verification_machine_test.cpp (96%) rename score/{TimeDaemon/code => time_daemon/src}/verification_machine/core/verification_stage.h (100%) rename score/{TimeDaemon/code => time_daemon/src}/verification_machine/core/verification_stage_mock.h (96%) rename score/{TimeDaemon/code => time_daemon/src}/verification_machine/svt/BUILD (79%) rename score/{TimeDaemon/code => time_daemon/src}/verification_machine/svt/factory.cpp (87%) rename score/{TimeDaemon/code => time_daemon/src}/verification_machine/svt/factory.h (94%) rename score/{TimeDaemon/code => time_daemon/src}/verification_machine/svt/svt_verification_machine.h (78%) rename score/{TimeDaemon/code => time_daemon/src}/verification_machine/svt/svt_verification_machine_test.cpp (94%) rename score/{TimeDaemon/code => time_daemon/src}/verification_machine/svt/validators/BUILD (89%) rename score/{TimeDaemon/code => time_daemon/src}/verification_machine/svt/validators/synchronization_validator.cpp (92%) rename score/{TimeDaemon/code => time_daemon/src}/verification_machine/svt/validators/synchronization_validator.h (91%) rename score/{TimeDaemon/code => time_daemon/src}/verification_machine/svt/validators/synchronization_validator_test.cpp (96%) rename score/{TimeDaemon/code => time_daemon/src}/verification_machine/svt/validators/time_jumps_validator.cpp (98%) rename score/{TimeDaemon/code => time_daemon/src}/verification_machine/svt/validators/time_jumps_validator.h (95%) rename score/{TimeDaemon/code => time_daemon/src}/verification_machine/svt/validators/time_jumps_validator_test.cpp (98%) rename score/{TimeDaemon/code => time_daemon/src}/verification_machine/svt/validators/timeout_validator.cpp (96%) rename score/{TimeDaemon/code => time_daemon/src}/verification_machine/svt/validators/timeout_validator.h (93%) rename score/{TimeDaemon/code => time_daemon/src}/verification_machine/svt/validators/timeout_validator_test.cpp (98%) diff --git a/score/time/SynchronizedVehicleTime/details/tdr/BUILD b/score/time/SynchronizedVehicleTime/details/tdr/BUILD index 14a4be9b..336fd0cd 100644 --- a/score/time/SynchronizedVehicleTime/details/tdr/BUILD +++ b/score/time/SynchronizedVehicleTime/details/tdr/BUILD @@ -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", ], ), @@ -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", diff --git a/score/time/SynchronizedVehicleTime/details/tdr/receiver.cpp b/score/time/SynchronizedVehicleTime/details/tdr/receiver.cpp index c06cc3d1..1edd41e7 100644 --- a/score/time/SynchronizedVehicleTime/details/tdr/receiver.cpp +++ b/score/time/SynchronizedVehicleTime/details/tdr/receiver.cpp @@ -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" diff --git a/score/time/SynchronizedVehicleTime/details/tdr/receiver.h b/score/time/SynchronizedVehicleTime/details/tdr/receiver.h index 496b672f..988c4b26 100644 --- a/score/time/SynchronizedVehicleTime/details/tdr/receiver.h +++ b/score/time/SynchronizedVehicleTime/details/tdr/receiver.h @@ -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" diff --git a/score/time/SynchronizedVehicleTime/details/tdr/receiver_integration_test.cpp b/score/time/SynchronizedVehicleTime/details/tdr/receiver_integration_test.cpp index a72ce016..df605812 100644 --- a/score/time/SynchronizedVehicleTime/details/tdr/receiver_integration_test.cpp +++ b/score/time/SynchronizedVehicleTime/details/tdr/receiver_integration_test.cpp @@ -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" diff --git a/score/time/SynchronizedVehicleTime/details/tdr/receiver_unit_test.cpp b/score/time/SynchronizedVehicleTime/details/tdr/receiver_unit_test.cpp index 1de67798..ccd26ec2 100644 --- a/score/time/SynchronizedVehicleTime/details/tdr/receiver_unit_test.cpp +++ b/score/time/SynchronizedVehicleTime/details/tdr/receiver_unit_test.cpp @@ -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" diff --git a/score/TimeDaemon/BUILD b/score/time_daemon/BUILD similarity index 65% rename from score/TimeDaemon/BUILD rename to score/time_daemon/BUILD index 78692e10..92922a78 100644 --- a/score/TimeDaemon/BUILD +++ b/score/time_daemon/BUILD @@ -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__"], ) diff --git a/score/TimeDaemon/code/application/BUILD b/score/time_daemon/src/application/BUILD similarity index 76% rename from score/TimeDaemon/code/application/BUILD rename to score/time_daemon/src/application/BUILD index 94b2c76f..99a5c5a3 100644 --- a/score/TimeDaemon/code/application/BUILD +++ b/score/time_daemon/src/application/BUILD @@ -20,9 +20,9 @@ cc_library( "timebase_handler.h", ], features = COMPILER_WARNING_FEATURES, - visibility = ["//score/TimeDaemon/code/application:__subpackages__"], + 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", ], @@ -31,15 +31,15 @@ cc_library( cc_binary( name = "TimeDaemon", srcs = [ - "TimeDaemon.cpp", - "TimeDaemon.h", + "time_daemon.cpp", + "time_daemon.h", "main.cpp", ], 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", @@ -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__"], ) diff --git a/score/TimeDaemon/code/application/job_runner/BUILD b/score/time_daemon/src/application/job_runner/BUILD similarity index 88% rename from score/TimeDaemon/code/application/job_runner/BUILD rename to score/time_daemon/src/application/job_runner/BUILD index 5a46cec5..3f4897be 100644 --- a/score/TimeDaemon/code/application/job_runner/BUILD +++ b/score/time_daemon/src/application/job_runner/BUILD @@ -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", ], @@ -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( diff --git a/score/TimeDaemon/code/application/job_runner/job_runner.cpp b/score/time_daemon/src/application/job_runner/job_runner.cpp similarity index 96% rename from score/TimeDaemon/code/application/job_runner/job_runner.cpp rename to score/time_daemon/src/application/job_runner/job_runner.cpp index 1b2f05be..b33e14e9 100644 --- a/score/TimeDaemon/code/application/job_runner/job_runner.cpp +++ b/score/time_daemon/src/application/job_runner/job_runner.cpp @@ -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" diff --git a/score/TimeDaemon/code/application/job_runner/job_runner.h b/score/time_daemon/src/application/job_runner/job_runner.h similarity index 100% rename from score/TimeDaemon/code/application/job_runner/job_runner.h rename to score/time_daemon/src/application/job_runner/job_runner.h diff --git a/score/TimeDaemon/code/application/job_runner/job_runner_test.cpp b/score/time_daemon/src/application/job_runner/job_runner_test.cpp similarity index 98% rename from score/TimeDaemon/code/application/job_runner/job_runner_test.cpp rename to score/time_daemon/src/application/job_runner/job_runner_test.cpp index 0687c419..bbae144c 100644 --- a/score/TimeDaemon/code/application/job_runner/job_runner_test.cpp +++ b/score/time_daemon/src/application/job_runner/job_runner_test.cpp @@ -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 #include diff --git a/score/TimeDaemon/code/application/main.cpp b/score/time_daemon/src/application/main.cpp similarity index 92% rename from score/TimeDaemon/code/application/main.cpp rename to score/time_daemon/src/application/main.cpp index 0a39406a..f6799707 100644 --- a/score/TimeDaemon/code/application/main.cpp +++ b/score/time_daemon/src/application/main.cpp @@ -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" diff --git a/score/TimeDaemon/code/application/svt/BUILD b/score/time_daemon/src/application/svt/BUILD similarity index 73% rename from score/TimeDaemon/code/application/svt/BUILD rename to score/time_daemon/src/application/svt/BUILD index a7695658..f0f1088c 100644 --- a/score/TimeDaemon/code/application/svt/BUILD +++ b/score/time_daemon/src/application/svt/BUILD @@ -27,14 +27,14 @@ 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 [ @@ -42,14 +42,14 @@ load("@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER "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", ], ), ] @@ -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 @@ -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", # ], diff --git a/score/TimeDaemon/code/application/svt/factory.cpp b/score/time_daemon/src/application/svt/factory.cpp similarity index 86% rename from score/TimeDaemon/code/application/svt/factory.cpp rename to score/time_daemon/src/application/svt/factory.cpp index 25d8f622..5d082e1b 100644 --- a/score/TimeDaemon/code/application/svt/factory.cpp +++ b/score/time_daemon/src/application/svt/factory.cpp @@ -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 { diff --git a/score/TimeDaemon/code/application/svt/factory.h b/score/time_daemon/src/application/svt/factory.h similarity index 94% rename from score/TimeDaemon/code/application/svt/factory.h rename to score/time_daemon/src/application/svt/factory.h index 6e9739fd..e755c08b 100644 --- a/score/TimeDaemon/code/application/svt/factory.h +++ b/score/time_daemon/src/application/svt/factory.h @@ -13,7 +13,7 @@ #ifndef SCORE_TIMEDAEMON_CODE_APPLICATION_FACTORY_H #define SCORE_TIMEDAEMON_CODE_APPLICATION_FACTORY_H -#include "score/TimeDaemon/code/application/timebase_handler.h" +#include "score/time_daemon/src/application/timebase_handler.h" #include diff --git a/score/TimeDaemon/code/application/svt/svt_handler.cpp b/score/time_daemon/src/application/svt/svt_handler.cpp similarity index 91% rename from score/TimeDaemon/code/application/svt/svt_handler.cpp rename to score/time_daemon/src/application/svt/svt_handler.cpp index 000b59d9..52739d44 100644 --- a/score/TimeDaemon/code/application/svt/svt_handler.cpp +++ b/score/time_daemon/src/application/svt/svt_handler.cpp @@ -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" diff --git a/score/TimeDaemon/code/application/svt/svt_handler.h b/score/time_daemon/src/application/svt/svt_handler.h similarity index 88% rename from score/TimeDaemon/code/application/svt/svt_handler.h rename to score/time_daemon/src/application/svt/svt_handler.h index d7e2581f..c48a9f50 100644 --- a/score/TimeDaemon/code/application/svt/svt_handler.h +++ b/score/time_daemon/src/application/svt/svt_handler.h @@ -13,13 +13,13 @@ #ifndef SCORE_TIMEDAEMON_CODE_APPLICATION_SVT_HANDLER_H #define SCORE_TIMEDAEMON_CODE_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 diff --git a/score/TimeDaemon/code/application/svt/svt_handler_integration_test.cpp b/score/time_daemon/src/application/svt/svt_handler_integration_test.cpp similarity index 96% rename from score/TimeDaemon/code/application/svt/svt_handler_integration_test.cpp rename to score/time_daemon/src/application/svt/svt_handler_integration_test.cpp index bc492981..dff3a6e3 100644 --- a/score/TimeDaemon/code/application/svt/svt_handler_integration_test.cpp +++ b/score/time_daemon/src/application/svt/svt_handler_integration_test.cpp @@ -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 #include diff --git a/score/TimeDaemon/code/application/TimeDaemon.cpp b/score/time_daemon/src/application/time_daemon.cpp similarity index 89% rename from score/TimeDaemon/code/application/TimeDaemon.cpp rename to score/time_daemon/src/application/time_daemon.cpp index 7dd67820..ea599c93 100644 --- a/score/TimeDaemon/code/application/TimeDaemon.cpp +++ b/score/time_daemon/src/application/time_daemon.cpp @@ -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" diff --git a/score/TimeDaemon/code/application/TimeDaemon.h b/score/time_daemon/src/application/time_daemon.h similarity index 95% rename from score/TimeDaemon/code/application/TimeDaemon.h rename to score/time_daemon/src/application/time_daemon.h index 891ea619..cd021291 100644 --- a/score/TimeDaemon/code/application/TimeDaemon.h +++ b/score/time_daemon/src/application/time_daemon.h @@ -13,7 +13,7 @@ #ifndef SCORE_TIMEDAEMON_CODE_APPLICATION_TIMEDAEMON_H #define SCORE_TIMEDAEMON_CODE_APPLICATION_TIMEDAEMON_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" diff --git a/score/TimeDaemon/code/application/timebase_handler.h b/score/time_daemon/src/application/timebase_handler.h similarity index 100% rename from score/TimeDaemon/code/application/timebase_handler.h rename to score/time_daemon/src/application/timebase_handler.h diff --git a/score/TimeDaemon/code/common/BUILD b/score/time_daemon/src/common/BUILD similarity index 78% rename from score/TimeDaemon/code/common/BUILD rename to score/time_daemon/src/common/BUILD index ea4d4fd9..feb6573f 100644 --- a/score/TimeDaemon/code/common/BUILD +++ b/score/time_daemon/src/common/BUILD @@ -22,16 +22,16 @@ cc_library( ], features = COMPILER_WARNING_FEATURES, tags = ["QM"], - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], deps = [], ) cc_unit_test_suites_for_host_and_qnx( name = "unit_test_suite", test_suites_from_sub_packages = [ - "//score/TimeDaemon/code/common/data_types:unit_test_suite", - "//score/TimeDaemon/code/common/data_flow:unit_test_suite", - "//score/TimeDaemon/code/common/machines:unit_test_suite", + "//score/time_daemon/src/common/data_types:unit_test_suite", + "//score/time_daemon/src/common/data_flow:unit_test_suite", + "//score/time_daemon/src/common/machines:unit_test_suite", ], - visibility = ["//score/TimeDaemon:__pkg__"], + visibility = ["//score/time_daemon:__pkg__"], ) diff --git a/score/TimeDaemon/code/common/data_flow/BUILD b/score/time_daemon/src/common/data_flow/BUILD similarity index 92% rename from score/TimeDaemon/code/common/data_flow/BUILD rename to score/time_daemon/src/common/data_flow/BUILD index 7d24a662..690d945f 100644 --- a/score/TimeDaemon/code/common/data_flow/BUILD +++ b/score/time_daemon/src/common/data_flow/BUILD @@ -23,7 +23,7 @@ cc_library( ], features = COMPILER_WARNING_FEATURES, tags = ["QM"], - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], deps = [], ) @@ -32,7 +32,7 @@ cc_unit_test_suites_for_host_and_qnx( cc_unit_tests = [ ":data_flow_test", ], - visibility = ["//score/TimeDaemon:__pkg__"], + visibility = ["//score/time_daemon:__pkg__"], ) cc_test( diff --git a/score/TimeDaemon/code/common/data_flow/consumer.h b/score/time_daemon/src/common/data_flow/consumer.h similarity index 100% rename from score/TimeDaemon/code/common/data_flow/consumer.h rename to score/time_daemon/src/common/data_flow/consumer.h diff --git a/score/TimeDaemon/code/common/data_flow/producer.h b/score/time_daemon/src/common/data_flow/producer.h similarity index 100% rename from score/TimeDaemon/code/common/data_flow/producer.h rename to score/time_daemon/src/common/data_flow/producer.h diff --git a/score/TimeDaemon/code/common/data_flow/producer_consumer_test.cpp b/score/time_daemon/src/common/data_flow/producer_consumer_test.cpp similarity index 98% rename from score/TimeDaemon/code/common/data_flow/producer_consumer_test.cpp rename to score/time_daemon/src/common/data_flow/producer_consumer_test.cpp index 7d8f6af7..237ed590 100644 --- a/score/TimeDaemon/code/common/data_flow/producer_consumer_test.cpp +++ b/score/time_daemon/src/common/data_flow/producer_consumer_test.cpp @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/common/data_flow/consumer.h" -#include "score/TimeDaemon/code/common/data_flow/producer.h" +#include "score/time_daemon/src/common/data_flow/consumer.h" +#include "score/time_daemon/src/common/data_flow/producer.h" #include "gmock/gmock.h" #include diff --git a/score/TimeDaemon/code/common/data_types/BUILD b/score/time_daemon/src/common/data_types/BUILD similarity index 92% rename from score/TimeDaemon/code/common/data_types/BUILD rename to score/time_daemon/src/common/data_types/BUILD index e6b718dc..61f6c196 100644 --- a/score/TimeDaemon/code/common/data_types/BUILD +++ b/score/time_daemon/src/common/data_types/BUILD @@ -22,7 +22,7 @@ cc_library( ], features = COMPILER_WARNING_FEATURES, tags = ["QM"], - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], deps = ["//score/time/HighPrecisionLocalSteadyClock:interface"], ) @@ -44,5 +44,5 @@ cc_unit_test_suites_for_host_and_qnx( cc_unit_tests = [ ":ptp_time_info_test", ], - visibility = ["//score/TimeDaemon/code/common:__pkg__"], + visibility = ["//score/time_daemon/src/common:__pkg__"], ) diff --git a/score/TimeDaemon/code/common/data_types/ptp_time_info.cpp b/score/time_daemon/src/common/data_types/ptp_time_info.cpp similarity index 98% rename from score/TimeDaemon/code/common/data_types/ptp_time_info.cpp rename to score/time_daemon/src/common/data_types/ptp_time_info.cpp index 1b50e77e..2d2bf3db 100644 --- a/score/TimeDaemon/code/common/data_types/ptp_time_info.cpp +++ b/score/time_daemon/src/common/data_types/ptp_time_info.cpp @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/common/data_types/ptp_time_info.h" +#include "score/time_daemon/src/common/data_types/ptp_time_info.h" #include #include diff --git a/score/TimeDaemon/code/common/data_types/ptp_time_info.h b/score/time_daemon/src/common/data_types/ptp_time_info.h similarity index 100% rename from score/TimeDaemon/code/common/data_types/ptp_time_info.h rename to score/time_daemon/src/common/data_types/ptp_time_info.h diff --git a/score/TimeDaemon/code/common/data_types/ptp_time_info_test.cpp b/score/time_daemon/src/common/data_types/ptp_time_info_test.cpp similarity index 98% rename from score/TimeDaemon/code/common/data_types/ptp_time_info_test.cpp rename to score/time_daemon/src/common/data_types/ptp_time_info_test.cpp index 258f0a34..960ea454 100644 --- a/score/TimeDaemon/code/common/data_types/ptp_time_info_test.cpp +++ b/score/time_daemon/src/common/data_types/ptp_time_info_test.cpp @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/common/data_types/ptp_time_info.h" +#include "score/time_daemon/src/common/data_types/ptp_time_info.h" #include #include diff --git a/score/TimeDaemon/code/common/logging_contexts.h b/score/time_daemon/src/common/logging_contexts.h similarity index 100% rename from score/TimeDaemon/code/common/logging_contexts.h rename to score/time_daemon/src/common/logging_contexts.h diff --git a/score/TimeDaemon/code/common/machines/BUILD b/score/time_daemon/src/common/machines/BUILD similarity index 90% rename from score/TimeDaemon/code/common/machines/BUILD rename to score/time_daemon/src/common/machines/BUILD index 09b5cbc6..9c5ef187 100644 --- a/score/TimeDaemon/code/common/machines/BUILD +++ b/score/time_daemon/src/common/machines/BUILD @@ -30,9 +30,9 @@ cc_library( ], features = COMPILER_WARNING_FEATURES, tags = ["QM"], - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], deps = [ - "//score/TimeDaemon/code/common:logging_contexts", + "//score/time_daemon/src/common:logging_contexts", "@score_baselibs//score/concurrency", ], ) @@ -42,7 +42,7 @@ cc_unit_test_suites_for_host_and_qnx( cc_unit_tests = [ ":machines_test", ], - visibility = ["//score/TimeDaemon:__pkg__"], + visibility = ["//score/time_daemon:__pkg__"], ) cc_test( diff --git a/score/TimeDaemon/code/common/machines/base_machine.cpp b/score/time_daemon/src/common/machines/base_machine.cpp similarity index 91% rename from score/TimeDaemon/code/common/machines/base_machine.cpp rename to score/time_daemon/src/common/machines/base_machine.cpp index 2a8ccbe8..326e378b 100644 --- a/score/TimeDaemon/code/common/machines/base_machine.cpp +++ b/score/time_daemon/src/common/machines/base_machine.cpp @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/common/machines/base_machine.h" +#include "score/time_daemon/src/common/machines/base_machine.h" namespace score { diff --git a/score/TimeDaemon/code/common/machines/base_machine.h b/score/time_daemon/src/common/machines/base_machine.h similarity index 100% rename from score/TimeDaemon/code/common/machines/base_machine.h rename to score/time_daemon/src/common/machines/base_machine.h diff --git a/score/TimeDaemon/code/common/machines/base_machine_test.cpp b/score/time_daemon/src/common/machines/base_machine_test.cpp similarity index 94% rename from score/TimeDaemon/code/common/machines/base_machine_test.cpp rename to score/time_daemon/src/common/machines/base_machine_test.cpp index 7bf1c437..7f7b36b4 100644 --- a/score/TimeDaemon/code/common/machines/base_machine_test.cpp +++ b/score/time_daemon/src/common/machines/base_machine_test.cpp @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/common/machines/base_machine.h" +#include "score/time_daemon/src/common/machines/base_machine.h" #include diff --git a/score/TimeDaemon/code/common/machines/event_driven_machine.cpp b/score/time_daemon/src/common/machines/event_driven_machine.cpp similarity index 97% rename from score/TimeDaemon/code/common/machines/event_driven_machine.cpp rename to score/time_daemon/src/common/machines/event_driven_machine.cpp index bfd49674..0e5bc472 100644 --- a/score/TimeDaemon/code/common/machines/event_driven_machine.cpp +++ b/score/time_daemon/src/common/machines/event_driven_machine.cpp @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/common/machines/event_driven_machine.h" +#include "score/time_daemon/src/common/machines/event_driven_machine.h" namespace score { diff --git a/score/TimeDaemon/code/common/machines/event_driven_machine.h b/score/time_daemon/src/common/machines/event_driven_machine.h similarity index 98% rename from score/TimeDaemon/code/common/machines/event_driven_machine.h rename to score/time_daemon/src/common/machines/event_driven_machine.h index 3a1926cd..dff2eda6 100644 --- a/score/TimeDaemon/code/common/machines/event_driven_machine.h +++ b/score/time_daemon/src/common/machines/event_driven_machine.h @@ -13,7 +13,7 @@ #ifndef SCORE_TIMEDAEMON_CODE_COMMON_MACHINES_EVENT_DRIVEN_MACHINE_H #define SCORE_TIMEDAEMON_CODE_COMMON_MACHINES_EVENT_DRIVEN_MACHINE_H -#include "score/TimeDaemon/code/common/machines/proactive_machine.h" +#include "score/time_daemon/src/common/machines/proactive_machine.h" #include "score/concurrency/condition_variable.h" #include diff --git a/score/TimeDaemon/code/common/machines/event_driven_machine_test.cpp b/score/time_daemon/src/common/machines/event_driven_machine_test.cpp similarity index 98% rename from score/TimeDaemon/code/common/machines/event_driven_machine_test.cpp rename to score/time_daemon/src/common/machines/event_driven_machine_test.cpp index c44c40ff..c5f2d9bf 100644 --- a/score/TimeDaemon/code/common/machines/event_driven_machine_test.cpp +++ b/score/time_daemon/src/common/machines/event_driven_machine_test.cpp @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/common/machines/event_driven_machine.h" +#include "score/time_daemon/src/common/machines/event_driven_machine.h" #include "gmock/gmock.h" #include diff --git a/score/TimeDaemon/code/common/machines/periodic_machine.cpp b/score/time_daemon/src/common/machines/periodic_machine.cpp similarity index 96% rename from score/TimeDaemon/code/common/machines/periodic_machine.cpp rename to score/time_daemon/src/common/machines/periodic_machine.cpp index ae98aadc..bddcf4f8 100644 --- a/score/TimeDaemon/code/common/machines/periodic_machine.cpp +++ b/score/time_daemon/src/common/machines/periodic_machine.cpp @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/common/machines/periodic_machine.h" +#include "score/time_daemon/src/common/machines/periodic_machine.h" namespace score { diff --git a/score/TimeDaemon/code/common/machines/periodic_machine.h b/score/time_daemon/src/common/machines/periodic_machine.h similarity index 98% rename from score/TimeDaemon/code/common/machines/periodic_machine.h rename to score/time_daemon/src/common/machines/periodic_machine.h index acf9e56e..5fb7178f 100644 --- a/score/TimeDaemon/code/common/machines/periodic_machine.h +++ b/score/time_daemon/src/common/machines/periodic_machine.h @@ -13,7 +13,7 @@ #ifndef SCORE_TIMEDAEMON_CODE_COMMON_MACHINES_PERIODIC_MACHINE_H #define SCORE_TIMEDAEMON_CODE_COMMON_MACHINES_PERIODIC_MACHINE_H -#include "score/TimeDaemon/code/common/machines/proactive_machine.h" +#include "score/time_daemon/src/common/machines/proactive_machine.h" #include "score/concurrency/condition_variable.h" #include diff --git a/score/TimeDaemon/code/common/machines/periodic_machine_test.cpp b/score/time_daemon/src/common/machines/periodic_machine_test.cpp similarity index 98% rename from score/TimeDaemon/code/common/machines/periodic_machine_test.cpp rename to score/time_daemon/src/common/machines/periodic_machine_test.cpp index 61277066..9fb5d990 100644 --- a/score/TimeDaemon/code/common/machines/periodic_machine_test.cpp +++ b/score/time_daemon/src/common/machines/periodic_machine_test.cpp @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/common/machines/periodic_machine.h" +#include "score/time_daemon/src/common/machines/periodic_machine.h" #include "gmock/gmock.h" #include diff --git a/score/TimeDaemon/code/common/machines/proactive_machine.h b/score/time_daemon/src/common/machines/proactive_machine.h similarity index 97% rename from score/TimeDaemon/code/common/machines/proactive_machine.h rename to score/time_daemon/src/common/machines/proactive_machine.h index 53499791..0b2e186f 100644 --- a/score/TimeDaemon/code/common/machines/proactive_machine.h +++ b/score/time_daemon/src/common/machines/proactive_machine.h @@ -13,7 +13,7 @@ #ifndef SCORE_TIMEDAEMON_CODE_COMMON_MACHINES_PROACTIVE_MACHINE_H #define SCORE_TIMEDAEMON_CODE_COMMON_MACHINES_PROACTIVE_MACHINE_H -#include "score/TimeDaemon/code/common/machines/base_machine.h" +#include "score/time_daemon/src/common/machines/base_machine.h" #include "score/concurrency/condition_variable.h" #include diff --git a/score/TimeDaemon/code/common/machines/reactive_machine.h b/score/time_daemon/src/common/machines/reactive_machine.h similarity index 96% rename from score/TimeDaemon/code/common/machines/reactive_machine.h rename to score/time_daemon/src/common/machines/reactive_machine.h index cbafcc8f..2e6d405d 100644 --- a/score/TimeDaemon/code/common/machines/reactive_machine.h +++ b/score/time_daemon/src/common/machines/reactive_machine.h @@ -13,7 +13,7 @@ #ifndef SCORE_TIMEDAEMON_CODE_COMMON_MACHINES_REACTIVE_MACHINE_H #define SCORE_TIMEDAEMON_CODE_COMMON_MACHINES_REACTIVE_MACHINE_H -#include "score/TimeDaemon/code/common/machines/base_machine.h" +#include "score/time_daemon/src/common/machines/base_machine.h" namespace score { diff --git a/score/TimeDaemon/code/control_flow_divider/BUILD b/score/time_daemon/src/control_flow_divider/BUILD similarity index 81% rename from score/TimeDaemon/code/control_flow_divider/BUILD rename to score/time_daemon/src/control_flow_divider/BUILD index f4109366..c5a1af13 100644 --- a/score/TimeDaemon/code/control_flow_divider/BUILD +++ b/score/time_daemon/src/control_flow_divider/BUILD @@ -16,8 +16,8 @@ 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/control_flow_divider/core:unit_test_suite", - "//score/TimeDaemon/code/control_flow_divider/ptp:unit_test_suite", + "//score/time_daemon/src/control_flow_divider/core:unit_test_suite", + "//score/time_daemon/src/control_flow_divider/ptp:unit_test_suite", ], - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], ) diff --git a/score/TimeDaemon/code/control_flow_divider/core/BUILD b/score/time_daemon/src/control_flow_divider/core/BUILD similarity index 86% rename from score/TimeDaemon/code/control_flow_divider/core/BUILD rename to score/time_daemon/src/control_flow_divider/core/BUILD index d5733bba..29e51da0 100644 --- a/score/TimeDaemon/code/control_flow_divider/core/BUILD +++ b/score/time_daemon/src/control_flow_divider/core/BUILD @@ -22,10 +22,10 @@ cc_library( ], features = COMPILER_WARNING_FEATURES, tags = ["QM"], - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], deps = [ - "//score/TimeDaemon/code/common/data_flow", - "//score/TimeDaemon/code/common/machines", + "//score/time_daemon/src/common/data_flow", + "//score/time_daemon/src/common/machines", "@score_baselibs//score/mw/log:frontend", ], ) @@ -35,7 +35,7 @@ cc_unit_test_suites_for_host_and_qnx( cc_unit_tests = [ ":control_flow_divider_test", ], - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], ) cc_test( diff --git a/score/TimeDaemon/code/control_flow_divider/core/control_flow_divider.h b/score/time_daemon/src/control_flow_divider/core/control_flow_divider.h similarity index 96% rename from score/TimeDaemon/code/control_flow_divider/core/control_flow_divider.h rename to score/time_daemon/src/control_flow_divider/core/control_flow_divider.h index 3c143971..e3054b5e 100644 --- a/score/TimeDaemon/code/control_flow_divider/core/control_flow_divider.h +++ b/score/time_daemon/src/control_flow_divider/core/control_flow_divider.h @@ -13,10 +13,10 @@ #ifndef SCORE_TIMEDAEMON_CODE_CONTROL_FLOW_DIVIDER_CORE_CONTROL_FLOW_DIVIDER_H #define SCORE_TIMEDAEMON_CODE_CONTROL_FLOW_DIVIDER_CORE_CONTROL_FLOW_DIVIDER_H -#include "score/TimeDaemon/code/common/data_flow/consumer.h" -#include "score/TimeDaemon/code/common/data_flow/producer.h" -#include "score/TimeDaemon/code/common/logging_contexts.h" -#include "score/TimeDaemon/code/common/machines/event_driven_machine.h" +#include "score/time_daemon/src/common/data_flow/consumer.h" +#include "score/time_daemon/src/common/data_flow/producer.h" +#include "score/time_daemon/src/common/logging_contexts.h" +#include "score/time_daemon/src/common/machines/event_driven_machine.h" #include "score/mw/log/logging.h" diff --git a/score/TimeDaemon/code/control_flow_divider/core/control_flow_divider_test.cpp b/score/time_daemon/src/control_flow_divider/core/control_flow_divider_test.cpp similarity index 98% rename from score/TimeDaemon/code/control_flow_divider/core/control_flow_divider_test.cpp rename to score/time_daemon/src/control_flow_divider/core/control_flow_divider_test.cpp index 219bc035..afb91fa9 100644 --- a/score/TimeDaemon/code/control_flow_divider/core/control_flow_divider_test.cpp +++ b/score/time_daemon/src/control_flow_divider/core/control_flow_divider_test.cpp @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/control_flow_divider/core/control_flow_divider.h" +#include "score/time_daemon/src/control_flow_divider/core/control_flow_divider.h" #include #include diff --git a/score/TimeDaemon/code/control_flow_divider/ptp/BUILD b/score/time_daemon/src/control_flow_divider/ptp/BUILD similarity index 86% rename from score/TimeDaemon/code/control_flow_divider/ptp/BUILD rename to score/time_daemon/src/control_flow_divider/ptp/BUILD index 6b3af346..a45d5c37 100644 --- a/score/TimeDaemon/code/control_flow_divider/ptp/BUILD +++ b/score/time_daemon/src/control_flow_divider/ptp/BUILD @@ -25,11 +25,11 @@ cc_library( ], features = COMPILER_WARNING_FEATURES, tags = ["QM"], - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], deps = [ - "//score/TimeDaemon/code/common/data_types:ptp_time_info", - "//score/TimeDaemon/code/common/machines", - "//score/TimeDaemon/code/control_flow_divider/core:control_flow_divider", + "//score/time_daemon/src/common/data_types:ptp_time_info", + "//score/time_daemon/src/common/machines", + "//score/time_daemon/src/control_flow_divider/core:control_flow_divider", "@score_baselibs//score/mw/log:frontend", ], ) @@ -40,7 +40,7 @@ cc_unit_test_suites_for_host_and_qnx( ":factory_test", ":ptp_control_flow_divider_test", ], - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], ) cc_test( diff --git a/score/TimeDaemon/code/control_flow_divider/ptp/factory.cpp b/score/time_daemon/src/control_flow_divider/ptp/factory.cpp similarity index 88% rename from score/TimeDaemon/code/control_flow_divider/ptp/factory.cpp rename to score/time_daemon/src/control_flow_divider/ptp/factory.cpp index 06a00d2d..1c4dc925 100644 --- a/score/TimeDaemon/code/control_flow_divider/ptp/factory.cpp +++ b/score/time_daemon/src/control_flow_divider/ptp/factory.cpp @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/control_flow_divider/ptp/factory.h" -#include "score/TimeDaemon/code/common/logging_contexts.h" +#include "score/time_daemon/src/control_flow_divider/ptp/factory.h" +#include "score/time_daemon/src/common/logging_contexts.h" #include "score/mw/log/logging.h" diff --git a/score/TimeDaemon/code/control_flow_divider/ptp/factory.h b/score/time_daemon/src/control_flow_divider/ptp/factory.h similarity index 96% rename from score/TimeDaemon/code/control_flow_divider/ptp/factory.h rename to score/time_daemon/src/control_flow_divider/ptp/factory.h index 2fae6923..9758323c 100644 --- a/score/TimeDaemon/code/control_flow_divider/ptp/factory.h +++ b/score/time_daemon/src/control_flow_divider/ptp/factory.h @@ -13,7 +13,7 @@ #ifndef SCORE_TIMEDAEMON_CODE_CONTROL_FLOW_DIVIDER_PTP_FACTORY_H #define SCORE_TIMEDAEMON_CODE_CONTROL_FLOW_DIVIDER_PTP_FACTORY_H -#include "score/TimeDaemon/code/control_flow_divider/ptp/ptp_control_flow_divider.h" +#include "score/time_daemon/src/control_flow_divider/ptp/ptp_control_flow_divider.h" #include #include diff --git a/score/TimeDaemon/code/control_flow_divider/ptp/factory_test.cpp b/score/time_daemon/src/control_flow_divider/ptp/factory_test.cpp similarity index 93% rename from score/TimeDaemon/code/control_flow_divider/ptp/factory_test.cpp rename to score/time_daemon/src/control_flow_divider/ptp/factory_test.cpp index 0ee0e476..b1f05b19 100644 --- a/score/TimeDaemon/code/control_flow_divider/ptp/factory_test.cpp +++ b/score/time_daemon/src/control_flow_divider/ptp/factory_test.cpp @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/control_flow_divider/ptp/factory.h" -#include "score/TimeDaemon/code/common/data_types/ptp_time_info.h" +#include "score/time_daemon/src/control_flow_divider/ptp/factory.h" +#include "score/time_daemon/src/common/data_types/ptp_time_info.h" #include diff --git a/score/TimeDaemon/code/control_flow_divider/ptp/ptp_control_flow_divider.h b/score/time_daemon/src/control_flow_divider/ptp/ptp_control_flow_divider.h similarity index 90% rename from score/TimeDaemon/code/control_flow_divider/ptp/ptp_control_flow_divider.h rename to score/time_daemon/src/control_flow_divider/ptp/ptp_control_flow_divider.h index eab314bb..4e81a7c2 100644 --- a/score/TimeDaemon/code/control_flow_divider/ptp/ptp_control_flow_divider.h +++ b/score/time_daemon/src/control_flow_divider/ptp/ptp_control_flow_divider.h @@ -13,8 +13,8 @@ #ifndef SCORE_TIMEDAEMON_CODE_CONTROL_FLOW_DIVIDER_PTP_PTP_CONTROL_FLOW_DIVIDER_H #define SCORE_TIMEDAEMON_CODE_CONTROL_FLOW_DIVIDER_PTP_PTP_CONTROL_FLOW_DIVIDER_H -#include "score/TimeDaemon/code/common/data_types/ptp_time_info.h" -#include "score/TimeDaemon/code/control_flow_divider/core/control_flow_divider.h" +#include "score/time_daemon/src/common/data_types/ptp_time_info.h" +#include "score/time_daemon/src/control_flow_divider/core/control_flow_divider.h" #include diff --git a/score/TimeDaemon/code/control_flow_divider/ptp/ptp_control_flow_divider_test.cpp b/score/time_daemon/src/control_flow_divider/ptp/ptp_control_flow_divider_test.cpp similarity index 97% rename from score/TimeDaemon/code/control_flow_divider/ptp/ptp_control_flow_divider_test.cpp rename to score/time_daemon/src/control_flow_divider/ptp/ptp_control_flow_divider_test.cpp index 92ad7315..aa378fdd 100644 --- a/score/TimeDaemon/code/control_flow_divider/ptp/ptp_control_flow_divider_test.cpp +++ b/score/time_daemon/src/control_flow_divider/ptp/ptp_control_flow_divider_test.cpp @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/common/data_types/ptp_time_info.h" -#include "score/TimeDaemon/code/control_flow_divider/ptp/factory.h" +#include "score/time_daemon/src/common/data_types/ptp_time_info.h" +#include "score/time_daemon/src/control_flow_divider/ptp/factory.h" #include diff --git a/score/TimeDaemon/code/ipc/BUILD b/score/time_daemon/src/ipc/BUILD similarity index 77% rename from score/TimeDaemon/code/ipc/BUILD rename to score/time_daemon/src/ipc/BUILD index 2dc48b11..d9632b23 100644 --- a/score/TimeDaemon/code/ipc/BUILD +++ b/score/time_daemon/src/ipc/BUILD @@ -17,10 +17,10 @@ load("@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER #alias to create svt publisher implementation objects alias( name = "svt_publisher", - actual = "//score/TimeDaemon/code/ipc/svt/publisher:factory", + actual = "//score/time_daemon/src/ipc/svt/publisher:factory", tags = ["QM"], visibility = [ - "//score/TimeDaemon:__subpackages__", + "//score/time_daemon:__subpackages__", # Added visibility for integration test purpose "//score/time/SynchronizedVehicleTime/details/tdr:__pkg__", ], @@ -29,11 +29,11 @@ alias( #alias to create svt receiver implementation objects alias( name = "svt_receiver", - actual = "//score/TimeDaemon/code/ipc/svt/receiver:factory", + actual = "//score/time_daemon/src/ipc/svt/receiver:factory", tags = ["QM"], visibility = [ # Added visibility for integration test purpose - "//score/TimeDaemon:__subpackages__", + "//score/time_daemon:__subpackages__", "//score/time/SynchronizedVehicleTime/details/tdr:__pkg__", ], ) @@ -41,7 +41,7 @@ alias( #alias to create svt receiver mock objects alias( name = "svt_receiver_mock", - actual = "//score/TimeDaemon/code/ipc/svt/receiver:factory_mock", + actual = "//score/time_daemon/src/ipc/svt/receiver:factory_mock", tags = ["QM"], visibility = ["//score/time/SynchronizedVehicleTime/details/tdr:__pkg__"], ) @@ -54,7 +54,7 @@ cc_library( "receiver.h", ], features = COMPILER_WARNING_FEATURES, - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], ) # receiver mock @@ -66,7 +66,7 @@ cc_library( "receiver_mock.h", ], features = COMPILER_WARNING_FEATURES, - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], deps = [ ":receiver", "@googletest//:gtest", @@ -80,14 +80,14 @@ cc_library( "data_converter.h", ], features = COMPILER_WARNING_FEATURES, - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], ) cc_unit_test_suites_for_host_and_qnx( name = "unit_test_suite", test_suites_from_sub_packages = [ - "//score/TimeDaemon/code/ipc/core:unit_test_suite", - "//score/TimeDaemon/code/ipc/svt:unit_test_suite", + "//score/time_daemon/src/ipc/core:unit_test_suite", + "//score/time_daemon/src/ipc/svt:unit_test_suite", ], - visibility = ["//score/TimeDaemon:__pkg__"], + visibility = ["//score/time_daemon:__pkg__"], ) diff --git a/score/TimeDaemon/code/ipc/core/BUILD b/score/time_daemon/src/ipc/core/BUILD similarity index 78% rename from score/TimeDaemon/code/ipc/core/BUILD rename to score/time_daemon/src/ipc/core/BUILD index 8266c1de..ebb12681 100644 --- a/score/TimeDaemon/code/ipc/core/BUILD +++ b/score/time_daemon/src/ipc/core/BUILD @@ -21,9 +21,9 @@ cc_library( "shared_memory_handler.h", ], features = COMPILER_WARNING_FEATURES, - visibility = ["//score/TimeDaemon/code/ipc:__subpackages__"], + visibility = ["//score/time_daemon/src/ipc:__subpackages__"], deps = [ - "//score/TimeDaemon/code/common:logging_contexts", + "//score/time_daemon/src/common:logging_contexts", "@score_baselibs//score/memory/shared", "@score_baselibs//score/mw/log:frontend", ], @@ -36,12 +36,12 @@ cc_library( "publisher_impl.h", ], features = COMPILER_WARNING_FEATURES, - visibility = ["//score/TimeDaemon/code/ipc:__subpackages__"], + visibility = ["//score/time_daemon/src/ipc:__subpackages__"], deps = [ ":shared_memory_handler", - "//score/TimeDaemon/code/common/data_flow", - "//score/TimeDaemon/code/common/machines", - "//score/TimeDaemon/code/ipc:data_converter", + "//score/time_daemon/src/common/data_flow", + "//score/time_daemon/src/common/machines", + "//score/time_daemon/src/ipc:data_converter", ], ) @@ -52,10 +52,10 @@ cc_library( "receiver_impl.h", ], features = COMPILER_WARNING_FEATURES, - visibility = ["//score/TimeDaemon/code/ipc:__subpackages__"], + visibility = ["//score/time_daemon/src/ipc:__subpackages__"], deps = [ ":shared_memory_handler", - "//score/TimeDaemon/code/ipc:receiver", + "//score/time_daemon/src/ipc:receiver", ], ) @@ -66,7 +66,7 @@ cc_unit_test_suites_for_host_and_qnx( ":publisher_impl_test", ":receiver_impl_test", ], - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], ) cc_test( @@ -78,7 +78,7 @@ cc_test( tags = ["unit"], deps = [ ":publisher_impl", - "//score/TimeDaemon/code/ipc:data_converter", + "//score/time_daemon/src/ipc:data_converter", "@googletest//:gtest", "@googletest//:gtest_main", "@score_baselibs//score/mw/log:console_only_backend", @@ -94,7 +94,7 @@ cc_test( tags = ["unit"], deps = [ ":receiver_impl", - "//score/TimeDaemon/code/ipc:data_converter", + "//score/time_daemon/src/ipc:data_converter", "@googletest//:gtest", "@googletest//:gtest_main", "@score_baselibs//score/mw/log:console_only_backend", @@ -110,8 +110,8 @@ cc_test( tags = ["unit"], deps = [ ":shared_memory_handler", - "//score/TimeDaemon/code/common/data_types:ptp_time_info", - "//score/TimeDaemon/code/ipc:data_converter", + "//score/time_daemon/src/common/data_types:ptp_time_info", + "//score/time_daemon/src/ipc:data_converter", "@googletest//:gtest", "@googletest//:gtest_main", "@score_baselibs//score/mw/log:console_only_backend", diff --git a/score/TimeDaemon/code/ipc/core/publisher_impl.h b/score/time_daemon/src/ipc/core/publisher_impl.h similarity index 86% rename from score/TimeDaemon/code/ipc/core/publisher_impl.h rename to score/time_daemon/src/ipc/core/publisher_impl.h index c6d18ff5..b043f16d 100644 --- a/score/TimeDaemon/code/ipc/core/publisher_impl.h +++ b/score/time_daemon/src/ipc/core/publisher_impl.h @@ -13,12 +13,12 @@ #ifndef SCORE_TIMEDAEMON_CODE_IPC_CORE_PUBLISHER_IMPL_H #define SCORE_TIMEDAEMON_CODE_IPC_CORE_PUBLISHER_IMPL_H -#include "score/TimeDaemon/code/common/data_flow/consumer.h" -#include "score/TimeDaemon/code/common/logging_contexts.h" -#include "score/TimeDaemon/code/common/machines/reactive_machine.h" +#include "score/time_daemon/src/common/data_flow/consumer.h" +#include "score/time_daemon/src/common/logging_contexts.h" +#include "score/time_daemon/src/common/machines/reactive_machine.h" -#include "score/TimeDaemon/code/ipc/core/shared_memory_handler.h" -#include "score/TimeDaemon/code/ipc/data_converter.h" +#include "score/time_daemon/src/ipc/core/shared_memory_handler.h" +#include "score/time_daemon/src/ipc/data_converter.h" namespace score { diff --git a/score/TimeDaemon/code/ipc/core/publisher_impl_test.cpp b/score/time_daemon/src/ipc/core/publisher_impl_test.cpp similarity index 93% rename from score/TimeDaemon/code/ipc/core/publisher_impl_test.cpp rename to score/time_daemon/src/ipc/core/publisher_impl_test.cpp index 5e6e8a45..f794f335 100644 --- a/score/TimeDaemon/code/ipc/core/publisher_impl_test.cpp +++ b/score/time_daemon/src/ipc/core/publisher_impl_test.cpp @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/ipc/core/publisher_impl.h" -#include "score/TimeDaemon/code/ipc/core/shared_memory_handler.h" -#include "score/TimeDaemon/code/ipc/core/test_types.h" +#include "score/time_daemon/src/ipc/core/publisher_impl.h" +#include "score/time_daemon/src/ipc/core/shared_memory_handler.h" +#include "score/time_daemon/src/ipc/core/test_types.h" #include diff --git a/score/TimeDaemon/code/ipc/core/receiver_impl.h b/score/time_daemon/src/ipc/core/receiver_impl.h similarity index 94% rename from score/TimeDaemon/code/ipc/core/receiver_impl.h rename to score/time_daemon/src/ipc/core/receiver_impl.h index e6b4c544..c986a180 100644 --- a/score/TimeDaemon/code/ipc/core/receiver_impl.h +++ b/score/time_daemon/src/ipc/core/receiver_impl.h @@ -13,9 +13,9 @@ #ifndef SCORE_TIMEDAEMON_CODE_IPC_CORE_RECEIVER_IMPL_H #define SCORE_TIMEDAEMON_CODE_IPC_CORE_RECEIVER_IMPL_H -#include "score/TimeDaemon/code/ipc/receiver.h" +#include "score/time_daemon/src/ipc/receiver.h" -#include "score/TimeDaemon/code/ipc/core/shared_memory_handler.h" +#include "score/time_daemon/src/ipc/core/shared_memory_handler.h" namespace score { diff --git a/score/TimeDaemon/code/ipc/core/receiver_impl_test.cpp b/score/time_daemon/src/ipc/core/receiver_impl_test.cpp similarity index 92% rename from score/TimeDaemon/code/ipc/core/receiver_impl_test.cpp rename to score/time_daemon/src/ipc/core/receiver_impl_test.cpp index 22c98920..9f1cc37d 100644 --- a/score/TimeDaemon/code/ipc/core/receiver_impl_test.cpp +++ b/score/time_daemon/src/ipc/core/receiver_impl_test.cpp @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/ipc/core/receiver_impl.h" -#include "score/TimeDaemon/code/ipc/core/shared_memory_handler.h" -#include "score/TimeDaemon/code/ipc/core/test_types.h" +#include "score/time_daemon/src/ipc/core/receiver_impl.h" +#include "score/time_daemon/src/ipc/core/shared_memory_handler.h" +#include "score/time_daemon/src/ipc/core/test_types.h" #include diff --git a/score/TimeDaemon/code/ipc/core/shared_memory_handler.h b/score/time_daemon/src/ipc/core/shared_memory_handler.h similarity index 99% rename from score/TimeDaemon/code/ipc/core/shared_memory_handler.h rename to score/time_daemon/src/ipc/core/shared_memory_handler.h index e550dadb..6a57e2ed 100644 --- a/score/TimeDaemon/code/ipc/core/shared_memory_handler.h +++ b/score/time_daemon/src/ipc/core/shared_memory_handler.h @@ -13,7 +13,7 @@ #ifndef SCORE_TIMEDAEMON_CODE_MSG_BROKER_SHARED_DATA_H #define SCORE_TIMEDAEMON_CODE_MSG_BROKER_SHARED_DATA_H -#include "score/TimeDaemon/code/common/logging_contexts.h" +#include "score/time_daemon/src/common/logging_contexts.h" #include "score/memory/shared/managed_memory_resource.h" #include "score/memory/shared/shared_memory_factory.h" #include "score/memory/shared/shared_memory_resource.h" diff --git a/score/TimeDaemon/code/ipc/core/shared_memory_handler_test.cpp b/score/time_daemon/src/ipc/core/shared_memory_handler_test.cpp similarity index 94% rename from score/TimeDaemon/code/ipc/core/shared_memory_handler_test.cpp rename to score/time_daemon/src/ipc/core/shared_memory_handler_test.cpp index 55c1c51d..22cfe201 100644 --- a/score/TimeDaemon/code/ipc/core/shared_memory_handler_test.cpp +++ b/score/time_daemon/src/ipc/core/shared_memory_handler_test.cpp @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/ipc/core/shared_memory_handler.h" -#include "score/TimeDaemon/code/ipc/core/test_types.h" +#include "score/time_daemon/src/ipc/core/shared_memory_handler.h" +#include "score/time_daemon/src/ipc/core/test_types.h" #include diff --git a/score/TimeDaemon/code/ipc/core/test_types.h b/score/time_daemon/src/ipc/core/test_types.h similarity index 98% rename from score/TimeDaemon/code/ipc/core/test_types.h rename to score/time_daemon/src/ipc/core/test_types.h index 493890ad..c4dee1d5 100644 --- a/score/TimeDaemon/code/ipc/core/test_types.h +++ b/score/time_daemon/src/ipc/core/test_types.h @@ -15,7 +15,7 @@ #include -#include "score/TimeDaemon/code/ipc/data_converter.h" +#include "score/time_daemon/src/ipc/data_converter.h" namespace score { diff --git a/score/TimeDaemon/code/ipc/data_converter.h b/score/time_daemon/src/ipc/data_converter.h similarity index 100% rename from score/TimeDaemon/code/ipc/data_converter.h rename to score/time_daemon/src/ipc/data_converter.h diff --git a/score/TimeDaemon/code/ipc/receiver.h b/score/time_daemon/src/ipc/receiver.h similarity index 100% rename from score/TimeDaemon/code/ipc/receiver.h rename to score/time_daemon/src/ipc/receiver.h diff --git a/score/TimeDaemon/code/ipc/receiver_mock.h b/score/time_daemon/src/ipc/receiver_mock.h similarity index 96% rename from score/TimeDaemon/code/ipc/receiver_mock.h rename to score/time_daemon/src/ipc/receiver_mock.h index 017c35ec..ab13deed 100644 --- a/score/TimeDaemon/code/ipc/receiver_mock.h +++ b/score/time_daemon/src/ipc/receiver_mock.h @@ -13,7 +13,7 @@ #ifndef SCORE_TIMEDAEMON_CODE_IPC_RECEIVER_MOCK_H #define SCORE_TIMEDAEMON_CODE_IPC_RECEIVER_MOCK_H -#include "score/TimeDaemon/code/ipc/receiver.h" +#include "score/time_daemon/src/ipc/receiver.h" #include diff --git a/score/TimeDaemon/code/ipc/svt/BUILD b/score/time_daemon/src/ipc/svt/BUILD similarity index 75% rename from score/TimeDaemon/code/ipc/svt/BUILD rename to score/time_daemon/src/ipc/svt/BUILD index e0e20e5d..2c7b34b7 100644 --- a/score/TimeDaemon/code/ipc/svt/BUILD +++ b/score/time_daemon/src/ipc/svt/BUILD @@ -20,7 +20,7 @@ cc_library( "config.h", ], features = COMPILER_WARNING_FEATURES, - visibility = ["//score/TimeDaemon/code/ipc/svt:__subpackages__"], + visibility = ["//score/time_daemon/src/ipc/svt:__subpackages__"], ) cc_library( @@ -32,10 +32,10 @@ cc_library( "svt_time_info.h", ], features = COMPILER_WARNING_FEATURES, - visibility = ["//score/TimeDaemon/code/ipc/svt:__subpackages__"], + visibility = ["//score/time_daemon/src/ipc/svt:__subpackages__"], deps = [ - "//score/TimeDaemon/code/common/data_types:ptp_time_info", - "//score/TimeDaemon/code/ipc:data_converter", + "//score/time_daemon/src/common/data_types:ptp_time_info", + "//score/time_daemon/src/ipc:data_converter", ], ) @@ -46,9 +46,9 @@ cc_test( ], tags = ["unit"], deps = [ - "//score/TimeDaemon/code/common/data_types:ptp_time_info", - "//score/TimeDaemon/code/ipc/svt/publisher:factory", - "//score/TimeDaemon/code/ipc/svt/receiver:factory", + "//score/time_daemon/src/common/data_types:ptp_time_info", + "//score/time_daemon/src/ipc/svt/publisher:factory", + "//score/time_daemon/src/ipc/svt/receiver:factory", "@googletest//:gtest", "@googletest//:gtest_main", "@score_baselibs//score/mw/log:console_only_backend", @@ -63,7 +63,7 @@ cc_test( tags = ["unit"], deps = [ ":time_info", - "//score/TimeDaemon/code/common/data_types:ptp_time_info", + "//score/time_daemon/src/common/data_types:ptp_time_info", "@googletest//:gtest", "@googletest//:gtest_main", ], @@ -75,5 +75,5 @@ cc_unit_test_suites_for_host_and_qnx( ":common_factory_test", ":svt_time_info_test", ], - visibility = ["//score/TimeDaemon/code/ipc:__subpackages__"], + visibility = ["//score/time_daemon/src/ipc:__subpackages__"], ) diff --git a/score/TimeDaemon/code/ipc/svt/common_factory_test.cpp b/score/time_daemon/src/ipc/svt/common_factory_test.cpp similarity index 92% rename from score/TimeDaemon/code/ipc/svt/common_factory_test.cpp rename to score/time_daemon/src/ipc/svt/common_factory_test.cpp index 81e1defa..f552e75e 100644 --- a/score/TimeDaemon/code/ipc/svt/common_factory_test.cpp +++ b/score/time_daemon/src/ipc/svt/common_factory_test.cpp @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/ipc/svt/publisher/factory.h" -#include "score/TimeDaemon/code/ipc/svt/receiver/factory.h" +#include "score/time_daemon/src/ipc/svt/publisher/factory.h" +#include "score/time_daemon/src/ipc/svt/receiver/factory.h" #include diff --git a/score/TimeDaemon/code/ipc/svt/config.h b/score/time_daemon/src/ipc/svt/config.h similarity index 100% rename from score/TimeDaemon/code/ipc/svt/config.h rename to score/time_daemon/src/ipc/svt/config.h diff --git a/score/TimeDaemon/code/ipc/svt/publisher/BUILD b/score/time_daemon/src/ipc/svt/publisher/BUILD similarity index 75% rename from score/TimeDaemon/code/ipc/svt/publisher/BUILD rename to score/time_daemon/src/ipc/svt/publisher/BUILD index e19388c8..c35579cc 100644 --- a/score/TimeDaemon/code/ipc/svt/publisher/BUILD +++ b/score/time_daemon/src/ipc/svt/publisher/BUILD @@ -21,11 +21,11 @@ cc_library( "svt_publisher.h", ], features = COMPILER_WARNING_FEATURES, - visibility = ["//score/TimeDaemon/code:__subpackages__"], + visibility = ["//score/time_daemon/src:__subpackages__"], deps = [ - "//score/TimeDaemon/code/common/data_types:ptp_time_info", - "//score/TimeDaemon/code/ipc/core:publisher_impl", - "//score/TimeDaemon/code/ipc/svt:config", - "//score/TimeDaemon/code/ipc/svt:time_info", + "//score/time_daemon/src/common/data_types:ptp_time_info", + "//score/time_daemon/src/ipc/core:publisher_impl", + "//score/time_daemon/src/ipc/svt:config", + "//score/time_daemon/src/ipc/svt:time_info", ], ) diff --git a/score/TimeDaemon/code/ipc/svt/publisher/factory.cpp b/score/time_daemon/src/ipc/svt/publisher/factory.cpp similarity index 87% rename from score/TimeDaemon/code/ipc/svt/publisher/factory.cpp rename to score/time_daemon/src/ipc/svt/publisher/factory.cpp index e86250e0..01302db2 100644 --- a/score/TimeDaemon/code/ipc/svt/publisher/factory.cpp +++ b/score/time_daemon/src/ipc/svt/publisher/factory.cpp @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/ipc/svt/publisher/factory.h" -#include "score/TimeDaemon/code/ipc/svt/config.h" +#include "score/time_daemon/src/ipc/svt/publisher/factory.h" +#include "score/time_daemon/src/ipc/svt/config.h" namespace score { diff --git a/score/TimeDaemon/code/ipc/svt/publisher/factory.h b/score/time_daemon/src/ipc/svt/publisher/factory.h similarity index 94% rename from score/TimeDaemon/code/ipc/svt/publisher/factory.h rename to score/time_daemon/src/ipc/svt/publisher/factory.h index cc94a597..35833d02 100644 --- a/score/TimeDaemon/code/ipc/svt/publisher/factory.h +++ b/score/time_daemon/src/ipc/svt/publisher/factory.h @@ -13,7 +13,7 @@ #ifndef SCORE_TIMEDAEMON_CODE_IPC_SVT_PUBLISHER_FACTORY_H #define SCORE_TIMEDAEMON_CODE_IPC_SVT_PUBLISHER_FACTORY_H -#include "score/TimeDaemon/code/ipc/svt/publisher/svt_publisher.h" +#include "score/time_daemon/src/ipc/svt/publisher/svt_publisher.h" #include diff --git a/score/TimeDaemon/code/ipc/svt/publisher/svt_publisher.h b/score/time_daemon/src/ipc/svt/publisher/svt_publisher.h similarity index 83% rename from score/TimeDaemon/code/ipc/svt/publisher/svt_publisher.h rename to score/time_daemon/src/ipc/svt/publisher/svt_publisher.h index 6ee2b710..d70aec19 100644 --- a/score/TimeDaemon/code/ipc/svt/publisher/svt_publisher.h +++ b/score/time_daemon/src/ipc/svt/publisher/svt_publisher.h @@ -13,9 +13,9 @@ #ifndef SCORE_TIMEDAEMON_CODE_IPC_SVT_SVT_PUBLISHER_H #define SCORE_TIMEDAEMON_CODE_IPC_SVT_SVT_PUBLISHER_H -#include "score/TimeDaemon/code/common/data_types/ptp_time_info.h" -#include "score/TimeDaemon/code/ipc/core/publisher_impl.h" -#include "score/TimeDaemon/code/ipc/svt/svt_time_info.h" +#include "score/time_daemon/src/common/data_types/ptp_time_info.h" +#include "score/time_daemon/src/ipc/core/publisher_impl.h" +#include "score/time_daemon/src/ipc/svt/svt_time_info.h" namespace score { diff --git a/score/TimeDaemon/code/ipc/svt/receiver/BUILD b/score/time_daemon/src/ipc/svt/receiver/BUILD similarity index 70% rename from score/TimeDaemon/code/ipc/svt/receiver/BUILD rename to score/time_daemon/src/ipc/svt/receiver/BUILD index 6ad48752..614681fb 100644 --- a/score/TimeDaemon/code/ipc/svt/receiver/BUILD +++ b/score/time_daemon/src/ipc/svt/receiver/BUILD @@ -21,11 +21,11 @@ cc_library( "svt_receiver.h", ], features = COMPILER_WARNING_FEATURES, - visibility = ["//score/TimeDaemon/code/ipc:__subpackages__"], + visibility = ["//score/time_daemon/src/ipc:__subpackages__"], deps = [ - "//score/TimeDaemon/code/ipc/core:receiver_impl", - "//score/TimeDaemon/code/ipc/svt:config", - "//score/TimeDaemon/code/ipc/svt:time_info", + "//score/time_daemon/src/ipc/core:receiver_impl", + "//score/time_daemon/src/ipc/svt:config", + "//score/time_daemon/src/ipc/svt:time_info", ], ) @@ -38,10 +38,10 @@ cc_library( "svt_receiver.h", ], features = COMPILER_WARNING_FEATURES, - visibility = ["//score/TimeDaemon/code/ipc:__subpackages__"], + visibility = ["//score/time_daemon/src/ipc:__subpackages__"], deps = [ - "//score/TimeDaemon/code/ipc:receiver_mock", - "//score/TimeDaemon/code/ipc/svt:config", - "//score/TimeDaemon/code/ipc/svt:time_info", + "//score/time_daemon/src/ipc:receiver_mock", + "//score/time_daemon/src/ipc/svt:config", + "//score/time_daemon/src/ipc/svt:time_info", ], ) diff --git a/score/TimeDaemon/code/ipc/svt/receiver/factory.cpp b/score/time_daemon/src/ipc/svt/receiver/factory.cpp similarity index 82% rename from score/TimeDaemon/code/ipc/svt/receiver/factory.cpp rename to score/time_daemon/src/ipc/svt/receiver/factory.cpp index 2edc2f8b..774fa425 100644 --- a/score/TimeDaemon/code/ipc/svt/receiver/factory.cpp +++ b/score/time_daemon/src/ipc/svt/receiver/factory.cpp @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/ipc/core/receiver_impl.h" -#include "score/TimeDaemon/code/ipc/svt/config.h" -#include "score/TimeDaemon/code/ipc/svt/receiver/svt_receiver.h" +#include "score/time_daemon/src/ipc/core/receiver_impl.h" +#include "score/time_daemon/src/ipc/svt/config.h" +#include "score/time_daemon/src/ipc/svt/receiver/svt_receiver.h" namespace score { diff --git a/score/TimeDaemon/code/ipc/svt/receiver/factory.h b/score/time_daemon/src/ipc/svt/receiver/factory.h similarity index 94% rename from score/TimeDaemon/code/ipc/svt/receiver/factory.h rename to score/time_daemon/src/ipc/svt/receiver/factory.h index 4c0f34fc..958f1280 100644 --- a/score/TimeDaemon/code/ipc/svt/receiver/factory.h +++ b/score/time_daemon/src/ipc/svt/receiver/factory.h @@ -13,7 +13,7 @@ #ifndef SCORE_TIMEDAEMON_CODE_IPC_SVT_RECEIVER_FACTORY_H #define SCORE_TIMEDAEMON_CODE_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 diff --git a/score/TimeDaemon/code/ipc/svt/receiver/factory_stub.cpp b/score/time_daemon/src/ipc/svt/receiver/factory_stub.cpp similarity index 82% rename from score/TimeDaemon/code/ipc/svt/receiver/factory_stub.cpp rename to score/time_daemon/src/ipc/svt/receiver/factory_stub.cpp index c3063aa8..a9bc079a 100644 --- a/score/TimeDaemon/code/ipc/svt/receiver/factory_stub.cpp +++ b/score/time_daemon/src/ipc/svt/receiver/factory_stub.cpp @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/ipc/receiver_mock.h" -#include "score/TimeDaemon/code/ipc/svt/receiver/svt_receiver.h" -#include "score/TimeDaemon/code/ipc/svt/svt_time_info.h" +#include "score/time_daemon/src/ipc/receiver_mock.h" +#include "score/time_daemon/src/ipc/svt/receiver/svt_receiver.h" +#include "score/time_daemon/src/ipc/svt/svt_time_info.h" namespace score { diff --git a/score/TimeDaemon/code/ipc/svt/receiver/svt_receiver.h b/score/time_daemon/src/ipc/svt/receiver/svt_receiver.h similarity index 89% rename from score/TimeDaemon/code/ipc/svt/receiver/svt_receiver.h rename to score/time_daemon/src/ipc/svt/receiver/svt_receiver.h index 0f503c67..a4287c0a 100644 --- a/score/TimeDaemon/code/ipc/svt/receiver/svt_receiver.h +++ b/score/time_daemon/src/ipc/svt/receiver/svt_receiver.h @@ -13,8 +13,8 @@ #ifndef SCORE_TIMEDAEMON_CODE_IPC_SVT_SVT_RECEIVER_H #define SCORE_TIMEDAEMON_CODE_IPC_SVT_SVT_RECEIVER_H -#include "score/TimeDaemon/code/ipc/receiver.h" -#include "score/TimeDaemon/code/ipc/svt/svt_time_info.h" +#include "score/time_daemon/src/ipc/receiver.h" +#include "score/time_daemon/src/ipc/svt/svt_time_info.h" namespace score { diff --git a/score/TimeDaemon/code/ipc/svt/svt_time_info.cpp b/score/time_daemon/src/ipc/svt/svt_time_info.cpp similarity index 99% rename from score/TimeDaemon/code/ipc/svt/svt_time_info.cpp rename to score/time_daemon/src/ipc/svt/svt_time_info.cpp index cd89f0fb..f9df8292 100644 --- a/score/TimeDaemon/code/ipc/svt/svt_time_info.cpp +++ b/score/time_daemon/src/ipc/svt/svt_time_info.cpp @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/ipc/svt/svt_time_info.h" +#include "score/time_daemon/src/ipc/svt/svt_time_info.h" #include #include diff --git a/score/TimeDaemon/code/ipc/svt/svt_time_info.h b/score/time_daemon/src/ipc/svt/svt_time_info.h similarity index 98% rename from score/TimeDaemon/code/ipc/svt/svt_time_info.h rename to score/time_daemon/src/ipc/svt/svt_time_info.h index 2e221b22..5f1d2b84 100644 --- a/score/TimeDaemon/code/ipc/svt/svt_time_info.h +++ b/score/time_daemon/src/ipc/svt/svt_time_info.h @@ -19,8 +19,8 @@ #include "score/time/HighPrecisionLocalSteadyClock/high_precision_local_steady_clock.h" -#include "score/TimeDaemon/code/common/data_types/ptp_time_info.h" -#include "score/TimeDaemon/code/ipc/data_converter.h" +#include "score/time_daemon/src/common/data_types/ptp_time_info.h" +#include "score/time_daemon/src/ipc/data_converter.h" namespace score { diff --git a/score/TimeDaemon/code/ipc/svt/svt_time_info_test.cpp b/score/time_daemon/src/ipc/svt/svt_time_info_test.cpp similarity index 99% rename from score/TimeDaemon/code/ipc/svt/svt_time_info_test.cpp rename to score/time_daemon/src/ipc/svt/svt_time_info_test.cpp index 51a885c7..f113e9e4 100644 --- a/score/TimeDaemon/code/ipc/svt/svt_time_info_test.cpp +++ b/score/time_daemon/src/ipc/svt/svt_time_info_test.cpp @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/ipc/svt/svt_time_info.h" +#include "score/time_daemon/src/ipc/svt/svt_time_info.h" #include #include diff --git a/score/TimeDaemon/code/msg_broker/BUILD b/score/time_daemon/src/msg_broker/BUILD similarity index 86% rename from score/TimeDaemon/code/msg_broker/BUILD rename to score/time_daemon/src/msg_broker/BUILD index 6aa363f7..d3917628 100644 --- a/score/TimeDaemon/code/msg_broker/BUILD +++ b/score/time_daemon/src/msg_broker/BUILD @@ -25,10 +25,10 @@ cc_library( "topic.h", ], features = COMPILER_WARNING_FEATURES, - visibility = ["//score/TimeDaemon/code:__subpackages__"], + visibility = ["//score/time_daemon/src:__subpackages__"], deps = [ - "//score/TimeDaemon/code/common:logging_contexts", - "//score/TimeDaemon/code/common/data_flow", + "//score/time_daemon/src/common:logging_contexts", + "//score/time_daemon/src/common/data_flow", "@score_baselibs//score/mw/log:frontend", ], ) @@ -38,7 +38,7 @@ cc_unit_test_suites_for_host_and_qnx( cc_unit_tests = [ ":msg_broker_test", ], - visibility = ["//score/TimeDaemon:__pkg__"], + visibility = ["//score/time_daemon:__pkg__"], ) cc_test( diff --git a/score/TimeDaemon/code/msg_broker/msg_broker.h b/score/time_daemon/src/msg_broker/msg_broker.h similarity index 93% rename from score/TimeDaemon/code/msg_broker/msg_broker.h rename to score/time_daemon/src/msg_broker/msg_broker.h index 093ba908..f92fd133 100644 --- a/score/TimeDaemon/code/msg_broker/msg_broker.h +++ b/score/time_daemon/src/msg_broker/msg_broker.h @@ -13,10 +13,10 @@ #ifndef SCORE_TIMEDAEMON_CODE_MSG_BROKER_MSG_BROKER_H #define SCORE_TIMEDAEMON_CODE_MSG_BROKER_MSG_BROKER_H -#include "score/TimeDaemon/code/common/data_flow/consumer.h" -#include "score/TimeDaemon/code/common/data_flow/producer.h" -#include "score/TimeDaemon/code/msg_broker/subscription.h" -#include "score/TimeDaemon/code/msg_broker/topic.h" +#include "score/time_daemon/src/common/data_flow/consumer.h" +#include "score/time_daemon/src/common/data_flow/producer.h" +#include "score/time_daemon/src/msg_broker/subscription.h" +#include "score/time_daemon/src/msg_broker/topic.h" #include "score/mw/log/logging.h" #include diff --git a/score/TimeDaemon/code/msg_broker/msg_broker_test.cpp b/score/time_daemon/src/msg_broker/msg_broker_test.cpp similarity index 95% rename from score/TimeDaemon/code/msg_broker/msg_broker_test.cpp rename to score/time_daemon/src/msg_broker/msg_broker_test.cpp index c4f72a1b..5d8c61b9 100644 --- a/score/TimeDaemon/code/msg_broker/msg_broker_test.cpp +++ b/score/time_daemon/src/msg_broker/msg_broker_test.cpp @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/msg_broker/msg_broker.h" -#include "score/TimeDaemon/code/common/data_flow/consumer.h" -#include "score/TimeDaemon/code/common/data_flow/producer.h" +#include "score/time_daemon/src/msg_broker/msg_broker.h" +#include "score/time_daemon/src/common/data_flow/consumer.h" +#include "score/time_daemon/src/common/data_flow/producer.h" #include #include diff --git a/score/TimeDaemon/code/msg_broker/subscription.h b/score/time_daemon/src/msg_broker/subscription.h similarity index 100% rename from score/TimeDaemon/code/msg_broker/subscription.h rename to score/time_daemon/src/msg_broker/subscription.h diff --git a/score/TimeDaemon/code/msg_broker/topic.cpp b/score/time_daemon/src/msg_broker/topic.cpp similarity index 96% rename from score/TimeDaemon/code/msg_broker/topic.cpp rename to score/time_daemon/src/msg_broker/topic.cpp index a7ced591..9f588ef9 100644 --- a/score/TimeDaemon/code/msg_broker/topic.cpp +++ b/score/time_daemon/src/msg_broker/topic.cpp @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/msg_broker/topic.h" +#include "score/time_daemon/src/msg_broker/topic.h" #include "score/mw/log/logging.h" diff --git a/score/TimeDaemon/code/msg_broker/topic.h b/score/time_daemon/src/msg_broker/topic.h similarity index 100% rename from score/TimeDaemon/code/msg_broker/topic.h rename to score/time_daemon/src/msg_broker/topic.h diff --git a/score/TimeDaemon/code/ptp_machine/BUILD b/score/time_daemon/src/ptp_machine/BUILD similarity index 69% rename from score/TimeDaemon/code/ptp_machine/BUILD rename to score/time_daemon/src/ptp_machine/BUILD index 6111572e..32dd2840 100644 --- a/score/TimeDaemon/code/ptp_machine/BUILD +++ b/score/time_daemon/src/ptp_machine/BUILD @@ -15,16 +15,16 @@ load("@score_baselibs//:bazel/unit_tests.bzl", "cc_unit_test_suites_for_host_and alias( name = "stub_ptp_machine", - actual = "//score/TimeDaemon/code/ptp_machine/stub:gptp_stub_machine", - visibility = ["//score/TimeDaemon:__subpackages__"], + actual = "//score/time_daemon/src/ptp_machine/stub:gptp_stub_machine", + visibility = ["//score/time_daemon:__subpackages__"], ) cc_unit_test_suites_for_host_and_qnx( name = "unit_test_suite", test_suites_from_sub_packages = [ - "//score/TimeDaemon/code/ptp_machine/core:unit_test_suite", - "//score/TimeDaemon/code/ptp_machine/shm:unit_test_suite", - "//score/TimeDaemon/code/ptp_machine/stub:unit_test_suite", + "//score/time_daemon/src/ptp_machine/core:unit_test_suite", + "//score/time_daemon/src/ptp_machine/shm:unit_test_suite", + "//score/time_daemon/src/ptp_machine/stub:unit_test_suite", ], - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], ) diff --git a/score/TimeDaemon/code/ptp_machine/core/BUILD b/score/time_daemon/src/ptp_machine/core/BUILD similarity index 84% rename from score/TimeDaemon/code/ptp_machine/core/BUILD rename to score/time_daemon/src/ptp_machine/core/BUILD index 2f9ee047..b927ad4b 100644 --- a/score/TimeDaemon/code/ptp_machine/core/BUILD +++ b/score/time_daemon/src/ptp_machine/core/BUILD @@ -23,10 +23,10 @@ cc_library( ], features = COMPILER_WARNING_FEATURES, tags = ["QM"], - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], deps = [ - "//score/TimeDaemon/code/common/data_flow", - "//score/TimeDaemon/code/common/machines", + "//score/time_daemon/src/common/data_flow", + "//score/time_daemon/src/common/machines", "//score/time/HighPrecisionLocalSteadyClock", "@score_baselibs//score/mw/log:frontend", ], @@ -39,7 +39,7 @@ cc_unit_test_suites_for_host_and_qnx( ], test_suites_from_sub_packages = [ ], - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], ) cc_test( @@ -51,7 +51,7 @@ cc_test( tags = ["unit"], deps = [ ":ptp_machine", - "//score/TimeDaemon/code/common/data_types:ptp_time_info", + "//score/time_daemon/src/common/data_types:ptp_time_info", "@googletest//:gtest", "@googletest//:gtest_main", "@score_baselibs//score/mw/log:console_only_backend", diff --git a/score/TimeDaemon/code/ptp_machine/core/ptp_engine_mock.h b/score/time_daemon/src/ptp_machine/core/ptp_engine_mock.h similarity index 97% rename from score/TimeDaemon/code/ptp_machine/core/ptp_engine_mock.h rename to score/time_daemon/src/ptp_machine/core/ptp_engine_mock.h index 29099f5e..ca44ae1c 100644 --- a/score/TimeDaemon/code/ptp_machine/core/ptp_engine_mock.h +++ b/score/time_daemon/src/ptp_machine/core/ptp_engine_mock.h @@ -13,7 +13,7 @@ #ifndef SCORE_TIMEDAEMON_CODE_PTP_MACHINE_CORE_PTP_ENGINE_MOCK_H #define SCORE_TIMEDAEMON_CODE_PTP_MACHINE_CORE_PTP_ENGINE_MOCK_H -#include "score/TimeDaemon/code/common/data_types/ptp_time_info.h" +#include "score/time_daemon/src/common/data_types/ptp_time_info.h" #include diff --git a/score/TimeDaemon/code/ptp_machine/core/ptp_machine.h b/score/time_daemon/src/ptp_machine/core/ptp_machine.h similarity index 96% rename from score/TimeDaemon/code/ptp_machine/core/ptp_machine.h rename to score/time_daemon/src/ptp_machine/core/ptp_machine.h index 9dd4bff1..7dfad444 100644 --- a/score/TimeDaemon/code/ptp_machine/core/ptp_machine.h +++ b/score/time_daemon/src/ptp_machine/core/ptp_machine.h @@ -13,10 +13,10 @@ #ifndef SCORE_TIMEDAEMON_CODE_PTP_MACHINE_CORE_PTP_PTP_MACHINE_H #define SCORE_TIMEDAEMON_CODE_PTP_MACHINE_CORE_PTP_PTP_MACHINE_H -#include "score/TimeDaemon/code/common/data_flow/producer.h" -#include "score/TimeDaemon/code/common/data_types/ptp_time_info.h" -#include "score/TimeDaemon/code/common/logging_contexts.h" -#include "score/TimeDaemon/code/common/machines/periodic_machine.h" +#include "score/time_daemon/src/common/data_flow/producer.h" +#include "score/time_daemon/src/common/data_types/ptp_time_info.h" +#include "score/time_daemon/src/common/logging_contexts.h" +#include "score/time_daemon/src/common/machines/periodic_machine.h" #include "score/mw/log/logging.h" diff --git a/score/TimeDaemon/code/ptp_machine/core/ptp_machine_test.cpp b/score/time_daemon/src/ptp_machine/core/ptp_machine_test.cpp similarity index 96% rename from score/TimeDaemon/code/ptp_machine/core/ptp_machine_test.cpp rename to score/time_daemon/src/ptp_machine/core/ptp_machine_test.cpp index e23f2e33..80240388 100644 --- a/score/TimeDaemon/code/ptp_machine/core/ptp_machine_test.cpp +++ b/score/time_daemon/src/ptp_machine/core/ptp_machine_test.cpp @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/ptp_machine/core/ptp_machine.h" -#include "score/TimeDaemon/code/ptp_machine/core/ptp_engine_mock.h" +#include "score/time_daemon/src/ptp_machine/core/ptp_machine.h" +#include "score/time_daemon/src/ptp_machine/core/ptp_engine_mock.h" #include #include diff --git a/score/TimeDaemon/code/ptp_machine/shm/BUILD b/score/time_daemon/src/ptp_machine/shm/BUILD similarity index 83% rename from score/TimeDaemon/code/ptp_machine/shm/BUILD rename to score/time_daemon/src/ptp_machine/shm/BUILD index 96fbc148..051b6f83 100644 --- a/score/TimeDaemon/code/ptp_machine/shm/BUILD +++ b/score/time_daemon/src/ptp_machine/shm/BUILD @@ -25,10 +25,10 @@ cc_library( ], features = COMPILER_WARNING_FEATURES, tags = ["QM"], - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], deps = [ - "//score/TimeDaemon/code/ptp_machine/core:ptp_machine", - "//score/TimeDaemon/code/ptp_machine/shm/details:shm_ptp_engine", + "//score/time_daemon/src/ptp_machine/core:ptp_machine", + "//score/time_daemon/src/ptp_machine/shm/details:shm_ptp_engine", "//score/libTSClient:gptp_ipc", ], ) @@ -50,7 +50,7 @@ cc_unit_test_suites_for_host_and_qnx( name = "unit_test_suite", cc_unit_tests = [":gptp_shm_machine_test"], test_suites_from_sub_packages = [ - "//score/TimeDaemon/code/ptp_machine/shm/details:unit_test_suite", + "//score/time_daemon/src/ptp_machine/shm/details:unit_test_suite", ], - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], ) diff --git a/score/TimeDaemon/code/ptp_machine/shm/details/BUILD b/score/time_daemon/src/ptp_machine/shm/details/BUILD similarity index 86% rename from score/TimeDaemon/code/ptp_machine/shm/details/BUILD rename to score/time_daemon/src/ptp_machine/shm/details/BUILD index 86750ebe..771e7ec0 100644 --- a/score/TimeDaemon/code/ptp_machine/shm/details/BUILD +++ b/score/time_daemon/src/ptp_machine/shm/details/BUILD @@ -24,10 +24,10 @@ cc_library( ], features = COMPILER_WARNING_FEATURES, tags = ["QM"], - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], deps = [ - "//score/TimeDaemon/code/common:logging_contexts", - "//score/TimeDaemon/code/common/data_types:ptp_time_info", + "//score/time_daemon/src/common:logging_contexts", + "//score/time_daemon/src/common/data_types:ptp_time_info", "//score/libTSClient:gptp_ipc", "@score_baselibs//score/mw/log:frontend", ], @@ -50,5 +50,5 @@ cc_unit_test_suites_for_host_and_qnx( name = "unit_test_suite", cc_unit_tests = [":shm_ptp_engine_test"], test_suites_from_sub_packages = [], - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], ) diff --git a/score/TimeDaemon/code/ptp_machine/shm/details/shm_ptp_engine.cpp b/score/time_daemon/src/ptp_machine/shm/details/shm_ptp_engine.cpp similarity index 96% rename from score/TimeDaemon/code/ptp_machine/shm/details/shm_ptp_engine.cpp rename to score/time_daemon/src/ptp_machine/shm/details/shm_ptp_engine.cpp index e202c150..30587ee0 100644 --- a/score/TimeDaemon/code/ptp_machine/shm/details/shm_ptp_engine.cpp +++ b/score/time_daemon/src/ptp_machine/shm/details/shm_ptp_engine.cpp @@ -10,9 +10,9 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/ptp_machine/shm/details/shm_ptp_engine.h" +#include "score/time_daemon/src/ptp_machine/shm/details/shm_ptp_engine.h" -#include "score/TimeDaemon/code/common/logging_contexts.h" +#include "score/time_daemon/src/common/logging_contexts.h" #include "score/libTSClient/gptp_ipc_data.h" #include "score/mw/log/logging.h" diff --git a/score/TimeDaemon/code/ptp_machine/shm/details/shm_ptp_engine.h b/score/time_daemon/src/ptp_machine/shm/details/shm_ptp_engine.h similarity index 96% rename from score/TimeDaemon/code/ptp_machine/shm/details/shm_ptp_engine.h rename to score/time_daemon/src/ptp_machine/shm/details/shm_ptp_engine.h index 9a9055ca..9a4c31d7 100644 --- a/score/TimeDaemon/code/ptp_machine/shm/details/shm_ptp_engine.h +++ b/score/time_daemon/src/ptp_machine/shm/details/shm_ptp_engine.h @@ -13,7 +13,7 @@ #ifndef SCORE_TIMEDAEMON_CODE_PTP_MACHINE_SHM_DETAILS_SHM_PTP_ENGINE_H #define SCORE_TIMEDAEMON_CODE_PTP_MACHINE_SHM_DETAILS_SHM_PTP_ENGINE_H -#include "score/TimeDaemon/code/common/data_types/ptp_time_info.h" +#include "score/time_daemon/src/common/data_types/ptp_time_info.h" #include "score/libTSClient/gptp_ipc_receiver.h" #include diff --git a/score/TimeDaemon/code/ptp_machine/shm/details/shm_ptp_engine_test.cpp b/score/time_daemon/src/ptp_machine/shm/details/shm_ptp_engine_test.cpp similarity index 99% rename from score/TimeDaemon/code/ptp_machine/shm/details/shm_ptp_engine_test.cpp rename to score/time_daemon/src/ptp_machine/shm/details/shm_ptp_engine_test.cpp index e67324b4..59c8bbaa 100644 --- a/score/TimeDaemon/code/ptp_machine/shm/details/shm_ptp_engine_test.cpp +++ b/score/time_daemon/src/ptp_machine/shm/details/shm_ptp_engine_test.cpp @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/ptp_machine/shm/details/shm_ptp_engine.h" +#include "score/time_daemon/src/ptp_machine/shm/details/shm_ptp_engine.h" #include "score/libTSClient/gptp_ipc_publisher.h" diff --git a/score/TimeDaemon/code/ptp_machine/shm/factory.cpp b/score/time_daemon/src/ptp_machine/shm/factory.cpp similarity index 93% rename from score/TimeDaemon/code/ptp_machine/shm/factory.cpp rename to score/time_daemon/src/ptp_machine/shm/factory.cpp index d863159f..b427f981 100644 --- a/score/TimeDaemon/code/ptp_machine/shm/factory.cpp +++ b/score/time_daemon/src/ptp_machine/shm/factory.cpp @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/ptp_machine/shm/factory.h" +#include "score/time_daemon/src/ptp_machine/shm/factory.h" namespace score { diff --git a/score/TimeDaemon/code/ptp_machine/shm/factory.h b/score/time_daemon/src/ptp_machine/shm/factory.h similarity index 96% rename from score/TimeDaemon/code/ptp_machine/shm/factory.h rename to score/time_daemon/src/ptp_machine/shm/factory.h index 65a5f4c4..d255b149 100644 --- a/score/TimeDaemon/code/ptp_machine/shm/factory.h +++ b/score/time_daemon/src/ptp_machine/shm/factory.h @@ -13,7 +13,7 @@ #ifndef SCORE_TIMEDAEMON_CODE_PTP_MACHINE_SHM_FACTORY_H #define SCORE_TIMEDAEMON_CODE_PTP_MACHINE_SHM_FACTORY_H -#include "score/TimeDaemon/code/ptp_machine/shm/gptp_shm_machine.h" +#include "score/time_daemon/src/ptp_machine/shm/gptp_shm_machine.h" #include "score/libTSClient/gptp_ipc_channel.h" #include diff --git a/score/TimeDaemon/code/ptp_machine/shm/gptp_shm_machine.h b/score/time_daemon/src/ptp_machine/shm/gptp_shm_machine.h similarity index 90% rename from score/TimeDaemon/code/ptp_machine/shm/gptp_shm_machine.h rename to score/time_daemon/src/ptp_machine/shm/gptp_shm_machine.h index 0da9f41b..51852891 100644 --- a/score/TimeDaemon/code/ptp_machine/shm/gptp_shm_machine.h +++ b/score/time_daemon/src/ptp_machine/shm/gptp_shm_machine.h @@ -13,8 +13,8 @@ #ifndef SCORE_TIMEDAEMON_CODE_PTP_MACHINE_SHM_GPTP_SHM_MACHINE_H #define SCORE_TIMEDAEMON_CODE_PTP_MACHINE_SHM_GPTP_SHM_MACHINE_H -#include "score/TimeDaemon/code/ptp_machine/core/ptp_machine.h" -#include "score/TimeDaemon/code/ptp_machine/shm/details/shm_ptp_engine.h" +#include "score/time_daemon/src/ptp_machine/core/ptp_machine.h" +#include "score/time_daemon/src/ptp_machine/shm/details/shm_ptp_engine.h" namespace score { diff --git a/score/TimeDaemon/code/ptp_machine/shm/gptp_shm_machine_test.cpp b/score/time_daemon/src/ptp_machine/shm/gptp_shm_machine_test.cpp similarity index 96% rename from score/TimeDaemon/code/ptp_machine/shm/gptp_shm_machine_test.cpp rename to score/time_daemon/src/ptp_machine/shm/gptp_shm_machine_test.cpp index 0d96d07d..759b6dea 100644 --- a/score/TimeDaemon/code/ptp_machine/shm/gptp_shm_machine_test.cpp +++ b/score/time_daemon/src/ptp_machine/shm/gptp_shm_machine_test.cpp @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/ptp_machine/shm/gptp_shm_machine.h" -#include "score/TimeDaemon/code/ptp_machine/shm/factory.h" +#include "score/time_daemon/src/ptp_machine/shm/gptp_shm_machine.h" +#include "score/time_daemon/src/ptp_machine/shm/factory.h" #include "score/libTSClient/gptp_ipc_publisher.h" #include diff --git a/score/TimeDaemon/code/ptp_machine/stub/BUILD b/score/time_daemon/src/ptp_machine/stub/BUILD similarity index 84% rename from score/TimeDaemon/code/ptp_machine/stub/BUILD rename to score/time_daemon/src/ptp_machine/stub/BUILD index d304be4c..a0446925 100644 --- a/score/TimeDaemon/code/ptp_machine/stub/BUILD +++ b/score/time_daemon/src/ptp_machine/stub/BUILD @@ -28,12 +28,12 @@ load("@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER features = COMPILER_WARNING_FEATURES, includes = [], tags = ["QM"], - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], deps = [ - "//score/TimeDaemon/code/common:logging_contexts", - "//score/TimeDaemon/code/common/machines", - "//score/TimeDaemon/code/ptp_machine/core:ptp_machine", - "//score/TimeDaemon/code/ptp_machine/stub/details:stub_ptp_engine", + "//score/time_daemon/src/common:logging_contexts", + "//score/time_daemon/src/common/machines", + "//score/time_daemon/src/ptp_machine/core:ptp_machine", + "//score/time_daemon/src/ptp_machine/stub/details:stub_ptp_engine", "@score_baselibs//score/mw/log:frontend", ] + deps, ) @@ -62,7 +62,7 @@ cc_unit_test_suites_for_host_and_qnx( ], test_suites_from_sub_packages = [ ], - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], ) cc_test( diff --git a/score/TimeDaemon/code/ptp_machine/stub/details/BUILD b/score/time_daemon/src/ptp_machine/stub/details/BUILD similarity index 85% rename from score/TimeDaemon/code/ptp_machine/stub/details/BUILD rename to score/time_daemon/src/ptp_machine/stub/details/BUILD index 254b3cb5..4ad265dd 100644 --- a/score/TimeDaemon/code/ptp_machine/stub/details/BUILD +++ b/score/time_daemon/src/ptp_machine/stub/details/BUILD @@ -24,10 +24,10 @@ cc_library( features = COMPILER_WARNING_FEATURES, includes = [], tags = ["QM"], - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], deps = [ - "//score/TimeDaemon/code/common:logging_contexts", - "//score/TimeDaemon/code/common/data_types:ptp_time_info", + "//score/time_daemon/src/common:logging_contexts", + "//score/time_daemon/src/common/data_types:ptp_time_info", "//score/time/HighPrecisionLocalSteadyClock:interface", "@score_baselibs//score/mw/log:frontend", ], diff --git a/score/TimeDaemon/code/ptp_machine/stub/details/stub_ptp_engine.cpp b/score/time_daemon/src/ptp_machine/stub/details/stub_ptp_engine.cpp similarity index 97% rename from score/TimeDaemon/code/ptp_machine/stub/details/stub_ptp_engine.cpp rename to score/time_daemon/src/ptp_machine/stub/details/stub_ptp_engine.cpp index 7350f2e2..c75d4bee 100644 --- a/score/TimeDaemon/code/ptp_machine/stub/details/stub_ptp_engine.cpp +++ b/score/time_daemon/src/ptp_machine/stub/details/stub_ptp_engine.cpp @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/ptp_machine/stub/details/stub_ptp_engine.h" -#include "score/TimeDaemon/code/common/logging_contexts.h" +#include "score/time_daemon/src/ptp_machine/stub/details/stub_ptp_engine.h" +#include "score/time_daemon/src/common/logging_contexts.h" #include "score/mw/log/logging.h" #include "score/time/HighPrecisionLocalSteadyClock/details/factory_impl.h" diff --git a/score/TimeDaemon/code/ptp_machine/stub/details/stub_ptp_engine.h b/score/time_daemon/src/ptp_machine/stub/details/stub_ptp_engine.h similarity index 98% rename from score/TimeDaemon/code/ptp_machine/stub/details/stub_ptp_engine.h rename to score/time_daemon/src/ptp_machine/stub/details/stub_ptp_engine.h index baed75df..46ad099f 100644 --- a/score/TimeDaemon/code/ptp_machine/stub/details/stub_ptp_engine.h +++ b/score/time_daemon/src/ptp_machine/stub/details/stub_ptp_engine.h @@ -13,7 +13,7 @@ #ifndef SCORE_TIMEDAEMON_CODE_PTP_MACHINE_STUB_DETAILS_STUB_PTP_ENGINE_H #define SCORE_TIMEDAEMON_CODE_PTP_MACHINE_STUB_DETAILS_STUB_PTP_ENGINE_H -#include "score/TimeDaemon/code/common/data_types/ptp_time_info.h" +#include "score/time_daemon/src/common/data_types/ptp_time_info.h" #include #include diff --git a/score/TimeDaemon/code/ptp_machine/stub/factory.cpp b/score/time_daemon/src/ptp_machine/stub/factory.cpp similarity index 94% rename from score/TimeDaemon/code/ptp_machine/stub/factory.cpp rename to score/time_daemon/src/ptp_machine/stub/factory.cpp index 8e67c188..9fae5b57 100644 --- a/score/TimeDaemon/code/ptp_machine/stub/factory.cpp +++ b/score/time_daemon/src/ptp_machine/stub/factory.cpp @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/ptp_machine/stub/factory.h" +#include "score/time_daemon/src/ptp_machine/stub/factory.h" #include "score/time/HighPrecisionLocalSteadyClock/details/factory_impl.h" namespace score diff --git a/score/TimeDaemon/code/ptp_machine/stub/factory.h b/score/time_daemon/src/ptp_machine/stub/factory.h similarity index 94% rename from score/TimeDaemon/code/ptp_machine/stub/factory.h rename to score/time_daemon/src/ptp_machine/stub/factory.h index cae06dea..21b48028 100644 --- a/score/TimeDaemon/code/ptp_machine/stub/factory.h +++ b/score/time_daemon/src/ptp_machine/stub/factory.h @@ -13,7 +13,7 @@ #ifndef SCORE_TIMEDAEMON_CODE_PTP_MACHINE_STUB_FACTORY_H #define SCORE_TIMEDAEMON_CODE_PTP_MACHINE_STUB_FACTORY_H -#include "score/TimeDaemon/code/ptp_machine/stub/gptp_stub_machine.h" +#include "score/time_daemon/src/ptp_machine/stub/gptp_stub_machine.h" namespace score { diff --git a/score/TimeDaemon/code/ptp_machine/stub/gptp_stub_machine.h b/score/time_daemon/src/ptp_machine/stub/gptp_stub_machine.h similarity index 89% rename from score/TimeDaemon/code/ptp_machine/stub/gptp_stub_machine.h rename to score/time_daemon/src/ptp_machine/stub/gptp_stub_machine.h index fe9d7dce..82a84473 100644 --- a/score/TimeDaemon/code/ptp_machine/stub/gptp_stub_machine.h +++ b/score/time_daemon/src/ptp_machine/stub/gptp_stub_machine.h @@ -13,8 +13,8 @@ #ifndef SCORE_TIMEDAEMON_CODE_PTP_MACHINE_STUB_GPTP_STUB_MACHINE_H #define SCORE_TIMEDAEMON_CODE_PTP_MACHINE_STUB_GPTP_STUB_MACHINE_H -#include "score/TimeDaemon/code/ptp_machine/core/ptp_machine.h" -#include "score/TimeDaemon/code/ptp_machine/stub/details/stub_ptp_engine.h" +#include "score/time_daemon/src/ptp_machine/core/ptp_machine.h" +#include "score/time_daemon/src/ptp_machine/stub/details/stub_ptp_engine.h" #include "score/mw/log/logging.h" diff --git a/score/TimeDaemon/code/ptp_machine/stub/gptp_stub_machine_integration_test.cpp b/score/time_daemon/src/ptp_machine/stub/gptp_stub_machine_integration_test.cpp similarity index 97% rename from score/TimeDaemon/code/ptp_machine/stub/gptp_stub_machine_integration_test.cpp rename to score/time_daemon/src/ptp_machine/stub/gptp_stub_machine_integration_test.cpp index 54b060ba..ba5af58c 100644 --- a/score/TimeDaemon/code/ptp_machine/stub/gptp_stub_machine_integration_test.cpp +++ b/score/time_daemon/src/ptp_machine/stub/gptp_stub_machine_integration_test.cpp @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/ptp_machine/stub/factory.h" -#include "score/TimeDaemon/code/ptp_machine/stub/details/stub_ptp_engine.h" +#include "score/time_daemon/src/ptp_machine/stub/factory.h" +#include "score/time_daemon/src/ptp_machine/stub/details/stub_ptp_engine.h" #include "score/time/HighPrecisionLocalSteadyClock/high_precision_local_steady_clock.h" #include "score/time/HighPrecisionLocalSteadyClock/details/factory_impl.h" diff --git a/score/TimeDaemon/code/verification_machine/BUILD b/score/time_daemon/src/verification_machine/BUILD similarity index 81% rename from score/TimeDaemon/code/verification_machine/BUILD rename to score/time_daemon/src/verification_machine/BUILD index 227f884d..f9ac6524 100644 --- a/score/TimeDaemon/code/verification_machine/BUILD +++ b/score/time_daemon/src/verification_machine/BUILD @@ -16,8 +16,8 @@ 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/verification_machine/core:unit_test_suite", - "//score/TimeDaemon/code/verification_machine/svt:unit_test_suite", + "//score/time_daemon/src/verification_machine/core:unit_test_suite", + "//score/time_daemon/src/verification_machine/svt:unit_test_suite", ], - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], ) diff --git a/score/TimeDaemon/code/verification_machine/core/BUILD b/score/time_daemon/src/verification_machine/core/BUILD similarity index 87% rename from score/TimeDaemon/code/verification_machine/core/BUILD rename to score/time_daemon/src/verification_machine/core/BUILD index b3d098da..22744f47 100644 --- a/score/TimeDaemon/code/verification_machine/core/BUILD +++ b/score/time_daemon/src/verification_machine/core/BUILD @@ -23,10 +23,10 @@ cc_library( ], features = COMPILER_WARNING_FEATURES, tags = ["QM"], - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], deps = [ - "//score/TimeDaemon/code/common/data_flow", - "//score/TimeDaemon/code/common/machines", + "//score/time_daemon/src/common/data_flow", + "//score/time_daemon/src/common/machines", "@score_baselibs//score/language/futurecpp", "@score_baselibs//score/mw/log:frontend", ], @@ -37,7 +37,7 @@ cc_unit_test_suites_for_host_and_qnx( cc_unit_tests = [ ":verification_machine_test", ], - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], ) cc_test( diff --git a/score/TimeDaemon/code/verification_machine/core/verification_machine.h b/score/time_daemon/src/verification_machine/core/verification_machine.h similarity index 95% rename from score/TimeDaemon/code/verification_machine/core/verification_machine.h rename to score/time_daemon/src/verification_machine/core/verification_machine.h index 28aed72b..ce0d1876 100644 --- a/score/TimeDaemon/code/verification_machine/core/verification_machine.h +++ b/score/time_daemon/src/verification_machine/core/verification_machine.h @@ -13,11 +13,11 @@ #ifndef SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_CORE_VERIFICATION_MACHINE_H #define SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_CORE_VERIFICATION_MACHINE_H -#include "score/TimeDaemon/code/common/data_flow/consumer.h" -#include "score/TimeDaemon/code/common/data_flow/producer.h" -#include "score/TimeDaemon/code/common/logging_contexts.h" -#include "score/TimeDaemon/code/common/machines/reactive_machine.h" -#include "score/TimeDaemon/code/verification_machine/core/verification_stage.h" +#include "score/time_daemon/src/common/data_flow/consumer.h" +#include "score/time_daemon/src/common/data_flow/producer.h" +#include "score/time_daemon/src/common/logging_contexts.h" +#include "score/time_daemon/src/common/machines/reactive_machine.h" +#include "score/time_daemon/src/verification_machine/core/verification_stage.h" #include "score/mw/log/logging.h" #include diff --git a/score/TimeDaemon/code/verification_machine/core/verification_machine_test.cpp b/score/time_daemon/src/verification_machine/core/verification_machine_test.cpp similarity index 96% rename from score/TimeDaemon/code/verification_machine/core/verification_machine_test.cpp rename to score/time_daemon/src/verification_machine/core/verification_machine_test.cpp index de9b3498..ad4652aa 100644 --- a/score/TimeDaemon/code/verification_machine/core/verification_machine_test.cpp +++ b/score/time_daemon/src/verification_machine/core/verification_machine_test.cpp @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/verification_machine/core/verification_machine.h" -#include "score/TimeDaemon/code/verification_machine/core/verification_stage_mock.h" +#include "score/time_daemon/src/verification_machine/core/verification_machine.h" +#include "score/time_daemon/src/verification_machine/core/verification_stage_mock.h" #include #include diff --git a/score/TimeDaemon/code/verification_machine/core/verification_stage.h b/score/time_daemon/src/verification_machine/core/verification_stage.h similarity index 100% rename from score/TimeDaemon/code/verification_machine/core/verification_stage.h rename to score/time_daemon/src/verification_machine/core/verification_stage.h diff --git a/score/TimeDaemon/code/verification_machine/core/verification_stage_mock.h b/score/time_daemon/src/verification_machine/core/verification_stage_mock.h similarity index 96% rename from score/TimeDaemon/code/verification_machine/core/verification_stage_mock.h rename to score/time_daemon/src/verification_machine/core/verification_stage_mock.h index 8fa92e39..7e9e754d 100644 --- a/score/TimeDaemon/code/verification_machine/core/verification_stage_mock.h +++ b/score/time_daemon/src/verification_machine/core/verification_stage_mock.h @@ -14,7 +14,7 @@ #define SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_CORE_VERIFICATION_STAGE_MOCK_H #include "gmock/gmock.h" -#include "score/TimeDaemon/code/verification_machine/core/verification_stage.h" +#include "score/time_daemon/src/verification_machine/core/verification_stage.h" #include #include diff --git a/score/TimeDaemon/code/verification_machine/svt/BUILD b/score/time_daemon/src/verification_machine/svt/BUILD similarity index 79% rename from score/TimeDaemon/code/verification_machine/svt/BUILD rename to score/time_daemon/src/verification_machine/svt/BUILD index fab6f6d4..388a91d3 100644 --- a/score/TimeDaemon/code/verification_machine/svt/BUILD +++ b/score/time_daemon/src/verification_machine/svt/BUILD @@ -25,12 +25,12 @@ cc_library( ], features = COMPILER_WARNING_FEATURES, tags = ["QM"], - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], deps = [ - "//score/TimeDaemon/code/common/data_types:ptp_time_info", - "//score/TimeDaemon/code/common/machines", - "//score/TimeDaemon/code/verification_machine/core:verification_machine", - "//score/TimeDaemon/code/verification_machine/svt/validators", + "//score/time_daemon/src/common/data_types:ptp_time_info", + "//score/time_daemon/src/common/machines", + "//score/time_daemon/src/verification_machine/core:verification_machine", + "//score/time_daemon/src/verification_machine/svt/validators", "@score_baselibs//score/mw/log:frontend", ], ) @@ -40,8 +40,8 @@ cc_unit_test_suites_for_host_and_qnx( cc_unit_tests = [ ":svt_verification_machine_test", ], - test_suites_from_sub_packages = ["//score/TimeDaemon/code/verification_machine/svt/validators:unit_test_suite"], - visibility = ["//score/TimeDaemon:__subpackages__"], + test_suites_from_sub_packages = ["//score/time_daemon/src/verification_machine/svt/validators:unit_test_suite"], + visibility = ["//score/time_daemon:__subpackages__"], ) cc_test( diff --git a/score/TimeDaemon/code/verification_machine/svt/factory.cpp b/score/time_daemon/src/verification_machine/svt/factory.cpp similarity index 87% rename from score/TimeDaemon/code/verification_machine/svt/factory.cpp rename to score/time_daemon/src/verification_machine/svt/factory.cpp index 5dc702b8..253ab475 100644 --- a/score/TimeDaemon/code/verification_machine/svt/factory.cpp +++ b/score/time_daemon/src/verification_machine/svt/factory.cpp @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/verification_machine/svt/factory.h" -#include "score/TimeDaemon/code/verification_machine/svt/validators/synchronization_validator.h" -#include "score/TimeDaemon/code/verification_machine/svt/validators/time_jumps_validator.h" -#include "score/TimeDaemon/code/verification_machine/svt/validators/timeout_validator.h" +#include "score/time_daemon/src/verification_machine/svt/factory.h" +#include "score/time_daemon/src/verification_machine/svt/validators/synchronization_validator.h" +#include "score/time_daemon/src/verification_machine/svt/validators/time_jumps_validator.h" +#include "score/time_daemon/src/verification_machine/svt/validators/timeout_validator.h" #include "score/time/HighPrecisionLocalSteadyClock/details/factory_impl.h" namespace score diff --git a/score/TimeDaemon/code/verification_machine/svt/factory.h b/score/time_daemon/src/verification_machine/svt/factory.h similarity index 94% rename from score/TimeDaemon/code/verification_machine/svt/factory.h rename to score/time_daemon/src/verification_machine/svt/factory.h index 32b0c113..43074179 100644 --- a/score/TimeDaemon/code/verification_machine/svt/factory.h +++ b/score/time_daemon/src/verification_machine/svt/factory.h @@ -13,7 +13,7 @@ #ifndef SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_SVT_FACTORY_H #define SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_SVT_FACTORY_H -#include "score/TimeDaemon/code/verification_machine/svt/svt_verification_machine.h" +#include "score/time_daemon/src/verification_machine/svt/svt_verification_machine.h" namespace score { diff --git a/score/TimeDaemon/code/verification_machine/svt/svt_verification_machine.h b/score/time_daemon/src/verification_machine/svt/svt_verification_machine.h similarity index 78% rename from score/TimeDaemon/code/verification_machine/svt/svt_verification_machine.h rename to score/time_daemon/src/verification_machine/svt/svt_verification_machine.h index 33e3298f..d6b37ecd 100644 --- a/score/TimeDaemon/code/verification_machine/svt/svt_verification_machine.h +++ b/score/time_daemon/src/verification_machine/svt/svt_verification_machine.h @@ -13,11 +13,11 @@ #ifndef SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_SVT_SVT_VERIFICATION_MACHINE_H #define SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_SVT_SVT_VERIFICATION_MACHINE_H -#include "score/TimeDaemon/code/common/data_types/ptp_time_info.h" -#include "score/TimeDaemon/code/verification_machine/core/verification_machine.h" -#include "score/TimeDaemon/code/verification_machine/svt/validators/synchronization_validator.h" -#include "score/TimeDaemon/code/verification_machine/svt/validators/time_jumps_validator.h" -#include "score/TimeDaemon/code/verification_machine/svt/validators/timeout_validator.h" +#include "score/time_daemon/src/common/data_types/ptp_time_info.h" +#include "score/time_daemon/src/verification_machine/core/verification_machine.h" +#include "score/time_daemon/src/verification_machine/svt/validators/synchronization_validator.h" +#include "score/time_daemon/src/verification_machine/svt/validators/time_jumps_validator.h" +#include "score/time_daemon/src/verification_machine/svt/validators/timeout_validator.h" namespace score { diff --git a/score/TimeDaemon/code/verification_machine/svt/svt_verification_machine_test.cpp b/score/time_daemon/src/verification_machine/svt/svt_verification_machine_test.cpp similarity index 94% rename from score/TimeDaemon/code/verification_machine/svt/svt_verification_machine_test.cpp rename to score/time_daemon/src/verification_machine/svt/svt_verification_machine_test.cpp index a63b7c43..b71b0823 100644 --- a/score/TimeDaemon/code/verification_machine/svt/svt_verification_machine_test.cpp +++ b/score/time_daemon/src/verification_machine/svt/svt_verification_machine_test.cpp @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/verification_machine/svt/svt_verification_machine.h" -#include "score/TimeDaemon/code/verification_machine/svt/factory.h" +#include "score/time_daemon/src/verification_machine/svt/svt_verification_machine.h" +#include "score/time_daemon/src/verification_machine/svt/factory.h" #include #include diff --git a/score/TimeDaemon/code/verification_machine/svt/validators/BUILD b/score/time_daemon/src/verification_machine/svt/validators/BUILD similarity index 89% rename from score/TimeDaemon/code/verification_machine/svt/validators/BUILD rename to score/time_daemon/src/verification_machine/svt/validators/BUILD index ce5e5b27..12245fbd 100644 --- a/score/TimeDaemon/code/verification_machine/svt/validators/BUILD +++ b/score/time_daemon/src/verification_machine/svt/validators/BUILD @@ -28,11 +28,11 @@ cc_library( ], features = COMPILER_WARNING_FEATURES, tags = ["QM"], - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], deps = [ - "//score/TimeDaemon/code/common:logging_contexts", - "//score/TimeDaemon/code/common/data_types:ptp_time_info", - "//score/TimeDaemon/code/verification_machine/core:verification_machine", + "//score/time_daemon/src/common:logging_contexts", + "//score/time_daemon/src/common/data_types:ptp_time_info", + "//score/time_daemon/src/verification_machine/core:verification_machine", "//score/time/HighPrecisionLocalSteadyClock", "@score_baselibs//score/mw/log:frontend", ], @@ -45,7 +45,7 @@ cc_unit_test_suites_for_host_and_qnx( ":synchronization_validator_test", ":time_jumps_validator_test", ], - visibility = ["//score/TimeDaemon:__subpackages__"], + visibility = ["//score/time_daemon:__subpackages__"], ) cc_test( diff --git a/score/TimeDaemon/code/verification_machine/svt/validators/synchronization_validator.cpp b/score/time_daemon/src/verification_machine/svt/validators/synchronization_validator.cpp similarity index 92% rename from score/TimeDaemon/code/verification_machine/svt/validators/synchronization_validator.cpp rename to score/time_daemon/src/verification_machine/svt/validators/synchronization_validator.cpp index 17dfdcaf..e4d4cd89 100644 --- a/score/TimeDaemon/code/verification_machine/svt/validators/synchronization_validator.cpp +++ b/score/time_daemon/src/verification_machine/svt/validators/synchronization_validator.cpp @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/verification_machine/svt/validators/synchronization_validator.h" -#include "score/TimeDaemon/code/common/logging_contexts.h" +#include "score/time_daemon/src/verification_machine/svt/validators/synchronization_validator.h" +#include "score/time_daemon/src/common/logging_contexts.h" #include "score/mw/log/logging.h" namespace score diff --git a/score/TimeDaemon/code/verification_machine/svt/validators/synchronization_validator.h b/score/time_daemon/src/verification_machine/svt/validators/synchronization_validator.h similarity index 91% rename from score/TimeDaemon/code/verification_machine/svt/validators/synchronization_validator.h rename to score/time_daemon/src/verification_machine/svt/validators/synchronization_validator.h index 7eb66c55..7ed319c1 100644 --- a/score/TimeDaemon/code/verification_machine/svt/validators/synchronization_validator.h +++ b/score/time_daemon/src/verification_machine/svt/validators/synchronization_validator.h @@ -13,8 +13,8 @@ #ifndef SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_SVT_VALIDATORS_SYNCHRONIZATION_VALIDATOR_H #define SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_SVT_VALIDATORS_SYNCHRONIZATION_VALIDATOR_H -#include "score/TimeDaemon/code/common/data_types/ptp_time_info.h" -#include "score/TimeDaemon/code/verification_machine/core/verification_stage.h" +#include "score/time_daemon/src/common/data_types/ptp_time_info.h" +#include "score/time_daemon/src/verification_machine/core/verification_stage.h" namespace score { diff --git a/score/TimeDaemon/code/verification_machine/svt/validators/synchronization_validator_test.cpp b/score/time_daemon/src/verification_machine/svt/validators/synchronization_validator_test.cpp similarity index 96% rename from score/TimeDaemon/code/verification_machine/svt/validators/synchronization_validator_test.cpp rename to score/time_daemon/src/verification_machine/svt/validators/synchronization_validator_test.cpp index bb3f1df0..b3db83e6 100644 --- a/score/TimeDaemon/code/verification_machine/svt/validators/synchronization_validator_test.cpp +++ b/score/time_daemon/src/verification_machine/svt/validators/synchronization_validator_test.cpp @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/verification_machine/svt/validators/synchronization_validator.h" +#include "score/time_daemon/src/verification_machine/svt/validators/synchronization_validator.h" #include "gmock/gmock.h" #include diff --git a/score/TimeDaemon/code/verification_machine/svt/validators/time_jumps_validator.cpp b/score/time_daemon/src/verification_machine/svt/validators/time_jumps_validator.cpp similarity index 98% rename from score/TimeDaemon/code/verification_machine/svt/validators/time_jumps_validator.cpp rename to score/time_daemon/src/verification_machine/svt/validators/time_jumps_validator.cpp index 5db1d366..7622b959 100644 --- a/score/TimeDaemon/code/verification_machine/svt/validators/time_jumps_validator.cpp +++ b/score/time_daemon/src/verification_machine/svt/validators/time_jumps_validator.cpp @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/verification_machine/svt/validators/time_jumps_validator.h" -#include "score/TimeDaemon/code/common/logging_contexts.h" +#include "score/time_daemon/src/verification_machine/svt/validators/time_jumps_validator.h" +#include "score/time_daemon/src/common/logging_contexts.h" #include "score/mw/log/logging.h" namespace score diff --git a/score/TimeDaemon/code/verification_machine/svt/validators/time_jumps_validator.h b/score/time_daemon/src/verification_machine/svt/validators/time_jumps_validator.h similarity index 95% rename from score/TimeDaemon/code/verification_machine/svt/validators/time_jumps_validator.h rename to score/time_daemon/src/verification_machine/svt/validators/time_jumps_validator.h index 6c808464..b9d1d7bb 100644 --- a/score/TimeDaemon/code/verification_machine/svt/validators/time_jumps_validator.h +++ b/score/time_daemon/src/verification_machine/svt/validators/time_jumps_validator.h @@ -13,8 +13,8 @@ #ifndef SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_SVT_VALIDATORS_TIME_JUMPS_VALIDATOR_H #define SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_SVT_VALIDATORS_TIME_JUMPS_VALIDATOR_H -#include "score/TimeDaemon/code/common/data_types/ptp_time_info.h" -#include "score/TimeDaemon/code/verification_machine/core/verification_stage.h" +#include "score/time_daemon/src/common/data_types/ptp_time_info.h" +#include "score/time_daemon/src/verification_machine/core/verification_stage.h" #include #include diff --git a/score/TimeDaemon/code/verification_machine/svt/validators/time_jumps_validator_test.cpp b/score/time_daemon/src/verification_machine/svt/validators/time_jumps_validator_test.cpp similarity index 98% rename from score/TimeDaemon/code/verification_machine/svt/validators/time_jumps_validator_test.cpp rename to score/time_daemon/src/verification_machine/svt/validators/time_jumps_validator_test.cpp index 4fca5a55..68c0b723 100644 --- a/score/TimeDaemon/code/verification_machine/svt/validators/time_jumps_validator_test.cpp +++ b/score/time_daemon/src/verification_machine/svt/validators/time_jumps_validator_test.cpp @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/verification_machine/svt/validators/time_jumps_validator.h" +#include "score/time_daemon/src/verification_machine/svt/validators/time_jumps_validator.h" #include "score/time/HighPrecisionLocalSteadyClock/high_precision_local_steady_clock_mock.h" diff --git a/score/TimeDaemon/code/verification_machine/svt/validators/timeout_validator.cpp b/score/time_daemon/src/verification_machine/svt/validators/timeout_validator.cpp similarity index 96% rename from score/TimeDaemon/code/verification_machine/svt/validators/timeout_validator.cpp rename to score/time_daemon/src/verification_machine/svt/validators/timeout_validator.cpp index 15d122c5..7c0c08bd 100644 --- a/score/TimeDaemon/code/verification_machine/svt/validators/timeout_validator.cpp +++ b/score/time_daemon/src/verification_machine/svt/validators/timeout_validator.cpp @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/verification_machine/svt/validators/timeout_validator.h" -#include "score/TimeDaemon/code/common/logging_contexts.h" +#include "score/time_daemon/src/verification_machine/svt/validators/timeout_validator.h" +#include "score/time_daemon/src/common/logging_contexts.h" #include "score/mw/log/logging.h" namespace score diff --git a/score/TimeDaemon/code/verification_machine/svt/validators/timeout_validator.h b/score/time_daemon/src/verification_machine/svt/validators/timeout_validator.h similarity index 93% rename from score/TimeDaemon/code/verification_machine/svt/validators/timeout_validator.h rename to score/time_daemon/src/verification_machine/svt/validators/timeout_validator.h index 49025abf..eba00a9b 100644 --- a/score/TimeDaemon/code/verification_machine/svt/validators/timeout_validator.h +++ b/score/time_daemon/src/verification_machine/svt/validators/timeout_validator.h @@ -13,8 +13,8 @@ #ifndef SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_SVT_VALIDATORS_TIMEOUT_VALIDATOR_H #define SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_SVT_VALIDATORS_TIMEOUT_VALIDATOR_H -#include "score/TimeDaemon/code/common/data_types/ptp_time_info.h" -#include "score/TimeDaemon/code/verification_machine/core/verification_stage.h" +#include "score/time_daemon/src/common/data_types/ptp_time_info.h" +#include "score/time_daemon/src/verification_machine/core/verification_stage.h" #include diff --git a/score/TimeDaemon/code/verification_machine/svt/validators/timeout_validator_test.cpp b/score/time_daemon/src/verification_machine/svt/validators/timeout_validator_test.cpp similarity index 98% rename from score/TimeDaemon/code/verification_machine/svt/validators/timeout_validator_test.cpp rename to score/time_daemon/src/verification_machine/svt/validators/timeout_validator_test.cpp index 9ce2234f..e57e1ede 100644 --- a/score/TimeDaemon/code/verification_machine/svt/validators/timeout_validator_test.cpp +++ b/score/time_daemon/src/verification_machine/svt/validators/timeout_validator_test.cpp @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/TimeDaemon/code/verification_machine/svt/validators/timeout_validator.h" +#include "score/time_daemon/src/verification_machine/svt/validators/timeout_validator.h" #include "score/time/HighPrecisionLocalSteadyClock/high_precision_local_steady_clock_mock.h" From 4fd57f942e15638b886dc54765bbbd991bc1dc64 Mon Sep 17 00:00:00 2001 From: "Hornburg Bjoern (ETAS-ECM XPC-Hi)" Date: Fri, 22 May 2026 09:24:16 +0200 Subject: [PATCH 2/3] Fix include guards --- score/time_daemon/src/application/job_runner/job_runner.h | 6 +++--- score/time_daemon/src/application/svt/factory.h | 6 +++--- score/time_daemon/src/application/svt/svt_handler.h | 6 +++--- score/time_daemon/src/application/time_daemon.h | 6 +++--- score/time_daemon/src/application/timebase_handler.h | 6 +++--- score/time_daemon/src/common/data_flow/consumer.h | 6 +++--- score/time_daemon/src/common/data_flow/producer.h | 6 +++--- score/time_daemon/src/common/data_types/ptp_time_info.h | 6 +++--- score/time_daemon/src/common/logging_contexts.h | 6 +++--- score/time_daemon/src/common/machines/base_machine.h | 6 +++--- .../time_daemon/src/common/machines/event_driven_machine.h | 6 +++--- score/time_daemon/src/common/machines/periodic_machine.h | 6 +++--- score/time_daemon/src/common/machines/proactive_machine.h | 6 +++--- score/time_daemon/src/common/machines/reactive_machine.h | 6 +++--- .../src/control_flow_divider/core/control_flow_divider.h | 6 +++--- score/time_daemon/src/control_flow_divider/ptp/factory.h | 6 +++--- .../src/control_flow_divider/ptp/ptp_control_flow_divider.h | 6 +++--- score/time_daemon/src/ipc/core/publisher_impl.h | 6 +++--- score/time_daemon/src/ipc/core/receiver_impl.h | 6 +++--- score/time_daemon/src/ipc/core/shared_memory_handler.h | 6 +++--- score/time_daemon/src/ipc/core/test_types.h | 6 +++--- score/time_daemon/src/ipc/data_converter.h | 6 +++--- score/time_daemon/src/ipc/receiver.h | 6 +++--- score/time_daemon/src/ipc/receiver_mock.h | 6 +++--- score/time_daemon/src/ipc/svt/config.h | 6 +++--- score/time_daemon/src/ipc/svt/publisher/factory.h | 6 +++--- score/time_daemon/src/ipc/svt/publisher/svt_publisher.h | 6 +++--- score/time_daemon/src/ipc/svt/receiver/factory.h | 6 +++--- score/time_daemon/src/ipc/svt/receiver/svt_receiver.h | 6 +++--- score/time_daemon/src/ipc/svt/svt_time_info.h | 6 +++--- score/time_daemon/src/msg_broker/msg_broker.h | 6 +++--- score/time_daemon/src/msg_broker/subscription.h | 6 +++--- score/time_daemon/src/msg_broker/topic.h | 6 +++--- score/time_daemon/src/ptp_machine/core/ptp_engine_mock.h | 6 +++--- score/time_daemon/src/ptp_machine/core/ptp_machine.h | 6 +++--- .../src/ptp_machine/shm/details/shm_ptp_engine.h | 6 +++--- score/time_daemon/src/ptp_machine/shm/factory.h | 6 +++--- score/time_daemon/src/ptp_machine/shm/gptp_shm_machine.h | 6 +++--- .../src/ptp_machine/stub/details/stub_ptp_engine.h | 6 +++--- score/time_daemon/src/ptp_machine/stub/factory.h | 6 +++--- score/time_daemon/src/ptp_machine/stub/gptp_stub_machine.h | 6 +++--- .../src/verification_machine/core/verification_machine.h | 6 +++--- .../src/verification_machine/core/verification_stage.h | 6 +++--- .../src/verification_machine/core/verification_stage_mock.h | 6 +++--- score/time_daemon/src/verification_machine/svt/factory.h | 6 +++--- .../src/verification_machine/svt/svt_verification_machine.h | 6 +++--- .../svt/validators/synchronization_validator.h | 6 +++--- .../svt/validators/time_jumps_validator.h | 6 +++--- .../verification_machine/svt/validators/timeout_validator.h | 6 +++--- 49 files changed, 147 insertions(+), 147 deletions(-) diff --git a/score/time_daemon/src/application/job_runner/job_runner.h b/score/time_daemon/src/application/job_runner/job_runner.h index 5f0c79c3..25c5728a 100644 --- a/score/time_daemon/src/application/job_runner/job_runner.h +++ b/score/time_daemon/src/application/job_runner/job_runner.h @@ -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 #include @@ -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 diff --git a/score/time_daemon/src/application/svt/factory.h b/score/time_daemon/src/application/svt/factory.h index e755c08b..be6b69f1 100644 --- a/score/time_daemon/src/application/svt/factory.h +++ b/score/time_daemon/src/application/svt/factory.h @@ -10,8 +10,8 @@ * * 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/time_daemon/src/application/timebase_handler.h" @@ -30,4 +30,4 @@ std::unique_ptr CreateSvtTimebase(); } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_APPLICATION_FACTORY_H +#endif // SCORE_TIME_DAEMON_SRC_APPLICATION_FACTORY_H diff --git a/score/time_daemon/src/application/svt/svt_handler.h b/score/time_daemon/src/application/svt/svt_handler.h index c48a9f50..63663225 100644 --- a/score/time_daemon/src/application/svt/svt_handler.h +++ b/score/time_daemon/src/application/svt/svt_handler.h @@ -10,8 +10,8 @@ * * 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/time_daemon/src/application/job_runner/job_runner.h" #include "score/time_daemon/src/application/timebase_handler.h" @@ -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 diff --git a/score/time_daemon/src/application/time_daemon.h b/score/time_daemon/src/application/time_daemon.h index cd021291..5ca13ad9 100644 --- a/score/time_daemon/src/application/time_daemon.h +++ b/score/time_daemon/src/application/time_daemon.h @@ -10,8 +10,8 @@ * * 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/time_daemon/src/application/timebase_handler.h" @@ -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 diff --git a/score/time_daemon/src/application/timebase_handler.h b/score/time_daemon/src/application/timebase_handler.h index dc3c2270..518faf66 100644 --- a/score/time_daemon/src/application/timebase_handler.h +++ b/score/time_daemon/src/application/timebase_handler.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_APPLICATION_TIMEBASE_HANDLER_H -#define SCORE_TIMEDAEMON_CODE_APPLICATION_TIMEBASE_HANDLER_H +#ifndef SCORE_TIME_DAEMON_SRC_APPLICATION_TIMEBASE_HANDLER_H +#define SCORE_TIME_DAEMON_SRC_APPLICATION_TIMEBASE_HANDLER_H #include #include @@ -79,4 +79,4 @@ class TimebaseHandler } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_APPLICATION_TIMEBASE_HANDLER_H +#endif // SCORE_TIME_DAEMON_SRC_APPLICATION_TIMEBASE_HANDLER_H diff --git a/score/time_daemon/src/common/data_flow/consumer.h b/score/time_daemon/src/common/data_flow/consumer.h index 41347208..60bfc55e 100644 --- a/score/time_daemon/src/common/data_flow/consumer.h +++ b/score/time_daemon/src/common/data_flow/consumer.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_COMMON_DATA_FLOW_CONSUMER_H -#define SCORE_TIMEDAEMON_CODE_COMMON_DATA_FLOW_CONSUMER_H +#ifndef SCORE_TIME_DAEMON_SRC_COMMON_DATA_FLOW_CONSUMER_H +#define SCORE_TIME_DAEMON_SRC_COMMON_DATA_FLOW_CONSUMER_H #include #include @@ -53,4 +53,4 @@ class Consumer } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_COMMON_DATA_FLOW_CONSUMER_H +#endif // SCORE_TIME_DAEMON_SRC_COMMON_DATA_FLOW_CONSUMER_H diff --git a/score/time_daemon/src/common/data_flow/producer.h b/score/time_daemon/src/common/data_flow/producer.h index f5643310..47230a2e 100644 --- a/score/time_daemon/src/common/data_flow/producer.h +++ b/score/time_daemon/src/common/data_flow/producer.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_COMMON_DATA_FLOW_PRODUCER_H -#define SCORE_TIMEDAEMON_CODE_COMMON_DATA_FLOW_PRODUCER_H +#ifndef SCORE_TIME_DAEMON_SRC_COMMON_DATA_FLOW_PRODUCER_H +#define SCORE_TIME_DAEMON_SRC_COMMON_DATA_FLOW_PRODUCER_H #include @@ -66,4 +66,4 @@ class Producer } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_COMMON_DATA_FLOW_PRODUCER_H +#endif // SCORE_TIME_DAEMON_SRC_COMMON_DATA_FLOW_PRODUCER_H diff --git a/score/time_daemon/src/common/data_types/ptp_time_info.h b/score/time_daemon/src/common/data_types/ptp_time_info.h index 648a214d..fa9cd0b2 100644 --- a/score/time_daemon/src/common/data_types/ptp_time_info.h +++ b/score/time_daemon/src/common/data_types/ptp_time_info.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_COMMON_DATA_TYPES_PTP_TIME_INFO_H -#define SCORE_TIMEDAEMON_CODE_COMMON_DATA_TYPES_PTP_TIME_INFO_H +#ifndef SCORE_TIME_DAEMON_SRC_COMMON_DATA_TYPES_PTP_TIME_INFO_H +#define SCORE_TIME_DAEMON_SRC_COMMON_DATA_TYPES_PTP_TIME_INFO_H #include #include @@ -166,4 +166,4 @@ void PrintTo(const PtpTimeInfo& info, std::ostream* os); } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_COMMON_DATA_TYPES_PTP_TIME_INFO_H +#endif // SCORE_TIME_DAEMON_SRC_COMMON_DATA_TYPES_PTP_TIME_INFO_H diff --git a/score/time_daemon/src/common/logging_contexts.h b/score/time_daemon/src/common/logging_contexts.h index 27a8cbf1..85a7c589 100644 --- a/score/time_daemon/src/common/logging_contexts.h +++ b/score/time_daemon/src/common/logging_contexts.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_COMMON_LOGGING_CONTEXTS_H -#define SCORE_TIMEDAEMON_CODE_COMMON_LOGGING_CONTEXTS_H +#ifndef SCORE_TIME_DAEMON_SRC_COMMON_LOGGING_CONTEXTS_H +#define SCORE_TIME_DAEMON_SRC_COMMON_LOGGING_CONTEXTS_H #include @@ -41,4 +41,4 @@ constexpr auto kControlFlowDividerContext = "CFDV"; } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_COMMON_LOGGING_CONTEXTS_H +#endif // SCORE_TIME_DAEMON_SRC_COMMON_LOGGING_CONTEXTS_H diff --git a/score/time_daemon/src/common/machines/base_machine.h b/score/time_daemon/src/common/machines/base_machine.h index 3f077e22..87f10507 100644 --- a/score/time_daemon/src/common/machines/base_machine.h +++ b/score/time_daemon/src/common/machines/base_machine.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_COMMON_MACHINES_BASE_MACHINE_H -#define SCORE_TIMEDAEMON_CODE_COMMON_MACHINES_BASE_MACHINE_H +#ifndef SCORE_TIME_DAEMON_SRC_COMMON_MACHINES_BASE_MACHINE_H +#define SCORE_TIME_DAEMON_SRC_COMMON_MACHINES_BASE_MACHINE_H #include @@ -64,4 +64,4 @@ class BaseMachine } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_COMMON_MACHINES_BASE_MACHINE_H +#endif // SCORE_TIME_DAEMON_SRC_COMMON_MACHINES_BASE_MACHINE_H diff --git a/score/time_daemon/src/common/machines/event_driven_machine.h b/score/time_daemon/src/common/machines/event_driven_machine.h index dff2eda6..19b36b78 100644 --- a/score/time_daemon/src/common/machines/event_driven_machine.h +++ b/score/time_daemon/src/common/machines/event_driven_machine.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_COMMON_MACHINES_EVENT_DRIVEN_MACHINE_H -#define SCORE_TIMEDAEMON_CODE_COMMON_MACHINES_EVENT_DRIVEN_MACHINE_H +#ifndef SCORE_TIME_DAEMON_SRC_COMMON_MACHINES_EVENT_DRIVEN_MACHINE_H +#define SCORE_TIME_DAEMON_SRC_COMMON_MACHINES_EVENT_DRIVEN_MACHINE_H #include "score/time_daemon/src/common/machines/proactive_machine.h" #include "score/concurrency/condition_variable.h" @@ -109,4 +109,4 @@ class EventDrivenMachine : public ProactiveMachine } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_COMMON_MACHINES_EVENT_DRIVEN_MACHINE_H +#endif // SCORE_TIME_DAEMON_SRC_COMMON_MACHINES_EVENT_DRIVEN_MACHINE_H diff --git a/score/time_daemon/src/common/machines/periodic_machine.h b/score/time_daemon/src/common/machines/periodic_machine.h index 5fb7178f..fb4b2649 100644 --- a/score/time_daemon/src/common/machines/periodic_machine.h +++ b/score/time_daemon/src/common/machines/periodic_machine.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_COMMON_MACHINES_PERIODIC_MACHINE_H -#define SCORE_TIMEDAEMON_CODE_COMMON_MACHINES_PERIODIC_MACHINE_H +#ifndef SCORE_TIME_DAEMON_SRC_COMMON_MACHINES_PERIODIC_MACHINE_H +#define SCORE_TIME_DAEMON_SRC_COMMON_MACHINES_PERIODIC_MACHINE_H #include "score/time_daemon/src/common/machines/proactive_machine.h" #include "score/concurrency/condition_variable.h" @@ -94,4 +94,4 @@ class PeriodicMachine : public ProactiveMachine } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_COMMON_MACHINES_PERIODIC_MACHINE_H +#endif // SCORE_TIME_DAEMON_SRC_COMMON_MACHINES_PERIODIC_MACHINE_H diff --git a/score/time_daemon/src/common/machines/proactive_machine.h b/score/time_daemon/src/common/machines/proactive_machine.h index 0b2e186f..651435aa 100644 --- a/score/time_daemon/src/common/machines/proactive_machine.h +++ b/score/time_daemon/src/common/machines/proactive_machine.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_COMMON_MACHINES_PROACTIVE_MACHINE_H -#define SCORE_TIMEDAEMON_CODE_COMMON_MACHINES_PROACTIVE_MACHINE_H +#ifndef SCORE_TIME_DAEMON_SRC_COMMON_MACHINES_PROACTIVE_MACHINE_H +#define SCORE_TIME_DAEMON_SRC_COMMON_MACHINES_PROACTIVE_MACHINE_H #include "score/time_daemon/src/common/machines/base_machine.h" #include "score/concurrency/condition_variable.h" @@ -66,4 +66,4 @@ class ProactiveMachine : public BaseMachine } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_COMMON_MACHINES_PROACTIVE_MACHINE_H +#endif // SCORE_TIME_DAEMON_SRC_COMMON_MACHINES_PROACTIVE_MACHINE_H diff --git a/score/time_daemon/src/common/machines/reactive_machine.h b/score/time_daemon/src/common/machines/reactive_machine.h index 2e6d405d..a3a8c0a3 100644 --- a/score/time_daemon/src/common/machines/reactive_machine.h +++ b/score/time_daemon/src/common/machines/reactive_machine.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_COMMON_MACHINES_REACTIVE_MACHINE_H -#define SCORE_TIMEDAEMON_CODE_COMMON_MACHINES_REACTIVE_MACHINE_H +#ifndef SCORE_TIME_DAEMON_SRC_COMMON_MACHINES_REACTIVE_MACHINE_H +#define SCORE_TIME_DAEMON_SRC_COMMON_MACHINES_REACTIVE_MACHINE_H #include "score/time_daemon/src/common/machines/base_machine.h" @@ -43,4 +43,4 @@ class ReactiveMachine : public BaseMachine } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_COMMON_MACHINES_REACTIVE_MACHINE_H +#endif // SCORE_TIME_DAEMON_SRC_COMMON_MACHINES_REACTIVE_MACHINE_H diff --git a/score/time_daemon/src/control_flow_divider/core/control_flow_divider.h b/score/time_daemon/src/control_flow_divider/core/control_flow_divider.h index e3054b5e..b6e1a9e3 100644 --- a/score/time_daemon/src/control_flow_divider/core/control_flow_divider.h +++ b/score/time_daemon/src/control_flow_divider/core/control_flow_divider.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_CONTROL_FLOW_DIVIDER_CORE_CONTROL_FLOW_DIVIDER_H -#define SCORE_TIMEDAEMON_CODE_CONTROL_FLOW_DIVIDER_CORE_CONTROL_FLOW_DIVIDER_H +#ifndef SCORE_TIME_DAEMON_SRC_CONTROL_FLOW_DIVIDER_CORE_CONTROL_FLOW_DIVIDER_H +#define SCORE_TIME_DAEMON_SRC_CONTROL_FLOW_DIVIDER_CORE_CONTROL_FLOW_DIVIDER_H #include "score/time_daemon/src/common/data_flow/consumer.h" #include "score/time_daemon/src/common/data_flow/producer.h" @@ -207,4 +207,4 @@ void ControlFlowDivider::Publish(const DataType& data) } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_CONTROL_FLOW_DIVIDER_CORE_CONTROL_FLOW_DIVIDER_H +#endif // SCORE_TIME_DAEMON_SRC_CONTROL_FLOW_DIVIDER_CORE_CONTROL_FLOW_DIVIDER_H diff --git a/score/time_daemon/src/control_flow_divider/ptp/factory.h b/score/time_daemon/src/control_flow_divider/ptp/factory.h index 9758323c..cac2c848 100644 --- a/score/time_daemon/src/control_flow_divider/ptp/factory.h +++ b/score/time_daemon/src/control_flow_divider/ptp/factory.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_CONTROL_FLOW_DIVIDER_PTP_FACTORY_H -#define SCORE_TIMEDAEMON_CODE_CONTROL_FLOW_DIVIDER_PTP_FACTORY_H +#ifndef SCORE_TIME_DAEMON_SRC_CONTROL_FLOW_DIVIDER_PTP_FACTORY_H +#define SCORE_TIME_DAEMON_SRC_CONTROL_FLOW_DIVIDER_PTP_FACTORY_H #include "score/time_daemon/src/control_flow_divider/ptp/ptp_control_flow_divider.h" @@ -41,4 +41,4 @@ std::shared_ptr CreatePtpControlFlowDivider(const std::st } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_CONTROL_FLOW_DIVIDER_PTP_FACTORY_H +#endif // SCORE_TIME_DAEMON_SRC_CONTROL_FLOW_DIVIDER_PTP_FACTORY_H diff --git a/score/time_daemon/src/control_flow_divider/ptp/ptp_control_flow_divider.h b/score/time_daemon/src/control_flow_divider/ptp/ptp_control_flow_divider.h index 4e81a7c2..966dd25c 100644 --- a/score/time_daemon/src/control_flow_divider/ptp/ptp_control_flow_divider.h +++ b/score/time_daemon/src/control_flow_divider/ptp/ptp_control_flow_divider.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_CONTROL_FLOW_DIVIDER_PTP_PTP_CONTROL_FLOW_DIVIDER_H -#define SCORE_TIMEDAEMON_CODE_CONTROL_FLOW_DIVIDER_PTP_PTP_CONTROL_FLOW_DIVIDER_H +#ifndef SCORE_TIME_DAEMON_SRC_CONTROL_FLOW_DIVIDER_PTP_PTP_CONTROL_FLOW_DIVIDER_H +#define SCORE_TIME_DAEMON_SRC_CONTROL_FLOW_DIVIDER_PTP_PTP_CONTROL_FLOW_DIVIDER_H #include "score/time_daemon/src/common/data_types/ptp_time_info.h" #include "score/time_daemon/src/control_flow_divider/core/control_flow_divider.h" @@ -34,4 +34,4 @@ using PtpControlFlowDivider = ControlFlowDivider; } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_CONTROL_FLOW_DIVIDER_PTP_PTP_CONTROL_FLOW_DIVIDER_H +#endif // SCORE_TIME_DAEMON_SRC_CONTROL_FLOW_DIVIDER_PTP_PTP_CONTROL_FLOW_DIVIDER_H diff --git a/score/time_daemon/src/ipc/core/publisher_impl.h b/score/time_daemon/src/ipc/core/publisher_impl.h index b043f16d..40ed78ed 100644 --- a/score/time_daemon/src/ipc/core/publisher_impl.h +++ b/score/time_daemon/src/ipc/core/publisher_impl.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_IPC_CORE_PUBLISHER_IMPL_H -#define SCORE_TIMEDAEMON_CODE_IPC_CORE_PUBLISHER_IMPL_H +#ifndef SCORE_TIME_DAEMON_SRC_IPC_CORE_PUBLISHER_IMPL_H +#define SCORE_TIME_DAEMON_SRC_IPC_CORE_PUBLISHER_IMPL_H #include "score/time_daemon/src/common/data_flow/consumer.h" #include "score/time_daemon/src/common/logging_contexts.h" @@ -66,4 +66,4 @@ void PublisherImpl::OnMessage(DataType data) } // namespace td } // namespace score -#endif // #ifndef SCORE_TIMEDAEMON_CODE_IPC_CORE_PUBLISHER_IMPL_H +#endif // #ifndef SCORE_TIME_DAEMON_SRC_IPC_CORE_PUBLISHER_IMPL_H diff --git a/score/time_daemon/src/ipc/core/receiver_impl.h b/score/time_daemon/src/ipc/core/receiver_impl.h index c986a180..1cc905fc 100644 --- a/score/time_daemon/src/ipc/core/receiver_impl.h +++ b/score/time_daemon/src/ipc/core/receiver_impl.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_IPC_CORE_RECEIVER_IMPL_H -#define SCORE_TIMEDAEMON_CODE_IPC_CORE_RECEIVER_IMPL_H +#ifndef SCORE_TIME_DAEMON_SRC_IPC_CORE_RECEIVER_IMPL_H +#define SCORE_TIME_DAEMON_SRC_IPC_CORE_RECEIVER_IMPL_H #include "score/time_daemon/src/ipc/receiver.h" @@ -63,4 +63,4 @@ std::optional ReceiverImpl::Receive() noexcept } // namespace td } // namespace score -#endif // #ifndef SCORE_TIMEDAEMON_CODE_IPC_CORE_RECEIVER_IMPL_H +#endif // #ifndef SCORE_TIME_DAEMON_SRC_IPC_CORE_RECEIVER_IMPL_H diff --git a/score/time_daemon/src/ipc/core/shared_memory_handler.h b/score/time_daemon/src/ipc/core/shared_memory_handler.h index 6a57e2ed..de1dda50 100644 --- a/score/time_daemon/src/ipc/core/shared_memory_handler.h +++ b/score/time_daemon/src/ipc/core/shared_memory_handler.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_MSG_BROKER_SHARED_DATA_H -#define SCORE_TIMEDAEMON_CODE_MSG_BROKER_SHARED_DATA_H +#ifndef SCORE_TIME_DAEMON_SRC_MSG_BROKER_SHARED_DATA_H +#define SCORE_TIME_DAEMON_SRC_MSG_BROKER_SHARED_DATA_H #include "score/time_daemon/src/common/logging_contexts.h" #include "score/memory/shared/managed_memory_resource.h" @@ -184,4 +184,4 @@ void SharedMemoryHandler::Send(const DataType& data) } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_MSG_BROKER_SHARED_DATA_H +#endif // SCORE_TIME_DAEMON_SRC_MSG_BROKER_SHARED_DATA_H diff --git a/score/time_daemon/src/ipc/core/test_types.h b/score/time_daemon/src/ipc/core/test_types.h index c4dee1d5..f0ad7559 100644 --- a/score/time_daemon/src/ipc/core/test_types.h +++ b/score/time_daemon/src/ipc/core/test_types.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_IPC_CORE_TEST_TYPES_H -#define SCORE_TIMEDAEMON_CODE_IPC_CORE_TEST_TYPES_H +#ifndef SCORE_TIME_DAEMON_SRC_IPC_CORE_TEST_TYPES_H +#define SCORE_TIME_DAEMON_SRC_IPC_CORE_TEST_TYPES_H #include @@ -112,4 +112,4 @@ struct DataConverter } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_IPC_CORE_TEST_TYPES_H +#endif // SCORE_TIME_DAEMON_SRC_IPC_CORE_TEST_TYPES_H diff --git a/score/time_daemon/src/ipc/data_converter.h b/score/time_daemon/src/ipc/data_converter.h index a4e7c4c8..6f76ea3b 100644 --- a/score/time_daemon/src/ipc/data_converter.h +++ b/score/time_daemon/src/ipc/data_converter.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_IPC_DATA_CONVERTER_H -#define SCORE_TIMEDAEMON_CODE_IPC_DATA_CONVERTER_H +#ifndef SCORE_TIME_DAEMON_SRC_IPC_DATA_CONVERTER_H +#define SCORE_TIME_DAEMON_SRC_IPC_DATA_CONVERTER_H #include @@ -48,4 +48,4 @@ inline Dst ConvertToIpcData(const Src& src) } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_IPC_DATA_CONVERTER_H +#endif // SCORE_TIME_DAEMON_SRC_IPC_DATA_CONVERTER_H diff --git a/score/time_daemon/src/ipc/receiver.h b/score/time_daemon/src/ipc/receiver.h index c3f56891..90a6cd6c 100644 --- a/score/time_daemon/src/ipc/receiver.h +++ b/score/time_daemon/src/ipc/receiver.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_IPC_RECEIVER_H -#define SCORE_TIMEDAEMON_CODE_IPC_RECEIVER_H +#ifndef SCORE_TIME_DAEMON_SRC_IPC_RECEIVER_H +#define SCORE_TIME_DAEMON_SRC_IPC_RECEIVER_H #include @@ -49,4 +49,4 @@ class Receiver } // namespace td } // namespace score -#endif // #ifndef SCORE_TIMEDAEMON_CODE_IPC_RECEIVER_H +#endif // #ifndef SCORE_TIME_DAEMON_SRC_IPC_RECEIVER_H diff --git a/score/time_daemon/src/ipc/receiver_mock.h b/score/time_daemon/src/ipc/receiver_mock.h index ab13deed..6ef5985a 100644 --- a/score/time_daemon/src/ipc/receiver_mock.h +++ b/score/time_daemon/src/ipc/receiver_mock.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_IPC_RECEIVER_MOCK_H -#define SCORE_TIMEDAEMON_CODE_IPC_RECEIVER_MOCK_H +#ifndef SCORE_TIME_DAEMON_SRC_IPC_RECEIVER_MOCK_H +#define SCORE_TIME_DAEMON_SRC_IPC_RECEIVER_MOCK_H #include "score/time_daemon/src/ipc/receiver.h" @@ -39,4 +39,4 @@ class ReceiverMock : public Receiver } // namespace td } // namespace score -#endif // #ifndef SCORE_TIMEDAEMON_CODE_IPC_RECEIVER_MOCK_H +#endif // #ifndef SCORE_TIME_DAEMON_SRC_IPC_RECEIVER_MOCK_H diff --git a/score/time_daemon/src/ipc/svt/config.h b/score/time_daemon/src/ipc/svt/config.h index 42a27144..9261cd9e 100644 --- a/score/time_daemon/src/ipc/svt/config.h +++ b/score/time_daemon/src/ipc/svt/config.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_IPC_SVT_SHMEM_PATH_H -#define SCORE_TIMEDAEMON_CODE_IPC_SVT_SHMEM_PATH_H +#ifndef SCORE_TIME_DAEMON_SRC_IPC_SVT_SHMEM_PATH_H +#define SCORE_TIME_DAEMON_SRC_IPC_SVT_SHMEM_PATH_H #include @@ -28,4 +28,4 @@ const std::string kSvtShmemPath{"/svt_shmem_path"}; } // namespace td } // namespace score -#endif // #ifndef SCORE_TIMEDAEMON_CODE_IPC_SVT_SHMEM_PATH_H +#endif // #ifndef SCORE_TIME_DAEMON_SRC_IPC_SVT_SHMEM_PATH_H diff --git a/score/time_daemon/src/ipc/svt/publisher/factory.h b/score/time_daemon/src/ipc/svt/publisher/factory.h index 35833d02..a7f88513 100644 --- a/score/time_daemon/src/ipc/svt/publisher/factory.h +++ b/score/time_daemon/src/ipc/svt/publisher/factory.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_IPC_SVT_PUBLISHER_FACTORY_H -#define SCORE_TIMEDAEMON_CODE_IPC_SVT_PUBLISHER_FACTORY_H +#ifndef SCORE_TIME_DAEMON_SRC_IPC_SVT_PUBLISHER_FACTORY_H +#define SCORE_TIME_DAEMON_SRC_IPC_SVT_PUBLISHER_FACTORY_H #include "score/time_daemon/src/ipc/svt/publisher/svt_publisher.h" @@ -32,4 +32,4 @@ std::shared_ptr CreateSvtPublisher(const std::string& machine_name } // namespace td } // namespace score -#endif // #ifndef SCORE_TIMEDAEMON_CODE_IPC_SVT_PUBLISHER_FACTORY_H +#endif // #ifndef SCORE_TIME_DAEMON_SRC_IPC_SVT_PUBLISHER_FACTORY_H diff --git a/score/time_daemon/src/ipc/svt/publisher/svt_publisher.h b/score/time_daemon/src/ipc/svt/publisher/svt_publisher.h index d70aec19..67c62288 100644 --- a/score/time_daemon/src/ipc/svt/publisher/svt_publisher.h +++ b/score/time_daemon/src/ipc/svt/publisher/svt_publisher.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_IPC_SVT_SVT_PUBLISHER_H -#define SCORE_TIMEDAEMON_CODE_IPC_SVT_SVT_PUBLISHER_H +#ifndef SCORE_TIME_DAEMON_SRC_IPC_SVT_SVT_PUBLISHER_H +#define SCORE_TIME_DAEMON_SRC_IPC_SVT_SVT_PUBLISHER_H #include "score/time_daemon/src/common/data_types/ptp_time_info.h" #include "score/time_daemon/src/ipc/core/publisher_impl.h" @@ -30,4 +30,4 @@ using SvtPublisher = PublisherImpl; } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_IPC_SVT_SVT_PUBLISHER_H +#endif // SCORE_TIME_DAEMON_SRC_IPC_SVT_SVT_PUBLISHER_H diff --git a/score/time_daemon/src/ipc/svt/receiver/factory.h b/score/time_daemon/src/ipc/svt/receiver/factory.h index 958f1280..edcde037 100644 --- a/score/time_daemon/src/ipc/svt/receiver/factory.h +++ b/score/time_daemon/src/ipc/svt/receiver/factory.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_IPC_SVT_RECEIVER_FACTORY_H -#define SCORE_TIMEDAEMON_CODE_IPC_SVT_RECEIVER_FACTORY_H +#ifndef SCORE_TIME_DAEMON_SRC_IPC_SVT_RECEIVER_FACTORY_H +#define SCORE_TIME_DAEMON_SRC_IPC_SVT_RECEIVER_FACTORY_H #include "score/time_daemon/src/ipc/svt/receiver/svt_receiver.h" @@ -32,4 +32,4 @@ std::shared_ptr CreateSvtReceiver(); } // namespace td } // namespace score -#endif // #ifndef SCORE_TIMEDAEMON_CODE_IPC_SVT_RECEIVER_FACTORY_H +#endif // #ifndef SCORE_TIME_DAEMON_SRC_IPC_SVT_RECEIVER_FACTORY_H diff --git a/score/time_daemon/src/ipc/svt/receiver/svt_receiver.h b/score/time_daemon/src/ipc/svt/receiver/svt_receiver.h index a4287c0a..424408be 100644 --- a/score/time_daemon/src/ipc/svt/receiver/svt_receiver.h +++ b/score/time_daemon/src/ipc/svt/receiver/svt_receiver.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_IPC_SVT_SVT_RECEIVER_H -#define SCORE_TIMEDAEMON_CODE_IPC_SVT_SVT_RECEIVER_H +#ifndef SCORE_TIME_DAEMON_SRC_IPC_SVT_SVT_RECEIVER_H +#define SCORE_TIME_DAEMON_SRC_IPC_SVT_SVT_RECEIVER_H #include "score/time_daemon/src/ipc/receiver.h" #include "score/time_daemon/src/ipc/svt/svt_time_info.h" @@ -29,4 +29,4 @@ using SvtReceiver = Receiver; } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_IPC_SVT_SVT_RECEIVER_H +#endif // SCORE_TIME_DAEMON_SRC_IPC_SVT_SVT_RECEIVER_H diff --git a/score/time_daemon/src/ipc/svt/svt_time_info.h b/score/time_daemon/src/ipc/svt/svt_time_info.h index 5f1d2b84..96289d6c 100644 --- a/score/time_daemon/src/ipc/svt/svt_time_info.h +++ b/score/time_daemon/src/ipc/svt/svt_time_info.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_IPC_SVT_SVT_TIME_INFO_H -#define SCORE_TIMEDAEMON_CODE_IPC_SVT_SVT_TIME_INFO_H +#ifndef SCORE_TIME_DAEMON_SRC_IPC_SVT_SVT_TIME_INFO_H +#define SCORE_TIME_DAEMON_SRC_IPC_SVT_SVT_TIME_INFO_H #include #include @@ -187,4 +187,4 @@ struct DataConverter } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_IPC_SVT_SVT_TIME_INFO_H +#endif // SCORE_TIME_DAEMON_SRC_IPC_SVT_SVT_TIME_INFO_H diff --git a/score/time_daemon/src/msg_broker/msg_broker.h b/score/time_daemon/src/msg_broker/msg_broker.h index f92fd133..0e28413b 100644 --- a/score/time_daemon/src/msg_broker/msg_broker.h +++ b/score/time_daemon/src/msg_broker/msg_broker.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_MSG_BROKER_MSG_BROKER_H -#define SCORE_TIMEDAEMON_CODE_MSG_BROKER_MSG_BROKER_H +#ifndef SCORE_TIME_DAEMON_SRC_MSG_BROKER_MSG_BROKER_H +#define SCORE_TIME_DAEMON_SRC_MSG_BROKER_MSG_BROKER_H #include "score/time_daemon/src/common/data_flow/consumer.h" #include "score/time_daemon/src/common/data_flow/producer.h" @@ -108,4 +108,4 @@ void MessageBroker::OnNewData(const Topic& topic, const T& data) const } // namespace td } // namespace score -#endif // #ifndef SCORE_TIMEDAEMON_CODE_MSG_BROKER_MSG_BROKER_H +#endif // #ifndef SCORE_TIME_DAEMON_SRC_MSG_BROKER_MSG_BROKER_H diff --git a/score/time_daemon/src/msg_broker/subscription.h b/score/time_daemon/src/msg_broker/subscription.h index 27efd498..16f8e9ac 100644 --- a/score/time_daemon/src/msg_broker/subscription.h +++ b/score/time_daemon/src/msg_broker/subscription.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_MSG_BROKER_SUBSCRIPTION_H -#define SCORE_TIMEDAEMON_CODE_MSG_BROKER_SUBSCRIPTION_H +#ifndef SCORE_TIME_DAEMON_SRC_MSG_BROKER_SUBSCRIPTION_H +#define SCORE_TIME_DAEMON_SRC_MSG_BROKER_SUBSCRIPTION_H #include @@ -40,4 +40,4 @@ class Subscription } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_MSG_BROKER_SUBSCRIPTION_H +#endif // SCORE_TIME_DAEMON_SRC_MSG_BROKER_SUBSCRIPTION_H diff --git a/score/time_daemon/src/msg_broker/topic.h b/score/time_daemon/src/msg_broker/topic.h index 38b6070d..d10adf0f 100644 --- a/score/time_daemon/src/msg_broker/topic.h +++ b/score/time_daemon/src/msg_broker/topic.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_MSG_BROKER_TOPIC_H -#define SCORE_TIMEDAEMON_CODE_MSG_BROKER_TOPIC_H +#ifndef SCORE_TIME_DAEMON_SRC_MSG_BROKER_TOPIC_H +#define SCORE_TIME_DAEMON_SRC_MSG_BROKER_TOPIC_H #include #include @@ -64,4 +64,4 @@ struct hash }; } // namespace std -#endif // SCORE_TIMEDAEMON_CODE_MSG_BROKER_TOPIC_H +#endif // SCORE_TIME_DAEMON_SRC_MSG_BROKER_TOPIC_H diff --git a/score/time_daemon/src/ptp_machine/core/ptp_engine_mock.h b/score/time_daemon/src/ptp_machine/core/ptp_engine_mock.h index ca44ae1c..b8df0cc1 100644 --- a/score/time_daemon/src/ptp_machine/core/ptp_engine_mock.h +++ b/score/time_daemon/src/ptp_machine/core/ptp_engine_mock.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_PTP_MACHINE_CORE_PTP_ENGINE_MOCK_H -#define SCORE_TIMEDAEMON_CODE_PTP_MACHINE_CORE_PTP_ENGINE_MOCK_H +#ifndef SCORE_TIME_DAEMON_SRC_PTP_MACHINE_CORE_PTP_ENGINE_MOCK_H +#define SCORE_TIME_DAEMON_SRC_PTP_MACHINE_CORE_PTP_ENGINE_MOCK_H #include "score/time_daemon/src/common/data_types/ptp_time_info.h" @@ -106,4 +106,4 @@ class FakePTPEngine } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_PTP_MACHINE_CORE_PTP_ENGINE_MOCK_H +#endif // SCORE_TIME_DAEMON_SRC_PTP_MACHINE_CORE_PTP_ENGINE_MOCK_H diff --git a/score/time_daemon/src/ptp_machine/core/ptp_machine.h b/score/time_daemon/src/ptp_machine/core/ptp_machine.h index 7dfad444..5a3dcd28 100644 --- a/score/time_daemon/src/ptp_machine/core/ptp_machine.h +++ b/score/time_daemon/src/ptp_machine/core/ptp_machine.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_PTP_MACHINE_CORE_PTP_PTP_MACHINE_H -#define SCORE_TIMEDAEMON_CODE_PTP_MACHINE_CORE_PTP_PTP_MACHINE_H +#ifndef SCORE_TIME_DAEMON_SRC_PTP_MACHINE_CORE_PTP_PTP_MACHINE_H +#define SCORE_TIME_DAEMON_SRC_PTP_MACHINE_CORE_PTP_PTP_MACHINE_H #include "score/time_daemon/src/common/data_flow/producer.h" #include "score/time_daemon/src/common/data_types/ptp_time_info.h" @@ -194,4 +194,4 @@ void PTPMachine::Publish(const PtpTimeInfo& data) } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_PTP_MACHINE_CORE_PTP_PTP_MACHINE_H +#endif // SCORE_TIME_DAEMON_SRC_PTP_MACHINE_CORE_PTP_PTP_MACHINE_H diff --git a/score/time_daemon/src/ptp_machine/shm/details/shm_ptp_engine.h b/score/time_daemon/src/ptp_machine/shm/details/shm_ptp_engine.h index 9a4c31d7..d6805014 100644 --- a/score/time_daemon/src/ptp_machine/shm/details/shm_ptp_engine.h +++ b/score/time_daemon/src/ptp_machine/shm/details/shm_ptp_engine.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_PTP_MACHINE_SHM_DETAILS_SHM_PTP_ENGINE_H -#define SCORE_TIMEDAEMON_CODE_PTP_MACHINE_SHM_DETAILS_SHM_PTP_ENGINE_H +#ifndef SCORE_TIME_DAEMON_SRC_PTP_MACHINE_SHM_DETAILS_SHM_PTP_ENGINE_H +#define SCORE_TIME_DAEMON_SRC_PTP_MACHINE_SHM_DETAILS_SHM_PTP_ENGINE_H #include "score/time_daemon/src/common/data_types/ptp_time_info.h" #include "score/libTSClient/gptp_ipc_receiver.h" @@ -59,4 +59,4 @@ class ShmPTPEngine final } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_PTP_MACHINE_SHM_DETAILS_SHM_PTP_ENGINE_H +#endif // SCORE_TIME_DAEMON_SRC_PTP_MACHINE_SHM_DETAILS_SHM_PTP_ENGINE_H diff --git a/score/time_daemon/src/ptp_machine/shm/factory.h b/score/time_daemon/src/ptp_machine/shm/factory.h index d255b149..37ba5a15 100644 --- a/score/time_daemon/src/ptp_machine/shm/factory.h +++ b/score/time_daemon/src/ptp_machine/shm/factory.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_PTP_MACHINE_SHM_FACTORY_H -#define SCORE_TIMEDAEMON_CODE_PTP_MACHINE_SHM_FACTORY_H +#ifndef SCORE_TIME_DAEMON_SRC_PTP_MACHINE_SHM_FACTORY_H +#define SCORE_TIME_DAEMON_SRC_PTP_MACHINE_SHM_FACTORY_H #include "score/time_daemon/src/ptp_machine/shm/gptp_shm_machine.h" #include "score/libTSClient/gptp_ipc_channel.h" @@ -41,4 +41,4 @@ std::shared_ptr CreateGPTPShmMachine(const std::string& name, } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_PTP_MACHINE_SHM_FACTORY_H +#endif // SCORE_TIME_DAEMON_SRC_PTP_MACHINE_SHM_FACTORY_H diff --git a/score/time_daemon/src/ptp_machine/shm/gptp_shm_machine.h b/score/time_daemon/src/ptp_machine/shm/gptp_shm_machine.h index 51852891..dc788c3e 100644 --- a/score/time_daemon/src/ptp_machine/shm/gptp_shm_machine.h +++ b/score/time_daemon/src/ptp_machine/shm/gptp_shm_machine.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_PTP_MACHINE_SHM_GPTP_SHM_MACHINE_H -#define SCORE_TIMEDAEMON_CODE_PTP_MACHINE_SHM_GPTP_SHM_MACHINE_H +#ifndef SCORE_TIME_DAEMON_SRC_PTP_MACHINE_SHM_GPTP_SHM_MACHINE_H +#define SCORE_TIME_DAEMON_SRC_PTP_MACHINE_SHM_GPTP_SHM_MACHINE_H #include "score/time_daemon/src/ptp_machine/core/ptp_machine.h" #include "score/time_daemon/src/ptp_machine/shm/details/shm_ptp_engine.h" @@ -35,4 +35,4 @@ using GPTPShmMachine = PTPMachine; } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_PTP_MACHINE_SHM_GPTP_SHM_MACHINE_H +#endif // SCORE_TIME_DAEMON_SRC_PTP_MACHINE_SHM_GPTP_SHM_MACHINE_H diff --git a/score/time_daemon/src/ptp_machine/stub/details/stub_ptp_engine.h b/score/time_daemon/src/ptp_machine/stub/details/stub_ptp_engine.h index 46ad099f..17005420 100644 --- a/score/time_daemon/src/ptp_machine/stub/details/stub_ptp_engine.h +++ b/score/time_daemon/src/ptp_machine/stub/details/stub_ptp_engine.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_PTP_MACHINE_STUB_DETAILS_STUB_PTP_ENGINE_H -#define SCORE_TIMEDAEMON_CODE_PTP_MACHINE_STUB_DETAILS_STUB_PTP_ENGINE_H +#ifndef SCORE_TIME_DAEMON_SRC_PTP_MACHINE_STUB_DETAILS_STUB_PTP_ENGINE_H +#define SCORE_TIME_DAEMON_SRC_PTP_MACHINE_STUB_DETAILS_STUB_PTP_ENGINE_H #include "score/time_daemon/src/common/data_types/ptp_time_info.h" @@ -88,4 +88,4 @@ class StubPTPEngine final } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_PTP_MACHINE_STUB_DETAILS_STUB_PTP_ENGINE_H +#endif // SCORE_TIME_DAEMON_SRC_PTP_MACHINE_STUB_DETAILS_STUB_PTP_ENGINE_H diff --git a/score/time_daemon/src/ptp_machine/stub/factory.h b/score/time_daemon/src/ptp_machine/stub/factory.h index 21b48028..0c10545e 100644 --- a/score/time_daemon/src/ptp_machine/stub/factory.h +++ b/score/time_daemon/src/ptp_machine/stub/factory.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_PTP_MACHINE_STUB_FACTORY_H -#define SCORE_TIMEDAEMON_CODE_PTP_MACHINE_STUB_FACTORY_H +#ifndef SCORE_TIME_DAEMON_SRC_PTP_MACHINE_STUB_FACTORY_H +#define SCORE_TIME_DAEMON_SRC_PTP_MACHINE_STUB_FACTORY_H #include "score/time_daemon/src/ptp_machine/stub/gptp_stub_machine.h" @@ -32,4 +32,4 @@ std::shared_ptr CreateGPTPStubMachine(const std::string& name); } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_PTP_MACHINE_STUB_FACTORY_H +#endif // SCORE_TIME_DAEMON_SRC_PTP_MACHINE_STUB_FACTORY_H diff --git a/score/time_daemon/src/ptp_machine/stub/gptp_stub_machine.h b/score/time_daemon/src/ptp_machine/stub/gptp_stub_machine.h index 82a84473..cec31104 100644 --- a/score/time_daemon/src/ptp_machine/stub/gptp_stub_machine.h +++ b/score/time_daemon/src/ptp_machine/stub/gptp_stub_machine.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_PTP_MACHINE_STUB_GPTP_STUB_MACHINE_H -#define SCORE_TIMEDAEMON_CODE_PTP_MACHINE_STUB_GPTP_STUB_MACHINE_H +#ifndef SCORE_TIME_DAEMON_SRC_PTP_MACHINE_STUB_GPTP_STUB_MACHINE_H +#define SCORE_TIME_DAEMON_SRC_PTP_MACHINE_STUB_GPTP_STUB_MACHINE_H #include "score/time_daemon/src/ptp_machine/core/ptp_machine.h" #include "score/time_daemon/src/ptp_machine/stub/details/stub_ptp_engine.h" @@ -34,4 +34,4 @@ using GPTPStubMachine = PTPMachine; } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_PTP_MACHINE_STUB_GPTP_STUB_MACHINE_H +#endif // SCORE_TIME_DAEMON_SRC_PTP_MACHINE_STUB_GPTP_STUB_MACHINE_H diff --git a/score/time_daemon/src/verification_machine/core/verification_machine.h b/score/time_daemon/src/verification_machine/core/verification_machine.h index ce0d1876..9cbbce61 100644 --- a/score/time_daemon/src/verification_machine/core/verification_machine.h +++ b/score/time_daemon/src/verification_machine/core/verification_machine.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_CORE_VERIFICATION_MACHINE_H -#define SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_CORE_VERIFICATION_MACHINE_H +#ifndef SCORE_TIME_DAEMON_SRC_VERIFICATION_MACHINE_CORE_VERIFICATION_MACHINE_H +#define SCORE_TIME_DAEMON_SRC_VERIFICATION_MACHINE_CORE_VERIFICATION_MACHINE_H #include "score/time_daemon/src/common/data_flow/consumer.h" #include "score/time_daemon/src/common/data_flow/producer.h" @@ -202,4 +202,4 @@ void VerificationMachine::SetupPipeline(const std::vector @@ -96,4 +96,4 @@ void VerificationStage::SetNext(std::unique_ptr } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_CORE_VERIFICATION_STAGE_MOCK_H +#endif // SCORE_TIME_DAEMON_SRC_VERIFICATION_MACHINE_CORE_VERIFICATION_STAGE_MOCK_H diff --git a/score/time_daemon/src/verification_machine/svt/factory.h b/score/time_daemon/src/verification_machine/svt/factory.h index 43074179..a3ac7f53 100644 --- a/score/time_daemon/src/verification_machine/svt/factory.h +++ b/score/time_daemon/src/verification_machine/svt/factory.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_SVT_FACTORY_H -#define SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_SVT_FACTORY_H +#ifndef SCORE_TIME_DAEMON_SRC_VERIFICATION_MACHINE_SVT_FACTORY_H +#define SCORE_TIME_DAEMON_SRC_VERIFICATION_MACHINE_SVT_FACTORY_H #include "score/time_daemon/src/verification_machine/svt/svt_verification_machine.h" @@ -32,4 +32,4 @@ std::shared_ptr CreateSvtVerificationMachine(const std:: } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_SVT_FACTORY_H +#endif // SCORE_TIME_DAEMON_SRC_VERIFICATION_MACHINE_SVT_FACTORY_H diff --git a/score/time_daemon/src/verification_machine/svt/svt_verification_machine.h b/score/time_daemon/src/verification_machine/svt/svt_verification_machine.h index d6b37ecd..2f8382da 100644 --- a/score/time_daemon/src/verification_machine/svt/svt_verification_machine.h +++ b/score/time_daemon/src/verification_machine/svt/svt_verification_machine.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_SVT_SVT_VERIFICATION_MACHINE_H -#define SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_SVT_SVT_VERIFICATION_MACHINE_H +#ifndef SCORE_TIME_DAEMON_SRC_VERIFICATION_MACHINE_SVT_SVT_VERIFICATION_MACHINE_H +#define SCORE_TIME_DAEMON_SRC_VERIFICATION_MACHINE_SVT_SVT_VERIFICATION_MACHINE_H #include "score/time_daemon/src/common/data_types/ptp_time_info.h" #include "score/time_daemon/src/verification_machine/core/verification_machine.h" @@ -32,4 +32,4 @@ using SvtVerificationMachine = VerificationMachine; } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_SVT_SVT_VERIFICATION_MACHINE_H +#endif // SCORE_TIME_DAEMON_SRC_VERIFICATION_MACHINE_SVT_SVT_VERIFICATION_MACHINE_H diff --git a/score/time_daemon/src/verification_machine/svt/validators/synchronization_validator.h b/score/time_daemon/src/verification_machine/svt/validators/synchronization_validator.h index 7ed319c1..71a4f70d 100644 --- a/score/time_daemon/src/verification_machine/svt/validators/synchronization_validator.h +++ b/score/time_daemon/src/verification_machine/svt/validators/synchronization_validator.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_SVT_VALIDATORS_SYNCHRONIZATION_VALIDATOR_H -#define SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_SVT_VALIDATORS_SYNCHRONIZATION_VALIDATOR_H +#ifndef SCORE_TIME_DAEMON_SRC_VERIFICATION_MACHINE_SVT_VALIDATORS_SYNCHRONIZATION_VALIDATOR_H +#define SCORE_TIME_DAEMON_SRC_VERIFICATION_MACHINE_SVT_VALIDATORS_SYNCHRONIZATION_VALIDATOR_H #include "score/time_daemon/src/common/data_types/ptp_time_info.h" #include "score/time_daemon/src/verification_machine/core/verification_stage.h" @@ -42,4 +42,4 @@ class SynchronizationValidator : public VerificationStage } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_SVT_VALIDATORS_SYNCHRONIZATION_VALIDATOR_H +#endif // SCORE_TIME_DAEMON_SRC_VERIFICATION_MACHINE_SVT_VALIDATORS_SYNCHRONIZATION_VALIDATOR_H diff --git a/score/time_daemon/src/verification_machine/svt/validators/time_jumps_validator.h b/score/time_daemon/src/verification_machine/svt/validators/time_jumps_validator.h index b9d1d7bb..0445fcf4 100644 --- a/score/time_daemon/src/verification_machine/svt/validators/time_jumps_validator.h +++ b/score/time_daemon/src/verification_machine/svt/validators/time_jumps_validator.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_SVT_VALIDATORS_TIME_JUMPS_VALIDATOR_H -#define SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_SVT_VALIDATORS_TIME_JUMPS_VALIDATOR_H +#ifndef SCORE_TIME_DAEMON_SRC_VERIFICATION_MACHINE_SVT_VALIDATORS_TIME_JUMPS_VALIDATOR_H +#define SCORE_TIME_DAEMON_SRC_VERIFICATION_MACHINE_SVT_VALIDATORS_TIME_JUMPS_VALIDATOR_H #include "score/time_daemon/src/common/data_types/ptp_time_info.h" #include "score/time_daemon/src/verification_machine/core/verification_stage.h" @@ -81,4 +81,4 @@ class TimeJumpsValidator : public VerificationStage } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_SVT_VALIDATORS_TIME_JUMPS_VALIDATOR_H +#endif // SCORE_TIME_DAEMON_SRC_VERIFICATION_MACHINE_SVT_VALIDATORS_TIME_JUMPS_VALIDATOR_H diff --git a/score/time_daemon/src/verification_machine/svt/validators/timeout_validator.h b/score/time_daemon/src/verification_machine/svt/validators/timeout_validator.h index eba00a9b..f68143c9 100644 --- a/score/time_daemon/src/verification_machine/svt/validators/timeout_validator.h +++ b/score/time_daemon/src/verification_machine/svt/validators/timeout_validator.h @@ -10,8 +10,8 @@ * * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#ifndef SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_SVT_VALIDATORS_TIMEOUT_VALIDATOR_H -#define SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_SVT_VALIDATORS_TIMEOUT_VALIDATOR_H +#ifndef SCORE_TIME_DAEMON_SRC_VERIFICATION_MACHINE_SVT_VALIDATORS_TIMEOUT_VALIDATOR_H +#define SCORE_TIME_DAEMON_SRC_VERIFICATION_MACHINE_SVT_VALIDATORS_TIMEOUT_VALIDATOR_H #include "score/time_daemon/src/common/data_types/ptp_time_info.h" #include "score/time_daemon/src/verification_machine/core/verification_stage.h" @@ -50,4 +50,4 @@ class TimeoutValidator : public VerificationStage } // namespace td } // namespace score -#endif // SCORE_TIMEDAEMON_CODE_VERIFICATION_MACHINE_SVT_VALIDATORS_TIMEOUT_VALIDATOR_H +#endif // SCORE_TIME_DAEMON_SRC_VERIFICATION_MACHINE_SVT_VALIDATORS_TIMEOUT_VALIDATOR_H From 97d3a050f7fdaf558e5c204449a09a7157af4942 Mon Sep 17 00:00:00 2001 From: "Hornburg Bjoern (ETAS-ECM XPC-Hi)" Date: Fri, 22 May 2026 13:55:53 +0200 Subject: [PATCH 3/3] Fix BUILD file formatting --- score/time_daemon/src/application/BUILD | 2 +- score/time_daemon/src/ptp_machine/core/BUILD | 2 +- score/time_daemon/src/ptp_machine/shm/BUILD | 2 +- score/time_daemon/src/ptp_machine/shm/details/BUILD | 2 +- score/time_daemon/src/ptp_machine/stub/details/BUILD | 2 +- score/time_daemon/src/verification_machine/svt/validators/BUILD | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/score/time_daemon/src/application/BUILD b/score/time_daemon/src/application/BUILD index 99a5c5a3..82b07c69 100644 --- a/score/time_daemon/src/application/BUILD +++ b/score/time_daemon/src/application/BUILD @@ -31,9 +31,9 @@ cc_library( cc_binary( name = "TimeDaemon", srcs = [ + "main.cpp", "time_daemon.cpp", "time_daemon.h", - "main.cpp", ], features = COMPILER_WARNING_FEATURES, tags = ["QM"], diff --git a/score/time_daemon/src/ptp_machine/core/BUILD b/score/time_daemon/src/ptp_machine/core/BUILD index b927ad4b..00b82eaa 100644 --- a/score/time_daemon/src/ptp_machine/core/BUILD +++ b/score/time_daemon/src/ptp_machine/core/BUILD @@ -25,9 +25,9 @@ cc_library( tags = ["QM"], visibility = ["//score/time_daemon:__subpackages__"], deps = [ + "//score/time/HighPrecisionLocalSteadyClock", "//score/time_daemon/src/common/data_flow", "//score/time_daemon/src/common/machines", - "//score/time/HighPrecisionLocalSteadyClock", "@score_baselibs//score/mw/log:frontend", ], ) diff --git a/score/time_daemon/src/ptp_machine/shm/BUILD b/score/time_daemon/src/ptp_machine/shm/BUILD index 051b6f83..ab425e8d 100644 --- a/score/time_daemon/src/ptp_machine/shm/BUILD +++ b/score/time_daemon/src/ptp_machine/shm/BUILD @@ -27,9 +27,9 @@ cc_library( tags = ["QM"], visibility = ["//score/time_daemon:__subpackages__"], deps = [ + "//score/libTSClient:gptp_ipc", "//score/time_daemon/src/ptp_machine/core:ptp_machine", "//score/time_daemon/src/ptp_machine/shm/details:shm_ptp_engine", - "//score/libTSClient:gptp_ipc", ], ) diff --git a/score/time_daemon/src/ptp_machine/shm/details/BUILD b/score/time_daemon/src/ptp_machine/shm/details/BUILD index 771e7ec0..dc3ad101 100644 --- a/score/time_daemon/src/ptp_machine/shm/details/BUILD +++ b/score/time_daemon/src/ptp_machine/shm/details/BUILD @@ -26,9 +26,9 @@ cc_library( tags = ["QM"], visibility = ["//score/time_daemon:__subpackages__"], deps = [ + "//score/libTSClient:gptp_ipc", "//score/time_daemon/src/common:logging_contexts", "//score/time_daemon/src/common/data_types:ptp_time_info", - "//score/libTSClient:gptp_ipc", "@score_baselibs//score/mw/log:frontend", ], ) diff --git a/score/time_daemon/src/ptp_machine/stub/details/BUILD b/score/time_daemon/src/ptp_machine/stub/details/BUILD index 4ad265dd..d8593b21 100644 --- a/score/time_daemon/src/ptp_machine/stub/details/BUILD +++ b/score/time_daemon/src/ptp_machine/stub/details/BUILD @@ -26,9 +26,9 @@ cc_library( tags = ["QM"], visibility = ["//score/time_daemon:__subpackages__"], deps = [ + "//score/time/HighPrecisionLocalSteadyClock:interface", "//score/time_daemon/src/common:logging_contexts", "//score/time_daemon/src/common/data_types:ptp_time_info", - "//score/time/HighPrecisionLocalSteadyClock:interface", "@score_baselibs//score/mw/log:frontend", ], ) diff --git a/score/time_daemon/src/verification_machine/svt/validators/BUILD b/score/time_daemon/src/verification_machine/svt/validators/BUILD index 12245fbd..a9af31f2 100644 --- a/score/time_daemon/src/verification_machine/svt/validators/BUILD +++ b/score/time_daemon/src/verification_machine/svt/validators/BUILD @@ -30,10 +30,10 @@ cc_library( tags = ["QM"], visibility = ["//score/time_daemon:__subpackages__"], deps = [ + "//score/time/HighPrecisionLocalSteadyClock", "//score/time_daemon/src/common:logging_contexts", "//score/time_daemon/src/common/data_types:ptp_time_info", "//score/time_daemon/src/verification_machine/core:verification_machine", - "//score/time/HighPrecisionLocalSteadyClock", "@score_baselibs//score/mw/log:frontend", ], )