Update memory inits and fixes - #61
Merged
Merged
Conversation
julionce
reviewed
Apr 30, 2020
|
|
||
| uxr_run_session_until_timeout(session, timeout); | ||
| if(!uxr_run_session_until_timeout(session, timeout)){ | ||
| ret = RMW_RET_TIMEOUT; |
Member
Author
There was a problem hiding this comment.
No, because the run_session may timeout but there may be some subscription/service ready for a previous call. They are checked in the following lines.
Assume a case where a certain rmw_wait retrieves two subscriptions and they are buffered and ready to rmw_take. On the app loop the user rmw_takes one of them and call rmw_wait again, this second rmw_wait will timeout in its uxr_run_session_until_timeout but there is a subscription buffered ready to take.
| if (!custom_service->micro_buffer_in_use){ | ||
| services->services[i] = NULL; | ||
| }else{ | ||
| ret = RMW_RET_OK; |
There was a problem hiding this comment.
If we return at line 103, we don't need to reset the return value again.
| if (!custom_client->micro_buffer_in_use){ | ||
| clients->clients[i] = NULL; | ||
| }else{ | ||
| ret = RMW_RET_OK; |
| if (!custom_subscription->micro_buffer_in_use){ | ||
| subscriptions->subscribers[i] = NULL; | ||
| }else{ | ||
| ret = RMW_RET_OK; |
Member
Author
|
The new logic is:
|
julionce
approved these changes
May 6, 2020
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR: