Revert "Fix 'microxrcedds_agent' name and dependency (#279) (#280)" (#283)

This reverts commit d2d97bc4a6.

.github/ISSUE_TEMPLATE/general-issue.md

@@ -12,7 +12,7 @@ assignees: ''
 - Hardware description: <!-- hardware where you are using micro-ROS -->
 - RTOS: <!-- RTOS where you are using micro-ROS -->
 - Installation type: <!-- micro_ros_setup, modules, etc  -->
-- Version or commit hash: <!-- version of micro-ROS used: foxy, rolling  -->
+- Version or commit hash: <!-- version of micro-ROS used: humble, jazzy, kilted, rolling  -->
 
 #### Steps to reproduce the issue
 <!-- Detailed instructions on how to reliably reproduce this issue http://sscce.org/-->

.github/workflows/ci.yml

@@ -3,36 +3,35 @@ name: CI micro-ROS Agent
 on:
     pull_request:
       branches:
-        - '**'
+        - 'kilted'
+    schedule:
+      - cron: '33 6 * * *'
 
 jobs:
 
     microros_agent_ci:
-        runs-on: ubuntu-20.04
-        container: microros/base:foxy
-
-        steps:
-        - uses: actions/checkout@v2
-          with:
-            path: urosagent
-
-        - name: Download dependencies
-          run: |
-            apt update
-            cd /uros_ws
-            . /opt/ros/$ROS_DISTRO/setup.sh
-            . install/local_setup.sh
-            rosdep update --rosdistro=$ROS_DISTRO
-            ros2 run micro_ros_setup create_agent_ws.sh
-
-        - name: Patch branch
-          run: |
-            rm -rf /uros_ws/src/uros/micro-ROS-Agent/*
-            cp -R urosagent/* /uros_ws/src/uros/micro-ROS-Agent/
-
-        - name: Build
-          run:  |
-            cd /uros_ws
-            . /opt/ros/$ROS_DISTRO/setup.sh
-            . install/local_setup.sh
-            ros2 run micro_ros_setup build_agent.sh
+      runs-on: ${{ matrix.os }}
+      strategy:
+        fail-fast: false
+        matrix:
+          os: [ ubuntu-latest ]
+          ros_distribution: [ kilted ]
+          include:
+            - docker_image: ubuntu:24.04
+              ros_distribution: kilted
+      container:
+        image: ${{ matrix.docker_image }}
+      steps:
+      - uses: actions/checkout@v4
+      - uses: ros-tooling/setup-ros@0.7.13
+        with:
+          use-ros2-testing: false
+          required-ros-distributions: ${{ matrix.ros_distribution }}
+      - name : Download and install dependencies
+        run: |
+          apt-get install ros-${{ matrix.ros_distribution }}-micro-ros-msgs
+          apt-get install ros-${{ matrix.ros_distribution }}-rmw-fastrtps-cpp
+      - uses : ros-tooling/action-ros-ci@0.4.3
+        with:
+          package-name: "micro_ros_agent"
+          target-ros2-distro: ${{ matrix.ros_distribution }}

README.md

@@ -55,3 +55,4 @@ see the file [3rd-party-licenses.txt](3rd-party-licenses.txt).
 Please notice the following issues/limitations:
 
 * There is an unknown issue when dealing with serial ports shared with the micro-ROS agent running inside a Docker. Sometimes it works with a remarkable packet loss.
+* There is an known issues with serial port communication on micro-ros-agent snap version. It is recommended to use the dockerized version or build it from source.

micro_ros_agent/CHANGELOG.rst

@@ -2,16 +2,58 @@
 Changelog for package micro-ros_agent
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-1.5.1 (2022-03-25)
+6.1.1 (2026-08-11)
 ------------------
-* Add services to graph manager (backport `#127 <https://github.com/micro-ROS/micro-ROS-Agent/issues/127>`_) (`#128 <https://github.com/micro-ROS/micro-ROS-Agent/issues/128>`_)
-* Add used missing includes (`#116 <https://github.com/micro-ROS/micro-ROS-Agent/issues/116>`_)
-* Add system logger flag (`#118 <https://github.com/micro-ROS/micro-ROS-Agent/issues/118>`_) (`#120 <https://github.com/micro-ROS/micro-ROS-Agent/issues/120>`_)
-* Add condition variable include (`#113 <https://github.com/micro-ROS/micro-ROS-Agent/issues/113>`_) (`#115 <https://github.com/micro-ROS/micro-ROS-Agent/issues/115>`_)
-* pass system name to xrceagent (`#110 <https://github.com/micro-ROS/micro-ROS-Agent/issues/110>`_) (`#111 <https://github.com/micro-ROS/micro-ROS-Agent/issues/111>`_)
-* Fix memory leak in FastDDS datawriter (`#107 <https://github.com/micro-ROS/micro-ROS-Agent/issues/107>`_) (`#108 <https://github.com/micro-ROS/micro-ROS-Agent/issues/108>`_)
+* Update maintainers (`#275 <https://github.com/micro-ROS/micro-ROS-Agent/issues/275>`_)
+* Update CMakeLists.txt (`#247 <https://github.com/micro-ROS/micro-ROS-Agent/issues/247>`_) (`#263 <https://github.com/micro-ROS/micro-ROS-Agent/issues/263>`_)
 
-1.5.0 (2021-09-13)
+6.1.0 (2025-07-10)
+------------------
+* Use target_link_libraries instead of ament_target_dependencies (`#253 <https://github.com/micro-ROS/micro-ROS-Agent/issues/253>`_)
+* Remove fastrtps_cmake_module from CMakeLists.txt (`#248 <https://github.com/micro-ROS/micro-ROS-Agent/issues/248>`_)
+* bump Micro XRCE-DDS Agent (`#245 <https://github.com/micro-ROS/micro-ROS-Agent/issues/245>`_)
+* Undo changes in micro-ros agent compilation (`#239 <https://github.com/micro-ROS/micro-ROS-Agent/issues/239>`_)
+* Update SuperBuild.cmake (`#238 <https://github.com/micro-ROS/micro-ROS-Agent/issues/238>`_)
+* Bump micro-ROS-Agent to Fast DDS v3.0.1 (`#237 <https://github.com/micro-ROS/micro-ROS-Agent/issues/237>`_)
+
+6.0.0 (2024-05-31)
+------------------
+* Bump Micro XRCE-DDS Agent (`#226 <https://github.com/micro-ROS/micro-ROS-Agent/issues/226>`_)
+
+5.0.1 (2024-01-29)
+------------------
+* Fix thread include (`#216 <https://github.com/micro-ROS/micro-ROS-Agent/issues/216>`_) (`#218 <https://github.com/micro-ROS/micro-ROS-Agent/issues/218>`_)
+
+5.0.0 (2023-06-06)
+------------------
+* Add empty type key hash to GraphCache (`#189 <https://github.com/micro-ROS/micro-ROS-Agent/issues/189>`_)
+* Contributors: Antonio Cuadros
+
+4.0.2 (2022-09-28)
+------------------
+* Fix Datawriter destruction (`#169 <https://github.com/micro-ROS/micro-ROS-Agent/issues/169>`_) (`#170 <https://github.com/micro-ROS/micro-ROS-Agent/issues/170>`_)
+* Synchronise predicate (`#160 <https://github.com/micro-ROS/micro-ROS-Agent/issues/160>`_) (`#165 <https://github.com/micro-ROS/micro-ROS-Agent/issues/165>`_)
+
+4.0.1 (2022-06-13)
+------------------
+* Fix memory leak in graph manager (`#147 <https://github.com/micro-ROS/micro-ROS-Agent/issues/147>`_) (`#148 <https://github.com/micro-ROS/micro-ROS-Agent/issues/148>`_)
+
+4.0.0 (2022-05-25)
+------------------
+
+3.0.1 (2022-03-25)
+------------------
+* Add services to graph manager (`#127 <https://github.com/micro-ROS/micro-ROS-Agent/issues/127>`_) (`#129 <https://github.com/micro-ROS/micro-ROS-Agent/issues/129>`_)
+* Add used missing includes (`#116 <https://github.com/micro-ROS/micro-ROS-Agent/issues/116>`_) (`#124 <https://github.com/micro-ROS/micro-ROS-Agent/issues/124>`_)
+* Add system logger flag (`#118 <https://github.com/micro-ROS/micro-ROS-Agent/issues/118>`_) (`#119 <https://github.com/micro-ROS/micro-ROS-Agent/issues/119>`_)
+* Add condition variable include (`#113 <https://github.com/micro-ROS/micro-ROS-Agent/issues/113>`_) (`#114 <https://github.com/micro-ROS/micro-ROS-Agent/issues/114>`_)
+* pass system name to xrceagent (`#110 <https://github.com/micro-ROS/micro-ROS-Agent/issues/110>`_) (`#112 <https://github.com/micro-ROS/micro-ROS-Agent/issues/112>`_)
+* Fix memory leak in FastDDS datawriter (`#107 <https://github.com/micro-ROS/micro-ROS-Agent/issues/107>`_) (`#109 <https://github.com/micro-ROS/micro-ROS-Agent/issues/109>`_)
+
+3.0.0 (2021-09-13)
+------------------
+
+1.0.1 (2021-09-13)
 ------------------
 * Remove XRCE dependency and add superbuild (`#97 <https://github.com/micro-ROS/micro-ROS-Agent/issues/97>`_)
 * Fixed launch file by using a list for arguments. Ensures order of items is kept. (`#93 <https://github.com/micro-ROS/micro-ROS-Agent/issues/93>`_) (`#94 <https://github.com/micro-ROS/micro-ROS-Agent/issues/94>`_)

micro_ros_agent/CMakeLists.txt

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.11)
 
 option(UROSAGENT_GENERATE_PROFILE
   "Generates agent.refs according to the .msgs provided in the .repos" OFF
@@ -34,8 +34,7 @@ find_package(ament_cmake REQUIRED)
 find_package(microxrcedds_agent REQUIRED)
 find_package(rosidl_cmake REQUIRED)
 find_package(fastcdr REQUIRED)
-find_package(fastrtps REQUIRED)
-find_package(fastrtps_cmake_module REQUIRED)
+find_package(fastdds REQUIRED)
 find_package(rmw_dds_common REQUIRED)
 find_package(rmw REQUIRED)
 find_package(rcutils REQUIRED)
@@ -63,22 +62,21 @@ target_include_directories(${PROJECT_NAME}
     include
   )
 
-ament_target_dependencies(${PROJECT_NAME}
-  rosidl_typesupport_fastrtps_cpp
-  rosidl_runtime_cpp
-  rosidl_typesupport_cpp
-  fastcdr
-  fastrtps
-  rmw_dds_common
-  rmw
-  rmw_fastrtps_shared_cpp
-  micro_ros_msgs
+target_link_libraries(${PROJECT_NAME}
+  ${micro_ros_msgs_TARGETS}
+  ${rmw_dds_common_TARGETS}
+  rmw::rmw
+  rmw_dds_common::rmw_dds_common_library
+  rmw_fastrtps_shared_cpp::rmw_fastrtps_shared_cpp
+  rosidl_runtime_cpp::rosidl_runtime_cpp
+  rosidl_typesupport_cpp::rosidl_typesupport_cpp
+  rosidl_typesupport_fastrtps_cpp::rosidl_typesupport_fastrtps_cpp
   )
 
 target_link_libraries(${PROJECT_NAME}
   microxrcedds_agent
   fastcdr
-  fastrtps
+  fastdds
   $<$<BOOL:$<PLATFORM_ID:Linux>>:rt>
   $<$<BOOL:$<PLATFORM_ID:Linux>>:dl>
   )

micro_ros_agent/cmake/SuperBuild.cmake

@@ -20,13 +20,13 @@ enable_language(C)
 enable_language(CXX)
 
 unset(xrceagent_DIR CACHE)
-find_package(xrceagent 2 EXACT QUIET)
+find_package(xrceagent 3 EXACT QUIET)
 if(NOT xrceagent_FOUND)
     ExternalProject_Add(xrceagent
             GIT_REPOSITORY
                 https://github.com/eProsima/Micro-XRCE-DDS-Agent.git
             GIT_TAG
-                ros2
+                v3.0.1
             PREFIX
                 ${PROJECT_BINARY_DIR}/agent
             INSTALL_DIR

micro_ros_agent/include/agent/graph_manager/graph_manager.hpp

@@ -15,28 +15,25 @@
 #ifndef _UROS_AGENT_GRAPH_MANAGER_HPP
 #define _UROS_AGENT_GRAPH_MANAGER_HPP
 
-#include "fastrtps/Domain.h"
-#include <fastrtps/TopicDataType.h>
-#include "fastrtps/attributes/ParticipantAttributes.h"
-#include "fastrtps/participant/Participant.h"
-#include "fastrtps/participant/ParticipantListener.h"
-#include "fastrtps/attributes/PublisherAttributes.h"
-#include "fastrtps/publisher/Publisher.h"
-#include <fastrtps/publisher/PublisherListener.h>
-#include <fastrtps/rtps/common/MatchingInfo.h>
-
+#include "fastdds/dds/topic/TopicDataType.hpp"
+#include "fastdds/rtps/attributes/RTPSParticipantAttributes.hpp"
+#include "fastdds/rtps/participant/RTPSParticipant.hpp"
+#include "fastdds/rtps/participant/RTPSParticipantListener.hpp"
+#include "fastdds/rtps/RTPSDomain.hpp"
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/dds/domain/DomainParticipantListener.hpp>
 #include <fastdds/dds/domain/qos/DomainParticipantQos.hpp>
 #include <fastdds/dds/publisher/DataWriter.hpp>
-#include <fastdds/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/dds/publisher/Publisher.hpp>
+#include <fastdds/dds/publisher/PublisherListener.hpp>
+#include <fastdds/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/dds/subscriber/DataReader.hpp>
+#include <fastdds/dds/subscriber/DataReaderListener.hpp>
 #include <fastdds/dds/subscriber/qos/DataReaderQos.hpp>
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
 #include <fastdds/dds/subscriber/Subscriber.hpp>
-#include <fastdds/dds/subscriber/DataReaderListener.hpp>
+#include <fastdds/rtps/common/MatchingInfo.hpp>
 
 #include "rmw/types.h"
 #include "rmw/names_and_types.h"
@@ -65,6 +62,7 @@
 #include <string>
 #include <memory>
 #include <map>
+#include <thread>
 
 namespace uros {
 namespace agent {
@@ -111,6 +109,12 @@ public:
         const eprosima::fastdds::dds::DomainParticipant* participant,
         bool from_microros = true);
 
+    /**
+     * @brief   Getter for the graph cache.
+     * @return  Reference to inner graph cache
+     */
+    rmw_dds_common::GraphCache& get_graph_cache() { return graphCache_; }
+
     /**
      * @brief   Adds a DDS datawriter to the graph tree.
      * @param   datawriter_guid rtps::GUID_t of the datawriter to be added.
@@ -118,7 +122,7 @@ public:
      * @param   datawriter Pointer to the datawriter to be added.
      */
     void add_datawriter(
-            const eprosima::fastrtps::rtps::GUID_t& datawriter_guid,
+            const eprosima::fastdds::rtps::GUID_t& datawriter_guid,
             const eprosima::fastdds::dds::DomainParticipant* participant,
             const eprosima::fastdds::dds::DataWriter* datawriter);
 
@@ -131,33 +135,18 @@ public:
      * @param   writer_qos QOS of the datawriter to be included into the graph tree.
      */
     void add_datawriter(
-            const eprosima::fastrtps::rtps::GUID_t& datawriter_guid,
+            const eprosima::fastdds::rtps::GUID_t& datawriter_guid,
             const std::string& topic_name,
             const std::string& type_name,
-            const eprosima::fastrtps::rtps::GUID_t& participant_guid,
+            const eprosima::fastdds::rtps::GUID_t& participant_guid,
             const eprosima::fastdds::dds::DataWriterQos& writer_qos);
 
-    /**
-     * @brief   Adds a DDS datawriter to the graph tree.
-     * @param   datawriter_guid rtps::GUID_t of the datawriter to be added.
-     * @param   topic_name Name of the topic to which the datawriter sends information to.
-     * @param   type_name Type name of the sent topic.
-     * @param   participant_guid rtps::GUID_t of the participant which owns this datawriter.
-     * @param   writer_qos QOS of the datawriter to be included into the graph tree.
-     */
-    void add_datawriter(
-            const eprosima::fastrtps::rtps::GUID_t& datawriter_guid,
-            const std::string& topic_name,
-            const std::string& type_name,
-            const eprosima::fastrtps::rtps::GUID_t& participant_guid,
-            const eprosima::fastdds::dds::WriterQos& writer_qos);
-
     /**
      * @brief   Removes a DDS datawriter from the graph tree.
      * @param   datawriter_guid rtps::GUID_t of the datawriter to be removed.
      */
     void remove_datawriter(
-            const eprosima::fastrtps::rtps::GUID_t& datawriter_guid);
+            const eprosima::fastdds::rtps::GUID_t& datawriter_guid);
 
     /**
      * @brief   Adds a DDS datareader to the graph tree.
@@ -166,7 +155,7 @@ public:
      * @param   datareader Pointer to the datareader to be added.
      */
     void add_datareader(
-            const eprosima::fastrtps::rtps::GUID_t& datareader_guid,
+            const eprosima::fastdds::rtps::GUID_t& datareader_guid,
             const eprosima::fastdds::dds::DomainParticipant* participant,
             const eprosima::fastdds::dds::DataReader* datareader);
 
@@ -176,36 +165,21 @@ public:
      * @param   topic_name Name of the topic to which the datareader sends information to.
      * @param   type_name Type name of the sent topic.
      * @param   participant_guid rtps::GUID_t of the participant which owns this datareader.
-     * @param   writer_qos QOS of the datareader to be included into the graph tree.
+     * @param   reader_qos QOS of the datareader to be included into the graph tree.
      */
     void add_datareader(
-            const eprosima::fastrtps::rtps::GUID_t& datareader_guid,
+            const eprosima::fastdds::rtps::GUID_t& datareader_guid,
             const std::string& topic_name,
             const std::string& type_name,
-            const eprosima::fastrtps::rtps::GUID_t& participant_guid,
+            const eprosima::fastdds::rtps::GUID_t& participant_guid,
             const eprosima::fastdds::dds::DataReaderQos& reader_qos);
 
-    /**
-     * @brief   Adds a DDS datareader to the graph tree.
-     * @param   datareader_guid rtps::GUID_t of the datareader to be added.
-     * @param   topic_name Name of the topic to which the datareader sends information to.
-     * @param   type_name Type name of the sent topic.
-     * @param   participant_guid rtps::GUID_t of the participant which owns this datareader.
-     * @param   writer_qos QOS of the datareader to be included into the graph tree.
-     */
-    void add_datareader(
-            const eprosima::fastrtps::rtps::GUID_t& datareader_guid,
-            const std::string& topic_name,
-            const std::string& type_name,
-            const eprosima::fastrtps::rtps::GUID_t& participant_guid,
-            const eprosima::fastdds::dds::ReaderQos& reader_qos);
-
     /**
      * @brief   Removes a DDS datareader from the graph tree.
      * @param   datareader_guid rtps::GUID_t of the datareader to be removed.
      */
     void remove_datareader(
-            const  eprosima::fastrtps::rtps::GUID_t& datareader_guid);
+            const  eprosima::fastdds::rtps::GUID_t& datareader_guid);
 
     /**
      * @brief   Associates a certain DDS entity with a provided participant.
@@ -214,7 +188,7 @@ public:
      * @param   entity_kind Kind of the DDS entity.
      */
     void associate_entity(
-            const eprosima::fastrtps::rtps::GUID_t& entity_guid,
+            const eprosima::fastdds::rtps::GUID_t& entity_guid,
             const eprosima::fastdds::dds::DomainParticipant* participant,
             const dds::xrce::ObjectKind& entity_kind);
 
@@ -235,21 +209,28 @@ private:
                 GraphManager* graph_manager);
     private:
 
-        template <typename Info>
+        template <typename DiscoveryStatus, typename Info>
         void process_discovery_info(
+                DiscoveryStatus reason,
                 const Info& proxyData);
 
         void on_participant_discovery(
                 eprosima::fastdds::dds::DomainParticipant* participant,
-                eprosima::fastrtps::rtps::ParticipantDiscoveryInfo&& info) override;
+                eprosima::fastdds::rtps::ParticipantDiscoveryStatus reason,
+                const eprosima::fastdds::dds::ParticipantBuiltinTopicData& info,
+                bool& should_be_ignored) override;
 
-        void on_subscriber_discovery(
-                eprosima::fastdds::dds::DomainParticipant* /*participant*/,
-                eprosima::fastrtps::rtps::ReaderDiscoveryInfo&& info) override;
+        void on_data_reader_discovery(
+                eprosima::fastdds::dds::DomainParticipant* participant,
+                eprosima::fastdds::rtps::ReaderDiscoveryStatus reason,
+                const eprosima::fastdds::dds::SubscriptionBuiltinTopicData& info,
+                bool& should_be_ignored) override;
 
-        void on_publisher_discovery(
-                eprosima::fastdds::dds::DomainParticipant* /*participant*/,
-                eprosima::fastrtps::rtps::WriterDiscoveryInfo&& info) override;
+        void on_data_writer_discovery(
+                eprosima::fastdds::dds::DomainParticipant* participant,
+                eprosima::fastdds::rtps::WriterDiscoveryStatus reason,
+                const eprosima::fastdds::dds::PublicationBuiltinTopicData& info,
+                bool& should_be_ignored) override;
 
         GraphManager* graphManager_from_;
     };
@@ -329,7 +310,7 @@ private:
     // Store a auxiliary publishers and datawriter for each participant created in micro-ROS
     std::map<
         const eprosima::fastdds::dds::DomainParticipant*,
-        std::unique_ptr<eprosima::fastdds::dds::DataWriter>
+        eprosima::fastdds::dds::DataWriter*
     > micro_ros_graph_datawriters_;
 };
 

micro_ros_agent/include/agent/graph_manager/graph_typesupport.hpp

@@ -15,18 +15,16 @@
 #ifndef UROS_AGENT_GRAPH_PARTICIPANTS_TYPESUPPORT_HPP_
 #define UROS_AGENT_GRAPH_PARTICIPANTS_TYPESUPPORT_HPP_
 
-#include "fastrtps/Domain.h"
-#include <fastrtps/TopicDataType.h>
-#include "fastrtps/attributes/ParticipantAttributes.h"
-#include "fastrtps/participant/Participant.h"
-#include "fastrtps/participant/ParticipantListener.h"
-#include "fastrtps/attributes/PublisherAttributes.h"
-#include "fastrtps/publisher/Publisher.h"
-#include <fastrtps/publisher/PublisherListener.h>
-#include <fastrtps/rtps/common/MatchingInfo.h>
-
+#include "fastdds/dds/publisher/Publisher.hpp"
+#include "fastdds/dds/topic/TopicDataType.hpp"
+#include "fastdds/rtps/attributes/RTPSParticipantAttributes.hpp"
+#include "fastdds/rtps/participant/RTPSParticipant.hpp"
+#include "fastdds/rtps/participant/RTPSParticipantListener.hpp"
+#include "fastdds/rtps/RTPSDomain.hpp"
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/qos/DomainParticipantQos.hpp>
+#include <fastdds/dds/publisher/PublisherListener.hpp>
+#include <fastdds/rtps/common/MatchingInfo.hpp>
 
 #include "rmw/types.h"
 #include "rmw/impl/cpp/key_value.hpp"
@@ -59,24 +57,31 @@ public:
     ParticipantEntitiesInfoTypeSupport();
 
     virtual bool serialize(
-            void* data,
-            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override;
+            const void* const data,
+            eprosima::fastdds::rtps::SerializedPayload_t& payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
     virtual bool deserialize(
-            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::rtps::SerializedPayload_t& payload,
             void* data) override;
 
-    virtual std::function<uint32_t()> getSerializedSizeProvider(
-            void* data) override;
+    virtual uint32_t calculate_serialized_size(
+            const void* const data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-    virtual void* createData() override;
+    virtual void* create_data() override;
 
-    virtual void deleteData(void* data) override;
+    virtual void delete_data(void* data) override;
 
-    virtual bool getKey(
-            void* data,
-            eprosima::fastrtps::rtps::InstanceHandle_t* handle,
-            bool force_md5) override;
+    virtual bool compute_key(
+            eprosima::fastdds::rtps::SerializedPayload_t& payload,
+            eprosima::fastdds::rtps::InstanceHandle_t& ihandle,
+            bool force_md5 = false) override;
+
+    virtual bool compute_key(
+            const void* const data,
+            eprosima::fastdds::rtps::InstanceHandle_t& ihandle,
+            bool force_md5 = false) override;
 
 private:
 
@@ -95,24 +100,31 @@ public:
     MicrorosGraphInfoTypeSupport();
 
     virtual bool serialize(
-            void* data,
-            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override;
+            const void* const data,
+            eprosima::fastdds::rtps::SerializedPayload_t& payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
     virtual bool deserialize(
-            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::rtps::SerializedPayload_t& payload,
             void* data) override;
 
-    virtual std::function<uint32_t()> getSerializedSizeProvider(
-            void* data) override;
+    virtual uint32_t calculate_serialized_size(
+            const void* const data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-    virtual void* createData() override;
+    virtual void* create_data() override;
 
-    virtual void deleteData(void* data) override;
+    virtual void delete_data(void* data) override;
 
-    virtual bool getKey(
-            void* data,
-            eprosima::fastrtps::rtps::InstanceHandle_t* handle,
-            bool force_md5) override;
+    virtual bool compute_key(
+            eprosima::fastdds::rtps::SerializedPayload_t& payload,
+            eprosima::fastdds::rtps::InstanceHandle_t& ihandle,
+            bool force_md5 = false) override;
+
+    virtual bool compute_key(
+            const void* const data,
+            eprosima::fastdds::rtps::InstanceHandle_t& ihandle,
+            bool force_md5 = false) override;
 
 private:
 

micro_ros_agent/package.xml

@@ -2,10 +2,10 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>micro_ros_agent</name>
-  <version>1.5.1</version>
+  <version>6.1.1</version>
   <description>micro-ROS Agent package</description>
-  <maintainer email="pablogarrido@eprosima.com">Pablo Garrido</maintainer>
-  <maintainer email="antoniocuadros@eprosima.com">Antonio Cuadros</maintainer>
+  <maintainer email="eugeniocollado@eprosima.com">Eugenio Collado</maintainer>
+  <maintainer email="davidlaseca@eprosima.com">David Laseca</maintainer>
   <license>Apache License 2.0</license>
 
   <buildtool_depend>ament_cmake</buildtool_depend>

micro_ros_agent/src/agent/Agent.cpp

@@ -79,14 +79,9 @@ bool Agent::create(
             {
                 auto graph_manager_ = find_or_create_graph_manager(participant->get_domain_id());
 
-                // TODO(jamoralp): Workaround for Fast-DDS bug #9977. Remove when fixed
-                const eprosima::fastrtps::rtps::InstanceHandle_t instance_handle =
-                    datawriter->get_instance_handle();
-                const eprosima::fastrtps::rtps::GUID_t datawriter_guid =
-                    iHandle2GUID(instance_handle);
-                graph_manager_->add_datawriter(datawriter_guid, participant, datawriter);
+                graph_manager_->add_datawriter(datawriter->guid(), participant, datawriter);
                 graph_manager_->associate_entity(
-                    datawriter_guid, participant, dds::xrce::OBJK_DATAWRITER);
+                    datawriter->guid(), participant, dds::xrce::OBJK_DATAWRITER);
             });
         xrce_dds_agent_instance_.add_middleware_callback(
             eprosima::uxr::Middleware::Kind::FASTDDS,
@@ -106,12 +101,7 @@ bool Agent::create(
 
                 auto graph_manager_ = find_or_create_graph_manager(participant->get_domain_id());
 
-                // TODO(jamoralp): Workaround for Fast-DDS bug #9977. Remove when fixed
-                const eprosima::fastrtps::rtps::InstanceHandle_t instance_handle =
-                    datawriter->get_instance_handle();
-                const eprosima::fastrtps::rtps::GUID_t datawriter_guid =
-                    eprosima::fastrtps::rtps::iHandle2GUID(instance_handle);
-                graph_manager_->remove_datawriter(datawriter_guid);
+                graph_manager_->remove_datawriter(datawriter->guid());
             });
 
         xrce_dds_agent_instance_.add_middleware_callback(
@@ -132,10 +122,10 @@ bool Agent::create(
                 auto graph_manager_ = find_or_create_graph_manager(participant->get_domain_id());
 
                 // TODO(jamoralp): Workaround for Fast-DDS bug #9977. Remove when fixed
-                const eprosima::fastrtps::rtps::InstanceHandle_t instance_handle =
+                const eprosima::fastdds::rtps::InstanceHandle_t instance_handle =
                     datareader->get_instance_handle();
-                const eprosima::fastrtps::rtps::GUID_t datareader_guid =
-                    eprosima::fastrtps::rtps::iHandle2GUID(instance_handle);
+                const eprosima::fastdds::rtps::GUID_t datareader_guid =
+                    eprosima::fastdds::rtps::iHandle2GUID(instance_handle);
                 graph_manager_->add_datareader(datareader_guid, participant, datareader);
                 graph_manager_->associate_entity(
                     datareader_guid, participant, dds::xrce::OBJK_DATAREADER);
@@ -158,10 +148,10 @@ bool Agent::create(
                 auto graph_manager_ = find_or_create_graph_manager(participant->get_domain_id());
 
                 // TODO(jamoralp): Workaround for Fast-DDS bug #9977. Remove when fixed
-                const eprosima::fastrtps::rtps::InstanceHandle_t instance_handle =
+                const eprosima::fastdds::rtps::InstanceHandle_t instance_handle =
                     datareader->get_instance_handle();
-                const eprosima::fastrtps::rtps::GUID_t datareader_guid =
-                    eprosima::fastrtps::rtps::iHandle2GUID(instance_handle);
+                const eprosima::fastdds::rtps::GUID_t datareader_guid =
+                    eprosima::fastdds::rtps::iHandle2GUID(instance_handle);
                 graph_manager_->remove_datareader(datareader_guid);
             });
 
@@ -184,21 +174,15 @@ bool Agent::create(
             {
                 auto graph_manager_ = find_or_create_graph_manager(participant->get_domain_id());
 
-                // TODO(pablogs): Workaround for Fast-DDS bug #9977. Remove when fixed
-                const eprosima::fastrtps::rtps::InstanceHandle_t instance_handle_dw =
-                    datawriter->get_instance_handle();
-                const eprosima::fastrtps::rtps::GUID_t datawriter_guid =
-                    eprosima::fastrtps::rtps::iHandle2GUID(instance_handle_dw);
-
-                graph_manager_->add_datawriter(datawriter_guid, participant, datawriter);
+                graph_manager_->add_datawriter(datawriter->guid(), participant, datawriter);
                 graph_manager_->associate_entity(
-                    datawriter_guid, participant, dds::xrce::OBJK_DATAWRITER);
+                    datawriter->guid(), participant, dds::xrce::OBJK_DATAWRITER);
 
                 // TODO(pablogs): Workaround for Fast-DDS bug #9977. Remove when fixed
-                const eprosima::fastrtps::rtps::InstanceHandle_t instance_handle_dr =
+                const eprosima::fastdds::rtps::InstanceHandle_t instance_handle =
                     datareader->get_instance_handle();
-                const eprosima::fastrtps::rtps::GUID_t datareader_guid =
-                    eprosima::fastrtps::rtps::iHandle2GUID(instance_handle_dr);
+                const eprosima::fastdds::rtps::GUID_t datareader_guid =
+                    eprosima::fastdds::rtps::iHandle2GUID(instance_handle);
                 graph_manager_->add_datareader(datareader_guid, participant, datareader);
                 graph_manager_->associate_entity(
                     datareader_guid, participant, dds::xrce::OBJK_DATAREADER);
@@ -222,18 +206,13 @@ bool Agent::create(
             {
                 auto graph_manager_ = find_or_create_graph_manager(participant->get_domain_id());
 
-                // TODO(pablogs): Workaround for Fast-DDS bug #9977. Remove when fixed
-                const eprosima::fastrtps::rtps::InstanceHandle_t instance_handle_dw =
-                    datawriter->get_instance_handle();
-                const eprosima::fastrtps::rtps::GUID_t datawriter_guid =
-                    eprosima::fastrtps::rtps::iHandle2GUID(instance_handle_dw);
-                graph_manager_->remove_datawriter(datawriter_guid);
+                graph_manager_->remove_datawriter(datawriter->guid());
 
                 // TODO(pablogs): Workaround for Fast-DDS bug #9977. Remove when fixed
-                const eprosima::fastrtps::rtps::InstanceHandle_t instance_handle_dr =
+                const eprosima::fastdds::rtps::InstanceHandle_t instance_handle =
                     datareader->get_instance_handle();
-                const eprosima::fastrtps::rtps::GUID_t datareader_guid =
-                    eprosima::fastrtps::rtps::iHandle2GUID(instance_handle_dr);
+                const eprosima::fastdds::rtps::GUID_t datareader_guid =
+                    eprosima::fastdds::rtps::iHandle2GUID(instance_handle);
                 graph_manager_->remove_datareader(datareader_guid);
             });
 
@@ -256,20 +235,15 @@ bool Agent::create(
             {
                 auto graph_manager_ = find_or_create_graph_manager(participant->get_domain_id());
 
-                // TODO(pablogs): Workaround for Fast-DDS bug #9977. Remove when fixed
-                const eprosima::fastrtps::rtps::InstanceHandle_t instance_handle_dw =
-                    datawriter->get_instance_handle();
-                const eprosima::fastrtps::rtps::GUID_t datawriter_guid =
-                    eprosima::fastrtps::rtps::iHandle2GUID(instance_handle_dw);
-                graph_manager_->add_datawriter(datawriter_guid, participant, datawriter);
+                graph_manager_->add_datawriter(datawriter->guid(), participant, datawriter);
                 graph_manager_->associate_entity(
-                    datawriter_guid, participant, dds::xrce::OBJK_DATAWRITER);
+                    datawriter->guid(), participant, dds::xrce::OBJK_DATAWRITER);
 
                 // TODO(pablogs): Workaround for Fast-DDS bug #9977. Remove when fixed
-                const eprosima::fastrtps::rtps::InstanceHandle_t instance_handle_dr =
+                const eprosima::fastdds::rtps::InstanceHandle_t instance_handle =
                     datareader->get_instance_handle();
-                const eprosima::fastrtps::rtps::GUID_t datareader_guid =
-                    eprosima::fastrtps::rtps::iHandle2GUID(instance_handle_dr);
+                const eprosima::fastdds::rtps::GUID_t datareader_guid =
+                    eprosima::fastdds::rtps::iHandle2GUID(instance_handle);
                 graph_manager_->add_datareader(datareader_guid, participant, datareader);
                 graph_manager_->associate_entity(
                     datareader_guid, participant, dds::xrce::OBJK_DATAREADER);
@@ -293,18 +267,13 @@ bool Agent::create(
             {
                 auto graph_manager_ = find_or_create_graph_manager(participant->get_domain_id());
 
-                // TODO(pablogs): Workaround for Fast-DDS bug #9977. Remove when fixed
-                const eprosima::fastrtps::rtps::InstanceHandle_t instance_handle_dw =
-                    datawriter->get_instance_handle();
-                const eprosima::fastrtps::rtps::GUID_t datawriter_guid =
-                    eprosima::fastrtps::rtps::iHandle2GUID(instance_handle_dw);
-                graph_manager_->remove_datawriter(datawriter_guid);
+                graph_manager_->remove_datawriter(datawriter->guid());
 
                 // TODO(pablogs): Workaround for Fast-DDS bug #9977. Remove when fixed
-                const eprosima::fastrtps::rtps::InstanceHandle_t instance_handle_dr =
+                const eprosima::fastdds::rtps::InstanceHandle_t instance_handle =
                     datareader->get_instance_handle();
-                const eprosima::fastrtps::rtps::GUID_t datareader_guid =
-                    eprosima::fastrtps::rtps::iHandle2GUID(instance_handle_dr);
+                const eprosima::fastdds::rtps::GUID_t datareader_guid =
+                    eprosima::fastdds::rtps::iHandle2GUID(instance_handle);
                 graph_manager_->remove_datareader(datareader_guid);
             });
 

micro_ros_agent/src/agent/graph_manager/graph_manager.cpp

@@ -16,6 +16,9 @@
 #define _UROS_AGENT_GRAPH_MANAGER_CPP
 
 #include <agent/graph_manager/graph_manager.hpp>
+#include <fastdds/dds/core/detail/DDSReturnCode.hpp>
+#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
+#include <fastdds/rtps/reader/ReaderDiscoveryStatus.hpp>
 
 #include <memory>
 #include <string>
@@ -54,9 +57,9 @@ GraphManager::GraphManager(eprosima::fastdds::dds::DomainId_t domain_id)
 
     participant_qos.name(enclave);
     participant_qos.wire_protocol().builtin.readerHistoryMemoryPolicy =
-        eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
+        eprosima::fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
     participant_qos.wire_protocol().builtin.writerHistoryMemoryPolicy =
-        eprosima::fastrtps::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
+        eprosima::fastdds::rtps::PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
 
     eprosima::fastdds::dds::StatusMask par_mask = eprosima::fastdds::dds::StatusMask::none();
     participant_.reset(eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->
@@ -91,7 +94,7 @@ GraphManager::GraphManager(eprosima::fastdds::dds::DomainId_t domain_id)
         eprosima::fastdds::dds::HistoryQosPolicyKind::KEEP_LAST_HISTORY_QOS;
     datawriter_qos_.history().depth = 1;
     datawriter_qos_.endpoint().history_memory_policy =
-        eprosima::fastrtps::rtps::MemoryManagementPolicy::PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
+        eprosima::fastdds::rtps::MemoryManagementPolicy::PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
     datawriter_qos_.publish_mode().kind =
         eprosima::fastdds::dds::PublishModeQosPolicyKind::ASYNCHRONOUS_PUBLISH_MODE;
     datawriter_qos_.reliability().kind =
@@ -113,7 +116,7 @@ GraphManager::GraphManager(eprosima::fastdds::dds::DomainId_t domain_id)
         eprosima::fastdds::dds::HistoryQosPolicyKind::KEEP_LAST_HISTORY_QOS;
     datareader_qos.history().depth = 1;
     datareader_qos.endpoint().history_memory_policy =
-        eprosima::fastrtps::rtps::MemoryManagementPolicy::PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
+        eprosima::fastdds::rtps::MemoryManagementPolicy::PREALLOCATED_WITH_REALLOC_MEMORY_MODE;
     datareader_qos.reliability().kind =
         eprosima::fastdds::dds::ReliabilityQosPolicyKind::RELIABLE_RELIABILITY_QOS;
     datareader_qos.durability().kind =
@@ -126,8 +129,10 @@ GraphManager::GraphManager(eprosima::fastdds::dds::DomainId_t domain_id)
     // Set graph cache on change callback function
     graphCache_.set_on_change_callback([this]()
     {
-        std::unique_lock<std::mutex> lock(this->mtx_);
-        this->graph_changed_ = true;
+        {
+            std::unique_lock<std::mutex> lock(this->mtx_);
+            this->graph_changed_ = true;
+        }
         this->cv_.notify_one();
     });
 
@@ -144,6 +149,7 @@ inline void GraphManager::publish_microros_graph()
             {
                 return this->graph_changed_;
             });
+            graph_changed_ = false;
         }
 
         if (display_on_change_)
@@ -151,7 +157,6 @@ inline void GraphManager::publish_microros_graph()
             std::cout << "Updated uros Graph: graph changed" << std::endl;
             std::cout << graphCache_ << std::endl;
         }
-        graph_changed_ = false;
 
         micro_ros_msgs::msg::Graph graph_message;
 
@@ -320,11 +325,10 @@ void GraphManager::add_participant(
         if (it == micro_ros_graph_datawriters_.end())
         {
             // Create datawriter
-            std::unique_ptr<eprosima::fastdds::dds::DataWriter> datawriter;
-            datawriter.reset(publisher_->create_datawriter(ros_discovery_topic_.get(), datawriter_qos_));
+            eprosima::fastdds::dds::DataWriter * datawriter = publisher_->create_datawriter(ros_discovery_topic_.get(), datawriter_qos_);
 
             it = micro_ros_graph_datawriters_.insert(
-                std::make_pair(participant, std::move(datawriter))).first;
+                std::make_pair(participant, datawriter)).first;
         }
 
         it->second->write(static_cast<void *>(&info));
@@ -344,12 +348,13 @@ void GraphManager::remove_participant(
         rmw_dds_common::convert_gid_to_msg(&gid, &info.gid);
         auto it = micro_ros_graph_datawriters_.find(participant);
         it->second->write(static_cast<void *>(&info));
+        publisher_->delete_datawriter(it->second);
+        micro_ros_graph_datawriters_.erase(participant);
     }
-    micro_ros_graph_datawriters_.erase(participant);
 }
 
 void GraphManager::add_datawriter(
-        const eprosima::fastrtps::rtps::GUID_t& datawriter_guid,
+        const eprosima::fastdds::rtps::GUID_t& datawriter_guid,
         const eprosima::fastdds::dds::DomainParticipant* participant,
         const eprosima::fastdds::dds::DataWriter* datawriter)
 {
@@ -360,10 +365,10 @@ void GraphManager::add_datawriter(
 }
 
 void GraphManager::add_datawriter(
-        const eprosima::fastrtps::rtps::GUID_t& datawriter_guid,
+        const eprosima::fastdds::rtps::GUID_t& datawriter_guid,
         const std::string& topic_name,
         const std::string& type_name,
-        const eprosima::fastrtps::rtps::GUID_t& participant_guid,
+        const eprosima::fastdds::rtps::GUID_t& participant_guid,
         const eprosima::fastdds::dds::DataWriterQos& writer_qos)
 {
     const rmw_gid_t datawriter_gid = rmw_fastrtps_shared_cpp::create_rmw_gid(
@@ -372,30 +377,12 @@ void GraphManager::add_datawriter(
         "rmw_fastrtps_cpp", participant_guid);
     const rmw_qos_profile_t qos_profile = fastdds_qos_to_rmw_qos(writer_qos);
 
-    graphCache_.add_entity(datawriter_gid, topic_name,
-        type_name, participant_gid, qos_profile, false);
-}
-
-void GraphManager::add_datawriter(
-        const eprosima::fastrtps::rtps::GUID_t& datawriter_guid,
-        const std::string& topic_name,
-        const std::string& type_name,
-        const eprosima::fastrtps::rtps::GUID_t& participant_guid,
-        const eprosima::fastdds::dds::WriterQos& writer_qos)
-{
-    const rmw_gid_t datawriter_gid = rmw_fastrtps_shared_cpp::create_rmw_gid(
-        "rmw_fastrtps_cpp", datawriter_guid);
-    const rmw_gid_t participant_gid = rmw_fastrtps_shared_cpp::create_rmw_gid(
-        "rmw_fastrtps_cpp", participant_guid);
-    rmw_qos_profile_t qos_profile = rmw_qos_profile_unknown;
-    dds_qos_to_rmw_qos(writer_qos, &qos_profile);
-
-    graphCache_.add_entity(datawriter_gid, topic_name,
-        type_name, participant_gid, qos_profile, false);
+    graphCache_.add_entity(datawriter_gid, topic_name, type_name,
+        rosidl_get_zero_initialized_type_hash(), participant_gid, qos_profile, false);
 }
 
 void GraphManager::remove_datawriter(
-        const eprosima::fastrtps::rtps::GUID_t& datawriter_guid)
+        const eprosima::fastdds::rtps::GUID_t& datawriter_guid)
 {
     const rmw_gid_t datawriter_gid = rmw_fastrtps_shared_cpp::create_rmw_gid(
         "rmw_fastrtps_cpp", datawriter_guid);
@@ -404,7 +391,7 @@ void GraphManager::remove_datawriter(
 }
 
 void GraphManager::add_datareader(
-        const eprosima::fastrtps::rtps::GUID_t& datareader_guid,
+        const eprosima::fastdds::rtps::GUID_t& datareader_guid,
         const eprosima::fastdds::dds::DomainParticipant* participant,
         const eprosima::fastdds::dds::DataReader* datareader)
 {
@@ -415,10 +402,10 @@ void GraphManager::add_datareader(
 }
 
 void GraphManager::add_datareader(
-        const eprosima::fastrtps::rtps::GUID_t& datareader_guid,
+        const eprosima::fastdds::rtps::GUID_t& datareader_guid,
         const std::string& topic_name,
         const std::string& type_name,
-        const eprosima::fastrtps::rtps::GUID_t& participant_guid,
+        const eprosima::fastdds::rtps::GUID_t& participant_guid,
         const eprosima::fastdds::dds::DataReaderQos& reader_qos)
 {
     const rmw_gid_t datareader_gid = rmw_fastrtps_shared_cpp::create_rmw_gid(
@@ -427,30 +414,17 @@ void GraphManager::add_datareader(
         "rmw_fastrtps_cpp", participant_guid);
     const rmw_qos_profile_t qos_profile = fastdds_qos_to_rmw_qos(reader_qos);
 
-    graphCache_.add_entity(datareader_gid, topic_name,
-        type_name, participant_gid, qos_profile, true);
-}
-
-void GraphManager::add_datareader(
-        const eprosima::fastrtps::rtps::GUID_t& datareader_guid,
-        const std::string& topic_name,
-        const std::string& type_name,
-        const eprosima::fastrtps::rtps::GUID_t& participant_guid,
-        const eprosima::fastdds::dds::ReaderQos& reader_qos)
-{
-    const rmw_gid_t datareader_gid = rmw_fastrtps_shared_cpp::create_rmw_gid(
-        "rmw_fastrtps_cpp", datareader_guid);
-    const rmw_gid_t participant_gid = rmw_fastrtps_shared_cpp::create_rmw_gid(
-        "rmw_fastrtps_cpp", participant_guid);
-    rmw_qos_profile_t qos_profile = rmw_qos_profile_unknown;
-    dds_qos_to_rmw_qos(reader_qos, &qos_profile);
-
-    graphCache_.add_entity(datareader_gid, topic_name,
-        type_name, participant_gid, qos_profile, true);
+    // TODO(acuadros95): Use typesupport to calculate type hash on micro-ROS and save and get it from reader_qos.user_data.
+    // Related PRs:
+    // https://github.com/ros2/rmw_dds_common/pull/70
+    // https://github.com/ros2/rmw_fastrtps/pull/671
+    // https://github.com/ros2/rmw_fastrtps/pull/680
+    graphCache_.add_entity(datareader_gid, topic_name, type_name,
+        rosidl_get_zero_initialized_type_hash(), participant_gid, qos_profile, true);
 }
 
 void GraphManager::remove_datareader(
-        const eprosima::fastrtps::rtps::GUID_t& datareader_guid)
+        const eprosima::fastdds::rtps::GUID_t& datareader_guid)
 {
     const rmw_gid_t datareader_gid = rmw_fastrtps_shared_cpp::create_rmw_gid(
         "rmw_fastrtps_cpp", datareader_guid);
@@ -459,7 +433,7 @@ void GraphManager::remove_datareader(
 }
 
 void GraphManager::associate_entity(
-        const eprosima::fastrtps::rtps::GUID_t& entity_guid,
+        const eprosima::fastdds::rtps::GUID_t& entity_guid,
         const eprosima::fastdds::dds::DomainParticipant* participant,
         const dds::xrce::ObjectKind& entity_kind)
 {
@@ -579,9 +553,9 @@ void GraphManager::update_node_entities_info()
     rmw_dds_common::msg::ParticipantEntitiesInfo entities_info;
     eprosima::fastdds::dds::SampleInfo sample_info;
     if (ros_discovery_datareader_->take_next_sample(&entities_info, &sample_info) ==
-        eprosima::fastrtps::types::ReturnCode_t::RETCODE_OK)
+        eprosima::fastdds::dds::RETCODE_OK)
     {
-        if (sample_info.instance_state == eprosima::fastdds::dds::InstanceStateKind::ALIVE)
+        if (sample_info.instance_state == eprosima::fastdds::dds::InstanceStateKind::ALIVE_INSTANCE_STATE)
         {
             graphCache_.update_participant_entities(entities_info);
         }
@@ -634,13 +608,18 @@ GraphManager::ParticipantListener::ParticipantListener(
 
 void GraphManager::ParticipantListener::on_participant_discovery(
         eprosima::fastdds::dds::DomainParticipant* participant,
-        eprosima::fastrtps::rtps::ParticipantDiscoveryInfo&& info)
+        eprosima::fastdds::rtps::ParticipantDiscoveryStatus reason,
+        const eprosima::fastdds::dds::ParticipantBuiltinTopicData& info,
+        bool& should_be_ignored)
 {
-    switch (info.status)
+    static_cast<void>(participant);
+    static_cast<void>(should_be_ignored);
+
+    switch (reason)
     {
-        case eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT:
+        case eprosima::fastdds::rtps::ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT:
         {
-            auto map = rmw::impl::cpp::parse_key_value(info.info.m_userData);
+            auto map = rmw::impl::cpp::parse_key_value(info.user_data);
             auto name_found = map.find("enclave");
 
             if (map.end() == name_found)
@@ -650,13 +629,15 @@ void GraphManager::ParticipantListener::on_participant_discovery(
             const std::string enclave =
                 std::string(name_found->second.begin(), name_found->second.end());
 
-            graphManager_from_->add_participant(participant, false, enclave);
+            const rmw_gid_t gid = rmw_fastrtps_shared_cpp::create_rmw_gid("rmw_fastrtps_cpp", info.guid);
+            graphManager_from_->get_graph_cache().add_participant(gid, enclave);
             break;
         }
-        case eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::REMOVED_PARTICIPANT:
-        case eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::DROPPED_PARTICIPANT:
+        case eprosima::fastdds::rtps::ParticipantDiscoveryStatus::REMOVED_PARTICIPANT:
+        case eprosima::fastdds::rtps::ParticipantDiscoveryStatus::DROPPED_PARTICIPANT:
         {
-            graphManager_from_->remove_participant(participant, false);
+            const rmw_gid_t gid = rmw_fastrtps_shared_cpp::create_rmw_gid("rmw_fastrtps_cpp", info.guid);
+            graphManager_from_->get_graph_cache().remove_participant(gid);
             break;
         }
         default:
@@ -666,72 +647,134 @@ void GraphManager::ParticipantListener::on_participant_discovery(
     }
 }
 
+static eprosima::fastdds::dds::DataWriterQos writer_qos_conversion(
+    const eprosima::fastdds::dds::PublicationBuiltinTopicData& writer_info)
+{
+    eprosima::fastdds::dds::DataWriterQos datawriter_qos;
+    eprosima::fastdds::dds::RTPSReliableWriterQos reliable_writer_qos;
+    reliable_writer_qos.disable_positive_acks = writer_info.disable_positive_acks;
+
+    datawriter_qos.durability(writer_info.durability);
+    datawriter_qos.durability_service(writer_info.durability_service);
+    datawriter_qos.deadline(writer_info.deadline);
+    datawriter_qos.latency_budget(writer_info.latency_budget);
+    datawriter_qos.liveliness(writer_info.liveliness);
+    datawriter_qos.reliability(writer_info.reliability);
+    datawriter_qos.lifespan(writer_info.lifespan);
+    datawriter_qos.user_data(writer_info.user_data);
+    datawriter_qos.ownership(writer_info.ownership);
+    datawriter_qos.ownership_strength(writer_info.ownership_strength);
+    datawriter_qos.destination_order(writer_info.destination_order);
+    datawriter_qos.reliable_writer_qos(reliable_writer_qos);
+    datawriter_qos.representation(writer_info.representation);
+    datawriter_qos.data_sharing(writer_info.data_sharing);
+
+    return datawriter_qos;
+}
+
+static eprosima::fastdds::dds::DataReaderQos reader_qos_conversion(
+    const eprosima::fastdds::rtps::SubscriptionBuiltinTopicData& reader_info)
+{
+    eprosima::fastdds::dds::DataReaderQos datareader_qos;
+    eprosima::fastdds::dds::RTPSReliableReaderQos reliable_reader_qos;
+    reliable_reader_qos.disable_positive_acks = reader_info.disable_positive_acks;
+
+    datareader_qos.durability(reader_info.durability);
+    datareader_qos.deadline(reader_info.deadline);
+    datareader_qos.latency_budget(reader_info.latency_budget);
+    datareader_qos.lifespan(reader_info.lifespan);
+    datareader_qos.liveliness(reader_info.liveliness);
+    datareader_qos.reliability(reader_info.reliability);
+    datareader_qos.ownership(reader_info.ownership);
+    datareader_qos.destination_order(reader_info.destination_order);
+    datareader_qos.user_data(reader_info.user_data);
+    datareader_qos.time_based_filter(reader_info.time_based_filter);
+    datareader_qos.type_consistency(reader_info.type_consistency);
+    datareader_qos.reliable_reader_qos(reliable_reader_qos);
+    datareader_qos.representation(reader_info.representation);
+    datareader_qos.data_sharing(reader_info.data_sharing);
+
+    return datareader_qos;
+}
+
+template <>
+void GraphManager::ParticipantListener::process_discovery_info<eprosima::fastdds::rtps::ReaderDiscoveryStatus, eprosima::fastdds::rtps::SubscriptionBuiltinTopicData>(
+        eprosima::fastdds::rtps::ReaderDiscoveryStatus reason,
+        const eprosima::fastdds::rtps::SubscriptionBuiltinTopicData& reader_info)
+{
+    switch (reason)
+    {
+        case eprosima::fastdds::rtps::ReaderDiscoveryStatus::CHANGED_QOS_READER:
+        {
+            return;
+        }
+        case eprosima::fastdds::rtps::ReaderDiscoveryStatus::DISCOVERED_READER:
+        {
+            const std::string topic_name = reader_info.topic_name.to_string();
+            const std::string type_name = reader_info.type_name.to_string();
+
+            graphManager_from_->add_datareader(reader_info.guid, topic_name, type_name,
+                reader_info.participant_guid, reader_qos_conversion(reader_info));
+            break;
+        }
+        default:
+        {
+            graphManager_from_->remove_datareader(reader_info.guid);
+            break;
+        }
+    }
+}
+
 template <>
-void GraphManager::ParticipantListener::process_discovery_info<eprosima::fastrtps::rtps::ReaderDiscoveryInfo>(
-        const eprosima::fastrtps::rtps::ReaderDiscoveryInfo& reader_info)
+void GraphManager::ParticipantListener::process_discovery_info<eprosima::fastdds::rtps::WriterDiscoveryStatus, eprosima::fastdds::rtps::PublicationBuiltinTopicData>(
+        eprosima::fastdds::rtps::WriterDiscoveryStatus reason,
+        const eprosima::fastdds::rtps::PublicationBuiltinTopicData& writer_info)
 {
-    switch (reader_info.status)
+    switch (reason)
     {
-        case eprosima::fastrtps::rtps::ReaderDiscoveryInfo::CHANGED_QOS_READER:
+        case eprosima::fastdds::rtps::WriterDiscoveryStatus::CHANGED_QOS_WRITER:
         {
             return;
         }
-        case eprosima::fastrtps::rtps::ReaderDiscoveryInfo::DISCOVERED_READER:
+        case eprosima::fastdds::rtps::WriterDiscoveryStatus::DISCOVERED_WRITER:
         {
-            const std::string topic_name = reader_info.info.topicName().to_string();
-            const std::string type_name = reader_info.info.typeName().to_string();
+            const std::string topic_name = writer_info.topic_name.to_string();
+            const std::string type_name = writer_info.type_name.to_string();
 
-            graphManager_from_->add_datareader(reader_info.info.guid(), topic_name, type_name,
-                iHandle2GUID(reader_info.info.RTPSParticipantKey()), reader_info.info.m_qos);
+            graphManager_from_->add_datawriter(writer_info.guid, topic_name, type_name,
+                writer_info.participant_guid, writer_qos_conversion(writer_info));
             break;
         }
         default:
         {
-            graphManager_from_->remove_datareader(reader_info.info.guid());
+            graphManager_from_->remove_datawriter(writer_info.guid);
             break;
         }
     }
 }
 
-template <>
-void GraphManager::ParticipantListener::process_discovery_info<eprosima::fastrtps::rtps::WriterDiscoveryInfo>(
-        const eprosima::fastrtps::rtps::WriterDiscoveryInfo& writer_info)
+void GraphManager::ParticipantListener::on_data_reader_discovery(
+        eprosima::fastdds::dds::DomainParticipant* participant,
+        eprosima::fastdds::rtps::ReaderDiscoveryStatus reason,
+        const eprosima::fastdds::dds::SubscriptionBuiltinTopicData& info,
+        bool& should_be_ignored)
 {
-    switch (writer_info.status)
-    {
-        case eprosima::fastrtps::rtps::WriterDiscoveryInfo::CHANGED_QOS_WRITER:
-        {
-            return;
-        }
-        case eprosima::fastrtps::rtps::WriterDiscoveryInfo::DISCOVERED_WRITER:
-        {
-            const std::string topic_name = writer_info.info.topicName().to_string();
-            const std::string type_name = writer_info.info.typeName().to_string();
+    static_cast<void>(participant);
+    static_cast<void>(should_be_ignored);
 
-            graphManager_from_->add_datawriter(writer_info.info.guid(), topic_name, type_name,
-                iHandle2GUID(writer_info.info.RTPSParticipantKey()), writer_info.info.m_qos);
-            break;
-        }
-        default:
-        {
-            graphManager_from_->remove_datawriter(writer_info.info.guid());
-            break;
-        }
-    }
+    process_discovery_info<eprosima::fastdds::rtps::ReaderDiscoveryStatus, eprosima::fastdds::rtps::SubscriptionBuiltinTopicData>(reason, info);
 }
 
-void GraphManager::ParticipantListener::on_subscriber_discovery(
-        eprosima::fastdds::dds::DomainParticipant* /*participant*/,
-        eprosima::fastrtps::rtps::ReaderDiscoveryInfo&& info)
+void GraphManager::ParticipantListener::on_data_writer_discovery(
+        eprosima::fastdds::dds::DomainParticipant* participant,
+        eprosima::fastdds::rtps::WriterDiscoveryStatus reason,
+        const eprosima::fastdds::dds::PublicationBuiltinTopicData& info,
+        bool& should_be_ignored)
 {
-    process_discovery_info<eprosima::fastrtps::rtps::ReaderDiscoveryInfo>(info);
-}
+    static_cast<void>(participant);
+    static_cast<void>(should_be_ignored);
 
-void GraphManager::ParticipantListener::on_publisher_discovery(
-        eprosima::fastdds::dds::DomainParticipant* /*participant*/,
-        eprosima::fastrtps::rtps::WriterDiscoveryInfo&& info)
-{
-    process_discovery_info<eprosima::fastrtps::rtps::WriterDiscoveryInfo>(info);
+    process_discovery_info<eprosima::fastdds::rtps::WriterDiscoveryStatus, eprosima::fastdds::rtps::PublicationBuiltinTopicData>(reason, info);
 }
 
 GraphManager::DatareaderListener::DatareaderListener(

micro_ros_agent/src/agent/graph_manager/graph_typesupport.cpp

@@ -41,27 +41,30 @@ ParticipantEntitiesInfoTypeSupport::ParticipantEntitiesInfoTypeSupport()
         ss << message_namespace << "::";
     }
     ss << "dds_::" << message_name << "_";
-    this->setName(ss.str().c_str());
+    this->set_name(ss.str().c_str());
 
-    bool full_bounded = true;
-    m_typeSize = 4 + callbacks_->max_serialized_size(full_bounded);
+    char full_bounded;
+    max_serialized_type_size = 4 + callbacks_->max_serialized_size(full_bounded);
 }
 
 bool ParticipantEntitiesInfoTypeSupport::serialize(
-        void * data,
-        eprosima::fastrtps::rtps::SerializedPayload_t * payload)
+        const void* const data,
+        eprosima::fastdds::rtps::SerializedPayload_t& payload,
+        eprosima::fastdds::dds::DataRepresentationId_t data_representation)
 {
-    eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(payload->data),
-        payload->max_size);
+    static_cast<void>(data_representation);
+
+    eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(payload.data),
+        payload.max_size);
     eprosima::fastcdr::Cdr scdr(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN,
-        eprosima::fastcdr::Cdr::DDS_CDR);
+        eprosima::fastcdr::DDS_CDR);
 
     scdr.serialize_encapsulation();
     if (callbacks_->cdr_serialize(data, scdr))
     {
-        payload->encapsulation = (scdr.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS) ?
+        payload.encapsulation = (scdr.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS) ?
             CDR_BE : CDR_LE;
-        payload->length = static_cast<uint32_t>(scdr.getSerializedDataLength());
+        payload.length = static_cast<uint32_t>(scdr.get_serialized_data_length());
         return true;
     }
     else
@@ -71,47 +74,58 @@ bool ParticipantEntitiesInfoTypeSupport::serialize(
 }
 
 bool ParticipantEntitiesInfoTypeSupport::deserialize(
-        eprosima::fastrtps::rtps::SerializedPayload_t * payload,
+        eprosima::fastdds::rtps::SerializedPayload_t& payload,
         void * data)
 {
-    eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(payload->data),
-        payload->length);
+    eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(payload.data),
+        payload.length);
     eprosima::fastcdr::Cdr dcdr(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN,
-        eprosima::fastcdr::Cdr::DDS_CDR);
+        eprosima::fastcdr::DDS_CDR);
 
     dcdr.read_encapsulation();
     return callbacks_->cdr_deserialize(dcdr, data);
 }
 
-std::function<uint32_t()> ParticipantEntitiesInfoTypeSupport::getSerializedSizeProvider(
-        void * data)
+uint32_t ParticipantEntitiesInfoTypeSupport::calculate_serialized_size(
+            const void* const data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation)
 {
-    return [data, this]() -> uint32_t
-    {
-        return static_cast<uint32_t>(4 + callbacks_->get_serialized_size(data));
-    };
+    static_cast<void>(data_representation);
+
+    return static_cast<uint32_t>(4 + callbacks_->get_serialized_size(data));
 }
 
-void * ParticipantEntitiesInfoTypeSupport::createData()
+void * ParticipantEntitiesInfoTypeSupport::create_data()
 {
     return static_cast<void *>(nullptr);
 }
 
-void ParticipantEntitiesInfoTypeSupport::deleteData(
+void ParticipantEntitiesInfoTypeSupport::delete_data(
         void * data)
 {
     (void) data;
 }
 
-bool ParticipantEntitiesInfoTypeSupport::getKey(
-        void * data,
-        eprosima::fastrtps::rtps::InstanceHandle_t * handle,
-        bool force_md5)
+bool ParticipantEntitiesInfoTypeSupport::compute_key(
+        eprosima::fastdds::rtps::SerializedPayload_t& payload,
+        eprosima::fastdds::rtps::InstanceHandle_t& ihandle,
+        bool force_md5 /* = false */)
+{
+    (void) payload;
+    (void) ihandle;
+    (void) force_md5;
+    return is_compute_key_provided;
+}
+
+bool ParticipantEntitiesInfoTypeSupport::compute_key(
+        const void * const data,
+        eprosima::fastdds::rtps::InstanceHandle_t& handle,
+        bool force_md5 /* = false */)
 {
     (void) data;
     (void) handle;
     (void) force_md5;
-    return m_isGetKeyDefined;
+    return is_compute_key_provided;
 }
 
 
@@ -133,27 +147,30 @@ MicrorosGraphInfoTypeSupport::MicrorosGraphInfoTypeSupport()
         ss << message_namespace << "::";
     }
     ss << "dds_::" << message_name << "_";
-    this->setName(ss.str().c_str());
+    this->set_name(ss.str().c_str());
 
-    bool full_bounded = true;
-    m_typeSize = 4 + callbacks_->max_serialized_size(full_bounded);
+    char full_bounded;
+    max_serialized_type_size = 4 + callbacks_->max_serialized_size(full_bounded);
 }
 
 bool MicrorosGraphInfoTypeSupport::serialize(
-        void * data,
-        eprosima::fastrtps::rtps::SerializedPayload_t * payload)
+        const void* const data,
+        eprosima::fastdds::rtps::SerializedPayload_t& payload,
+        eprosima::fastdds::dds::DataRepresentationId_t data_representation)
 {
-    eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(payload->data),
-        payload->max_size);
+    static_cast<void>(data_representation);
+
+    eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(payload.data),
+        payload.max_size);
     eprosima::fastcdr::Cdr scdr(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN,
-        eprosima::fastcdr::Cdr::DDS_CDR);
+        eprosima::fastcdr::DDS_CDR);
 
     scdr.serialize_encapsulation();
     if (callbacks_->cdr_serialize(data, scdr))
     {
-        payload->encapsulation = (scdr.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS) ?
+        payload.encapsulation = (scdr.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS) ?
             CDR_BE : CDR_LE;
-        payload->length = static_cast<uint32_t>(scdr.getSerializedDataLength());
+        payload.length = static_cast<uint32_t>(scdr.get_serialized_data_length());
         return true;
     }
     else
@@ -163,47 +180,58 @@ bool MicrorosGraphInfoTypeSupport::serialize(
 }
 
 bool MicrorosGraphInfoTypeSupport::deserialize(
-        eprosima::fastrtps::rtps::SerializedPayload_t * payload,
-        void * data)
+        eprosima::fastdds::rtps::SerializedPayload_t& payload,
+        void* data)
 {
-    eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(payload->data),
-        payload->length);
+    eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(payload.data),
+        payload.length);
     eprosima::fastcdr::Cdr dcdr(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN,
-        eprosima::fastcdr::Cdr::DDS_CDR);
+        eprosima::fastcdr::DDS_CDR);
 
     dcdr.read_encapsulation();
     return callbacks_->cdr_deserialize(dcdr, data);
 }
 
-std::function<uint32_t()> MicrorosGraphInfoTypeSupport::getSerializedSizeProvider(
-        void * data)
+uint32_t MicrorosGraphInfoTypeSupport::calculate_serialized_size(
+        const void* const data,
+        eprosima::fastdds::dds::DataRepresentationId_t data_representation)
 {
-    return [data, this]() -> uint32_t
-    {
-        return static_cast<uint32_t>(4 + callbacks_->get_serialized_size(data));
-    };
+    static_cast<void>(data_representation);
+
+    return static_cast<uint32_t>(4 + callbacks_->get_serialized_size(data));
 }
 
-void * MicrorosGraphInfoTypeSupport::createData()
+void * MicrorosGraphInfoTypeSupport::create_data()
 {
     return static_cast<void *>(nullptr);
 }
 
-void MicrorosGraphInfoTypeSupport::deleteData(
+void MicrorosGraphInfoTypeSupport::delete_data(
         void * data)
 {
     (void) data;
 }
 
-bool MicrorosGraphInfoTypeSupport::getKey(
-        void * data,
-        eprosima::fastrtps::rtps::InstanceHandle_t * handle,
-        bool force_md5)
+bool MicrorosGraphInfoTypeSupport::compute_key(
+        eprosima::fastdds::rtps::SerializedPayload_t& payload,
+        eprosima::fastdds::rtps::InstanceHandle_t& ihandle,
+        bool force_md5 /* = false */)
+{
+    (void) payload;
+    (void) ihandle;
+    (void) force_md5;
+    return is_compute_key_provided;
+}
+
+bool MicrorosGraphInfoTypeSupport::compute_key(
+        const void* const data,
+        eprosima::fastdds::rtps::InstanceHandle_t& ihandle,
+        bool force_md5 /* = false */)
 {
     (void) data;
-    (void) handle;
+    (void) ihandle;
     (void) force_md5;
-    return m_isGetKeyDefined;
+    return is_compute_key_provided;
 }
 
 }  // namespace graph_manager