Skip to content

fix multi thread issue on MessageQueue::awaitTermination #22

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
merged 1 commit into from
Apr 21, 2021
Merged

fix multi thread issue on MessageQueue::awaitTermination #22

Show file tree
Hide file tree
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
5 changes: 1 addition & 4 deletions src/utils/MessageQueue.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,7 @@ class LoopQueueGuard {
q.erase(queue_);
}

{
std::unique_lock<std::mutex> lk(queue_->queueMutex_);
queue_->workerCount_--;
}
queue_->workerCount_--;
queue_->workerQuitCondition_.notify_all();
}

Expand Down
2 changes: 1 addition & 1 deletion src/utils/MessageQueue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ class MessageQueue {
std::condition_variable queueNotFullCondition_;
std::deque<Message*> queue_;
std::atomic_int32_t messageIdCounter_;
size_t workerCount_;
std::atomic_uint32_t workerCount_;
std::condition_variable workerQuitCondition_;

std::shared_ptr<Supervisor> supervisor_;
Expand Down