Skip to content

Commit 8e62890

Browse files
micro-ROS foxy Library auto-update 28-05-2021 07:08 (#291)
Co-authored-by: pablogs9 <[email protected]>
1 parent 893d9d9 commit 8e62890

File tree

4 files changed

+18
-7
lines changed

4 files changed

+18
-7
lines changed

built_packages

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

2-
https://github.com/eProsima/Micro-XRCE-DDS-Client.git 8b86e86848811428c1a2bdf7acd84ed9215c74e6
2+
https://github.com/eProsima/Micro-XRCE-DDS-Client.git 4e132687b8e6cdf988cfa6f52383ffe041f094a4
33
https://github.com/eProsima/Micro-CDR.git bf546d5d10ef0a81e0a6f8561c7e9a54ef0b20b0
4-
https://github.com/ros-controls/control_msgs 653b646ba34d2166149cc02269bac0f48beb72b0
4+
https://github.com/ros-controls/control_msgs 87a867ee6ddb672aa4569f23c19dac5274ce7c28
55
https://github.com/ros2/rosidl.git 75964cbdb3ba13854e749dcd2dd8274b73a5360c
66
https://github.com/ros2/rcl_logging.git d22a6630f039bee97c6667394def926a5426a673
77
https://github.com/ros2/rosidl_dds.git e88b1d0e62a2dca0788142cf1fb266a3a3c3d7dc
@@ -30,5 +30,5 @@ https://github.com/ament/ament_cmake.git 589cf00e21b100f2844b127bb53743b7bf29ee7
3030
https://github.com/ament/ament_package.git 3397bb0ae1cc93d93e1e27da31c0bcb0f4fe0f46
3131
https://github.com/ament/uncrustify_vendor.git 0291bc988c45846400aca50cb973bf04a4de3d56
3232
https://github.com/ament/ament_lint.git 418a69c7e0f922adc889ac1bc2a7dcf721bf7060
33-
https://github.com/ament/ament_index.git dd678ad846fdf3692df4177539c2a277d68b22b9
33+
https://github.com/ament/ament_index.git ff71598b04732d9a8378e1f258f4e3803faf598c
3434
https://github.com/ament/googletest.git 69ff0aa660dd25ecdc8a1fe91505c3c58e0032c2

src/uxr/client/profile/multithread/multithread.h

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,19 @@ UXRDLLAPI void uxr_unlock(
7878
#define UXR_LOCK_TRANSPORT(comm) uxr_lock(&comm->mutex)
7979
#define UXR_UNLOCK_TRANSPORT(comm) uxr_unlock(&comm->mutex)
8080

81-
#define UXR_LOCK_STREAM_ID(session, stream_id) uxr_lock(uxr_get_stream_mutex_from_id(session, stream_id))
82-
#define UXR_UNLOCK_STREAM_ID(session, stream_id) uxr_unlock(uxr_get_stream_mutex_from_id(session, stream_id))
81+
#define UXR_LOCK_STREAM_ID(session, stream_id) { \
82+
uxrMutex* stream_mutex = uxr_get_stream_mutex_from_id(session, stream_id); \
83+
if (stream_mutex != NULL){ \
84+
uxr_lock(stream_mutex); \
85+
} \
86+
}
87+
88+
#define UXR_UNLOCK_STREAM_ID(session, stream_id){ \
89+
uxrMutex* stream_mutex = uxr_get_stream_mutex_from_id(session, stream_id); \
90+
if (stream_mutex != NULL){ \
91+
uxr_unlock(stream_mutex); \
92+
} \
93+
}
8394

8495
#define UXR_LOCK_ALL_INPUT_STREAMS(session) \
8596
for (uint8_t i = 0; i < session->streams.input_best_effort_size; ++i){ \

src/uxr/client/profile/transport/ip/tcp/tcp_transport_posix.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ typedef struct uxrTCPPlatform
3434
}
3535
#endif // ifdef __cplusplus
3636

37-
#endif // UXR_CLIENT_PROFILE_TRANSPORT_IP_TCP_TCPTRANSPORTPOSIX_H_
37+
#endif // UXR_CLIENT_PROFILE_TRANSPORT_IP_TCP_TCPTRANSPORTPOSIX_H_

src/uxr/client/util/ping.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,4 @@ UXRDLLAPI bool uxr_ping_agent_attempts(
7474
}
7575
#endif // ifdef __cplusplus
7676

77-
#endif // UXR_CLIENT_UTIL_PING_H_
77+
#endif // UXR_CLIENT_UTIL_PING_H_

0 commit comments

Comments
 (0)