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

Jump to bottom

Sync components removal #272

Merged
merged 9 commits into from
Aug 28, 2020
Merged

Sync components removal #272

merged 9 commits into from
Aug 28, 2020

Conversation

mcres
Copy link
Contributor

@mcres mcres commented Aug 5, 2020 •
edited
Loading

It sets the SerializedStateMap and SerializedState messages when a component is removed after EntityComponentManager::RemoveComponent is called. This allows a more precise synchronization between the server and GUI EntityComponentManager.

This PR is made in order to solve an issue in #234 already described here (no. 3).

A couple of comments about the PR:

  • This TODO comment wasn't removed, given that the PR doesn't do any queuing.
  • I think the PR should have 2 tests: one that checks the SerializedStateMap message after calling RemoveComponent, and another one that checks that a component is actually removed when its remove flag in the message is set to true. I've implemented the first one and the second should be already done here.

@mcres
Set serialized message for removed components
b630cfd 
Signed-off-by: Martiño Crespo <marticres@gmail.com>
@mcres
Update component message
61841ca 
Signed-off-by: Martiño Crespo <marticres@gmail.com>
@mcres mcres requested a review from chapulina as a code owner August 5, 2020 09:02
@mcres
Copy link
Contributor Author

mcres commented Aug 5, 2020

@azeey @mabelzhang

@mcres mcres mentioned this pull request Aug 5, 2020
Merged
@azeey azeey self-requested a review August 5, 2020 14:35
azeey
azeey requested changes Aug 5, 2020
View reviewed changes
src/EntityComponentManager.cc Outdated Show resolved Hide resolved
src/EntityComponentManager.cc Outdated Show resolved Hide resolved
src/EntityComponentManager.cc Outdated Show resolved Hide resolved
src/EntityComponentManager.cc Outdated Show resolved Hide resolved
@chapulina chapulina added this to Inbox in Core development via automation Aug 5, 2020
@chapulina chapulina added the 🔮 dome Ignition Dome label Aug 5, 2020
@chapulina chapulina moved this from Inbox to In review in Core development Aug 5, 2020
@mcres
PR Feedback
7992720 
Signed-off-by: Martiño Crespo <marticres@gmail.com>
azeey
azeey requested changes Aug 11, 2020
View reviewed changes
Copy link
Contributor

@azeey azeey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is looking great! I left some comments mainly to improve test coverage. Let me know if you don't have enough time.

src/EntityComponentManager_TEST.cc Show resolved Hide resolved
include/ignition/gazebo/EntityComponentManager.hh Show resolved Hide resolved
src/EntityComponentManager.cc Outdated Show resolved Hide resolved
@mcres
PR Feedback 2
942c6d4 
Signed-off-by: Martiño Crespo <marticres@gmail.com>
azeey
azeey approved these changes Aug 11, 2020
View reviewed changes
Copy link
Contributor

@azeey azeey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excellent work! I have one last suggestion. Otherwise, this is good to go.

src/EntityComponentManager_TEST.cc Show resolved Hide resolved
src/EntityComponentManager_TEST.cc Show resolved Hide resolved
@mcres
Add more checks to test
2f3cd6e 
Signed-off-by: Martiño Crespo <marticres@gmail.com>
@azeey
Copy link
Contributor

azeey commented Aug 12, 2020

This looks ready to me. @chapulina, mind taking a quick look?

chapulina
chapulina approved these changes Aug 12, 2020
View reviewed changes
Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great! Thank you for putting time into this. I just have a couple of minor comments for your consideration.

src/EntityComponentManager.cc Outdated Show resolved Hide resolved
src/SimulationRunner.cc Show resolved Hide resolved
@mcres
Minor changes
b913c32 
Signed-off-by: Martiño Crespo <marticres@gmail.com>
chapulina
chapulina suggested changes Aug 14, 2020
View reviewed changes
Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, we should address the failing test on macOS.

src/EntityComponentManager_TEST.cc Outdated Show resolved Hide resolved
mcres and others added 2 commits August 18, 2020 00:03
@mcres
Fix tests for macOS
1137c86 
Signed-off-by: Martiño Crespo <marticres@gmail.com>
@azeey
Merge branch 'master' into sync_components_removal
ea3af3b
@mcres
Copy link
Contributor Author

mcres commented Aug 26, 2020

Is there anything that needs to be done yet?

@chapulina
Copy link
Contributor

@osrf-jenkins run tests please

chapulina
chapulina approved these changes Aug 28, 2020
View reviewed changes
Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work, this will be super helpful 👍

@chapulina chapulina merged commit 5b65ca6 into gazebosim:master Aug 28, 2020
Core development automation moved this from In review to Done Aug 28, 2020
mihirk284 pushed a commit to mihirk284/ign-gazebo that referenced this pull request Sep 1, 2020
@mcres @azeey
@chapulina @mihirk284
Sync components removal (gazebosim#272)
4bada3e 
Signed-off-by: Martiño Crespo <marticres@gmail.com>

Co-authored-by: Addisu Z. Taddese <addisu@openrobotics.org>
Co-authored-by: Louise Poubel <louise@openrobotics.org>
ahcorde pushed a commit that referenced this pull request Sep 1, 2020
@mcres @azeey
@chapulina @ahcorde
Sync components removal (#272)
1bc6ab5 
Signed-off-by: Martiño Crespo <marticres@gmail.com>

Co-authored-by: Addisu Z. Taddese <addisu@openrobotics.org>
Co-authored-by: Louise Poubel <louise@openrobotics.org>
@mcres mcres deleted the sync_components_removal branch September 8, 2020 20:08
@iche033 iche033 mentioned this pull request Dec 11, 2020
Closed
@iche033 iche033 mentioned this pull request Dec 19, 2020
Merged
@diegoferigo diegoferigo mentioned this pull request Dec 19, 2020
Closed
@azeey azeey mentioned this pull request Dec 23, 2020
Merged
@j-rivero j-rivero removed this from Done in Core development May 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@azeey azeey azeey approved these changes

@chapulina chapulina chapulina approved these changes

Assignees

@mcres mcres

Labels
🔮 dome Ignition Dome
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@mcres @azeey @chapulina