FredyH/GWSockets
1
0
Fork 0
Code Issues Packages Projects Releases 7 Activity

fixed a possible deadlock

Browse Source
This commit is contained in:
Frederik Haselmeier 2018-05-12 17:08:01 +02:00
parent 3831218894
commit 652fa424fc
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/GWSocket.cpp
View File

@ -43,7 +43,7 @@ bool GWSocket::close()
}
//To prevent recursive locking
{
std::lock_guard<std::mutex> guard(this->queueMutex);
std::lock_guard<std::recursive_mutex> guard(this->queueMutex);
this->writeQueue.emplace_back(OUT_DISCONNECT);
}
this->checkWriting();
@ -222,7 +222,7 @@ void GWSocket::open()
void GWSocket::checkWriting()
{
std::lock_guard<std::mutex> guard(this->queueMutex);
std::unique_lock<std::recursive_mutex> guard(this->queueMutex);
if ((this->state == STATE_CONNECTED || this->state == SATE_DISCONNECT_REQUESTED) && !writing && !this->writeQueue.empty())
{
this->writing = true;
@ -242,6 +242,8 @@ void GWSocket::checkWriting()
}
else
{
//This is to prevent deadlocks in closeNow()
guard.unlock();
//If this case is reached it must be the case that the socket was closed elsewhere before.
//This just ensures that we will definitely end up in a disconnected state
this->closeNow();
@ -258,7 +260,7 @@ void GWSocket::write(std::string message)
{
//To prevent recursive locking in checkWriting()
{
std::lock_guard<std::mutex> guard(this->queueMutex);
std::lock_guard<std::recursive_mutex> guard(this->queueMutex);
this->writeQueue.emplace_back(OUT_MESSAGE, message);
}
checkWriting();
@ -284,7 +286,7 @@ void GWSocket::onWrite(const boost::system::error_code &ec, size_t bytesTransfer
void GWSocket::clearQueue()
{
std::lock_guard<std::mutex> guard(this->queueMutex);
std::lock_guard<std::recursive_mutex> guard(this->queueMutex);
this->writeQueue.clear();
}

2
src/GWSocket.h
View File

@ -107,7 +107,7 @@ protected:
std::deque<GWSocketMessageOut> writeQueue;
//This mutex is currently completely unnecessary since everything runs in the server's main thread
//I included it here and in the code anyways if we ever want to change this
std::mutex queueMutex;
std::recursive_mutex queueMutex;
};

2
version.txt
View File

@ -1 +1 @@
0.9.0
0.9.1