Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-22 12:56:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Moved DataRate interface from rsiface (old) -> rsConfig.

Browse source 
* Internally moved storage of data rate from pqipersongroup -> p3serverconfig
 * made DataRate + Operating Mode work together.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5889 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-11-25 20:25:34 +00:00
parent 0fa8d55062
commit de80f2aa3e
10 changed files with 113 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

103
libretroshare/src/rsserver/p3serverconfig.cc
View file

@ -28,17 +28,27 @@
RsServerConfig *rsConfig = NULL;
static const std::string pqih_ftr("PQIH_FTR");
p3ServerConfig::p3ServerConfig(p3PeerMgr *peerMgr, p3LinkMgr *linkMgr, p3NetMgr *netMgr, p3GeneralConfig *genCfg)
#define DEFAULT_DOWNLOAD_KB_RATE (200.0)
#define DEFAULT_UPLOAD_KB_RATE (50.0)
#define MIN_MINIMAL_RATE (5.0)
p3ServerConfig::p3ServerConfig(p3PeerMgr *peerMgr, p3LinkMgr *linkMgr, p3NetMgr *netMgr, pqihandler *pqih, p3GeneralConfig *genCfg)
:configMtx("p3ServerConfig")
{
mPeerMgr = peerMgr;
mLinkMgr = linkMgr;
mNetMgr = netMgr;
mPqiHandler = pqih;
mGeneralConfig = genCfg;
mUserLevel = RSCONFIG_USER_LEVEL_NEW; /* START LEVEL */
mRateDownload = DEFAULT_DOWNLOAD_KB_RATE;
mRateUpload = DEFAULT_UPLOAD_KB_RATE;
rsConfig = this;
}
@ -50,6 +60,33 @@ p3ServerConfig::~p3ServerConfig()
}
void p3ServerConfig::load_config()
{
/* get the real bandwidth setting from GeneralConfig */
std::string rates = mGeneralConfig -> getSetting(pqih_ftr);
float mri, mro;
if (2 == sscanf(rates.c_str(), "%f %f", &mri, &mro))
{
RsStackMutex stack(configMtx); /******* LOCKED MUTEX *****/
mRateDownload = mri;
mRateUpload = mro;
}
else
{
RsStackMutex stack(configMtx); /******* LOCKED MUTEX *****/
mRateDownload = DEFAULT_DOWNLOAD_KB_RATE;
mRateUpload = DEFAULT_UPLOAD_KB_RATE;
}
/* enable operating mode */
uint32_t opMode = getOperatingMode();
switchToOperatingMode(opMode);
}
#define RS_CONFIG_ADVANCED_STRING "AdvMode"
bool p3ServerConfig::findConfigurationOption(uint32_t key, std::string &keystr)
@ -305,6 +342,7 @@ uint32_t p3ServerConfig::getOperatingMode()
return mode;
}
bool p3ServerConfig::setOperatingMode(uint32_t opMode)
{
std::string modestr = "FULL";
@ -329,8 +367,18 @@ bool p3ServerConfig::setOperatingMode(uint32_t opMode)
return switchToOperatingMode(opMode);
}
bool p3ServerConfig::switchToOperatingMode(uint32_t opMode)
{
float dl_rate = 0;
float ul_rate = 0;
{
RsStackMutex stack(configMtx); /******* LOCKED MUTEX *****/
dl_rate = mRateDownload;
ul_rate = mRateUpload;
}
switch (opMode)
{
default:
@ -338,6 +386,8 @@ bool p3ServerConfig::switchToOperatingMode(uint32_t opMode)
/* switch on all transfers */
/* 100% bandwidth */
/* switch on popups, enable hashing */
//setMaxRate(true, mri); // In / Download
//setMaxRate(false, mro); // Out / Upload.
break;
case RS_OPMODE_NOTURTLE:
/* switch on all transfers - except turtle, enable hashing */
@ -349,13 +399,36 @@ bool p3ServerConfig::switchToOperatingMode(uint32_t opMode)
/* switch on all transfers */
/* reduce bandwidth to 25% */
/* switch off popups, enable hashing */
dl_rate *= 0.25;
ul_rate *= 0.25;
break;
case RS_OPMODE_MINIMAL:
/* switch off all transfers */
/* reduce bandwidth to 10%, but make sure there is enough for VoIP */
/* switch on popups, enable hashing */
dl_rate *= 0.10;
ul_rate *= 0.10;
if (dl_rate < MIN_MINIMAL_RATE)
{
dl_rate = MIN_MINIMAL_RATE;
}
if (ul_rate < MIN_MINIMAL_RATE)
{
ul_rate = MIN_MINIMAL_RATE;
}
break;
}
if (mPqiHandler)
{
mPqiHandler -> setMaxRate(true, dl_rate);
mPqiHandler -> setMaxRate(false, ul_rate);
}
return true;
}
@ -363,20 +436,36 @@ bool p3ServerConfig::switchToOperatingMode(uint32_t opMode)
/* handle data rates.
* Mutex must be handled at the lower levels: TODO */
int p3ServerConfig::SetDataRates( int downKb, int upKb ) /* in kbrates */
int p3ServerConfig::SetMaxDataRates( int downKb, int upKb ) /* in kbrates */
{
//pqih -> setMaxRate(true, totalDownload);
//pqih -> setMaxRate(false, totalUpload);
char line[512];
//pqih -> save_config();
{
RsStackMutex stack(configMtx); /******* LOCKED MUTEX *****/
mRateDownload = downKb;
mRateUpload = upKb;
sprintf(line, "%f %f", mRateDownload, mRateUpload);
}
mGeneralConfig->setSetting(pqih_ftr, std::string(line));
load_config(); // load and setup everything.
return 1;
}
int p3ServerConfig::GetDataRates( float &inKb, float &outKb ) /* in kbrates */
int p3ServerConfig::GetMaxDataRates( int &inKb, int &outKb ) /* in kbrates */
{
//pqih -> getCurrentRates(inKb, outKb);
RsStackMutex stack(configMtx); /******* LOCKED MUTEX *****/
inKb = mRateDownload;
outKb = mRateUpload;
return 1;
}
int p3ServerConfig::GetCurrentDataRates( float &inKb, float &outKb )
{
mPqiHandler->getCurrentRates(inKb, outKb);
return 1;
}