fix fragment bug #316
Merged
fix fragment bug #316
Conversation
This file contains 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
| "id": request_object["id"], | ||
| "data": service_response_data # put service response in "data"-field of response object (in this case it's twice "data", because response value is also named data (in srv-file) | ||
| "values": service_response_data # put service response in "data"-field of response object (in this case it's twice "data", because response value is also named data (in srv-file) |
There was a problem hiding this comment.
Does this comment need to be updated to refer to the new field name "values"?
There was a problem hiding this comment.
This modifed is to repair service_response message error.
There was a problem hiding this comment.
Should I resubmit it？
There was a problem hiding this comment.
@WH-0501 You can just add the changes we've requested to the branch you created your Pull Request from, then push to it. The Pull Request will be updated automatically, no need to make a new one :)
T045T
reviewed
Jan 13, 2018
| @@ -169,7 +169,12 @@ def defragment(self, message): | |||
| self.protocol.log("debug", log_msg) | |||
|
|
|||
| # Reconstruct the message | |||
| reconstructed_msg = ''.join(self.received_fragments[msg_id]["fragment_list"][0:message["total"]]) | |||
| print(type(self.received_fragments[msg_id]["fragment_list"])) | |||
| @@ -169,7 +169,12 @@ def defragment(self, message): | |||
| self.protocol.log("debug", log_msg) | |||
|
|
|||
| # Reconstruct the message | |||
| reconstructed_msg = ''.join(self.received_fragments[msg_id]["fragment_list"][0:message["total"]]) | |||
| print(type(self.received_fragments[msg_id]["fragment_list"])) | |||
| #reconstructed_msg = ''.join(self.received_fragments[msg_id]["fragment_list"][0:message["total"]]) | |||
| print(type(self.received_fragments[msg_id]["fragment_list"])) | ||
| #reconstructed_msg = ''.join(self.received_fragments[msg_id]["fragment_list"][0:message["total"]]) | ||
| reconstructed_msg = '' | ||
| for key,value in self.received_fragments[msg_id]["fragment_list"].items(): |
There was a problem hiding this comment.
- You're not checking the size bound from the message (
msg['total']) any more - Please change your code back to use
''.join(), as it's significantly faster (see https://waymoot.org/home/python_string/ )
|
@T045T, Thanks. How about this change? |
T045T
approved these changes
Jan 15, 2018
| @@ -56,7 +56,8 @@ def calculate_service_response(request): | |||
|
|
|||
| response_object = { "op": "service_response", | |||
| "id": request_object["id"], | |||
| "data": service_response_data # put service response in "data"-field of response object (in this case it's twice "data", because response value is also named data (in srv-file) | |||
| "service": service_name, | |||
There was a problem hiding this comment.
I'll fix the indentation in the merge commit :)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 fix the 的fragment bug while using the rosbridge_library/test/experimental/fragmentation+srv+tcp test.
First, self.received_fragments[msg_id]["fragment_list"] in defragmentation.py has type dict, but dict doesn't support slice.
Second, response_object in test_non-ros_service_server_fragmented.py doesn't has 'service' field, and the ‘data’ field should be 'values'