niklas/rcl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Initialize service timestamps to 0 and test. (#642)

Browse source 
Signed-off-by: Luetkebohle Ingo (CR/AEX3) <ingo.luetkebohle@de.bosch.com>
This commit is contained in:
Ingo Lütkebohle 2020-05-05 14:48:27 +02:00 • committed by GitHub
parent 47501d17c5
commit 1eee2f2515
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rcl/src/rcl/client.c
View file

@ -303,6 +303,8 @@ rcl_take_response_with_info(
RCL_CHECK_ARGUMENT_FOR_NULL(ros_response, RCL_RET_INVALID_ARGUMENT); RCL_CHECK_ARGUMENT_FOR_NULL(ros_response, RCL_RET_INVALID_ARGUMENT);
bool taken = false; bool taken = false;
request_header->source_timestamp = 0;
request_header->received_timestamp = 0;
if (rmw_take_response( if (rmw_take_response(
client->impl->rmw_handle, request_header, ros_response, &taken) != RMW_RET_OK) client->impl->rmw_handle, request_header, ros_response, &taken) != RMW_RET_OK)
{ {

22
rcl/test/rcl/test_service.cpp
View file

@ -182,6 +182,9 @@ TEST_F(CLASSNAME(TestServiceFixture, RMW_IMPLEMENTATION), test_service_nominal)
client_request.uint8_value = 1; client_request.uint8_value = 1;
client_request.uint32_value = 2; client_request.uint32_value = 2;
int64_t sequence_number; int64_t sequence_number;
rcutils_time_point_value_t start_timestamp;
// take timestamp before sending request
EXPECT_EQ(RCUTILS_RET_OK, rcutils_system_time_now(&start_timestamp));
ret = rcl_send_request(&client, &client_request, &sequence_number); ret = rcl_send_request(&client, &client_request, &sequence_number);
EXPECT_EQ(sequence_number, 1); EXPECT_EQ(sequence_number, 1);
test_msgs__srv__BasicTypes_Request__fini(&client_request); test_msgs__srv__BasicTypes_Request__fini(&client_request);
@ -211,8 +214,22 @@ TEST_F(CLASSNAME(TestServiceFixture, RMW_IMPLEMENTATION), test_service_nominal)
EXPECT_EQ(1, service_request.uint8_value); EXPECT_EQ(1, service_request.uint8_value);
EXPECT_EQ(2UL, service_request.uint32_value); EXPECT_EQ(2UL, service_request.uint32_value);
#ifdef RMW_TIMESTAMPS_SUPPORTED
EXPECT_GE(header.source_timestamp, start_timestamp);
#ifdef RMW_RECEIVED_TIMESTAMP_SUPPORTED
EXPECT_GE(header.received_timestamp, start_timestamp);
EXPECT_GE(header.received_timestamp, header.source_timestamp);
#else
EXPECT_EQ(0u, header.received_timestamp);
#endif
#else
EXPECT_EQ(0u, header.source_timestamp);
EXPECT_EQ(0u, header.received_timestamp);
#endif
// Simulate a response callback by summing the request and send the response.. // Simulate a response callback by summing the request and send the response..
service_response.uint64_value = service_request.uint8_value + service_request.uint32_value; service_response.uint64_value = service_request.uint8_value + service_request.uint32_value;
// take new timestamp before sending response
EXPECT_EQ(RCUTILS_RET_OK, rcutils_system_time_now(&start_timestamp));
ret = rcl_send_response(&service, &header.request_id, &service_response); ret = rcl_send_response(&service, &header.request_id, &service_response);
ASSERT_EQ(RCL_RET_OK, ret) << rcl_get_error_string().str; ASSERT_EQ(RCL_RET_OK, ret) << rcl_get_error_string().str;
test_msgs__srv__BasicTypes_Request__fini(&service_request); test_msgs__srv__BasicTypes_Request__fini(&service_request);
@ -229,9 +246,10 @@ TEST_F(CLASSNAME(TestServiceFixture, RMW_IMPLEMENTATION), test_service_nominal)
EXPECT_EQ(client_response.uint64_value, 3ULL); EXPECT_EQ(client_response.uint64_value, 3ULL);
EXPECT_EQ(header.request_id.sequence_number, 1); EXPECT_EQ(header.request_id.sequence_number, 1);
#ifdef RMW_TIMESTAMPS_SUPPORTED #ifdef RMW_TIMESTAMPS_SUPPORTED
EXPECT_NE(0u, header.source_timestamp); EXPECT_GE(header.source_timestamp, start_timestamp);
#ifdef RMW_RECEIVED_TIMESTAMP_SUPPORTED #ifdef RMW_RECEIVED_TIMESTAMP_SUPPORTED
EXPECT_NE(0u, header.received_timestamp); EXPECT_GE(header.received_timestamp, start_timestamp);
EXPECT_GE(header.received_timestamp, header.source_timestamp);
#else #else
EXPECT_EQ(0u, header.received_timestamp); EXPECT_EQ(0u, header.received_timestamp);
#endif #endif