Skip to content

Commit

Permalink
Update documented expectations for GIDs (#335)
Browse files Browse the repository at this point in the history
* Clarify that GIDs are globally unique within a ROS domain.

Signed-off-by: Jacob Perron <jacob@openrobotics.org>
  • Loading branch information
jacobperron committed Mar 7, 2023
1 parent c570323 commit 33f1cf0
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 11 deletions.
25 changes: 16 additions & 9 deletions rmw/include/rmw/rmw.h
Original file line number Diff line number Diff line change
Expand Up @@ -3039,7 +3039,7 @@ rmw_count_services(
const char * service_name,
size_t * count);

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

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

/// Check if two unique identifiers (gids) are equal.
/// Check if two globally unique identifiers (GIDs) are equal.
/**
* <hr>
* Attribute | Adherence
Expand All @@ -3125,14 +3132,14 @@ rmw_get_gid_for_client(const rmw_client_t * client, rmw_gid_t * gid);
*
* \par Thread-safety
* Unique identifier comparison is a reentrant function, but:
* - Access to both gids is read-only but it is not synchronized.
* - Access to both GIDs is read-only but it is not synchronized.
* Concurrent `gid1` and `gid2` reads are safe, but concurrent reads and writes are not.
* - Access to primitive data-type arguments is not synchronized.
* It is not safe to read or write `result` while rmw_compare_gids_equal() uses it.
*
* \param[in] gid1 First unique identifier to compare.
* \param[in] gid2 Second unique identifier to compare.
* \param[out] result true if both gids are equal, false otherwise.
* \param[out] result true if both GIDs are equal, false otherwise.
* \return `RMW_RET_OK` if successful, or
* \return `RMW_RET_INVALID_ARGUMENT` if `gid1` or `gid2` is NULL, or
* \return `RMW_RET_INCORRECT_RMW_IMPLEMENTATION` if the implementation
Expand Down
9 changes: 7 additions & 2 deletions rmw/include/rmw/types.h
Original file line number Diff line number Diff line change
Expand Up @@ -618,13 +618,18 @@ typedef struct RMW_PUBLIC_TYPE rmw_qos_profile_s
bool avoid_ros_namespace_conventions;
} rmw_qos_profile_t;

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

/// Byte data Gid value
/// Byte data GID value
uint8_t data[RMW_GID_STORAGE_SIZE];
} rmw_gid_t;

Expand Down

0 comments on commit 33f1cf0

Please sign in to comment.