monitoring default in ecal.yaml corrected to 5000 ms

clang-tidy
eclipse-ecal · Jul 26, 2024 · c7008f2 · c7008f2
1 parent fe4492e
commit c7008f2
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 22 deletions.
diff --git a/ecal/core/cfg/ecal.yaml b/ecal/core/cfg/ecal.yaml
@@ -1,8 +1,8 @@
-#  _____     _ _                                ____    _    _                             
-# | ____|___| (_)_ __  ___  ___            ___ / ___|  / \  | |                            
-# |  _| / __| | | '_ \/ __|/ _ \  _____   / _ \ |     / _ \ | |                            
-# | |__| (__| | | |_) \__ \  __/ |_____| |  __/ |___ / ___ \| |___                         
-# |_____\___|_|_| .__/|___/\___|          \___|\____/_/   \_\_____|                        
+#  _____     _ _                                ____    _    _                                 
+# | ____|___| (_)_ __  ___  ___            ___ / ___|  / \  | |                                
+# |  _| / __| | | '_ \/ __|/ _ \  _____   / _ \ |     / _ \ | |                                
+# | |__| (__| | | |_) \__ \  __/ |_____| |  __/ |___ / ___ \| |___                             
+# |_____\___|_|_| .__/|___/\___|          \___|\____/_/   \_\_____|                            
 #               |_|                                                                            
 #        _       _           _                    __ _                       _   _             
 #   __ _| | ___ | |__   __ _| |   ___ ___  _ __  / _(_) __ _ _   _ _ __ __ _| |_(_) ___  _ __  
@@ -15,7 +15,7 @@
 # Registration layer configuration
 registration:
   # Topic registration refresh cylce (has to be smaller then registration timeout! Default: 1000)
-  registration_refresh: 1000   
+  registration_refresh: 1000
   # Timeout for topic registration in ms (internal, Default: 60000)
   registration_timeout: 60000
   # Enable to receive registration information on the same local machine
@@ -38,12 +38,12 @@ registration:
     udp:
       enable: true
       port: 14000
-  
+
 
 # Monitoring configuration
 monitoring:
-  # Timeout for topic monitoring in ms (Default: 1000), increase in 1000er steps
-  timeout: 1000
+  # Timeout for topic monitoring in ms (Default: 5000), increase in 1000er steps
+  timeout: 5000
   # Topics blacklist as regular expression (will not be monitored)
   filter_excl: "^__.*$"
   # Topics whitelist as regular expression (will be monitored only) (Default: "")
@@ -74,7 +74,7 @@ transport_layer:
     join_all_interfaces: false
     # Windows specific setting to enable receiving UDP traffic with the Npcap based receiver
     npcap_enabled: false 
-    
+
     # In local mode multicast group and ttl are set by default and are not adjustable
     local:
       # Multicast group base. All registration and logging is sent on this address 
@@ -86,22 +86,22 @@ transport_layer:
       # Multicast group base. All registration and logging is sent on this address 
       group: "239.0.0.1" 
       # TTL (hop limit) is used to determine the amount of routers being traversed towards the destination
-      ttl: 3   
+      ttl: 3
 
-  tcp: 
+  tcp:
     # Reader amount of threads that shall execute workload
     number_executor_reader: 4
     # Writer amount of threads that shall execute workload
     number_executor_writer: 4
     # Reconnection attemps the session will try to reconnect in case of an issue
     max_reconnections: 5
 
-  shm:     
+  shm:
     # Default memory file size for new publisher
     memfile_min_size_bytes: 4096
     # Dynamic file size reserve before recreating memory file if topic size changes
     memfile_reserve_percent: 50
-    
+
 
 # Publisher specific base settings
 publisher:
@@ -117,12 +117,12 @@ publisher:
       acknowledge_timeout_ms: 0
       # Maximum number of used buffers (needs to be greater than 1, default = 1)
       memfile_buffer_count: 1
-    
+
     # Base configuration for UDP publisher
     udp:
       # Enable layer
       enable: true
-        
+
     # Base configuration for TCP publisher
     tcp:
       # Enable layer
@@ -157,7 +157,7 @@ subscriber:
 
   # Enable dropping of payload messages that arrive out of order
   drop_out_of_order_messages: true
-  
+
 
 # Time configuration
 time:

diff --git a/ecal/core/src/registration/ecal_registration_provider.cpp b/ecal/core/src/registration/ecal_registration_provider.cpp
@@ -158,7 +158,7 @@ namespace eCAL
   void CRegistrationProvider::TriggerRegisterSendThread()
   {
     {
-      std::lock_guard<std::mutex> lock(m_reg_sample_snd_thread_cv_mtx);
+      const std::lock_guard<std::mutex> lock(m_reg_sample_snd_thread_cv_mtx);
       m_reg_sample_snd_thread_trigger = true;
     }
     m_reg_sample_snd_thread_cv.notify_one();

diff --git a/ecal/core/src/registration/ecal_registration_sample_applier.cpp b/ecal/core/src/registration/ecal_registration_sample_applier.cpp
@@ -59,7 +59,7 @@ namespace eCAL
       return true;
     }
 
-    bool CSampleApplier::IsHostGroupMember(const Registration::Sample& sample_)
+    bool CSampleApplier::IsHostGroupMember(const Registration::Sample& sample_) const
     {
       std::string host_group_name;
       std::string host_name;
@@ -96,7 +96,7 @@ namespace eCAL
       return true;
     }
 
-    bool CSampleApplier::IsSameProcess(const Registration::Sample& sample_)
+    bool CSampleApplier::IsSameProcess(const Registration::Sample& sample_) const
     {
       int32_t pid(0);
       switch (sample_.cmd_type)

diff --git a/ecal/core/src/registration/ecal_registration_sample_applier.h b/ecal/core/src/registration/ecal_registration_sample_applier.h
@@ -54,8 +54,9 @@ namespace eCAL
       void RemCustomApplySampleCallback(const std::string& customer_);
 
     private:
-      bool IsSameProcess(const Registration::Sample& sample_);
-      bool IsHostGroupMember(const eCAL::Registration::Sample& sample_);
+      bool IsSameProcess(const Registration::Sample& sample_) const;
+      bool IsHostGroupMember(const eCAL::Registration::Sample& sample_) const;
+
       bool AcceptRegistrationSample(const Registration::Sample& sample_);
 
       bool                                  m_network;