2020#include < fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
2121#include < fastdds/rtps/reader/ReaderDiscoveryStatus.hpp>
2222
23+ #include < cstring>
2324#include < memory>
2425#include < string>
2526#include < utility>
@@ -29,6 +30,23 @@ namespace uros {
2930namespace agent {
3031namespace graph_manager {
3132
33+ // Builds a GID the way rmw_fastrtps_cpp does, the 16-byte GUID copied as is
34+ // Defined here since rmw_fastrtps_shared_cpp, which provided it, was removed upstream
35+ // (ros2/rmw_fastrtps#923)
36+ rmw_gid_t create_rmw_gid (
37+ const char * identifier,
38+ const eprosima::fastdds::rtps::GUID_t& guid)
39+ {
40+ static_assert (
41+ sizeof (guid) == sizeof (guid.guidPrefix .value ) + sizeof (guid.entityId .value ) &&
42+ sizeof (guid) <= RMW_GID_STORAGE_SIZE ,
43+ " Fast DDS GUID_t must be a packed prefix + entity id that fits in rmw_gid_t" );
44+ rmw_gid_t rmw_gid = {};
45+ rmw_gid.implementation_identifier = identifier;
46+ std::memcpy (rmw_gid.data , &guid, sizeof (guid));
47+ return rmw_gid;
48+ }
49+
3250GraphManager::GraphManager (eprosima::fastdds::dds::DomainId_t domain_id)
3351 : domain_id_(domain_id)
3452 , graph_changed_(false )
@@ -307,7 +325,7 @@ void GraphManager::add_participant(
307325 const std::string& enclave)
308326{
309327 const eprosima::fastdds::dds::DomainParticipantQos qos = participant->get_qos ();
310- const rmw_gid_t gid = rmw_fastrtps_shared_cpp:: create_rmw_gid (" rmw_fastrtps_cpp" , participant->guid ());
328+ const rmw_gid_t gid = create_rmw_gid (" rmw_fastrtps_cpp" , participant->guid ());
311329
312330 graphCache_.add_participant (gid, enclave);
313331
@@ -339,7 +357,7 @@ void GraphManager::remove_participant(
339357 const eprosima::fastdds::dds::DomainParticipant* participant,
340358 bool from_microros)
341359{
342- const rmw_gid_t gid = rmw_fastrtps_shared_cpp:: create_rmw_gid (" rmw_fastrtps_cpp" , participant->guid ());
360+ const rmw_gid_t gid = create_rmw_gid (" rmw_fastrtps_cpp" , participant->guid ());
343361 graphCache_.remove_participant (gid);
344362
345363 if (from_microros)
@@ -371,9 +389,9 @@ void GraphManager::add_datawriter(
371389 const eprosima::fastdds::rtps::GUID_t& participant_guid,
372390 const eprosima::fastdds::dds::DataWriterQos& writer_qos)
373391{
374- const rmw_gid_t datawriter_gid = rmw_fastrtps_shared_cpp:: create_rmw_gid (
392+ const rmw_gid_t datawriter_gid = create_rmw_gid (
375393 " rmw_fastrtps_cpp" , datawriter_guid);
376- const rmw_gid_t participant_gid = rmw_fastrtps_shared_cpp:: create_rmw_gid (
394+ const rmw_gid_t participant_gid = create_rmw_gid (
377395 " rmw_fastrtps_cpp" , participant_guid);
378396 const rmw_qos_profile_t qos_profile = fastdds_qos_to_rmw_qos (writer_qos);
379397
@@ -384,7 +402,7 @@ void GraphManager::add_datawriter(
384402void GraphManager::remove_datawriter (
385403 const eprosima::fastdds::rtps::GUID_t& datawriter_guid)
386404{
387- const rmw_gid_t datawriter_gid = rmw_fastrtps_shared_cpp:: create_rmw_gid (
405+ const rmw_gid_t datawriter_gid = create_rmw_gid (
388406 " rmw_fastrtps_cpp" , datawriter_guid);
389407
390408 graphCache_.remove_entity (datawriter_gid, false );
@@ -408,9 +426,9 @@ void GraphManager::add_datareader(
408426 const eprosima::fastdds::rtps::GUID_t& participant_guid,
409427 const eprosima::fastdds::dds::DataReaderQos& reader_qos)
410428{
411- const rmw_gid_t datareader_gid = rmw_fastrtps_shared_cpp:: create_rmw_gid (
429+ const rmw_gid_t datareader_gid = create_rmw_gid (
412430 " rmw_fastrtps_cpp" , datareader_guid);
413- const rmw_gid_t participant_gid = rmw_fastrtps_shared_cpp:: create_rmw_gid (
431+ const rmw_gid_t participant_gid = create_rmw_gid (
414432 " rmw_fastrtps_cpp" , participant_guid);
415433 const rmw_qos_profile_t qos_profile = fastdds_qos_to_rmw_qos (reader_qos);
416434
@@ -426,7 +444,7 @@ void GraphManager::add_datareader(
426444void GraphManager::remove_datareader (
427445 const eprosima::fastdds::rtps::GUID_t& datareader_guid)
428446{
429- const rmw_gid_t datareader_gid = rmw_fastrtps_shared_cpp:: create_rmw_gid (
447+ const rmw_gid_t datareader_gid = create_rmw_gid (
430448 " rmw_fastrtps_cpp" , datareader_guid);
431449
432450 graphCache_.remove_entity (datareader_gid, true );
@@ -437,9 +455,9 @@ void GraphManager::associate_entity(
437455 const eprosima::fastdds::dds::DomainParticipant* participant,
438456 const dds::xrce::ObjectKind& entity_kind)
439457{
440- const rmw_gid_t entity_gid = rmw_fastrtps_shared_cpp:: create_rmw_gid (
458+ const rmw_gid_t entity_gid = create_rmw_gid (
441459 " rmw_fastrtps_cpp" , entity_guid);
442- const rmw_gid_t participant_gid = rmw_fastrtps_shared_cpp:: create_rmw_gid (
460+ const rmw_gid_t participant_gid = create_rmw_gid (
443461 " rmw_fastrtps_cpp" , participant->guid ());
444462
445463 eprosima::fastdds::dds::DomainParticipantQos qos = participant->get_qos ();
@@ -629,14 +647,14 @@ void GraphManager::ParticipantListener::on_participant_discovery(
629647 const std::string enclave =
630648 std::string (name_found->second .begin (), name_found->second .end ());
631649
632- const rmw_gid_t gid = rmw_fastrtps_shared_cpp:: create_rmw_gid (" rmw_fastrtps_cpp" , info.guid );
650+ const rmw_gid_t gid = create_rmw_gid (" rmw_fastrtps_cpp" , info.guid );
633651 graphManager_from_->get_graph_cache ().add_participant (gid, enclave);
634652 break ;
635653 }
636654 case eprosima::fastdds::rtps::ParticipantDiscoveryStatus::REMOVED_PARTICIPANT :
637655 case eprosima::fastdds::rtps::ParticipantDiscoveryStatus::DROPPED_PARTICIPANT :
638656 {
639- const rmw_gid_t gid = rmw_fastrtps_shared_cpp:: create_rmw_gid (" rmw_fastrtps_cpp" , info.guid );
657+ const rmw_gid_t gid = create_rmw_gid (" rmw_fastrtps_cpp" , info.guid );
640658 graphManager_from_->get_graph_cache ().remove_participant (gid);
641659 break ;
642660 }
0 commit comments