Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-27 00:15:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove unneeded pqithreadstreamer and pqissl mutex locks

Browse source
This commit is contained in:
jolavillette 2020-05-06 21:29:46 +02:00
parent 2c1238db2c
commit 4ead639e8c
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libretroshare/src/pqi/pqissl.cc
View file

@ -372,7 +372,9 @@ int pqissl::status()
// tick...... // tick......
int pqissl::tick() int pqissl::tick()
{ {
RsStackMutex stack(mSslMtx); /**** LOCKED MUTEX ****/ // there is no reason to lock pqissl mutex now
// we will lock the mutex later if we actually need to call to ConnectAttempt
// RsStackMutex stack(mSslMtx); /**** LOCKED MUTEX ****/
// pqistreamer::tick(); // pqistreamer::tick();
@ -385,7 +387,8 @@ int pqissl::tick()
#ifdef PQISSL_LOG_DEBUG #ifdef PQISSL_LOG_DEBUG
rslog(RSL_DEBUG_BASIC, pqisslzone, "pqissl::tick() Continuing Connection Attempt!"); rslog(RSL_DEBUG_BASIC, pqisslzone, "pqissl::tick() Continuing Connection Attempt!");
#endif #endif
// now lock pqissl mutex, that will take up to 10 ms
RsStackMutex stack(mSslMtx); /**** LOCKED MUTEX ****/
ConnectAttempt(); ConnectAttempt();
return 1; return 1;
} }

4
libretroshare/src/pqi/pqithreadstreamer.cc
View file

@ -43,7 +43,9 @@ bool pqithreadstreamer::RecvItem(RsItem *item)
int pqithreadstreamer::tick() int pqithreadstreamer::tick()
{ {
RsStackMutex stack(mThreadMutex); // pqithreadstreamer mutex lock is not needed here
// we are only checking if the connection is active, and if not active we will try to establish it
// RsStackMutex stack(mThreadMutex);
tick_bio(); tick_bio();
return 0; return 0;