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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libretroshare/src/pqi/pqistreamer.cc
View File

@ -218,10 +218,14 @@ 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 ****/
diff = int64_t(t) - int64_t(mAvgLastUpdate) ;
}
if (diff > PQISTREAM_AVG_PERIOD)
{
float avgReadpSec = getRate(true ) * PQISTREAM_AVG_FRAC + (1.0 - PQISTREAM_AVG_FRAC) * mAvgReadCount/(1000.0 * float(diff)); 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)); float avgSentpSec = getRate(false) * PQISTREAM_AVG_FRAC + (1.0 - PQISTREAM_AVG_FRAC) * mAvgSentCount/(1000.0 * float(diff));
@ -243,11 +247,14 @@ void pqistreamer::updateRates()
setRate(false, 0); setRate(false, 0);
} }
{
RsStackMutex stack(mStreamerMtx); /**** LOCKED MUTEX ****/
mAvgLastUpdate = t; mAvgLastUpdate = t;
mAvgReadCount = 0; mAvgReadCount = 0;
mAvgSentCount = 0; mAvgSentCount = 0;
} }
} }
}
int pqistreamer::tick_bio() int pqistreamer::tick_bio()
{ {