Distance segfault #642
Merged
Distance segfault #642
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
added 13 commits
September 28, 2020 12:23
Signed-off-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>
mjcarroll
reviewed
Oct 1, 2020
| # docker is run | ||
| RUN mkdir -p subt_ws/src \ | ||
| && cd subt_ws/src \ | ||
| && git clone https://github.com/osrf/subt -b distance_segfault |
There was a problem hiding this comment.
Reminder to reset this branch before merging.
There was a problem hiding this comment.
I guess we didn't want this part merged as is, right?
subt_ign/src/GameLogicPlugin.cc
Outdated
| @@ -576,6 +590,13 @@ GameLogicPlugin::~GameLogicPlugin() | |||
| this->dataPtr->finished = true; | |||
| if (this->dataPtr->publishThread) | |||
| this->dataPtr->publishThread->join(); | |||
|
|
|||
| if (this->dataPtr->bagThread) | |||
There was a problem hiding this comment.
Since this is already done in Finish it may not be necessary to duplicate here.
There was a problem hiding this comment.
Actually when running this, I get a segfault because it's trying to join the thread twice for some reason, I have a fix inbound.
mjcarroll
reviewed
Oct 1, 2020
subt_ign/src/GameLogicPlugin.cc
Outdated
Comment on lines
695
to
697
| this->dataPtr->rosRecorder.reset(new rosbag::Recorder(recorderOptions)); | ||
| this->dataPtr->bagThread.reset(new std::thread( | ||
| &GameLogicPluginPrivate::RosBag, this->dataPtr.get())); |
There was a problem hiding this comment.
Suggested change
| this->dataPtr->rosRecorder.reset(new rosbag::Recorder(recorderOptions)); | |
| this->dataPtr->bagThread.reset(new std::thread( | |
| &GameLogicPluginPrivate::RosBag, this->dataPtr.get())); | |
| this->dataPtr->rosRecorder = std::make_unique<rosbag::Recorder>(recorderOptions); | |
| this->dataPtr->bagThread = std::make_unique<std::thread>([&](){ | |
| this->dataPtr->rosRecorder->run(); | |
| }); |
I think you can save yourself a member function here.
There was a problem hiding this comment.
I also did this in bc03832 since I was in there.
Signed-off-by: Michael Carroll <michael@openrobotics.org>
mjcarroll
approved these changes
Oct 1, 2020
angelacmaio
approved these changes
Oct 6, 2020
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 attempts to resolve #631 and fixes ROS bag recording on the simulation server. A docker image based on this is available using osrf/subt-virtual-testbed:cloudsim_sim_issue_631.