Remove Data ID / SetId functionality

app/mon/mon_tui/src/model/data/topic.hpp

@@ -51,7 +51,6 @@ struct Topic
   int32_t local_connections_count;
   int32_t external_connections_count;
   int32_t message_drops;
-  int64_t data_id;
   int64_t data_clock;
   int32_t data_frequency_mhz;
   std::map<std::string, std::string> attributes;

app/mon/mon_tui/src/model/monitor.hpp

@@ -213,7 +213,6 @@ class MonitorModel
       topic.local_connections_count = t.connections_local();
       topic.external_connections_count = t.connections_external();
       topic.message_drops = t.message_drops();
-      topic.data_id = t.data_id();
       topic.data_clock = t.data_clock();
       topic.data_frequency_mhz = t.data_frequency();
     }

ecal/core/include/ecal/types/monitoring.h

@@ -89,6 +89,7 @@ namespace eCAL
       int32_t                             connections_external{0}; //!< number of external connected entities
       int32_t                             message_drops{0};        //!< dropped messages
 
+      [[deprecated("The data_id field is deprecated and will always be zero")]]
       int64_t                             data_id{0};              //!< data send id (publisher setid)
       int64_t                             data_clock{0};           //!< data clock (send / receive action)
       int32_t                             data_frequency{0};       //!< data frequency (send / receive samples per second) [mHz]

ecal/core/src/io/shm/ecal_memfile_header.h

@@ -1,6 +1,6 @@
 /* ========================= eCAL LICENSE =================================
  *
- * Copyright (C) 2016 - 2019 Continental Corporation
+ * Copyright (C) 2016 - 2025 Continental Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@ namespace eCAL
   { //-V802
     uint16_t   hdr_size   = sizeof(SMemFileHeader);
     uint64_t   data_size  = 0;
+    [[deprecated("This field is deprecated, but must be kept for compatibility reasons")]]
     uint64_t   id         = 0;
     uint64_t   clock      = 0;
     int64_t    time       = 0;

ecal/core/src/io/shm/ecal_memfile_pool.cpp

@@ -223,13 +223,13 @@ namespace eCAL
                     // calculate user payload address
                     data_buf = static_cast<const char*>(buf) + mfile_hdr.hdr_size;
                     // call user callback function
-                    m_data_callback(data_buf, mfile_hdr.data_size, (long long)mfile_hdr.id, (long long)mfile_hdr.clock, (long long)mfile_hdr.time, (size_t)mfile_hdr.hash);
+                    m_data_callback(data_buf, mfile_hdr.data_size, (long long)mfile_hdr.clock, (long long)mfile_hdr.time, (size_t)mfile_hdr.hash);
                   }
                 }
                 else
                 {
                   // call user callback function
-                  m_data_callback(data_buf, mfile_hdr.data_size, (long long)mfile_hdr.id, (long long)mfile_hdr.clock, (long long)mfile_hdr.time, (size_t)mfile_hdr.hash);
+                  m_data_callback(data_buf, mfile_hdr.data_size, (long long)mfile_hdr.clock, (long long)mfile_hdr.time, (size_t)mfile_hdr.hash);
                 }
               }
             }
@@ -264,7 +264,7 @@ namespace eCAL
             if (post_process_buffer)
             {
               // add sample to data reader (and call user callback function)
-              if (m_data_callback) m_data_callback(receive_buffer.data(), receive_buffer.size(), (long long)mfile_hdr.id, (long long)mfile_hdr.clock, (long long)mfile_hdr.time, (size_t)mfile_hdr.hash);
+              if (m_data_callback) m_data_callback(receive_buffer.data(), receive_buffer.size(), (long long)mfile_hdr.clock, (long long)mfile_hdr.time, (size_t)mfile_hdr.hash);
             }
 
             // send acknowledge event

ecal/core/src/io/shm/ecal_memfile_pool.h

@@ -1,6 +1,6 @@
 /* ========================= eCAL LICENSE =================================
  *
- * Copyright (C) 2016 - 2024 Continental Corporation
+ * Copyright (C) 2016 - 2025 Continental Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@
 
 namespace eCAL
 {
-  using MemFileDataCallbackT = std::function<size_t (const char *, size_t, long long, long long, long long, size_t)>;
+  using MemFileDataCallbackT = std::function<size_t (const char *, size_t, long long, long long, size_t)>;
 
   ////////////////////////////////////////
   // CMemFileObserver

ecal/core/src/io/shm/ecal_memfile_sync.cpp

@@ -167,8 +167,6 @@ namespace eCAL
     struct SMemFileHeader memfile_hdr;
     // set data size
     memfile_hdr.data_size         = static_cast<uint64_t>(data_.len);
-    // set header id
-    memfile_hdr.id                = static_cast<uint64_t>(data_.id);
     // set header clock
     memfile_hdr.clock             = static_cast<uint64_t>(data_.clock);
     // set header time

ecal/core/src/monitoring/ecal_monitoring_impl.cpp

@@ -154,7 +154,6 @@ namespace eCAL
     }
     const int32_t      connections_local = sample_topic.connections_local;
     const int32_t      connections_external = sample_topic.connections_external;
-    const int64_t      data_id = sample_topic.data_id;
     const int64_t      data_clock = sample_topic.data_clock;
     const int32_t      message_drops = sample_topic.message_drops;
     const int32_t      data_frequency = sample_topic.data_frequency;
@@ -237,7 +236,6 @@ namespace eCAL
       TopicInfo.topic_size           = static_cast<int>(topic_size);
       TopicInfo.connections_local    = static_cast<int>(connections_local);
       TopicInfo.connections_external = static_cast<int>(connections_external);
-      TopicInfo.data_id              = data_id;
       TopicInfo.data_clock           = data_clock;
       TopicInfo.message_drops        = message_drops;
       TopicInfo.data_frequency       = data_frequency;

ecal/core/src/pubsub/ecal_publisher.cpp

@@ -103,7 +103,7 @@ namespace eCAL
 
     // send content via data writer layer
     const long long write_time = (time_ == DEFAULT_TIME_ARGUMENT) ? eCAL::Time::GetMicroSeconds() : time_;
-    return m_publisher_impl->Write(payload_, write_time, 0);
+    return m_publisher_impl->Write(payload_, write_time);
   }
 
   bool CPublisher::Send(const std::string& payload_, long long time_)

ecal/core/src/pubsub/ecal_publisher_impl.cpp

@@ -147,7 +147,7 @@ namespace eCAL
     Unregister();
   }
 
-  bool CPublisherImpl::Write(CPayloadWriter& payload_, long long time_, long long filter_id_)
+  bool CPublisherImpl::Write(CPayloadWriter& payload_, long long time_)
   {
     // get payload buffer size (one time, to avoid multiple computations)
     const size_t payload_buf_size(payload_.GetSize());
@@ -174,7 +174,7 @@ namespace eCAL
     }
 
     // prepare counter and internal states
-    const size_t snd_hash = PrepareWrite(filter_id_, payload_buf_size);
+    const size_t snd_hash = PrepareWrite(payload_buf_size);
 
     // did we write anything
     bool written(false);
@@ -195,7 +195,6 @@ namespace eCAL
         // fill writer data
         struct SWriterAttr wattr;
         wattr.len = payload_buf_size;
-        wattr.id = m_id;
         wattr.clock = m_clock;
         wattr.hash = snd_hash;
         wattr.time = time_;
@@ -258,7 +257,6 @@ namespace eCAL
         // fill writer data
         struct SWriterAttr wattr;
         wattr.len = payload_buf_size;
-        wattr.id = m_id;
         wattr.clock = m_clock;
         wattr.hash = snd_hash;
         wattr.time = time_;
@@ -307,7 +305,6 @@ namespace eCAL
         // fill writer data
         struct SWriterAttr wattr;
         wattr.len = payload_buf_size;
-        wattr.id = m_id;
         wattr.clock = m_clock;
         wattr.hash = snd_hash;
         wattr.time = time_;
@@ -630,7 +627,6 @@ namespace eCAL
 
     ecal_reg_sample_topic.process_name = m_attributes.process_name;
     ecal_reg_sample_topic.unit_name    = m_attributes.unit_name;
-    ecal_reg_sample_topic.data_id      = m_id;
     ecal_reg_sample_topic.data_clock       = m_clock;
     ecal_reg_sample_topic.data_frequency        = GetFrequency();
 
@@ -818,11 +814,8 @@ namespace eCAL
 #endif
   }
 
-  size_t CPublisherImpl::PrepareWrite(long long id_, size_t len_)
+  size_t CPublisherImpl::PrepareWrite(size_t len_)
   {
-    // store id
-    m_id = id_;
-
     // handle write counters
     RefreshSendCounter();
 

ecal/core/src/pubsub/ecal_publisher_impl.h

@@ -77,7 +77,7 @@ namespace eCAL
     CPublisherImpl(const SDataTypeInformation& topic_info_, const eCAL::eCALWriter::SAttributes& attr_);
     ~CPublisherImpl();
 
-    bool Write(CPayloadWriter& payload_, long long time_, long long filter_id_);
+    bool Write(CPayloadWriter& payload_, long long time_);
 
     bool SetDataTypeInformation(const SDataTypeInformation& topic_info_);
 
@@ -120,7 +120,7 @@ namespace eCAL
 
     size_t GetConnectionCount();
 
-    size_t PrepareWrite(long long id_, size_t len_);
+    size_t PrepareWrite(size_t len_);
 
     TransportLayer::eType DetermineTransportLayer2Start(const std::vector<eTLayerType>& enabled_pub_layer_, const std::vector<eTLayerType>& enabled_sub_layer_, bool same_host_);
 
@@ -148,7 +148,6 @@ namespace eCAL
     std::mutex                             m_event_id_callback_mutex;
     PubEventCallbackT                      m_event_id_callback;
 
-    long long                              m_id = 0;
     long long                              m_clock = 0;
 
     std::mutex                             m_frequency_calculator_mutex;

ecal/core/src/pubsub/ecal_subgate.cpp

@@ -162,7 +162,6 @@ namespace eCAL
           ecal_sample.topic_info,
           payload_addr,
           payload_size,
-          ecal_sample_content.id,
           ecal_sample_content.clock,
           ecal_sample_content.time,
           static_cast<size_t>(ecal_sample_content.hash),
@@ -178,7 +177,7 @@ namespace eCAL
     return (applied_size > 0);
   }
 
-  bool CSubGate::ApplySample(const Payload::TopicInfo& topic_info_, const char* buf_, size_t len_, long long id_, long long clock_, long long time_, size_t hash_, eTLayerType layer_)
+  bool CSubGate::ApplySample(const Payload::TopicInfo& topic_info_, const char* buf_, size_t len_, long long clock_, long long time_, size_t hash_, eTLayerType layer_)
   {
     if (!m_created) return false;
 
@@ -199,7 +198,7 @@ namespace eCAL
 
     for (const auto& reader : readers_to_apply)
     {
-      applied_size = reader->ApplySample(topic_info_, buf_, len_, id_, clock_, time_, hash_, layer_);
+      applied_size = reader->ApplySample(topic_info_, buf_, len_, clock_, time_, hash_, layer_);
     }
 
     return (applied_size > 0);

ecal/core/src/pubsub/ecal_subgate.h

@@ -1,6 +1,6 @@
 /* ========================= eCAL LICENSE =================================
  *
- * Copyright (C) 2016 - 2024 Continental Corporation
+ * Copyright (C) 2016 - 2025 Continental Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@ namespace eCAL
     bool HasSample(const std::string& sample_name_);
 
     bool ApplySample(const char* serialized_sample_data_, size_t serialized_sample_size_, eTLayerType layer_);
-    bool ApplySample(const Payload::TopicInfo& topic_info_, const char* buf_, size_t len_, long long id_, long long clock_, long long time_, size_t hash_, eTLayerType layer_);
+    bool ApplySample(const Payload::TopicInfo& topic_info_, const char* buf_, size_t len_, long long clock_, long long time_, size_t hash_, eTLayerType layer_);
 
     void ApplyPublisherRegistration(const Registration::Sample& ecal_sample_);
     void ApplyPublisherUnregistration(const Registration::Sample& ecal_sample_);

ecal/core/src/pubsub/ecal_subscriber_impl.cpp

@@ -232,15 +232,6 @@ namespace eCAL
     return true;
   }
 
-  void CSubscriberImpl::SetFilterIDs(const std::set<long long>& filter_ids_)
-  {
-#ifndef NDEBUG
-    Logging::Log(Logging::log_level_debug2, m_attributes.topic_name + "::CSubscriberImpl::SetFilterIDs");
-#endif
-
-    m_id_set = filter_ids_;
-  }
-
   void CSubscriberImpl::ApplyPublisherRegistration(const SPublicationInfo& publication_info_, const SDataTypeInformation& data_type_info_, const SLayerStates& pub_layer_states_)
   {
     // flag write enabled from publisher side (information not used yet)
@@ -370,7 +361,7 @@ namespace eCAL
 #endif
   }
 
-  size_t CSubscriberImpl::ApplySample(const Payload::TopicInfo& topic_info_, const char* payload_, size_t size_, long long id_, long long clock_, long long time_, size_t /*hash_*/, eTLayerType layer_)
+  size_t CSubscriberImpl::ApplySample(const Payload::TopicInfo& topic_info_, const char* payload_, size_t size_, long long clock_, long long time_, size_t /*hash_*/, eTLayerType layer_)
   {
     // ensure thread safety
     const std::lock_guard<std::mutex> lock(m_receive_callback_mutex);
@@ -391,12 +382,6 @@ namespace eCAL
       return size_;
     }
 
-    // We might not want to apply samples sent with a given ID (deprecated!)
-    if (!ShouldApplySampleBasedOnId(id_))
-    {
-      return 0;
-    }
-
     // store receive layer
     m_layers.udp.active |= layer_ == tl_ecal_udp;
     m_layers.shm.active |= layer_ == tl_ecal_shm;
@@ -774,17 +759,6 @@ namespace eCAL
     return true;
   }
 
-  bool CSubscriberImpl::ShouldApplySampleBasedOnId(long long id_) const
-  {
-    // 
-    if (!m_id_set.empty() && (m_id_set.find(id_) == m_id_set.end()))
-    {
-      return false;
-    }
-
-    return true;
-  }
-
   void CSubscriberImpl::TriggerFrequencyUpdate()
   {
     const auto receive_time = std::chrono::steady_clock::now();

ecal/core/src/pubsub/ecal_subscriber_impl.h

@@ -85,8 +85,6 @@ namespace eCAL
     bool SetEventCallback(const SubEventCallbackT& callback_);
     bool RemoveEventCallback();
 
-    void SetFilterIDs(const std::set<long long>& filter_ids_);
-
     void ApplyPublisherRegistration(const SPublicationInfo& publication_info_, const SDataTypeInformation& data_type_info_, const SLayerStates& pub_layer_states_);
     void ApplyPublisherUnregistration(const SPublicationInfo& publication_info_, const SDataTypeInformation& data_type_info_);
 
@@ -103,7 +101,7 @@ namespace eCAL
     const SDataTypeInformation& GetDataTypeInformation() const { return(m_topic_info); }
 
     void InitializeLayers();
-    size_t ApplySample(const Payload::TopicInfo& topic_info_, const char* payload_, size_t size_, long long id_, long long clock_, long long time_, size_t hash_, eTLayerType layer_);
+    size_t ApplySample(const Payload::TopicInfo& topic_info_, const char* payload_, size_t size_, long long clock_, long long time_, size_t hash_, eTLayerType layer_);
 
   protected:
     void Register();
@@ -127,7 +125,6 @@ namespace eCAL
 
     bool ShouldApplySampleBasedOnClock(const SPublicationInfo& publication_info_, long long clock_) const;
     bool ShouldApplySampleBasedOnLayer(eTLayerType layer_) const;
-    bool ShouldApplySampleBasedOnId(long long id_) const;
 
     void TriggerFrequencyUpdate();
     void TriggerMessageDropUdate(const SPublicationInfo& publication_info_, uint64_t message_counter);
@@ -177,8 +174,6 @@ namespace eCAL
 
     using CounterCacheMapT = CounterCacheMap<SPublicationInfo>;
     CounterCacheMapT                          m_publisher_message_counter_map;
-
-    std::set<long long>                       m_id_set;
 
     SLayerStates                              m_layers;
     std::atomic<bool>                         m_created;

ecal/core/src/readwrite/ecal_writer_data.h

@@ -1,6 +1,6 @@
 /* ========================= eCAL LICENSE =================================
  *
- * Copyright (C) 2016 - 2019 Continental Corporation
+ * Copyright (C) 2016 - 2025 Continental Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,6 @@ namespace eCAL
   struct SWriterAttr
   {
     size_t       len                    = 0;
-    long long    id                     = 0;
     long long    clock                  = 0;
     size_t       hash                   = 0;
     long long    time                   = 0;

ecal/core/src/readwrite/shm/ecal_reader_shm.cpp

@@ -59,20 +59,20 @@ namespace eCAL
         topic_info.topic_id   = par_.topic_id;
         topic_info.process_id = par_.process_id;
 
-        auto data_callback = [this, topic_info](const char* buf_, size_t len_, long long id_, long long clock_, long long time_, size_t hash_)->size_t
+        auto data_callback = [this, topic_info](const char* buf_, size_t len_, long long clock_, long long time_, size_t hash_)->size_t
         {
-          return OnNewShmFileContent(topic_info, buf_, len_, id_, clock_, time_, hash_);
+          return OnNewShmFileContent(topic_info, buf_, len_, clock_, time_, hash_);
         };
         g_memfile_pool()->ObserveFile(memfile_name, memfile_event, m_attributes.registration_timeout_ms, data_callback);
       }
     }
   }
 
-  size_t CSHMReaderLayer::OnNewShmFileContent(const Payload::TopicInfo& topic_info_, const char* buf_, size_t len_, long long id_, long long clock_, long long time_, size_t hash_)
+  size_t CSHMReaderLayer::OnNewShmFileContent(const Payload::TopicInfo& topic_info_, const char* buf_, size_t len_, long long clock_, long long time_, size_t hash_)
   {
     if (g_subgate() != nullptr)
     {
-      if (g_subgate()->ApplySample(topic_info_, buf_, len_, id_, clock_, time_, hash_, tl_ecal_shm))
+      if (g_subgate()->ApplySample(topic_info_, buf_, len_, clock_, time_, hash_, tl_ecal_shm))
       {
         return len_;
       }

ecal/core/src/readwrite/shm/ecal_reader_shm.h

@@ -50,7 +50,7 @@ namespace eCAL
     void SetConnectionParameter(SReaderLayerPar& par_) override;
 
   private:
-    size_t OnNewShmFileContent(const Payload::TopicInfo& topic_info_, const char* buf_, size_t len_, long long id_, long long clock_, long long time_, size_t hash_);
+    size_t OnNewShmFileContent(const Payload::TopicInfo& topic_info_, const char* buf_, size_t len_, long long clock_, long long time_, size_t hash_);
 
     eCAL::eCALReader::SHM::SAttributes m_attributes;
   };

ecal/core/src/readwrite/tcp/ecal_reader_tcp.cpp

@@ -121,7 +121,6 @@ namespace eCAL
           ecal_header_topic_info,
           data_payload,
           static_cast<size_t>(ecal_header_content.size),
-          ecal_header_content.id,
           ecal_header_content.clock,
           ecal_header_content.time,
           ecal_header_content.hash,