Squash Rebase P2P

Adjust pub sub test to only one call to rmw_wait


Refactor entities creation XML and REF


Added entity creation buffer pointer


Added entity creation buffer pointer


Updates


Fix


Updates


Updates


Updated CI


Typos corrections

Author: pablogs9

.github/workflows/ci.yml

@@ -19,12 +19,12 @@ jobs:
         - name: Download dependencies
           run: |
             git clone -b foxy https://github.com/eProsima/Micro-CDR src/Micro-CDR 
-            git clone -b foxy https://github.com/eProsima/Micro-XRCE-DDS-Client src/Micro-XRCE-DDS-Client 
+            git clone -b feature/brokerless_p2p https://github.com/eProsima/Micro-XRCE-DDS-Client src/Micro-XRCE-DDS-Client 
             git clone -b foxy https://github.com/micro-ROS/rosidl_typesupport_microxrcedds src/rosidl_typesupport_microxrcedds
             touch src/rosidl_typesupport_microxrcedds/test/COLCON_IGNORE
       
         - name: Build
-          run: . /opt/ros/foxy/setup.sh && colcon build 
+          run: . /opt/ros/foxy/setup.sh && colcon build --cmake-args -DUCLIENT_MAX_SESSION_CONNECTION_ATTEMPTS=1
 
         - name: Test
           run: | 

rmw_microxrcedds_c/src/callbacks.c

@@ -49,7 +49,7 @@ void on_topic(
     if ((custom_subscription->datareader_id.id == object_id.id) &&
       (custom_subscription->datareader_id.type == object_id.type))
     {
-      custom_subscription->micro_buffer_lenght[custom_subscription->history_write_index] = length;
+      custom_subscription->micro_buffer_length[custom_subscription->history_write_index] = length;
       ucdr_deserialize_array_uint8_t(
         ub,
         custom_subscription->micro_buffer[custom_subscription->history_write_index], length);
@@ -89,7 +89,7 @@ void on_request(
   while (service_item != NULL) {
     rmw_uxrce_service_t * custom_service = (rmw_uxrce_service_t *)service_item->data;
     if (custom_service->request_id == request_id) {
-      custom_service->micro_buffer_lenght[custom_service->history_write_index] = length;
+      custom_service->micro_buffer_length[custom_service->history_write_index] = length;
       ucdr_deserialize_array_uint8_t(
         ub,
         custom_service->micro_buffer[custom_service->history_write_index], length);
@@ -132,7 +132,7 @@ void on_reply(
   while (client_item != NULL) {
     rmw_uxrce_client_t * custom_client = (rmw_uxrce_client_t *)client_item->data;
     if (custom_client->request_id == request_id) {
-      custom_client->micro_buffer_lenght[custom_client->history_write_index] = length;
+      custom_client->micro_buffer_length[custom_client->history_write_index] = length;
       ucdr_deserialize_array_uint8_t(
         ub,
         custom_client->micro_buffer[custom_client->history_write_index], length);

rmw_microxrcedds_c/src/rmw_client.c

@@ -127,13 +127,24 @@ rmw_create_client(
     }
     client_req = uxr_buffer_create_requester_xml(
       &custom_node->context->session,
-      custom_node->context->reliable_output, custom_client->client_id,
-      custom_node->participant_id, rmw_uxrce_xml_buffer, UXR_REPLACE);
+      *custom_node->context->entity_creation_output, 
+      custom_client->client_id,
+      custom_node->participant_id, 
+      rmw_uxrce_xml_buffer, 
+      UXR_REPLACE);
 #elif defined(MICRO_XRCEDDS_USE_REFS)
-    // TODO(pablogs9): Is possible to instantiate a replier by ref?
-    // client_req = uxr_buffer_create_replier_ref(&custom_node->context->session,
-    //     custom_node->context->reliable_output, custom_service->subscriber_id,
-    //     custom_node->participant_id, "", UXR_REPLACE);
+    if (!build_requester_profile(service_name, rmw_uxrce_profile_name, sizeof(rmw_uxrce_profile_name))) {
+      RMW_SET_ERROR_MSG("failed to generate ref request for client creation");
+      goto fail;
+    }
+
+    client_req = uxr_buffer_create_requester_ref(
+      &custom_node->context->session,
+      *custom_node->context->entity_creation_output, 
+      custom_client->client_id,
+      custom_node->participant_id, 
+      rmw_uxrce_profile_name, 
+      UXR_REPLACE);
 #endif
 
     rmw_client->data = custom_client;
@@ -144,7 +155,7 @@ rmw_create_client(
         &custom_node->context->session, 1000, requests,
         status, 1))
     {
-      RMW_SET_ERROR_MSG("Issues creating Micro XRCE-DDS entities");
+      RMW_SET_ERROR_MSG("Issues creating Requester Micro XRCE-DDS entities");
       put_memory(&client_memory, &custom_client->mem);
       goto fail;
     }
@@ -162,8 +173,10 @@ rmw_create_client(
 
     custom_client->request_id = uxr_buffer_request_data(
       &custom_node->context->session,
-      custom_node->context->reliable_output, custom_client->client_id,
-      custom_client->stream_id, &delivery_control);
+      *custom_node->context->entity_creation_output,
+      custom_client->client_id,
+      custom_client->stream_id, 
+      &delivery_control);
   }
   return rmw_client;
 
@@ -203,7 +216,8 @@ rmw_destroy_client(
     rmw_uxrce_client_t * custom_client = (rmw_uxrce_client_t *)client->data;
     uint16_t delete_client =
       uxr_buffer_delete_entity(
-      &custom_node->context->session, custom_node->context->reliable_output,
+      &custom_node->context->session, 
+      *custom_node->context->entity_creation_output,
       custom_client->client_id);
 
     uint16_t requests[] = {delete_client};
@@ -212,7 +226,7 @@ rmw_destroy_client(
         &custom_node->context->session, 1000, requests, status,
         sizeof(status)))
     {
-      RMW_SET_ERROR_MSG("unable to remove client from the server");
+      RMW_SET_ERROR_MSG("Unable to remove client from the server");
       result_ret = RMW_RET_ERROR;
     } else {
       rmw_uxrce_fini_client_memory(client);

rmw_microxrcedds_c/src/rmw_init.c

@@ -33,9 +33,13 @@
 #include <termios.h>
 #endif
 
+#ifdef UCLIENT_BROKERLESS_ENABLE
+#include <uxr/client/brokerless/brokerless.h>
+#endif
+
 #if defined(MICRO_XRCEDDS_SERIAL) || defined(MICRO_XRCEDDS_CUSTOM_SERIAL)
 #define CLOSE_TRANSPORT(transport) uxr_close_serial_transport(transport)
-#elif defined(MICRO_XRCEDDS_UDP)
+#elif defined(MICRO_XRCEDDS_UDP) && !defined(UCLIENT_BROKERLESS_ENABLE)
 #define CLOSE_TRANSPORT(transport) uxr_close_udp_transport(transport)
 #else
 #define CLOSE_TRANSPORT(transport)
@@ -245,8 +249,7 @@ rmw_init(const rmw_init_options_t * options, rmw_context_t * context)
   }
   printf("Serial mode => dev: %s\n", context_impl->connection_params.serial_device);
 
-#elif defined(MICRO_XRCEDDS_UDP)
-  // TODO(Borja) Think how we are going to select transport to use
+#elif defined(MICRO_XRCEDDS_UDP) && !defined(UCLIENT_BROKERLESS_ENABLE)
   #ifdef MICRO_XRCEDDS_IPV4
   uxrIpProtocol ip_protocol = UXR_IPv4;
   #elif defined(MICRO_XRCEDDS_IPV6)
@@ -263,6 +266,11 @@ rmw_init(const rmw_init_options_t * options, rmw_context_t * context)
   printf(
     "UDP mode => ip: %s - port: %s\n", context_impl->connection_params.agent_address,
     context_impl->connection_params.agent_port);
+#elif defined(MICRO_XRCEDDS_UDP) && defined(UCLIENT_BROKERLESS_ENABLE)
+
+  context_impl->transport.comm = brokerless_comm_stub;
+
+  printf("UDP mode => Brokerless P2P\n");
 #elif defined(MICRO_XRCEDDS_CUSTOM_SERIAL)
   int pseudo_fd = 0;
   if (strlen(options->impl->connection_params.serial_device) > 0) {
@@ -289,23 +297,26 @@ rmw_init(const rmw_init_options_t * options, rmw_context_t * context)
 
   context_impl->reliable_input = uxr_create_input_reliable_stream(
     &context_impl->session, context_impl->input_reliable_stream_buffer,
-    context_impl->transport.comm.mtu * RMW_UXRCE_STREAM_HISTORY, RMW_UXRCE_STREAM_HISTORY);
-  context_impl->reliable_output =
-    uxr_create_output_reliable_stream(
+    RMW_UXRCE_MAX_BUFFER_SIZE, RMW_UXRCE_STREAM_HISTORY);
+  context_impl->reliable_output = uxr_create_output_reliable_stream(
     &context_impl->session, context_impl->output_reliable_stream_buffer,
-    context_impl->transport.comm.mtu * RMW_UXRCE_STREAM_HISTORY, RMW_UXRCE_STREAM_HISTORY);
+    RMW_UXRCE_MAX_BUFFER_SIZE, RMW_UXRCE_STREAM_HISTORY);
 
   context_impl->best_effort_input = uxr_create_input_best_effort_stream(&context_impl->session);
   context_impl->best_effort_output = uxr_create_output_best_effort_stream(
     &context_impl->session,
-    context_impl->output_best_effort_stream_buffer, context_impl->transport.comm.mtu);
-
+    context_impl->output_best_effort_stream_buffer, RMW_UXRCE_MAX_TRANSPORT_MTU);
 
+#ifndef UCLIENT_BROKERLESS_ENABLE
+  context_impl->entity_creation_output = &context_impl->reliable_output;
   if (!uxr_create_session(&context_impl->session)) {
     CLOSE_TRANSPORT(&context_impl->transport);
     RMW_SET_ERROR_MSG("failed to create node session on Micro ROS Agent.");
     return RMW_RET_ERROR;
   }
+#else
+  context_impl->entity_creation_output = &context_impl->best_effort_output;
+#endif
 
   return RMW_RET_OK;
 }

rmw_microxrcedds_c/src/rmw_microxrcedds_topic.c

@@ -21,7 +21,6 @@
 
 #include "./utils.h"
 
-
 rmw_uxrce_topic_t *
 create_topic(
   struct rmw_uxrce_node_t * custom_node,
@@ -34,7 +33,6 @@ create_topic(
     RMW_SET_ERROR_MSG("Not available memory node");
     goto fail;
   }
-
   rmw_uxrce_topic_t * custom_topic = (rmw_uxrce_topic_t *)memory_node->data;
 
 
@@ -63,8 +61,11 @@ create_topic(
 
   topic_req = uxr_buffer_create_topic_xml(
     &custom_node->context->session,
-    custom_node->context->reliable_output, custom_topic->topic_id,
-    custom_node->participant_id, rmw_uxrce_xml_buffer, UXR_REPLACE);
+    *custom_node->context->entity_creation_output, 
+    custom_topic->topic_id,
+    custom_node->participant_id, 
+    rmw_uxrce_xml_buffer, 
+    UXR_REPLACE);
 #elif defined(MICRO_XRCEDDS_USE_REFS)
   (void)qos_policies;
   if (!build_topic_profile(topic_name, rmw_uxrce_profile_name, sizeof(rmw_uxrce_profile_name))) {
@@ -76,18 +77,23 @@ create_topic(
 
   topic_req = uxr_buffer_create_topic_ref(
     &custom_node->context->session,
-    custom_node->context->reliable_output, custom_topic->topic_id,
-    custom_node->participant_id, rmw_uxrce_profile_name, UXR_REPLACE);
+    *custom_node->context->entity_creation_output, 
+    custom_topic->topic_id,
+    custom_node->participant_id, 
+    rmw_uxrce_profile_name, 
+    UXR_REPLACE);
 #endif
 
   // Send the request and wait for response
   uint8_t status;
-  custom_topic->sync_with_agent =
-    uxr_run_session_until_all_status(
-    &custom_node->context->session, 1000, &topic_req,
-    &status, 1);
-  if (!custom_topic->sync_with_agent) {
-    RMW_SET_ERROR_MSG("Issues creating micro XRCE-DDS entities");
+
+  if (UXR_BEST_EFFORT_STREAM == custom_node->context->entity_creation_output->type)
+  {
+    uxr_flash_output_streams(&custom_node->context->session);
+  }
+  else if(!(custom_topic->sync_with_agent = uxr_run_session_until_all_status(&custom_node->context->session, 1000, &topic_req, &status, 1)))
+  {
+    RMW_SET_ERROR_MSG("Issues creating Topic Micro XRCE-DDS entities");
     rmw_uxrce_fini_topic_memory(custom_topic);
     custom_topic = NULL;
     goto fail;
@@ -103,16 +109,22 @@ rmw_ret_t destroy_topic(rmw_uxrce_topic_t * topic)
 
   uint16_t delete_topic = uxr_buffer_delete_entity(
     &topic->owner_node->context->session,
-    topic->owner_node->context->reliable_output,
+    *topic->owner_node->context->entity_creation_output,
     topic->topic_id);
 
   uint16_t requests[] = {delete_topic};
   uint8_t status[1];
-  if (!uxr_run_session_until_all_status(
+
+  if (UXR_BEST_EFFORT_STREAM == topic->owner_node->context->entity_creation_output->type)
+  {
+    uxr_flash_output_streams(&topic->owner_node->context->session);
+    rmw_uxrce_fini_topic_memory(topic);
+  }
+  else if (!uxr_run_session_until_all_status(
       &topic->owner_node->context->session, 1000, requests,
       status, 1))
   {
-    RMW_SET_ERROR_MSG("unable to remove topic from the server");
+    RMW_SET_ERROR_MSG("Unable to remove topic from the server");
     result_ret = RMW_RET_ERROR;
   } else {
     rmw_uxrce_fini_topic_memory(topic);

rmw_microxrcedds_c/src/rmw_node.c

@@ -85,8 +85,11 @@ rmw_node_t * create_node(
   participant_req =
     uxr_buffer_create_participant_xml(
     &node_info->context->session,
-    node_info->context->reliable_output,
-    node_info->participant_id, (uint16_t)domain_id, rmw_uxrce_xml_buffer, UXR_REPLACE);
+    *node_info->context->entity_creation_output,
+    node_info->participant_id, 
+    (uint16_t)domain_id, 
+    rmw_uxrce_xml_buffer, 
+    UXR_REPLACE);
 #elif defined(MICRO_XRCEDDS_USE_REFS)
   if (!build_participant_profile(rmw_uxrce_profile_name, sizeof(rmw_uxrce_profile_name))) {
     RMW_SET_ERROR_MSG("failed to generate xml request for node creation");
@@ -95,15 +98,24 @@ rmw_node_t * create_node(
   participant_req =
     uxr_buffer_create_participant_ref(
     &node_info->context->session,
-    node_info->context->reliable_output,
-    node_info->participant_id, (uint16_t)domain_id, rmw_uxrce_profile_name, UXR_REPLACE);
+    *custom_node->context->entity_creation_output,
+    node_info->participant_id, 
+    (uint16_t)domain_id, 
+    rmw_uxrce_profile_name, 
+    UXR_REPLACE);
 #endif
+
   uint8_t status[1];
   uint16_t requests[] = {participant_req};
 
-  if (!uxr_run_session_until_all_status(&node_info->context->session, 1000, requests, status, 1)) {
+  if (UXR_BEST_EFFORT_STREAM == node_info->context->entity_creation_output->type)
+  {
+    uxr_flash_output_streams(&node_info->context->session);
+  }
+  else if(!uxr_run_session_until_all_status(&node_info->context->session, 1000, requests, status, 1))
+  {
     rmw_uxrce_fini_node_memory(node_handle);
-    RMW_SET_ERROR_MSG("Issues creating micro XRCE-DDS entities");
+    RMW_SET_ERROR_MSG("Issues creating Participant Micro XRCE-DDS entities");
     return NULL;
   }
 
@@ -201,14 +213,16 @@ rmw_ret_t rmw_destroy_node(rmw_node_t * node)
 
   uint16_t participant_req = uxr_buffer_delete_entity(
     &custom_node->context->session,
-    custom_node->context->reliable_output,
+    *custom_node->context->entity_creation_output,
     custom_node->participant_id);
   uint8_t status[1];
   uint16_t requests[] = {participant_req};
 
-  if (!uxr_run_session_until_all_status(
-      &custom_node->context->session, 1000, requests, status,
-      1))
+  if (UXR_BEST_EFFORT_STREAM == custom_node->context->entity_creation_output->type)
+  {
+    uxr_flash_output_streams(&custom_node->context->session);
+  }
+  else if(!uxr_run_session_until_all_status(&custom_node->context->session, 1000, requests, status,1))
   {
     ret = RMW_RET_ERROR;
   }

rmw_microxrcedds_c/src/rmw_publish.c

@@ -54,7 +54,7 @@ rmw_publish(
     {
       written = functions->cdr_serialize(ros_message, &mb);
 
-      if (UXR_BEST_EFFORT_STREAM == custom_publisher->stream_id.type) {
+      if (written && UXR_BEST_EFFORT_STREAM == custom_publisher->stream_id.type) {
         uxr_flash_output_streams(&custom_publisher->owner_node->context->session);
       } else {
         written &= uxr_run_session_until_confirm_delivery(