mirror of
https://github.com/micro-ROS/micro-ROS-Agent.git
synced 2026-09-06 09:55:15 +02:00
Compare commits
20
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4e805eaf6b | ||
|
|
454c019fbf | ||
|
|
0ae200d715 | ||
|
|
6b99ec7298 | ||
|
|
3263e694e4 | ||
|
|
3c5d31f2b0 | ||
|
|
0d4fcf8547 | ||
|
|
52b35ef2eb | ||
|
|
48f4905f42 | ||
|
|
6d67807737 | ||
|
|
ddefabfa8c | ||
|
|
90545b7184 | ||
|
|
07c460a327 | ||
|
|
8aea206b93 | ||
|
|
ff2ae91877 | ||
|
|
b89677ed96 | ||
|
|
6f096337e5 | ||
|
|
d2a7e319ca | ||
|
|
7369137252 | ||
|
|
6cce230857 |
+29
-29
@@ -2,37 +2,37 @@ name: CI micro-ROS Agent
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches:
|
||||
- '**'
|
||||
branches:
|
||||
- 'galactic'
|
||||
schedule:
|
||||
- cron: '33 6 * * *'
|
||||
|
||||
jobs:
|
||||
|
||||
microros_agent_ci:
|
||||
runs-on: ubuntu-20.04
|
||||
container: microros/base:rolling
|
||||
runs-on: ubuntu-20.04
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [ ubuntu-20.04 ]
|
||||
ros_distribution: [ galactic ]
|
||||
include:
|
||||
- docker_image: ubuntu:20.04
|
||||
ros_distribution: galactic
|
||||
container:
|
||||
image: ubuntu:20.04
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: ros-tooling/setup-ros@0.3.2
|
||||
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.2.5
|
||||
with:
|
||||
package-name: "micro_ros_agent"
|
||||
target-ros2-distro: ${{ matrix.ros_distribution }}
|
||||
|
||||
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
|
||||
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
|
||||
@@ -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.
|
||||
@@ -2,6 +2,39 @@
|
||||
Changelog for package micro-ros_agent
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
2.0.3 (2022-06-13)
|
||||
------------------
|
||||
* Fix memory leak in graph manager (`#147 <https://github.com/micro-ROS/micro-ROS-Agent/issues/147>`_) (`#150 <https://github.com/micro-ROS/micro-ROS-Agent/issues/150>`_)
|
||||
|
||||
2.0.2 (2022-05-25)
|
||||
------------------
|
||||
|
||||
2.0.1 (2022-03-25)
|
||||
------------------
|
||||
* Add services to graph manager (`#127 <https://github.com/micro-ROS/micro-ROS-Agent/issues/127>`_)
|
||||
* Add used missing includes (`#116 <https://github.com/micro-ROS/micro-ROS-Agent/issues/116>`_) (`#125 <https://github.com/micro-ROS/micro-ROS-Agent/issues/125>`_)
|
||||
* Add system logger flag (`#118 <https://github.com/micro-ROS/micro-ROS-Agent/issues/118>`_)
|
||||
* Add condition variable include (`#113 <https://github.com/micro-ROS/micro-ROS-Agent/issues/113>`_)
|
||||
* pass system name to xrceagent (`#110 <https://github.com/micro-ROS/micro-ROS-Agent/issues/110>`_)
|
||||
* Fix memory leak in FastDDS datawriter (`#107 <https://github.com/micro-ROS/micro-ROS-Agent/issues/107>`_)
|
||||
* Contributors: Antonio Cuadros, Pablo Garrido, Roland Schwan, mergify[bot]
|
||||
|
||||
2.0.0 (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>`_)
|
||||
* Modify argument type (`#91 <https://github.com/micro-ROS/micro-ROS-Agent/issues/91>`_)
|
||||
* Fix graph manager datawriters behaviour (`#84 <https://github.com/micro-ROS/micro-ROS-Agent/issues/84>`_)
|
||||
* Graph manager: Fix participant mask for listener callbacks (`#81 <https://github.com/micro-ROS/micro-ROS-Agent/issues/81>`_)
|
||||
* Fix agent launch (`#78 <https://github.com/micro-ROS/micro-ROS-Agent/issues/78>`_)
|
||||
* Fix graph manager node namespaces (`#75 <https://github.com/micro-ROS/micro-ROS-Agent/issues/75>`_)
|
||||
* Fix Rolling agent (`#61 <https://github.com/micro-ROS/micro-ROS-Agent/issues/61>`_)
|
||||
* Add multi domain graph manager (`#69 <https://github.com/micro-ROS/micro-ROS-Agent/issues/69>`_)
|
||||
* Add ros2 launch capabilities and example launch file (`#47 <https://github.com/micro-ROS/micro-ROS-Agent/issues/47>`_)
|
||||
* Snap build for the micro-ROS-Agent (`#43 <https://github.com/micro-ROS/micro-ROS-Agent/issues/43>`_)
|
||||
* Create graph manager after checking passed CLI arguments and launch xrce-dds server (`#41 <https://github.com/micro-ROS/micro-ROS-Agent/issues/41>`_)
|
||||
* Contributors: Antonio Cuadros, Jose Antonio Moral, Pablo Garrido, mergify[bot]
|
||||
|
||||
0.0.1 (2019-04-24)
|
||||
-----------------
|
||||
* Initial release
|
||||
|
||||
@@ -19,7 +19,16 @@ option(UROSAGENT_GENERATE_PROFILE
|
||||
)
|
||||
set(CMAKE_C_CLANG_TIDY clang-tidy -checks=*)
|
||||
|
||||
project(micro_ros_agent LANGUAGES CXX)
|
||||
option(MICROROSAGENT_SUPERBUILD "Enable superbuild compilation." ON)
|
||||
option(UAGENT_USE_SYSTEM_LOGGER "Force use of system installed spdlog logger on superbuild." OFF)
|
||||
|
||||
if(NOT MICROROSAGENT_SUPERBUILD)
|
||||
project(micro_ros_agent LANGUAGES CXX)
|
||||
else()
|
||||
project(uagent_superbuild NONE)
|
||||
include(${PROJECT_SOURCE_DIR}/cmake/SuperBuild.cmake)
|
||||
return()
|
||||
endif()
|
||||
|
||||
find_package(ament_cmake REQUIRED)
|
||||
find_package(microxrcedds_agent REQUIRED)
|
||||
|
||||
@@ -0,0 +1,68 @@
|
||||
# Copyright 2019 Proyectos y Sistemas de Mantenimiento SL (eProsima).
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
include(ExternalProject)
|
||||
|
||||
unset(_deps)
|
||||
|
||||
enable_language(C)
|
||||
enable_language(CXX)
|
||||
|
||||
unset(xrceagent_DIR CACHE)
|
||||
find_package(xrceagent 2 EXACT QUIET)
|
||||
if(NOT xrceagent_FOUND)
|
||||
ExternalProject_Add(xrceagent
|
||||
GIT_REPOSITORY
|
||||
https://github.com/eProsima/Micro-XRCE-DDS-Agent.git
|
||||
GIT_TAG
|
||||
ros2
|
||||
PREFIX
|
||||
${PROJECT_BINARY_DIR}/agent
|
||||
INSTALL_DIR
|
||||
${CMAKE_INSTALL_PREFIX}
|
||||
CMAKE_CACHE_ARGS
|
||||
-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
|
||||
-DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
|
||||
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
|
||||
-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}
|
||||
-DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
|
||||
-DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS}
|
||||
-DCMAKE_SHARED_LINKER_FLAGS:STRING=${CMAKE_SHARED_LINKER_FLAGS}
|
||||
-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
|
||||
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
|
||||
-DCMAKE_PREFIX_PATH:PATH=<INSTALL_DIR>
|
||||
-DCMAKE_SYSTEM_NAME:STRING=${CMAKE_SYSTEM_NAME}
|
||||
-DUAGENT_USE_SYSTEM_FASTDDS:BOOL=ON
|
||||
-DUAGENT_USE_SYSTEM_FASTCDR:BOOL=ON
|
||||
-DUAGENT_USE_SYSTEM_LOGGER:BOOL=${UAGENT_USE_SYSTEM_LOGGER}
|
||||
-DUAGENT_CED_PROFILE:BOOL=OFF
|
||||
-DUAGENT_P2P_PROFILE:BOOL=OFF
|
||||
-DUAGENT_BUILD_EXECUTABLE:BOOL=OFF
|
||||
-DUAGENT_ISOLATED_INSTALL:BOOL=OFF
|
||||
)
|
||||
endif()
|
||||
|
||||
# Main project.
|
||||
ExternalProject_Add(micro_ros_agent
|
||||
SOURCE_DIR
|
||||
${PROJECT_SOURCE_DIR}
|
||||
BINARY_DIR
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
CMAKE_CACHE_ARGS
|
||||
-DMICROROSAGENT_SUPERBUILD:BOOL=OFF
|
||||
INSTALL_COMMAND
|
||||
""
|
||||
DEPENDS
|
||||
xrceagent
|
||||
)
|
||||
@@ -20,6 +20,10 @@
|
||||
#include <uxr/agent/middleware/utils/Callbacks.hpp>
|
||||
|
||||
#include <agent/graph_manager/graph_manager.hpp>
|
||||
|
||||
#include <map>
|
||||
#include <memory>
|
||||
|
||||
// TODO(jamoralp): class Documentation
|
||||
namespace uros {
|
||||
namespace agent {
|
||||
|
||||
@@ -12,6 +12,9 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#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"
|
||||
@@ -58,8 +61,10 @@
|
||||
#include <agent/graph_manager/graph_typesupport.hpp>
|
||||
#include <agent/utils/demangle.hpp>
|
||||
|
||||
#ifndef _UROS_AGENT_GRAPH_MANAGER_HPP
|
||||
#define _UROS_AGENT_GRAPH_MANAGER_HPP
|
||||
#include <condition_variable>
|
||||
#include <string>
|
||||
#include <memory>
|
||||
#include <map>
|
||||
|
||||
namespace uros {
|
||||
namespace agent {
|
||||
@@ -106,6 +111,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.
|
||||
|
||||
@@ -7,6 +7,6 @@ def generate_launch_description():
|
||||
package='micro_ros_agent',
|
||||
executable='micro_ros_agent',
|
||||
name='micro_ros_agent',
|
||||
arguments={"udp4", "-p", "8888", "-v6"}
|
||||
arguments=["udp4", "-p", "8888", "-v6"]
|
||||
)
|
||||
])
|
||||
|
||||
@@ -2,9 +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>0.0.1</version>
|
||||
<description>DDS-XCRE agent implementation </description>
|
||||
<maintainer email="borjaouterelo@eprosima.com">Borja Outerelo</maintainer>
|
||||
<version>2.0.3</version>
|
||||
<description>micro-ROS Agent package</description>
|
||||
<maintainer email="pablogarrido@eprosima.com">Pablo Garrido</maintainer>
|
||||
<maintainer email="antoniocuadros@eprosima.com">Antonio Cuadros</maintainer>
|
||||
<license>Apache License 2.0</license>
|
||||
|
||||
<buildtool_depend>ament_cmake</buildtool_depend>
|
||||
@@ -14,7 +15,6 @@
|
||||
<test_depend>ament_lint_auto</test_depend>
|
||||
<test_depend>ament_lint_common</test_depend>
|
||||
|
||||
<depend>microxrcedds_agent</depend>
|
||||
<depend>rmw</depend>
|
||||
<depend>rcutils</depend>
|
||||
<depend>rmw_fastrtps_shared_cpp</depend>
|
||||
|
||||
@@ -17,6 +17,9 @@
|
||||
|
||||
#include <agent/Agent.hpp>
|
||||
|
||||
#include <utility>
|
||||
#include <memory>
|
||||
|
||||
namespace uros {
|
||||
namespace agent {
|
||||
|
||||
@@ -76,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,
|
||||
@@ -103,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(
|
||||
@@ -166,6 +159,128 @@ bool Agent::create(
|
||||
eprosima::uxr::Middleware::Kind::FASTDDS,
|
||||
eprosima::uxr::middleware::CallbackKind::DELETE_DATAREADER,
|
||||
std::move(on_delete_datareader));
|
||||
|
||||
/**
|
||||
* Add CREATE_REQUESTER callback.
|
||||
*/
|
||||
std::function<void (
|
||||
const eprosima::fastdds::dds::DomainParticipant *,
|
||||
const eprosima::fastdds::dds::DataWriter *,
|
||||
const eprosima::fastdds::dds::DataReader *)> on_create_requester
|
||||
([&](
|
||||
const eprosima::fastdds::dds::DomainParticipant* participant,
|
||||
const eprosima::fastdds::dds::DataWriter* datawriter,
|
||||
const eprosima::fastdds::dds::DataReader * datareader) -> void
|
||||
{
|
||||
auto graph_manager_ = find_or_create_graph_manager(participant->get_domain_id());
|
||||
|
||||
graph_manager_->add_datawriter(datawriter->guid(), participant, datawriter);
|
||||
graph_manager_->associate_entity(
|
||||
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 =
|
||||
datareader->get_instance_handle();
|
||||
const eprosima::fastrtps::rtps::GUID_t datareader_guid =
|
||||
eprosima::fastrtps::rtps::iHandle2GUID(instance_handle);
|
||||
graph_manager_->add_datareader(datareader_guid, participant, datareader);
|
||||
graph_manager_->associate_entity(
|
||||
datareader_guid, participant, dds::xrce::OBJK_DATAREADER);
|
||||
});
|
||||
xrce_dds_agent_instance_.add_middleware_callback(
|
||||
eprosima::uxr::Middleware::Kind::FASTDDS,
|
||||
eprosima::uxr::middleware::CallbackKind::CREATE_REQUESTER,
|
||||
std::move(on_create_requester));
|
||||
|
||||
/**
|
||||
* Add DELETE_REQUESTER callback.
|
||||
*/
|
||||
std::function<void (
|
||||
const eprosima::fastdds::dds::DomainParticipant *,
|
||||
const eprosima::fastdds::dds::DataWriter *,
|
||||
const eprosima::fastdds::dds::DataReader *)> on_delete_requester
|
||||
([&](
|
||||
const eprosima::fastdds::dds::DomainParticipant* participant,
|
||||
const eprosima::fastdds::dds::DataWriter* datawriter,
|
||||
const eprosima::fastdds::dds::DataReader * datareader) -> void
|
||||
{
|
||||
auto graph_manager_ = find_or_create_graph_manager(participant->get_domain_id());
|
||||
|
||||
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 =
|
||||
datareader->get_instance_handle();
|
||||
const eprosima::fastrtps::rtps::GUID_t datareader_guid =
|
||||
eprosima::fastrtps::rtps::iHandle2GUID(instance_handle);
|
||||
graph_manager_->remove_datareader(datareader_guid);
|
||||
});
|
||||
|
||||
xrce_dds_agent_instance_.add_middleware_callback(
|
||||
eprosima::uxr::Middleware::Kind::FASTDDS,
|
||||
eprosima::uxr::middleware::CallbackKind::DELETE_REQUESTER,
|
||||
std::move(on_delete_requester));
|
||||
|
||||
/**
|
||||
* Add CREATE_REPLIER callback.
|
||||
*/
|
||||
std::function<void (
|
||||
const eprosima::fastdds::dds::DomainParticipant *,
|
||||
const eprosima::fastdds::dds::DataWriter *,
|
||||
const eprosima::fastdds::dds::DataReader *)> on_create_replier
|
||||
([&](
|
||||
const eprosima::fastdds::dds::DomainParticipant* participant,
|
||||
const eprosima::fastdds::dds::DataWriter* datawriter,
|
||||
const eprosima::fastdds::dds::DataReader * datareader) -> void
|
||||
{
|
||||
auto graph_manager_ = find_or_create_graph_manager(participant->get_domain_id());
|
||||
|
||||
graph_manager_->add_datawriter(datawriter->guid(), participant, datawriter);
|
||||
graph_manager_->associate_entity(
|
||||
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 =
|
||||
datareader->get_instance_handle();
|
||||
const eprosima::fastrtps::rtps::GUID_t datareader_guid =
|
||||
eprosima::fastrtps::rtps::iHandle2GUID(instance_handle);
|
||||
graph_manager_->add_datareader(datareader_guid, participant, datareader);
|
||||
graph_manager_->associate_entity(
|
||||
datareader_guid, participant, dds::xrce::OBJK_DATAREADER);
|
||||
});
|
||||
xrce_dds_agent_instance_.add_middleware_callback(
|
||||
eprosima::uxr::Middleware::Kind::FASTDDS,
|
||||
eprosima::uxr::middleware::CallbackKind::CREATE_REPLIER,
|
||||
std::move(on_create_replier));
|
||||
|
||||
/**
|
||||
* Add DELETE_REPLIER callback.
|
||||
*/
|
||||
std::function<void (
|
||||
const eprosima::fastdds::dds::DomainParticipant *,
|
||||
const eprosima::fastdds::dds::DataWriter *,
|
||||
const eprosima::fastdds::dds::DataReader *)> on_delete_replier
|
||||
([&](
|
||||
const eprosima::fastdds::dds::DomainParticipant* participant,
|
||||
const eprosima::fastdds::dds::DataWriter* datawriter,
|
||||
const eprosima::fastdds::dds::DataReader * datareader) -> void
|
||||
{
|
||||
auto graph_manager_ = find_or_create_graph_manager(participant->get_domain_id());
|
||||
|
||||
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 =
|
||||
datareader->get_instance_handle();
|
||||
const eprosima::fastrtps::rtps::GUID_t datareader_guid =
|
||||
eprosima::fastrtps::rtps::iHandle2GUID(instance_handle);
|
||||
graph_manager_->remove_datareader(datareader_guid);
|
||||
});
|
||||
|
||||
xrce_dds_agent_instance_.add_middleware_callback(
|
||||
eprosima::uxr::Middleware::Kind::FASTDDS,
|
||||
eprosima::uxr::middleware::CallbackKind::DELETE_REPLIER,
|
||||
std::move(on_delete_replier));
|
||||
}
|
||||
|
||||
return result;
|
||||
|
||||
@@ -17,6 +17,11 @@
|
||||
|
||||
#include <agent/graph_manager/graph_manager.hpp>
|
||||
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
namespace uros {
|
||||
namespace agent {
|
||||
namespace graph_manager {
|
||||
@@ -96,7 +101,7 @@ GraphManager::GraphManager(eprosima::fastdds::dds::DomainId_t domain_id)
|
||||
|
||||
eprosima::fastdds::dds::DataWriterQos ros_to_microros_datawriter_qos_ = datawriter_qos_;
|
||||
ros_to_microros_datawriter_qos_.history().kind =
|
||||
eprosima::fastdds::dds::HistoryQosPolicyKind::KEEP_ALL_HISTORY_QOS;
|
||||
eprosima::fastdds::dds::HistoryQosPolicyKind::KEEP_LAST_HISTORY_QOS;
|
||||
ros_to_microros_graph_datawriter_.reset(
|
||||
publisher_->create_datawriter(ros_to_microros_graph_topic_.get(), ros_to_microros_datawriter_qos_));
|
||||
|
||||
@@ -592,7 +597,7 @@ GraphManager::ParticipantListener::ParticipantListener(
|
||||
}
|
||||
|
||||
void GraphManager::ParticipantListener::on_participant_discovery(
|
||||
eprosima::fastdds::dds::DomainParticipant* participant,
|
||||
eprosima::fastdds::dds::DomainParticipant* /* participant */,
|
||||
eprosima::fastrtps::rtps::ParticipantDiscoveryInfo&& info)
|
||||
{
|
||||
switch (info.status)
|
||||
@@ -609,13 +614,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.info.m_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:
|
||||
{
|
||||
graphManager_from_->remove_participant(participant, false);
|
||||
const rmw_gid_t gid = rmw_fastrtps_shared_cpp::create_rmw_gid("rmw_fastrtps_cpp", info.info.m_guid);
|
||||
graphManager_from_->get_graph_cache().remove_participant(gid);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
||||
@@ -17,6 +17,8 @@
|
||||
|
||||
#include <agent/graph_manager/graph_typesupport.hpp>
|
||||
|
||||
#include <string>
|
||||
|
||||
namespace uros {
|
||||
namespace agent {
|
||||
namespace graph_manager {
|
||||
|
||||
@@ -14,6 +14,9 @@
|
||||
|
||||
#include <agent/Agent.hpp>
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
uros::agent::Agent micro_ros_agent;
|
||||
|
||||
Reference in New Issue
Block a user