mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
fixed cross-deadlock between pqissl and pqithreadstreamer by removing locks over atomic operations.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7766 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
f5a30c3d3f
commit
85515f0a62
@ -1767,9 +1767,7 @@ int pqissl::netstatus()
|
||||
|
||||
int pqissl::isactive()
|
||||
{
|
||||
RsStackMutex stack(mSslMtx); /**** LOCKED MUTEX ****/
|
||||
|
||||
return active;
|
||||
return active; // no need to mutex this. It's atomic.
|
||||
}
|
||||
|
||||
bool pqissl::moretoread(uint32_t usec)
|
||||
|
@ -54,10 +54,8 @@ int pqithreadstreamer::tick()
|
||||
|
||||
void pqithreadstreamer::start()
|
||||
{
|
||||
{
|
||||
RsStackMutex stack(mThreadMutex);
|
||||
mToRun = true;
|
||||
}
|
||||
|
||||
RsThread::start();
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user