[core] Registration::SampleIdentifier and partial sample serialization

eCAL Registration samples have a command type, and some member types.
Now the serialization is performed only partially, according to the command type.

Additionally, every sample now has a unique ID, marking the entity which has produced this sample.
This info will be unique within the whole eCAL Ecosystem.

ecal/core/src/ecal_descgate.cpp

@@ -125,12 +125,12 @@ namespace eCAL
         response_type.name       = method.resp_type;
         response_type.descriptor = method.resp_desc;
 
-        ApplyServiceDescription(m_service_info_map, sample_.service.sname, method.mname, std::stoull(sample_.service.sid), request_type, response_type, GetDataTypeInfoQuality(request_type, true), GetDataTypeInfoQuality(response_type, true));
+        ApplyServiceDescription(m_service_info_map, sample_.service.sname, method.mname, std::stoull(sample_.identifier.entity_id), request_type, response_type, GetDataTypeInfoQuality(request_type, true), GetDataTypeInfoQuality(response_type, true));
       }
     }
     break;
     case bct_unreg_service:
-      RemServiceDescription(m_service_info_map, sample_.service.sname, std::stoull(sample_.service.sid));
+      RemServiceDescription(m_service_info_map, sample_.service.sname, std::stoull(sample_.identifier.entity_id));
       break;
     case bct_reg_client:
       for (const auto& method : sample_.client.methods)
@@ -143,23 +143,23 @@ namespace eCAL
         response_type.name       = method.resp_type;
         response_type.descriptor = method.resp_desc;
 
-        ApplyServiceDescription(m_client_info_map, sample_.client.sname, method.mname, std::stoull(sample_.client.sid), request_type, response_type, GetDataTypeInfoQuality(request_type, false), GetDataTypeInfoQuality(response_type, false));
+        ApplyServiceDescription(m_client_info_map, sample_.client.sname, method.mname, std::stoull(sample_.identifier.entity_id), request_type, response_type, GetDataTypeInfoQuality(request_type, false), GetDataTypeInfoQuality(response_type, false));
       }
       break;
     case bct_unreg_client:
-      RemServiceDescription(m_client_info_map, sample_.client.sname, std::stoull(sample_.client.sid));
+      RemServiceDescription(m_client_info_map, sample_.client.sname, std::stoull(sample_.identifier.entity_id));
       break;
     case bct_reg_publisher:
-      ApplyTopicDescription(m_publisher_info_map, sample_.topic.tname, std::stoull(sample_.topic.tid), sample_.topic.tdatatype, GetDataTypeInfoQuality(sample_.topic.tdatatype, true));
+      ApplyTopicDescription(m_publisher_info_map, sample_.topic.tname, std::stoull(sample_.identifier.entity_id), sample_.topic.tdatatype, GetDataTypeInfoQuality(sample_.topic.tdatatype, true));
       break;
     case bct_unreg_publisher:
-      RemTopicDescription(m_publisher_info_map, sample_.topic.tname, std::stoull(sample_.topic.tid));
+      RemTopicDescription(m_publisher_info_map, sample_.topic.tname, std::stoull(sample_.identifier.entity_id));
       break;
     case bct_reg_subscriber:
-      ApplyTopicDescription(m_subscriber_info_map, sample_.topic.tname, std::stoull(sample_.topic.tid), sample_.topic.tdatatype, GetDataTypeInfoQuality(sample_.topic.tdatatype, false));
+      ApplyTopicDescription(m_subscriber_info_map, sample_.topic.tname, std::stoull(sample_.identifier.entity_id), sample_.topic.tdatatype, GetDataTypeInfoQuality(sample_.topic.tdatatype, false));
       break;
     case bct_unreg_subscriber:
-      RemTopicDescription(m_subscriber_info_map, sample_.topic.tname, std::stoull(sample_.topic.tid));
+      RemTopicDescription(m_subscriber_info_map, sample_.topic.tname, std::stoull(sample_.identifier.entity_id));
       break;
     default:
     {

ecal/core/src/monitoring/ecal_monitoring_impl.cpp

@@ -197,7 +197,7 @@ namespace eCAL
   bool CMonitoringImpl::RegisterTopic(const Registration::Sample& sample_, enum ePubSub pubsub_type_)
   {
     const auto& sample_topic = sample_.topic;
-    const int          process_id = sample_topic.pid;
+    const int          process_id = sample_.identifier.process_id;
     const std::string& topic_name = sample_topic.tname;
     const int32_t      topic_size = sample_topic.tsize;
     bool               topic_tlayer_ecal_udp(false);
@@ -253,11 +253,11 @@ namespace eCAL
       const std::lock_guard<std::mutex> lock(pTopicMap->sync);
 
       // common infos
-      const std::string& host_name       = sample_topic.hname;
+      const std::string& host_name       = sample_.identifier.host_name;
       const std::string& host_group_name = sample_topic.hgname;
       const std::string& process_name    = sample_topic.pname;
       const std::string& unit_name       = sample_topic.uname;
-      const std::string& topic_id        = sample_topic.tid;
+      const std::string& topic_id        = sample_.identifier.entity_id;
       std::string        direction;
       switch (pubsub_type_)
       {
@@ -338,7 +338,7 @@ namespace eCAL
   {
     const auto& sample_topic = sample_.topic;
     const std::string& topic_name = sample_topic.tname;
-    const std::string& topic_id   = sample_topic.tid;
+    const std::string& topic_id   = sample_.identifier.entity_id;
 
     // unregister from topic map
     STopicMonMap* pTopicMap = GetMap(pubsub_type_);
@@ -358,10 +358,10 @@ namespace eCAL
   bool CMonitoringImpl::RegisterProcess(const Registration::Sample& sample_)
   {
     const auto& sample_process = sample_.process;
-    const std::string&    host_name                    = sample_process.hname;
+    const std::string&    host_name                    = sample_.identifier.host_name;
     const std::string&    host_group_name              = sample_process.hgname;
     const std::string&    process_name                 = sample_process.pname;
-    const int             process_id                   = sample_process.pid;
+    const int             process_id                   = sample_.identifier.process_id;
     const std::string&    process_param                = sample_process.pparam;
     const std::string&    unit_name                    = sample_process.uname;
     const auto&           sample_process_state         = sample_process.state;
@@ -409,7 +409,7 @@ namespace eCAL
   {
     const auto& sample_process = sample_.process;
     const std::string& process_name = sample_process.pname;
-    const int          process_id   = sample_process.pid;
+    const int          process_id   = sample_.identifier.process_id;
 
     // create map key
     const std::string process_name_id = process_name + std::to_string(process_id);
@@ -425,13 +425,16 @@ namespace eCAL
 
   bool CMonitoringImpl::RegisterServer(const Registration::Sample& sample_)
   {
+    const auto& sample_identifier = sample_.identifier;
+    const std::string& service_id = sample_identifier.entity_id;
+    const int32_t      process_id = sample_identifier.process_id;
+    const std::string& host_name  = sample_identifier.host_name;
+
     const auto& sample_service = sample_.service;
-    const std::string& host_name    = sample_service.hname;
     const std::string& service_name = sample_service.sname;
-    const std::string& service_id   = sample_service.sid;
     const std::string& process_name = sample_service.pname;
     const std::string& unit_name    = sample_service.uname;
-    const int32_t      process_id   = sample_service.pid;
+
     const uint32_t     tcp_port_v0  = sample_service.tcp_port_v0;
     const uint32_t     tcp_port_v1  = sample_service.tcp_port_v1;
 
@@ -474,10 +477,12 @@ namespace eCAL
 
   bool CMonitoringImpl::UnregisterServer(const Registration::Sample& sample_)
   {
-    const auto& sample_service = sample_.service;
+    const auto& sample_service    = sample_.service;
+    const auto& sample_identifier = sample_.identifier;
+
     const std::string& service_name = sample_service.sname;
-    const std::string& service_id   = sample_service.sid;
-    const int          process_id   = sample_service.pid;
+    const std::string& service_id   = sample_identifier.entity_id;
+    const int          process_id   = sample_identifier.process_id;
 
     // create map key
     const std::string service_name_id = service_name + service_id + std::to_string(process_id);
@@ -493,13 +498,15 @@ namespace eCAL
 
   bool CMonitoringImpl::RegisterClient(const Registration::Sample& sample_)
   {
+    const auto& sample_identifier = sample_.identifier;
+    const std::string& service_id = sample_identifier.entity_id;
+    const int32_t      process_id = sample_identifier.process_id;
+    const std::string& host_name  = sample_identifier.host_name;
+
     const auto& sample_client = sample_.client;
-    const std::string& host_name    = sample_client.hname;
     const std::string& service_name = sample_client.sname;
-    const std::string& service_id   = sample_client.sid;
     const std::string& process_name = sample_client.pname;
     const std::string& unit_name    = sample_client.uname;
-    const int          process_id   = sample_client.pid;
 
     // create map key
     const std::string service_name_id = service_name + service_id + std::to_string(process_id);
@@ -538,10 +545,12 @@ namespace eCAL
 
   bool CMonitoringImpl::UnregisterClient(const Registration::Sample& sample_)
   {
+    const auto& sample_identifier = sample_.identifier;
+    const std::string& service_id = sample_identifier.entity_id;
+    const int32_t      process_id = sample_identifier.process_id;
+
     const auto& sample_client = sample_.client;
     const std::string& service_name = sample_client.sname;
-    const std::string& service_id   = sample_client.sid;
-    const int          process_id   = sample_client.pid;
 
     // create map key
     const std::string service_name_id = service_name + service_id + std::to_string(process_id);

ecal/core/src/pubsub/ecal_pubgate.cpp

@@ -120,10 +120,11 @@ namespace eCAL
     // check topic name
     if (topic_name.empty()) return;
 
+    // TODO: Substitute ProducerInfo type
     CDataWriter::SSubscriptionInfo subscription_info;
-    subscription_info.host_name                  = ecal_topic.hname;
-    subscription_info.topic_id                   = ecal_topic.tid;
-    subscription_info.process_id                 = ecal_topic.pid;
+    subscription_info.host_name                  = ecal_sample_.identifier.host_name;
+    subscription_info.topic_id                   = ecal_sample_.identifier.entity_id;
+    subscription_info.process_id                 = ecal_sample_.identifier.process_id;
     const SDataTypeInformation topic_information = ecal_topic.tdatatype;
 
     CDataWriter::SLayerStates layer_states;
@@ -180,10 +181,11 @@ namespace eCAL
     // check topic name
     if (topic_name.empty()) return;
 
+    //TODO: Remove the subscription info type
     CDataWriter::SSubscriptionInfo subscription_info;
-    subscription_info.host_name  = ecal_topic.hname;
-    subscription_info.topic_id   = ecal_topic.tid;
-    subscription_info.process_id = ecal_topic.pid;
+    subscription_info.host_name  = ecal_sample_.identifier.host_name;
+    subscription_info.topic_id   = ecal_sample_.identifier.entity_id;
+    subscription_info.process_id = ecal_sample_.identifier.process_id;
 
     // unregister subscriber
     const std::shared_lock<std::shared_timed_mutex> lock(m_topic_name_datawriter_sync);

ecal/core/src/pubsub/ecal_subgate.cpp

@@ -219,10 +219,11 @@ namespace eCAL
     // check topic name
     if (topic_name.empty()) return;
 
+    // TODO: Remove the PublicationInfo type
     CDataReader::SPublicationInfo publication_info;
-    publication_info.host_name                   = ecal_topic.hname;
-    publication_info.topic_id                    = ecal_topic.tid;
-    publication_info.process_id                  = ecal_topic.pid;
+    publication_info.host_name  = ecal_sample_.identifier.host_name;
+    publication_info.topic_id   = ecal_sample_.identifier.entity_id;
+    publication_info.process_id = ecal_sample_.identifier.process_id;
     const SDataTypeInformation topic_information = ecal_topic.tdatatype;
 
     CDataReader::SLayerStates layer_states;
@@ -282,10 +283,11 @@ namespace eCAL
     // check topic name
     if (topic_name.empty()) return;
 
+    // TODO: Remove the SPublicationInfo type!
     CDataReader::SPublicationInfo publication_info;
-    publication_info.host_name  = ecal_topic.hname;
-    publication_info.topic_id   = ecal_topic.tid;
-    publication_info.process_id = ecal_topic.pid;
+    publication_info.host_name  = ecal_sample_.identifier.host_name;
+    publication_info.topic_id   = ecal_sample_.identifier.entity_id;
+    publication_info.process_id = ecal_sample_.identifier.process_id;
 
     // unregister publisher
     const std::shared_lock<std::shared_timed_mutex> lock(m_topic_name_datareader_sync);

ecal/core/src/readwrite/ecal_reader.cpp

@@ -570,11 +570,14 @@ namespace eCAL
     Registration::Sample ecal_reg_sample;
     ecal_reg_sample.cmd_type = bct_reg_subscriber;
 
+    auto& ecal_reg_sample_identifier = ecal_reg_sample.identifier;
+    ecal_reg_sample_identifier.process_id = m_pid;
+    ecal_reg_sample_identifier.entity_id  = m_topic_id;
+    ecal_reg_sample_identifier.host_name  = m_host_name;
+
     auto& ecal_reg_sample_topic = ecal_reg_sample.topic;
-    ecal_reg_sample_topic.hname  = m_host_name;
     ecal_reg_sample_topic.hgname = m_host_group_name;
     ecal_reg_sample_topic.tname  = m_topic_name;
-    ecal_reg_sample_topic.tid    = m_topic_id;
     // topic_information
     {
       auto& ecal_reg_sample_tdatatype = ecal_reg_sample_topic.tdatatype;
@@ -627,7 +630,6 @@ namespace eCAL
     }
 #endif
 
-    ecal_reg_sample_topic.pid           = m_pid;
     ecal_reg_sample_topic.pname         = m_pname;
     ecal_reg_sample_topic.uname         = Process::GetUnitName();
     ecal_reg_sample_topic.dclock        = m_clock;
@@ -647,13 +649,15 @@ namespace eCAL
     Registration::Sample ecal_unreg_sample;
     ecal_unreg_sample.cmd_type = bct_unreg_subscriber;
 
+    auto& ecal_reg_sample_identifier = ecal_unreg_sample.identifier;
+    ecal_reg_sample_identifier.process_id = m_pid;
+    ecal_reg_sample_identifier.entity_id = m_topic_id;
+    ecal_reg_sample_identifier.host_name = m_host_name;
+
     auto& ecal_reg_sample_topic = ecal_unreg_sample.topic;
-    ecal_reg_sample_topic.hname  = m_host_name;
     ecal_reg_sample_topic.hgname = m_host_group_name;
     ecal_reg_sample_topic.pname  = m_pname;
-    ecal_reg_sample_topic.pid    = m_pid;
     ecal_reg_sample_topic.tname  = m_topic_name;
-    ecal_reg_sample_topic.tid    = m_topic_id;
     ecal_reg_sample_topic.uname  = Process::GetUnitName();
 
     return ecal_unreg_sample;

ecal/core/src/readwrite/ecal_writer.cpp

@@ -616,11 +616,15 @@ namespace eCAL
     Registration::Sample ecal_reg_sample;
     ecal_reg_sample.cmd_type = bct_reg_publisher;
 
+    auto& ecal_reg_sample_identifier = ecal_reg_sample.identifier;
+    ecal_reg_sample_identifier.process_id = m_pid;
+    ecal_reg_sample_identifier.entity_id  = m_topic_id;
+    ecal_reg_sample_identifier.host_name  = m_host_name;
+
     auto& ecal_reg_sample_topic = ecal_reg_sample.topic;
-    ecal_reg_sample_topic.hname  = m_host_name;
     ecal_reg_sample_topic.hgname = m_host_group_name;
     ecal_reg_sample_topic.tname  = m_topic_name;
-    ecal_reg_sample_topic.tid    = m_topic_id;
+
     // topic_information
     {
       auto& ecal_reg_sample_tdatatype = ecal_reg_sample_topic.tdatatype;
@@ -679,7 +683,6 @@ namespace eCAL
     }
 #endif
 
-    ecal_reg_sample_topic.pid    = m_pid;
     ecal_reg_sample_topic.pname  = m_pname;
     ecal_reg_sample_topic.uname  = Process::GetUnitName();
     ecal_reg_sample_topic.did    = m_id;
@@ -711,13 +714,15 @@ namespace eCAL
     Registration::Sample ecal_unreg_sample;
     ecal_unreg_sample.cmd_type = bct_unreg_publisher;
 
+    auto& ecal_reg_sample_identifier = ecal_unreg_sample.identifier;
+    ecal_reg_sample_identifier.process_id = m_pid;
+    ecal_reg_sample_identifier.entity_id  = m_topic_id;
+    ecal_reg_sample_identifier.host_name  = m_host_name;
+
     auto& ecal_reg_sample_topic  = ecal_unreg_sample.topic;
-    ecal_reg_sample_topic.hname  = m_host_name;
     ecal_reg_sample_topic.hgname = m_host_group_name;
     ecal_reg_sample_topic.pname  = m_pname;
-    ecal_reg_sample_topic.pid    = m_pid;
     ecal_reg_sample_topic.tname  = m_topic_name;
-    ecal_reg_sample_topic.tid    = m_topic_id;
     ecal_reg_sample_topic.uname  = Process::GetUnitName();
 
     return ecal_unreg_sample;

ecal/core/src/registration/ecal_process_registration.cpp

@@ -34,10 +34,13 @@ eCAL::Registration::Sample eCAL::Registration::GetProcessRegisterSample()
 {
   Registration::Sample process_sample;
   process_sample.cmd_type = bct_reg_process;
+
+  auto& process_sample_identifier = process_sample.identifier;
+  process_sample_identifier.host_name  = eCAL::Process::GetHostName();
+  process_sample_identifier.process_id = eCAL::Process::GetProcessID();
+
   auto& process_sample_process = process_sample.process;
-  process_sample_process.hname = eCAL::Process::GetHostName();
   process_sample_process.hgname = eCAL::Process::GetHostGroupName();
-  process_sample_process.pid = eCAL::Process::GetProcessID();
   process_sample_process.pname = eCAL::Process::GetProcessName();
   process_sample_process.uname = eCAL::Process::GetUnitName();
   process_sample_process.pparam = eCAL::Process::GetProcessParameter();
@@ -94,9 +97,12 @@ eCAL::Registration::Sample eCAL::Registration::GetProcessUnregisterSample()
 {
   Registration::Sample process_sample;
   process_sample.cmd_type = bct_unreg_process;
+
+  auto& process_sample_identifier = process_sample.identifier;
+  process_sample_identifier.host_name = eCAL::Process::GetHostName();
+  process_sample_identifier.process_id = eCAL::Process::GetProcessID();
+
   auto& process_sample_process = process_sample.process;
-  process_sample_process.hname = eCAL::Process::GetHostName();
-  process_sample_process.pid = eCAL::Process::GetProcessID();
   process_sample_process.pname = eCAL::Process::GetProcessName();
   process_sample_process.uname = eCAL::Process::GetUnitName();