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

added additional factor to reduce Nxs item broadcast when outqueues are already filled in whereas user-defined bandwidth limit is unreached

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7656 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-11-02 10:21:45 +00:00
parent 5d13dee029
commit 2912b533a5
1 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
libretroshare/src/gxs/rsgxsnetservice.cc
View file

@ -101,6 +101,9 @@ int RsGxsNetService::tick()
class NxsBandwidthRecorder class NxsBandwidthRecorder
{ {
public: public:
static const int OUTQUEUE_CUTOFF_VALUE = 500 ;
static const int BANDWIDTH_ESTIMATE_DELAY = 20 ;
static void recordEvent(uint16_t service_type, RsItem *item) static void recordEvent(uint16_t service_type, RsItem *item)
{ {
RsStackMutex m(mtx) ; RsStackMutex m(mtx) ;
@ -116,10 +119,11 @@ public:
total_record += bw ; total_record += bw ;
++total_events ; ++total_events ;
#ifdef NXS_NET_DEBUG
std::cerr << "bandwidthRecorder::recordEvent() Recording event time=" << now << ". bw=" << bw << std::endl; std::cerr << "bandwidthRecorder::recordEvent() Recording event time=" << now << ". bw=" << bw << std::endl;
#endif
// Every 20 seconds at min, compute a new estimate of the required bandwidth. // Every 20 seconds at min, compute a new estimate of the required bandwidth.
static const int BANDWIDTH_ESTIMATE_DELAY = 20 ;
if(now > last_event_record + BANDWIDTH_ESTIMATE_DELAY*1000) if(now > last_event_record + BANDWIDTH_ESTIMATE_DELAY*1000)
{ {
@ -152,13 +156,29 @@ public:
rsConfig->GetMaxDataRates(maxIn,maxOut) ; rsConfig->GetMaxDataRates(maxIn,maxOut) ;
rsConfig->GetCurrentDataRates(currIn,currOut) ; rsConfig->GetCurrentDataRates(currIn,currOut) ;
RsConfigDataRates rates ;
rsConfig->getTotalBandwidthRates(rates) ;
std::cerr << std::dec << std::endl;
float outqueue_factor = 1.0f/pow( std::max(0.02f,rates.mQueueOut / (float)OUTQUEUE_CUTOFF_VALUE),5.0f) ;
float accepted_bandwidth = std::max( 0.0f, maxOut - currOut) ; float accepted_bandwidth = std::max( 0.0f, maxOut - currOut) ;
float sending_probability = std::min( accepted_bandwidth / estimated_required_bandwidth,1.0f ) ; float max_bandwidth_factor = std::min( accepted_bandwidth / estimated_required_bandwidth,1.0f ) ;
// We account for two things here:
// 1 - the required max bandwidth
// 2 - the current network overload, measured from the size of the outqueues.
//
// Only the later can limit the traffic if the internet connexion speed is responsible for outqueue overloading.
float sending_probability = std::min(outqueue_factor,max_bandwidth_factor) ;
#ifdef NXS_NET_DEBUG #ifdef NXS_NET_DEBUG
std::cerr << "bandwidthRecorder::computeCurrentSendingProbability()" << std::endl; std::cerr << "bandwidthRecorder::computeCurrentSendingProbability()" << std::endl;
std::cerr << " current required bandwidth : " << estimated_required_bandwidth << " KB/s" << std::endl; std::cerr << " current required bandwidth : " << estimated_required_bandwidth << " KB/s" << std::endl;
std::cerr << " max out = " << maxOut << ", currOut=" << currOut << std::endl; std::cerr << " max_bandwidth_factor : " << max_bandwidth_factor << std::endl;
std::cerr << " outqueue size : " << rates.mQueueOut << ", factor=" << outqueue_factor << std::endl;
std::cerr << " max out : " << maxOut << ", currOut=" << currOut << std::endl;
std::cerr << " computed probability : " << sending_probability << std::endl; std::cerr << " computed probability : " << sending_probability << std::endl;
#endif #endif