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

added mutex protection around pqistreamer::getRates, since float r/w are not necessarily atomic

Browse source
This commit is contained in:
csoler 2016-06-11 09:33:11 -04:00
parent eba90a83c6
commit 0d1d31a25f
3 changed files with 105 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

32
libretroshare/src/pqi/pqi_base.h
View file

@ -83,35 +83,35 @@ public:
:bw_in(0), bw_out(0), bwMax_in(0), bwMax_out(0), :bw_in(0), bw_out(0), bwMax_in(0), bwMax_out(0),
bwCapEnabled(false), bwCap_in(0), bwCap_out(0) { return; } bwCapEnabled(false), bwCap_in(0), bwCap_out(0) { return; }
virtual ~RateInterface() { return; } virtual ~RateInterface() { return; }
virtual void getRates(RsBwRates &rates) virtual void getRates(RsBwRates &rates)
{ {
rates.mRateIn = bw_in; rates.mRateIn = bw_in;
rates.mRateOut = bw_out; rates.mRateOut = bw_out;
rates.mMaxRateIn = bwMax_in; rates.mMaxRateIn = bwMax_in;
rates.mMaxRateOut = bwMax_out; rates.mMaxRateOut = bwMax_out;
return; return;
} }
virtual int gatherStatistics(std::list<RSTrafficClue>& /* outqueue_lst */,std::list<RSTrafficClue>& /* inqueue_lst */) { return 0;} virtual int gatherStatistics(std::list<RSTrafficClue>& /* outqueue_lst */,std::list<RSTrafficClue>& /* inqueue_lst */) { return 0;}
virtual int getQueueSize(bool /* in */) { return 0;} virtual int getQueueSize(bool /* in */) { return 0;}
virtual float getRate(bool in) virtual float getRate(bool in)
{ {
if (in) if (in)
return bw_in; return bw_in;
return bw_out; return bw_out;
} }
virtual float getMaxRate(bool in) virtual float getMaxRate(bool in)
{ {
if (in) if (in)
return bwMax_in; return bwMax_in;
return bwMax_out; return bwMax_out;
} }
virtual void setMaxRate(bool in, float val) virtual void setMaxRate(bool in, float val)
{ {
if (in) if (in)
{ {
@ -140,8 +140,8 @@ virtual void setMaxRate(bool in, float val)
} }
virtual void setRateCap(float val_in, float val_out) virtual void setRateCap(float val_in, float val_out)
{ {
if ((val_in == 0) && (val_out == 0)) if ((val_in == 0) && (val_out == 0))
{ {
#ifdef DEBUG_RATECAP #ifdef DEBUG_RATECAP
@ -160,11 +160,11 @@ virtual void setRateCap(float val_in, float val_out)
bwCap_out = val_out; bwCap_out = val_out;
} }
return; return;
} }
protected: protected:
void setRate(bool in, float val) virtual void setRate(bool in, float val)
{ {
if (in) if (in)
bw_in = val; bw_in = val;
@ -173,10 +173,10 @@ void setRate(bool in, float val)
return; return;
} }
private: private:
float bw_in, bw_out, bwMax_in, bwMax_out; float bw_in, bw_out, bwMax_in, bwMax_out;
bool bwCapEnabled; bool bwCapEnabled;
float bwCap_in, bwCap_out; float bwCap_in, bwCap_out;
}; };

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

@ -77,6 +77,13 @@ pqistreamer::pqistreamer(RsSerialiser *rss, const RsPeerId& id, BinInterface *bi
mCurrRead(0), mCurrSent(0), mCurrRead(0), mCurrSent(0),
mAvgReadCount(0), mAvgSentCount(0) mAvgReadCount(0), mAvgSentCount(0)
{ {
// 100 B/s (minimal)
setMaxRate(true, 0.1);
setMaxRate(false, 0.1);
setRate(true, 0); // needs to be off-mutex
setRate(false, 0);
RsStackMutex stack(mStreamerMtx); /**** LOCKED MUTEX ****/ RsStackMutex stack(mStreamerMtx); /**** LOCKED MUTEX ****/
mAcceptsPacketSlicing = false ; // by default. Will be turned into true when everyone's ready. mAcceptsPacketSlicing = false ; // by default. Will be turned into true when everyone's ready.
@ -91,12 +98,6 @@ pqistreamer::pqistreamer(RsSerialiser *rss, const RsPeerId& id, BinInterface *bi
mPkt_rpending = 0; mPkt_rpending = 0;
mReading_state = reading_state_initial ; mReading_state = reading_state_initial ;
// 100 B/s (minimal)
setMaxRate(true, 0.1);
setMaxRate(false, 0.1);
setRate(true, 0);
setRate(false, 0);
pqioutput(PQL_DEBUG_ALL, pqistreamerzone, "pqistreamer::pqistreamer() Initialisation!"); pqioutput(PQL_DEBUG_ALL, pqistreamerzone, "pqistreamer::pqistreamer() Initialisation!");
if (!bio_in) if (!bio_in)
@ -195,6 +196,22 @@ RsItem *pqistreamer::GetItem()
return osr; return osr;
} }
float pqistreamer::getRate(bool b)
{
RsStackMutex stack(mStreamerMtx); /**** LOCKED MUTEX ****/
return RateInterface::getRate(b) ;
}
void pqistreamer::setMaxRate(bool b,float f)
{
RsStackMutex stack(mStreamerMtx); /**** LOCKED MUTEX ****/
RateInterface::setMaxRate(b,f) ;
}
void pqistreamer::setRate(bool b,float f)
{
RsStackMutex stack(mStreamerMtx); /**** LOCKED MUTEX ****/
RateInterface::setRate(b,f) ;
}
void pqistreamer::updateRates() void pqistreamer::updateRates()
{ {
// now update rates both ways. // now update rates both ways.

6
libretroshare/src/pqi/pqistreamer.h
View file

@ -67,6 +67,12 @@ class pqistreamer: public PQInterface
virtual void getRates(RsBwRates &rates); virtual void getRates(RsBwRates &rates);
virtual int getQueueSize(bool in); // extracting data. virtual int getQueueSize(bool in); // extracting data.
virtual int gatherStatistics(std::list<RSTrafficClue>& outqueue_stats,std::list<RSTrafficClue>& inqueue_stats); // extracting data. virtual int gatherStatistics(std::list<RSTrafficClue>& outqueue_stats,std::list<RSTrafficClue>& inqueue_stats); // extracting data.
// mutex protected versions of RateInterface calls.
virtual void setRate(bool b,float f) ;
virtual void setMaxRate(bool b,float f) ;
virtual float getRate(bool b) ;
protected: protected:
int tick_bio(); int tick_bio();