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

added mutex proteciton around mAvgLastUpdate to avoid it being changed by the constructor

Browse source
This commit is contained in:
csoler 2016-06-11 09:50:22 -04:00
parent 0d1d31a25f
commit 23e8e932be
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -218,12 +218,16 @@ void pqistreamer::updateRates()
time_t t = time(NULL); // get current timestep. time_t t = time(NULL); // get current timestep.
if (t > mAvgLastUpdate + PQISTREAM_AVG_PERIOD)
{ {
int64_t diff = int64_t(t) - int64_t(mAvgLastUpdate) ; RsStackMutex stack(mStreamerMtx); /**** LOCKED MUTEX ****/
float avgReadpSec = getRate(true ) * PQISTREAM_AVG_FRAC + (1.0 - PQISTREAM_AVG_FRAC) * mAvgReadCount/(1000.0 * float(diff)); diff = int64_t(t) - int64_t(mAvgLastUpdate) ;
float avgSentpSec = getRate(false) * PQISTREAM_AVG_FRAC + (1.0 - PQISTREAM_AVG_FRAC) * mAvgSentCount/(1000.0 * float(diff)); }
if (diff > PQISTREAM_AVG_PERIOD)
{
float avgReadpSec = getRate(true ) * PQISTREAM_AVG_FRAC + (1.0 - PQISTREAM_AVG_FRAC) * mAvgReadCount/(1000.0 * float(diff));
float avgSentpSec = getRate(false) * PQISTREAM_AVG_FRAC + (1.0 - PQISTREAM_AVG_FRAC) * mAvgSentCount/(1000.0 * float(diff));
#ifdef DEBUG_PQISTREAMER #ifdef DEBUG_PQISTREAMER
std::cerr << "Peer " << PeerId() << ": Current speed estimates: " << avgReadpSec << " / " << avgSentpSec << std::endl; std::cerr << "Peer " << PeerId() << ": Current speed estimates: " << avgReadpSec << " / " << avgSentpSec << std::endl;
@ -243,9 +247,12 @@ void pqistreamer::updateRates()
setRate(false, 0); setRate(false, 0);
} }
mAvgLastUpdate = t; {
mAvgReadCount = 0; RsStackMutex stack(mStreamerMtx); /**** LOCKED MUTEX ****/
mAvgSentCount = 0; mAvgLastUpdate = t;
mAvgReadCount = 0;
mAvgSentCount = 0;
}
} }
} }