Skip to content

Reordering code to avoid data race on StatefulWriter destructor [5501] #546

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

Merged
richiware merged 1 commit into from
May 31, 2019
Merged

Reordering code to avoid data race on StatefulWriter destructor [5501] #546

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 10 additions & 9 deletions src/cpp/rtps/writer/StatefulWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,6 @@ StatefulWriter::~StatefulWriter()
delete ack_timer_;
}

// Stop all active proxies and pass them to the pool
while (!matched_readers_.empty())
{
ReaderProxy* remote_reader = matched_readers_.back();
matched_readers_.pop_back();
remote_reader->stop();
matched_readers_pool_.push_back(remote_reader);
}

if(nack_response_event_ != nullptr)
{
delete(nack_response_event_);
Expand All @@ -131,11 +122,21 @@ StatefulWriter::~StatefulWriter()
mp_periodicHB = nullptr;
}

// Stop all active proxies and pass them to the pool
while (!matched_readers_.empty())
{
ReaderProxy* remote_reader = matched_readers_.back();
matched_readers_.pop_back();
remote_reader->stop();
matched_readers_pool_.push_back(remote_reader);
}

// Delete all proxies in the pool
for (ReaderProxy* remote_reader : matched_readers_pool_)
{
delete(remote_reader);
}

}

/*
Expand Down