Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use existing check_wait_set_for_data to avoid duplicated code #185

Merged
merged 2 commits into from
Jan 18, 2018
Merged

use existing check_wait_set_for_data to avoid duplicated code #185

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99cc7c8
use existing check_wait_set_for_data to avoid duplicated code
jwang11 Jan 5, 2018
2a4b09e
Remove trailing space on blank line.
clalancette Jan 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 1 addition & 40 deletions rmw_fastrtps_cpp/src/rmw_wait.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,46 +148,7 @@ rmw_wait(
// If wait_timeout is not null and either of its fields are nonzero, we have to wait
bool hasToWait = (wait_timeout && (wait_timeout->sec > 0 || wait_timeout->nsec > 0)) ||
!wait_timeout;

if (subscriptions) {
for (size_t i = 0; hasToWait && i < subscriptions->subscriber_count; ++i) {
void * data = subscriptions->subscribers[i];
auto custom_subscriber_info = static_cast<CustomSubscriberInfo *>(data);
if (custom_subscriber_info->listener_->hasData()) {
hasToWait = false;
}
}
}

if (clients) {
for (size_t i = 0; hasToWait && i < clients->client_count; ++i) {
void * data = clients->clients[i];
CustomClientInfo * custom_client_info = static_cast<CustomClientInfo *>(data);
if (custom_client_info->listener_->hasData()) {
hasToWait = false;
}
}
}

if (services) {
for (size_t i = 0; hasToWait && i < services->service_count; ++i) {
void * data = services->services[i];
auto custom_service_info = static_cast<CustomServiceInfo *>(data);
if (custom_service_info->listener_->hasData()) {
hasToWait = false;
}
}
}

if (guard_conditions) {
for (size_t i = 0; hasToWait && i < guard_conditions->guard_condition_count; ++i) {
void * data = guard_conditions->guard_conditions[i];
auto guard_condition = static_cast<GuardCondition *>(data);
if (guard_condition->hasTriggered()) {
hasToWait = false;
}
}
}
hasToWait &= !check_wait_set_for_data(subscriptions, guard_conditions, services, clients);

bool timeout = false;

Expand Down