Rama copybara export cw 05

.bazelrc

@@ -24,7 +24,7 @@ common --//score/datarouter/build_configuration_flags:persistent_logging=False
 common --//score/datarouter/build_configuration_flags:persistent_config_feature_enabled=False
 common --//score/datarouter/build_configuration_flags:enable_nonverbose_dlt=False
 common --//score/datarouter/build_configuration_flags:enable_dynamic_configuration_in_datarouter=False
-common --//score/datarouter/build_configuration_flags:dlt_file_transfer_feature=False
+common --//score/datarouter/build_configuration_flags:file_transfer=False
 common --//score/datarouter/build_configuration_flags:use_local_vlan=True
 
 build --incompatible_strict_action_env

MODULE.bazel

@@ -95,14 +95,14 @@ bazel_dep(name = "rapidjson", version = "1.1.0")
 bazel_dep(name = "score_communication", version = "0.1.2")
 git_override(
     module_name = "score_communication",
-    commit = "5a70133dd8bd632f5c07f200a5ee4bc9f507c23b",
+    commit = "42eb047495099ec70b5c8773f29783cc205bf7df",
     remote = "https://github.com/eclipse-score/communication.git",
 )
 
 bazel_dep(name = "score_baselibs", version = "0.2.0")
 git_override(
     module_name = "score_baselibs",
-    commit = "3c65b223e9f516f95935bb4cd2e83d6088ca016f",
+    commit = "99d49637a2199f33a71edc479d39970e3bdcb271",
     remote = "https://github.com/eclipse-score/baselibs.git",
 )
 

score/datarouter/BUILD

@@ -37,8 +37,8 @@ cc_library(
     strip_include_prefix = "include",
     visibility = [
         "//score/datarouter/dlt_filetransfer_trigger_lib:__pkg__",
-        "//score/datarouter/file_transfer:__subpackages__",
-        "//score/datarouter/persistent_logging/persistent_logging:__pkg__",
+        "//score/datarouter/src/file_transfer:__subpackages__",
+        "//score/datarouter/src/persistent_logging/persistent_logging:__pkg__",
         "//score/datarouter/test:__subpackages__",
     ],
     deps = [
@@ -109,6 +109,7 @@ cc_library(
         "//score/datarouter/dynamic_configuration/i_session",
         "@score_baselibs//score/os:pthread",
         "@score_baselibs//score/os:sys_poll",
+        "@score_baselibs//score/quality/compiler_warnings",
     ],
 )
 
@@ -128,6 +129,7 @@ cc_library(
         "//score/datarouter/dynamic_configuration/i_session",
         "@score_baselibs//score/os:pthread",
         "@score_baselibs//score/os:sys_poll",
+        "@score_baselibs//score/quality/compiler_warnings",
     ],
 )
 
@@ -162,11 +164,11 @@ cc_library(
     features = COMPILER_WARNING_FEATURES,
     strip_include_prefix = "include",
     visibility = [
-        "//score/datarouter/file_transfer:__subpackages__",
         "//score/datarouter/nonverbose_dlt:__pkg__",
         "//score/datarouter/nonverbose_dlt_stub:__pkg__",
-        "//score/datarouter/persistent_logging:__pkg__",
-        "//score/datarouter/persistent_logging/persistent_logging:__pkg__",
+        "//score/datarouter/src/file_transfer:__subpackages__",
+        "//score/datarouter/src/persistent_logging:__pkg__",
+        "//score/datarouter/src/persistent_logging/persistent_logging:__pkg__",
         "//score/datarouter/test:__subpackages__",
     ],
     deps = [
@@ -185,11 +187,11 @@ cc_library(
     features = COMPILER_WARNING_FEATURES,
     strip_include_prefix = "include",
     visibility = [
-        "//score/datarouter/file_transfer:__subpackages__",
         "//score/datarouter/nonverbose_dlt:__pkg__",
         "//score/datarouter/nonverbose_dlt_stub:__pkg__",
-        "//score/datarouter/persistent_logging:__pkg__",
-        "//score/datarouter/persistent_logging/persistent_logging:__pkg__",
+        "//score/datarouter/src/file_transfer:__subpackages__",
+        "//score/datarouter/src/persistent_logging:__pkg__",
+        "//score/datarouter/src/persistent_logging/persistent_logging:__pkg__",
     ],
     deps = [
         ":datarouter_types",
@@ -448,7 +450,7 @@ cc_library(
     features = COMPILER_WARNING_FEATURES,
     strip_include_prefix = "include",
     visibility = [
-        "//score/datarouter/file_transfer:__subpackages__",
+        "//score/datarouter/src/file_transfer:__subpackages__",
     ],
     deps = [
         ":dltprotocol",
@@ -492,7 +494,7 @@ cc_library(
             ],
             "//conditions:default": [],
         }) + select({
-            "//score/datarouter/build_configuration_flags:config_dlt_file_transfer": ["DLT_FILE_TRANSFER_FEATURE"],
+            "//score/datarouter/build_configuration_flags:config_file_transfer": ["DLT_FILE_TRANSFER_FEATURE"],
             "//conditions:default": [],
         }) + select({
             "//score/datarouter/build_configuration_flags:config_persistent_logging": ["PERSISTENT_LOGGING"],
@@ -508,11 +510,11 @@ cc_library(
             ],
             "//conditions:default": ["//score/datarouter/src/persistency/stub_persistent_dictionary:stub_persistent_dictionary_factory"],
         }) + select({
-            "//score/datarouter/build_configuration_flags:config_dlt_file_transfer": [
-                "//score/datarouter/file_transfer/file_transfer_impl:file_transfer_stream_handler",
+            "//score/datarouter/build_configuration_flags:config_file_transfer": [
+                "//score/datarouter/src/file_transfer/file_transfer_impl:file_transfer_stream_handler",
             ],
             "//conditions:default": [
-                "//score/datarouter/file_transfer/file_transfer_stub:file_transfer_stream_handler_stub",
+                "//score/datarouter/src/file_transfer/file_transfer_stub:file_transfer_stream_handler_stub",
             ],
         }) + select({
             "//score/datarouter/build_configuration_flags:config_datarouter_nonverbose_dlt": [
@@ -530,10 +532,10 @@ cc_library(
             ],
         }) + select({
             "//score/datarouter/build_configuration_flags:config_persistent_logging": [
-                "//score/datarouter/persistent_logging/persistent_logging_stub:sysedr_stub",
+                "//score/datarouter/src/persistent_logging/persistent_logging_stub:sysedr_stub",
             ],
             "//conditions:default": [
-                "//score/datarouter/persistent_logging/persistent_logging_stub:sysedr_stub",
+                "//score/datarouter/src/persistent_logging/persistent_logging_stub:sysedr_stub",
             ],
         }),
     )
@@ -593,7 +595,7 @@ cc_library(
         ":udp_stream_output",
         ":unixdomain_server",
         "//score/datarouter/network:vlan",
-        "//score/datarouter/persistent_logging/persistent_logging_stub:sysedr_stub",
+        "//score/datarouter/src/persistent_logging/persistent_logging_stub:sysedr_stub",
         "@score_baselibs//score/language/futurecpp",
         "@score_baselibs//score/mw/log/configuration:nvconfig",
         "@score_baselibs//score/os:socket",
@@ -760,7 +762,10 @@ cc_library(
         "//conditions:default": [],
     }),
     strip_include_prefix = "include",
-    visibility = ["//visibility:private"],
+    visibility = [
+        "//score/datarouter:__pkg__",
+        "//score/datarouter/test:__subpackages__",
+    ],
     deps = [
         ":datarouter_feature_config",
         ":datarouter_lib",
@@ -770,7 +775,39 @@ cc_library(
         "@score_baselibs//score/mw/log/configuration:nvconfigfactory",
     ] + select({
         "//score/datarouter/build_configuration_flags:config_persistent_logging": [
-            "//score/datarouter/persistent_logging/persistent_logging_stub:sysedr_stub",
+            "//score/datarouter/src/persistent_logging/persistent_logging_stub:sysedr_stub",
+        ],
+        "//conditions:default": [],
+    }),
+)
+
+cc_library(
+    name = "datarouter_socketserver_testing",
+    testonly = True,
+    srcs = [
+        "src/daemon/socketserver.cpp",
+    ],
+    hdrs = [
+        "include/daemon/socketserver.h",
+    ],
+    # TODO: will be reworked in Ticket-207823
+    features = COMPILER_WARNING_FEATURES,
+    local_defines = select({
+        "//score/datarouter/build_configuration_flags:config_persistent_logging": ["PERSISTENT_LOGGING"],
+        "//conditions:default": [],
+    }),
+    strip_include_prefix = "include",
+    visibility = ["//score/datarouter/test:__subpackages__"],
+    deps = [
+        ":datarouter_feature_config",
+        ":datarouter_lib",
+        ":dltserver",
+        ":persistentlogconfig",
+        ":socketserver_config_lib_testing",
+        "@score_baselibs//score/mw/log/configuration:nvconfigfactory",
+    ] + select({
+        "//score/datarouter/build_configuration_flags:config_persistent_logging": [
+            "//score/datarouter/src/persistent_logging/persistent_logging_stub:sysedr_stub",
         ],
         "//conditions:default": [],
     }),
@@ -858,8 +895,9 @@ cc_library(
         "//score/datarouter/daemon_communication:daemon_session_handle_interface",
         "//score/mw/log/detail/data_router:message_passing_interface",
         "//score/mw/log/detail/data_router/shared_memory:reader",
+        "@score_baselibs//score/concurrency",
         "@score_baselibs//score/os:pthread",
-        "@score_communication//score/mw/com/message_passing",
+        "@score_communication//score/message_passing",
     ],
 )
 
@@ -1037,7 +1075,7 @@ cc_library(
         ":log",
         "@score_baselibs//score/mw/log/configuration:nvconfig",
         "//score/datarouter/dlt_filetransfer_trigger_lib:filetransfer_message_types",
-        "//score/datarouter/persistent_logging/persistent_logging_stub:sysedr_stub",
+        "//score/datarouter/src/persistent_logging/persistent_logging_stub:sysedr_stub",
     ],
 )
 
@@ -1048,6 +1086,7 @@ cc_library(
 test_suite(
     name = "unit_tests",
     tests = [
+        "//score/datarouter/lib/synchronized:synchronized_test",
         #"//score/datarouter/persistent_log_request:unit_tests",
         #"//score/datarouter/test:unit_tests",
         #"//score/datarouter/tools/generator:unit_tests",

score/datarouter/build_configuration_flags/BUILD

@@ -71,14 +71,14 @@ config_setting(
 )
 
 bool_flag(
-    name = "dlt_file_transfer_feature",
+    name = "file_transfer",
     build_setting_default = True,
 )
 
 config_setting(
-    name = "config_dlt_file_transfer",
+    name = "config_file_transfer",
     flag_values = {
-        ":dlt_file_transfer_feature": "True",
+        ":file_transfer": "True",
     },
     visibility = [
         "//score/datarouter:__subpackages__",

score/datarouter/daemon_communication/BUILD

@@ -13,6 +13,18 @@
 
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER_WARNING_FEATURES")
+load("@score_baselibs//score/quality/clang_tidy:extra_checks.bzl", "clang_tidy_extra_checks")
+
+clang_tidy_extra_checks(
+    name = "clang_tidy_extra_checks",
+    extra_features = [
+        "spp_code_style_check_header_guards",
+        "spp_code_style_check_method_names",
+        "spp_code_style_check_readability",
+        "spp_code_style_check_type_names",
+        "spp_code_style_check_variable_names",
+    ],
+)
 
 cc_library(
     name = "daemon_session_handle_interface",

score/datarouter/daemon_communication/session_handle_interface.h

@@ -26,7 +26,7 @@ namespace daemon
 class ISessionHandle
 {
   public:
-    virtual void AcquireRequest() const = 0;
+    virtual bool AcquireRequest() const = 0;
     virtual ~ISessionHandle() = default;
 };
 

score/datarouter/daemon_communication/session_handle_mock.h

@@ -24,7 +24,7 @@ namespace score::platform::internal::daemon::mock
 class SessionHandleMock : public score::platform::internal::daemon::ISessionHandle
 {
   public:
-    MOCK_METHOD(void, AcquireRequest, (), (const, override));
+    MOCK_METHOD(bool, AcquireRequest, (), (const, override));
 };
 
 }  // namespace score::platform::internal::daemon::mock

score/datarouter/datarouter/data_router.cpp

@@ -122,8 +122,6 @@ std::unique_ptr<DataRouter::SourceSession> DataRouter::new_source_session_impl(
     std::unique_ptr<score::mw::log::detail::ISharedMemoryReader> reader,
     const score::mw::log::NvConfig& nvConfig)
 {
-    std::lock_guard<std::mutex> lock(subscriber_mutex_);
-
     auto sourceSession =
         std::make_unique<DataRouter::SourceSession>(*this,
                                                     std::move(reader),
@@ -134,6 +132,19 @@ std::unique_ptr<DataRouter::SourceSession> DataRouter::new_source_session_impl(
                                                     quota_enforcement_enabled,
                                                     stats_logger_,
                                                     std::make_unique<score::platform::internal::LogParser>(nvConfig));
+
+    if (!sourceSession)
+    {
+        return nullptr;
+    }
+
+    std::lock_guard<std::mutex> lock(subscriber_mutex_);
+
+    // Insert is protected by subscriber_mutex_ held by caller (new_source_session_impl).
+    // This relies on the calling convention that SourceSession is only constructed
+    // from new_source_session_impl() which acquires the lock before construction.
+    std::ignore = sources_.insert(sourceSession.get());
+
     if (sourceCallback_)
     {
         sourceCallback_(std::move(sourceSession->get_parser()));
@@ -268,9 +279,8 @@ void DataRouter::SourceSession::processAndRouteLogMessages(uint64_t& message_cou
                 if ((peek_bytes.has_value() && peek_bytes.value() > 0) ||
                     (cmd->ticks_without_write > kTicksWithoutAcquireWhileNoWrites))
                 {
-                    cmd->acquire_requested = true;
-                    request_acquire();
-                    needs_fast_reschedule = true;
+                    cmd->acquire_requested = request_acquire();
+                    needs_fast_reschedule = cmd->acquire_requested;
                 }
                 else
                 {
@@ -279,9 +289,8 @@ void DataRouter::SourceSession::processAndRouteLogMessages(uint64_t& message_cou
             }
             else
             {
-                cmd->acquire_requested = true;
-                request_acquire();
-                needs_fast_reschedule = true;
+                cmd->acquire_requested = request_acquire();
+                needs_fast_reschedule = cmd->acquire_requested;
             }
         }
     }
@@ -377,8 +386,6 @@ DataRouter::SourceSession::SourceSession(DataRouter& router,
         stats->name = name;
     }
 
-    std::ignore = router_.sources_.insert(this);
-
     {
         auto stats = stats_data_.lock();
         if (stats->name == "DR")
@@ -524,19 +531,26 @@ void DataRouter::SourceSession::show_stats()
     }
 }
 
-void DataRouter::SourceSession::request_acquire()
+bool DataRouter::SourceSession::request_acquire()
 {
-    ++(stats_data_.lock()->count_acquire_requests);
-
-    score::cpp::visit(score::cpp::overload(
-                   [](UnixDomainServer::SessionHandle& handle) {
-                       handle.pass_message("<");
-                   },
-                   [](score::cpp::pmr::unique_ptr<score::platform::internal::daemon::ISessionHandle>& handle) {
-                       handle->AcquireRequest();
-                       // For the quality team argumentation, kindly, check Ticket-200702 and Ticket-229594.
-                   }),  // LCOV_EXCL_LINE : tooling issue. no code to test in this line.
-               handle_);
+    const bool acquire_result =
+        score::cpp::visit(score::cpp::overload(
+                       [](UnixDomainServer::SessionHandle& handle) {
+                           handle.pass_message("<");
+                           return true;
+                       },
+                       [](score::cpp::pmr::unique_ptr<score::platform::internal::daemon::ISessionHandle>& handle) {
+                           return handle->AcquireRequest();
+                           // For the quality team argumentation, kindly, check Ticket-200702 and Ticket-229594.
+                       }),  // LCOV_EXCL_LINE : tooling issue. no code to test in this line.
+                   handle_);
+
+    if (acquire_result)
+    {
+        ++(stats_data_.lock()->count_acquire_requests);
+    }
+
+    return acquire_result;
 }
 
 void DataRouter::SourceSession::on_acquire_response(const score::mw::log::detail::ReadAcquireResult& acq)

score/datarouter/datarouter/data_router.h

@@ -182,7 +182,7 @@ class DataRouter
         void on_closed_by_peer() override;
 
         void checkAndSetQuotaEnforcement();
-        void request_acquire();
+        bool request_acquire();
 
         Synchronized<LocalSubscriberData> local_subscriber_data_;
         Synchronized<CommandData> command_data_;