Skip to content

Fix race condition during high CPU load in WebSocket::stop #609

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

Open
cosminpolifronie wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix race condition during high CPU load in WebSocket::stop #609

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
15 changes: 12 additions & 3 deletions ixwebsocket/IXWebSocket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,14 +186,23 @@ namespace ix

void WebSocket::stop(uint16_t code, const std::string& reason)
{
const bool isJoinable = _thread.joinable();

if(isJoinable)
{
// we need to set _stop before close()
// otherwise automatic reconnection might restart the connection before _stop has a chance to get set
// this can happen during high CPU load => _thread.join() below blocks indefinitely
_stop = true;
_sleepCondition.notify_one();
}

close(code, reason);

if (_thread.joinable())
if (isJoinable)
{
// wait until working thread will exit
// it will exit after close operation is finished
_stop = true;
_sleepCondition.notify_one();
_thread.join();
_stop = false;
}
Expand Down
Loading