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

try to isolate pqistreamer mutex from pqissl mutex, step 1: pqistreamer::tick_recv()

Browse source
This commit is contained in:
jolavillette 2020-05-02 09:47:24 +02:00
parent 07e71c3ea6
commit d35dd76ca5
1 changed files with 29 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

41
libretroshare/src/pqi/pqistreamer.cc
View file

@ -288,16 +288,26 @@ int pqistreamer::tick_bio()
int pqistreamer::tick_recv(uint32_t timeout) int pqistreamer::tick_recv(uint32_t timeout)
{ {
RsStackMutex stack(mStreamerMtx); /**** LOCKED MUTEX ****/ // Only our thread manipulates mIncoming queue and related counters.
// The lock of pqistreamer mutex is thus not needed here.
// For the moment and for safety reasons it is still kept in 3 places:
// - in pqistreamer::tick_recv before calling free_pend_locked, as I dont know what this method actually does
// - in pqistreamer::handleincomingitem_locked, as it modifies mIncoming queue
// - in pqistreamer::inReadBytes_locked, as it modifies related counters
//
// RsStackMutex stack(mStreamerMtx); /**** LOCKED MUTEX ****/
if (mBio->moretoread(timeout)) if (mBio->moretoread(timeout))
{ {
handleincoming_locked(); handleincoming_locked();
} }
if(!(mBio->isactive())) if(!(mBio->isactive()))
{ {
free_pend_locked(); // lock only now, see comment above
} RsStackMutex stack(mStreamerMtx); /**** LOCKED MUTEX ****/
free_pend_locked();
}
return 1; return 1;
} }
@ -414,16 +424,20 @@ int pqistreamer::handleincomingitem_locked(RsItem *pqi,int len)
// Use overloaded Contact function // Use overloaded Contact function
pqi -> PeerId(PeerId()); pqi -> PeerId(PeerId());
mIncoming.push_back(pqi);
++mIncomingSize ;
/*******************************************************************************************/ // lock only now, see comment in pqistreamer::tick_recv
// keep info for stats for a while. Only keep the items for the last two seconds. sec n is ongoing and second n-1 RsStackMutex stack(mStreamerMtx); /**** LOCKED MUTEX ****/
// is a full statistics chunk that can be used in the GUI
locked_addTrafficClue(pqi,len,mCurrentStatsChunk_In) ; mIncoming.push_back(pqi);
++mIncomingSize ;
/*******************************************************************************************/ /*******************************************************************************************/
// keep info for stats for a while. Only keep the items for the last two seconds. sec n is ongoing and second n-1
// is a full statistics chunk that can be used in the GUI
locked_addTrafficClue(pqi,len,mCurrentStatsChunk_In) ;
/*******************************************************************************************/
return 1; return 1;
} }
@ -1241,6 +1255,9 @@ void pqistreamer::inReadBytes_locked(uint32_t inb)
} }
#endif #endif
// lock only now, see comment in pqistreamer::tick_recv
RsStackMutex stack(mStreamerMtx); /**** LOCKED MUTEX ****/
mTotalRead += inb; mTotalRead += inb;
mCurrRead += inb; mCurrRead += inb;
mAvgReadCount += inb; mAvgReadCount += inb;