Skip to content

Commit a7e99aa

Browse files
micro-ROS rolling Library auto-update 08-03-2023 06:19 (#1336)
Co-authored-by: pablogs9 <[email protected]>
1 parent 8c9832e commit a7e99aa

File tree

4 files changed

+28
-15
lines changed

4 files changed

+28
-15
lines changed

built_packages

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ https://github.com/ament/ament_package.git d990e0e321793a475602b4a8e6f09b64d1c1f
66
https://github.com/ament/googletest.git e99f485c6e9cb87cb7ce5bd0bef5cd5de23d5b77
77
https://github.com/ament/uncrustify_vendor.git 94ed3f68d1d2e44e04398c4538509f5e78114dae
88
https://github.com/eProsima/Micro-CDR.git ed4fd513a24a53b93d548d342cb7aa0a18716f04
9-
https://github.com/eProsima/Micro-XRCE-DDS-Client.git fe83fd082e82ab1aeed75829e04c10207df74576
9+
https://github.com/eProsima/Micro-XRCE-DDS-Client.git c28bf96f6e93ad1e01b8f0d74ea255e6bd8b07d2
1010
https://github.com/micro-ROS/micro_ros_msgs.git e3664463e78ae5d0c34d86be92d707b3d9dfd27d
1111
https://github.com/micro-ROS/micro_ros_utilities fa107f7a935fd2fb9b05e2c1ee9f1819b56da68d
12-
https://github.com/micro-ROS/rcl f93f6f9031307add795ff1aee97a7034e4ccfd07
12+
https://github.com/micro-ROS/rcl 77dd2b636ab77b3a1dfac1ad448f5991b30ce546
1313
https://github.com/micro-ROS/rcutils ca121a032395f26f736857b2636b9cf21acd3b67
1414
https://github.com/micro-ROS/rmw-microxrcedds.git a374e1d5c9ce01555ef6843aa9a2358d37c63da9
1515
https://github.com/micro-ROS/rosidl_typesupport.git 8477585bfa0cf98deeeb15aa10a525cba9edaea9
@@ -24,7 +24,7 @@ https://github.com/ros2/rcl_interfaces.git 18d891afec8002e00c5ca3b392cf05d035e6e
2424
https://github.com/ros2/rcl_logging.git cdef749a304f734ba275f8466a4883db6400dc75
2525
https://github.com/ros2/rclc b46dba3daab335967a62b338dd30c51f0a5d8261
2626
https://github.com/ros2/rcpputils.git 39b20134e571ba74baa7c77750eab586da90b7a5
27-
https://github.com/ros2/rmw.git c570323007190812ff3cd1ff45121855a2e5b7a9
27+
https://github.com/ros2/rmw.git 33f1cf0d3d46853f3a142391f499c3c8b2926af5
2828
https://github.com/ros2/rmw_implementation.git 2adb8a0858477c839affd9b97b6ae4599ae85dc4
2929
https://github.com/ros2/rosidl.git 7790c70717e09c003711f6f65015666c223fc283
3030
https://github.com/ros2/rosidl_core.git 83df4c6574f90a8479d0b0211a463a7806ad6179

src/rmw/rmw.h

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3039,7 +3039,7 @@ rmw_count_services(
30393039
const char * service_name,
30403040
size_t * count);
30413041

3042-
/// Get the unique identifier (gid) of a publisher.
3042+
/// Get the globally unique identifier (GID) of a publisher.
30433043
/**
30443044
* <hr>
30453045
* Attribute | Adherence
@@ -3055,12 +3055,16 @@ rmw_count_services(
30553055
* Publishers are thread-safe objects, and so are all operations on them except for
30563056
* finalization.
30573057
* Therefore, it is safe to get the unique identifier from the same publisher concurrently.
3058-
* However, access to the gid is not synchronized.
3058+
* However, access to the GID is not synchronized.
30593059
* It is not safe to read or write `gid` while rmw_get_gid_for_publisher() uses it.
30603060
*
30613061
* \pre Given `publisher` must be a valid publisher, as returned by rmw_create_publisher().
30623062
*
3063-
* \param[in] publisher Publisher to get a gid from.
3063+
* This is expected to be globally unique within a ROS domain.
3064+
* The identifier should be the same when reported both locally (where the entity was created)
3065+
* and on remote hosts or processes.
3066+
*
3067+
* \param[in] publisher Publisher to get a GID from.
30643068
* \param[out] gid Publisher's unique identifier, populated on success
30653069
* but left unchanged on failure.
30663070
* \return `RMW_RET_OK` if successful, or
@@ -3075,7 +3079,7 @@ RMW_WARN_UNUSED
30753079
rmw_ret_t
30763080
rmw_get_gid_for_publisher(const rmw_publisher_t * publisher, rmw_gid_t * gid);
30773081

3078-
/// Get the unique identifier (gid) of a service client.
3082+
/// Get the globally unique identifier (GID) of a service client.
30793083
/**
30803084
* <hr>
30813085
* Attribute | Adherence
@@ -3091,12 +3095,15 @@ rmw_get_gid_for_publisher(const rmw_publisher_t * publisher, rmw_gid_t * gid);
30913095
* Service clients are thread-safe objects, and so are all operations on them except for
30923096
* finalization.
30933097
* Therefore, it is safe to get the unique identifier from the same client concurrently.
3094-
* However, access to the gid is not synchronized.
3098+
* However, access to the GID is not synchronized.
30953099
* It is not safe to read or write `gid` while rmw_get_gid_for_client() uses it.
30963100
*
30973101
* \pre Given `client` must be a valid service client, as returned by rmw_create_client().
30983102
*
3099-
* \param[in] client Service client to get a gid from.
3103+
* This is expected to be globally unique within a ROS domain.
3104+
* The identifier should be the same when reported both locally (where the entity was created)
3105+
* and on remote hosts or processes.
3106+
* \param[in] client Service client to get a GID from.
31003107
* \param[out] gid Service client's unique identifier, populated on success
31013108
* but left unchanged on failure.
31023109
* \return `RMW_RET_OK` if successful, or
@@ -3111,7 +3118,7 @@ RMW_WARN_UNUSED
31113118
rmw_ret_t
31123119
rmw_get_gid_for_client(const rmw_client_t * client, rmw_gid_t * gid);
31133120

3114-
/// Check if two unique identifiers (gids) are equal.
3121+
/// Check if two globally unique identifiers (GIDs) are equal.
31153122
/**
31163123
* <hr>
31173124
* Attribute | Adherence
@@ -3125,14 +3132,14 @@ rmw_get_gid_for_client(const rmw_client_t * client, rmw_gid_t * gid);
31253132
*
31263133
* \par Thread-safety
31273134
* Unique identifier comparison is a reentrant function, but:
3128-
* - Access to both gids is read-only but it is not synchronized.
3135+
* - Access to both GIDs is read-only but it is not synchronized.
31293136
* Concurrent `gid1` and `gid2` reads are safe, but concurrent reads and writes are not.
31303137
* - Access to primitive data-type arguments is not synchronized.
31313138
* It is not safe to read or write `result` while rmw_compare_gids_equal() uses it.
31323139
*
31333140
* \param[in] gid1 First unique identifier to compare.
31343141
* \param[in] gid2 Second unique identifier to compare.
3135-
* \param[out] result true if both gids are equal, false otherwise.
3142+
* \param[out] result true if both GIDs are equal, false otherwise.
31363143
* \return `RMW_RET_OK` if successful, or
31373144
* \return `RMW_RET_INVALID_ARGUMENT` if `gid1` or `gid2` is NULL, or
31383145
* \return `RMW_RET_INCORRECT_RMW_IMPLEMENTATION` if the implementation

src/rmw/types.h

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -618,13 +618,18 @@ typedef struct RMW_PUBLIC_TYPE rmw_qos_profile_s
618618
bool avoid_ros_namespace_conventions;
619619
} rmw_qos_profile_t;
620620

621-
/// ROS graph ID of the topic
621+
/// Globally unique identifier for a ROS graph entity
622+
/**
623+
* This is expected to be globally unique within a ROS domain.
624+
* The identifier should be the same when reported both locally (where the entity was created)
625+
* and on remote hosts or processes.
626+
*/
622627
typedef struct RMW_PUBLIC_TYPE rmw_gid_s
623628
{
624629
/// Name of the rmw implementation
625630
const char * implementation_identifier;
626631

627-
/// Byte data Gid value
632+
/// Byte data GID value
628633
uint8_t data[RMW_GID_STORAGE_SIZE];
629634
} rmw_gid_t;
630635

src/uxr/client/core/session/session.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ typedef void (* uxrOnRequestFunc) (
122122
* @param reply_id Identifier of the reply.
123123
* @param ub Serialized request data.
124124
* @param length Length of the serialized data.
125-
* @param args User pointer data.
125+
* @param args User pointer data.
126126
*/
127127
typedef void (* uxrOnReplyFunc) (
128128
struct uxrSession* session,
@@ -136,6 +136,7 @@ typedef void (* uxrOnReplyFunc) (
136136
/**
137137
* @brief Function signature used for flush_callback callbacks.
138138
* @param session Session structure related to the buffer to be flushed.
139+
* @param args Flush callback args pointer.
139140
*/
140141
typedef bool (* uxrOnBuffersFull) (
141142
struct uxrSession* session,

0 commit comments

Comments
 (0)