Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-26 07:59:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1975 from RetroShare/revert-1942-UpdateRates

Browse Source 
Revert "bandwidth control improvement"
This commit is contained in:
csoler 2020-05-24 23:40:50 +02:00 committed by GitHub
commit d87abb45e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 105 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

171
libretroshare/src/pqi/pqihandler.cc
View File

@ -42,19 +42,39 @@ using std::dec;
#include <sys/timeb.h> #include <sys/timeb.h>
#endif #endif
//#define PQI_HDL_DEBUG_UR 1
#ifdef PQI_HDL_DEBUG_UR
static double getCurrentTS()
{
#ifndef WINDOWS_SYS
struct timeval cts_tmp;
gettimeofday(&cts_tmp, NULL);
double cts = (cts_tmp.tv_sec) + ((double) cts_tmp.tv_usec) / 1000000.0;
#else
struct _timeb timebuf;
_ftime( &timebuf);
double cts = (timebuf.time) + ((double) timebuf.millitm) / 1000.0;
#endif
return cts;
}
#endif
struct RsLog::logInfo pqihandlerzoneInfo = {RsLog::Default, "pqihandler"}; struct RsLog::logInfo pqihandlerzoneInfo = {RsLog::Default, "pqihandler"};
#define pqihandlerzone &pqihandlerzoneInfo #define pqihandlerzone &pqihandlerzoneInfo
//static const int PQI_HANDLER_NB_PRIORITY_LEVELS = 10 ; //static const int PQI_HANDLER_NB_PRIORITY_LEVELS = 10 ;
//static const float PQI_HANDLER_NB_PRIORITY_RATIO = 2 ; //static const float PQI_HANDLER_NB_PRIORITY_RATIO = 2 ;
//#define UPDATE_RATES_DEBUG 1 /****
// #define DEBUG_TICK 1 #define DEBUG_TICK 1
// #define RSITEM_DEBUG 1 #define RSITEM_DEBUG 1
****/
pqihandler::pqihandler() : coreMtx("pqihandler") pqihandler::pqihandler() : coreMtx("pqihandler")
{ {
RS_STACK_MUTEX(coreMtx); /**************** LOCKED MUTEX ****************/ RsStackMutex stack(coreMtx); /**************** LOCKED MUTEX ****************/
// setup minimal total+individual rates. // setup minimal total+individual rates.
rateIndiv_out = 0.01; rateIndiv_out = 0.01;
@ -77,7 +97,7 @@ int pqihandler::tick()
int moreToTick = 0; int moreToTick = 0;
{ {
RS_STACK_MUTEX(coreMtx); /**************** LOCKED MUTEX ****************/ RsStackMutex stack(coreMtx); /**************** LOCKED MUTEX ****************/
// tick all interfaces... // tick all interfaces...
std::map<RsPeerId, SearchModule *>::iterator it; std::map<RsPeerId, SearchModule *>::iterator it;
@ -107,13 +127,9 @@ int pqihandler::tick()
if(now > mLastRateCapUpdate + 5) if(now > mLastRateCapUpdate + 5)
{ {
std::map<RsPeerId, RsConfigDataRates> rateMap;
std::map<RsPeerId, RsConfigDataRates>::iterator it;
// every 5 secs, update the max rates for all modules // every 5 secs, update the max rates for all modules
RS_STACK_MUTEX(coreMtx); /**************** LOCKED MUTEX ****************/ RsStackMutex stack(coreMtx); /**************** LOCKED MUTEX ****************/
for(std::map<RsPeerId, SearchModule *>::iterator it = mods.begin(); it != mods.end(); ++it) for(std::map<RsPeerId, SearchModule *>::iterator it = mods.begin(); it != mods.end(); ++it)
{ {
// This is rather inelegant, but pqihandler has searchModules that are dynamically allocated, so the max rates // This is rather inelegant, but pqihandler has searchModules that are dynamically allocated, so the max rates
@ -133,7 +149,7 @@ int pqihandler::tick()
bool pqihandler::queueOutRsItem(RsItem *item) bool pqihandler::queueOutRsItem(RsItem *item)
{ {
RS_STACK_MUTEX(coreMtx); /**************** LOCKED MUTEX ****************/ RsStackMutex stack(coreMtx); /**************** LOCKED MUTEX ****************/
uint32_t size ; uint32_t size ;
locked_HandleRsItem(item, size); locked_HandleRsItem(item, size);
@ -150,7 +166,7 @@ bool pqihandler::queueOutRsItem(RsItem *item)
int pqihandler::status() int pqihandler::status()
{ {
std::map<RsPeerId, SearchModule *>::iterator it; std::map<RsPeerId, SearchModule *>::iterator it;
RS_STACK_MUTEX(coreMtx); /**************** LOCKED MUTEX ****************/ RsStackMutex stack(coreMtx); /**************** LOCKED MUTEX ****************/
{ // for output { // for output
std::string out = "pqihandler::status() Active Modules:\n"; std::string out = "pqihandler::status() Active Modules:\n";
@ -176,7 +192,7 @@ int pqihandler::status()
bool pqihandler::AddSearchModule(SearchModule *mod) bool pqihandler::AddSearchModule(SearchModule *mod)
{ {
RS_STACK_MUTEX(coreMtx); /**************** LOCKED MUTEX ****************/ RsStackMutex stack(coreMtx); /**************** LOCKED MUTEX ****************/
// if peerid used -> error. // if peerid used -> error.
//std::map<RsPeerId, SearchModule *>::iterator it; //std::map<RsPeerId, SearchModule *>::iterator it;
if (mod->peerid != mod->pqi->PeerId()) if (mod->peerid != mod->pqi->PeerId())
@ -207,7 +223,7 @@ bool pqihandler::AddSearchModule(SearchModule *mod)
bool pqihandler::RemoveSearchModule(SearchModule *mod) bool pqihandler::RemoveSearchModule(SearchModule *mod)
{ {
RS_STACK_MUTEX(coreMtx); /**************** LOCKED MUTEX ****************/ RsStackMutex stack(coreMtx); /**************** LOCKED MUTEX ****************/
std::map<RsPeerId, SearchModule *>::iterator it; std::map<RsPeerId, SearchModule *>::iterator it;
for(it = mods.begin(); it != mods.end(); ++it) for(it = mods.begin(); it != mods.end(); ++it)
{ {
@ -297,7 +313,7 @@ int pqihandler::ExtractRates(std::map<RsPeerId, RsBwRates> &ratemap, RsBwRat
total.mQueueOut = 0; total.mQueueOut = 0;
/* Lock once rates have been retrieved */ /* Lock once rates have been retrieved */
RS_STACK_MUTEX(coreMtx); /**************** LOCKED MUTEX ****************/ RsStackMutex stack(coreMtx); /**************** LOCKED MUTEX ****************/
std::map<RsPeerId, SearchModule *>::iterator it; std::map<RsPeerId, SearchModule *>::iterator it;
for(it = mods.begin(); it != mods.end(); ++it) for(it = mods.begin(); it != mods.end(); ++it)
@ -324,6 +340,10 @@ int pqihandler::ExtractRates(std::map<RsPeerId, RsBwRates> &ratemap, RsBwRat
// internal fn to send updates // internal fn to send updates
int pqihandler::UpdateRates() int pqihandler::UpdateRates()
{ {
#ifdef PQI_HDL_DEBUG_UR
uint64_t t_now;
#endif
std::map<RsPeerId, SearchModule *>::iterator it; std::map<RsPeerId, SearchModule *>::iterator it;
float avail_in = getMaxRate(true); float avail_in = getMaxRate(true);
@ -333,15 +353,18 @@ int pqihandler::UpdateRates()
float used_bw_out = 0; float used_bw_out = 0;
/* Lock once rates have been retrieved */ /* Lock once rates have been retrieved */
RS_STACK_MUTEX(coreMtx); /**************** LOCKED MUTEX ****************/ RsStackMutex stack(coreMtx); /**************** LOCKED MUTEX ****************/
int num_sm = mods.size(); int num_sm = mods.size();
float used_bw_in_table[num_sm]; /* table of in bandwidth currently used by each module */ float used_bw_in_table[num_sm]; /* table of in bandwidth currently used by each module */
float used_bw_out_table[num_sm]; /* table of out bandwidth currently used by each module */ float used_bw_out_table[num_sm]; /* table of out bandwidth currently used by each module */
// loop through modules to get the used bandwidth int effectiveUploadsSm = 0;
#ifdef UPDATE_RATES_DEBUG int effectiveDownloadsSm = 0;
RsDbg() << "UPDATE_RATES pqihandler::UpdateRates Looping through modules" << std::endl;
// loop through modules to get the used bandwith and the number of modules that are affectively transfering
#ifdef PQI_HDL_DEBUG_UR
std::cerr << "Looping through modules" << std::endl;
#endif #endif
int index = 0; int index = 0;
@ -349,33 +372,49 @@ int pqihandler::UpdateRates()
for(it = mods.begin(); it != mods.end(); ++it) for(it = mods.begin(); it != mods.end(); ++it)
{ {
SearchModule *mod = (it -> second); SearchModule *mod = (it -> second);
float crate_in = mod -> pqi -> getRate(true);
traffInSum += mod -> pqi -> getTraffic(true); traffInSum += mod -> pqi -> getTraffic(true);
traffOutSum += mod -> pqi -> getTraffic(false); traffOutSum += mod -> pqi -> getTraffic(false);
float crate_in = mod -> pqi -> getRate(true); #ifdef PQI_HDL_DEBUG_UR
if(crate_in > 0.0)
std::cerr << " got in rate for peer " << it->first << " : " << crate_in << std::endl;
#endif
if ((crate_in > 0.01 * avail_in) || (crate_in > 0.1))
{
++effectiveDownloadsSm;
}
float crate_out = mod -> pqi -> getRate(false); float crate_out = mod -> pqi -> getRate(false);
if ((crate_out > 0.01 * avail_out) || (crate_out > 0.1))
{
++effectiveUploadsSm;
}
used_bw_in += crate_in; used_bw_in += crate_in;
used_bw_out += crate_out; used_bw_out += crate_out;
/* fill the table of used bandwidths */ /* fill the table of bandwidth */
used_bw_in_table[index] = crate_in; used_bw_in_table[index] = crate_in;
used_bw_out_table[index] = crate_out; used_bw_out_table[index] = crate_out;
++index; ++index;
} }
#ifdef UPDATE_RATES_DEBUG #ifdef PQI_HDL_DEBUG_UR
RsDbg() << "UPDATE_RATES pqihandler::UpdateRates Sorting used_bw_out_table: " << num_sm << " entries" << std::endl; t_now = 1000 * getCurrentTS();
std::cerr << dec << t_now << " pqihandler::UpdateRates(): Sorting used_bw_out_table: " << num_sm << " entries" << std::endl;
#endif #endif
/* Sort the used bw in/out table in ascending order */ /* Sort the used bw in/out table in ascending order */
std::sort(used_bw_in_table, used_bw_in_table + num_sm); std::sort(used_bw_in_table, used_bw_in_table + num_sm);
std::sort(used_bw_out_table, used_bw_out_table + num_sm); std::sort(used_bw_out_table, used_bw_out_table + num_sm);
#ifdef UPDATE_RATES_DEBUG #ifdef PQI_HDL_DEBUG_UR
RsDbg() << "UPDATE_RATES pqihandler::UpdateRates used_bw_out " << used_bw_out << std::endl; t_now = 1000 * getCurrentTS();
std::cerr << dec << t_now << " pqihandler::UpdateRates(): Done." << std::endl;
std::cerr << dec << t_now << " pqihandler::UpdateRates(): used_bw_out " << used_bw_out << std::endl;
#endif #endif
/* Calculate the optimal out_max value, taking into account avail_out and the out bw requested by modules */ /* Calculate the optimal out_max value, taking into account avail_out and the out bw requested by modules */
@ -402,8 +441,9 @@ int pqihandler::UpdateRates()
} }
} }
#ifdef UPDATE_RATES_DEBUG #ifdef PQI_HDL_DEBUG_UR
RsDbg() << "UPDATE_RATES pqihandler::UpdateRates mod_index " << mod_index << " out_max_bw " << out_max_bw << " remaining out bw " << out_remaining_bw << std::endl; t_now = 1000 * getCurrentTS();
std::cerr << dec << t_now << " pqihandler::UpdateRates(): mod_index " << mod_index << " out_max_bw " << out_max_bw << " remaining out bw " << out_remaining_bw << std::endl;
#endif #endif
/* Allocate only half the remaining out bw, if any, to make it smoother */ /* Allocate only half the remaining out bw, if any, to make it smoother */
@ -433,70 +473,67 @@ int pqihandler::UpdateRates()
} }
} }
#ifdef UPDATE_RATES_DEBUG #ifdef PQI_HDL_DEBUG_UR
RsDbg() << "UPDATE_RATES pqihandler::UpdateRates mod_index " << mod_index << " in_max_bw " << in_max_bw << " remaining in bw " << in_remaining_bw << std::endl; t_now = 1000 * getCurrentTS();
std::cerr << dec << t_now << " pqihandler::UpdateRates(): mod_index " << mod_index << " in_max_bw " << in_max_bw << " remaining in bw " << in_remaining_bw << std::endl;
#endif #endif
/* Allocate only half the remaining in bw, if any, to make it smoother */ /* Allocate only half the remaining in bw, if any, to make it smoother */
in_max_bw = in_max_bw + in_remaining_bw / 2; in_max_bw = in_max_bw + in_remaining_bw / 2;
// store current total in and ou used bw
#ifdef DEBUG_QOS
// std::cerr << "Totals (In) Used B/W " << used_bw_in;
// std::cerr << " Available B/W " << avail_in;
// std::cerr << " Effective transfers " << effectiveDownloadsSm << std::endl;
// std::cerr << "Totals (Out) Used B/W " << used_bw_out;
// std::cerr << " Available B/W " << avail_out;
// std::cerr << " Effective transfers " << effectiveUploadsSm << std::endl;
#endif
locked_StoreCurrentRates(used_bw_in, used_bw_out); locked_StoreCurrentRates(used_bw_in, used_bw_out);
#ifdef UPDATE_RATES_DEBUG //computing average rates for effective transfers
RsDbg() << "UPDATE_RATES pqihandler::UpdateRates setting new out_max " << out_max_bw << " in_max " << in_max_bw << std::endl; float max_in_effective = avail_in / num_sm;
if (effectiveDownloadsSm != 0) {
max_in_effective = avail_in / effectiveDownloadsSm;
}
float max_out_effective = avail_out / num_sm;
if (effectiveUploadsSm != 0) {
max_out_effective = avail_out / effectiveUploadsSm;
}
//modify the in and out limit
#ifdef PQI_HDL_DEBUG_UR
t_now = 1000 * getCurrentTS();
std::cerr << dec << t_now << " pqihandler::UpdateRates(): setting new out_max " << out_max_bw << " in_max " << in_max_bw << std::endl;
#endif #endif
// retrieve down (from peer point of view) bandwidth limits set by peers in their own settings
std::map<RsPeerId, RsConfigDataRates> rateMap;
rsConfig->getAllBandwidthRates(rateMap);
std::map<RsPeerId, RsConfigDataRates>::iterator rateMap_it;
#ifdef UPDATE_RATES_DEBUG
// Dump RsConfigurationDataRates
RsDbg() << "UPDATE_RATES pqihandler::UpdateRates RsConfigDataRates dump" << std::endl;
for (rateMap_it = rateMap.begin(); rateMap_it != rateMap.end(); rateMap_it++)
RsDbg () << "UPDATE_RATES pqihandler::UpdateRates PeerId " << rateMap_it->first.toStdString() << " mAllowedOut " << rateMap_it->second.mAllowedOut << std::endl;
#endif
// update max rates taking into account the limits set by peers in their own settings
for(it = mods.begin(); it != mods.end(); ++it) for(it = mods.begin(); it != mods.end(); ++it)
{ {
SearchModule *mod = (it -> second); SearchModule *mod = (it -> second);
// for our down bandwidth we set the max to the calculated value without taking into account the max set by peers: they will control their up bw on their side mod -> pqi -> setMaxRate(true, in_max_bw);
mod -> pqi -> setMaxRate(true, in_max_bw); mod -> pqi -> setMaxRate(false, out_max_bw);
// for our up bandwidth we limit to the maximum down bw provided by peers via BwCtrl because we don't want to clog our outqueues, the SSL buffers, and our friends inbound queues
if ((rateMap_it = rateMap.find(mod->pqi->PeerId())) != rateMap.end())
{
if (rateMap_it->second.mAllowedOut > 0)
{
if (out_max_bw > rateMap_it->second.mAllowedOut)
mod -> pqi -> setMaxRate(false, rateMap_it->second.mAllowedOut);
else
mod -> pqi -> setMaxRate(false, out_max_bw);
}
else
mod -> pqi -> setMaxRate(false, out_max_bw);
}
} }
#ifdef UPDATE_RATES_DEBUG
// dump maxRates //cap the rates
for(it = mods.begin(); it != mods.end(); ++it) for(it = mods.begin(); it != mods.end(); ++it)
{ {
SearchModule *mod = (it -> second); SearchModule *mod = (it -> second);
RsDbg() << "UPDATE_RATES pqihandler::UpdateRates PeerID " << (mod ->pqi -> PeerId()).toStdString() << " new bandwidth limits up " << mod -> pqi -> getMaxRate(false) << " down " << mod -> pqi -> getMaxRate(true) << std::endl; if (mod -> pqi -> getMaxRate(false) < max_out_effective) mod -> pqi -> setMaxRate(false, max_out_effective);
if (mod -> pqi -> getMaxRate(false) > avail_out) mod -> pqi -> setMaxRate(false, avail_out);
if (mod -> pqi -> getMaxRate(true) < max_in_effective) mod -> pqi -> setMaxRate(true, max_in_effective);
if (mod -> pqi -> getMaxRate(true) > avail_in) mod -> pqi -> setMaxRate(true, avail_in);
} }
#endif
return 1; return 1;
} }
void pqihandler::getCurrentRates(float &in, float &out) void pqihandler::getCurrentRates(float &in, float &out)
{ {
RS_STACK_MUTEX(coreMtx); /**************** LOCKED MUTEX ****************/ RsStackMutex stack(coreMtx); /**************** LOCKED MUTEX ****************/
in = rateTotal_in; in = rateTotal_in;
out = rateTotal_out; out = rateTotal_out;