Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed cross-deadlock between pqissl and pqithreadstreamer by removing locks over atomic operations.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7766 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-12-16 21:46:07 +00:00
parent f5a30c3d3f
commit 85515f0a62
2 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libretroshare/src/pqi/pqissl.cc
View File

@ -1767,9 +1767,7 @@ int pqissl::netstatus()
int pqissl::isactive() int pqissl::isactive()
{ {
RsStackMutex stack(mSslMtx); /**** LOCKED MUTEX ****/ return active; // no need to mutex this. It's atomic.
return active;
} }
bool pqissl::moretoread(uint32_t usec) bool pqissl::moretoread(uint32_t usec)

42
libretroshare/src/pqi/pqithreadstreamer.cc
View File

@ -54,38 +54,36 @@ int pqithreadstreamer::tick()
void pqithreadstreamer::start() void pqithreadstreamer::start()
{ {
{ mToRun = true;
RsStackMutex stack(mThreadMutex);
mToRun = true;
}
RsThread::start(); RsThread::start();
} }
void pqithreadstreamer::run() void pqithreadstreamer::run()
{ {
std::cerr << "pqithreadstream::run()"; std::cerr << "pqithreadstream::run()";
std::cerr << std::endl; std::cerr << std::endl;
{ {
RsStackMutex stack(mThreadMutex); RsStackMutex stack(mThreadMutex);
mRunning = true; mRunning = true;
} }
while(1) while(1)
{ {
{ {
RsStackMutex stack(mThreadMutex); RsStackMutex stack(mThreadMutex);
if (!mToRun) if (!mToRun)
{ {
std::cerr << "pqithreadstream::run() stopping"; std::cerr << "pqithreadstream::run() stopping";
std::cerr << std::endl; std::cerr << std::endl;
mRunning = false; mRunning = false;
return; return;
} }
} }
data_tick(); data_tick();
} }
} }
void pqithreadstreamer::stop() void pqithreadstreamer::stop()