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

Optimized startup of RetroShare by removing two unnecessary calls to AuthGPGimpl::storeAllKeys.

Browse source 
Fixed small hangs of RetroShare by removing the core lock in RsServer::ConfigGetDataRates. Is that needed?

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4725 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-12-12 09:37:03 +00:00
parent ef57cd44b3
commit e150e31401
5 changed files with 54 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libretroshare/src/rsserver/p3face-config.cc
View file

@ -73,17 +73,17 @@ int RsServer::ConfigSetDataRates( int totalDownload, int totalUpload ) /* in
int RsServer::ConfigGetDataRates( float &inKb, float &outKb ) /* in kbrates */
{
/* fill the rsiface class */
RsIface &iface = getIface();
// RsIface &iface = getIface();
/* lock Mutexes */
lockRsCore(); /* LOCK */
iface.lockData(); /* LOCK */
// lockRsCore(); /* LOCK */
// iface.lockData(); /* LOCK */
pqih -> getCurrentRates(inKb, outKb);
pqih -> getCurrentRates(inKb, outKb);
/* unlock Mutexes */
iface.unlockData(); /* UNLOCK */
unlockRsCore(); /* UNLOCK */
// iface.unlockData(); /* UNLOCK */
// unlockRsCore(); /* UNLOCK */
return 1;
}

1
libretroshare/src/rsserver/rsinit.cc
View file

@ -2181,7 +2181,6 @@ int RsServer::StartupRetroShare()
//mConfigMgr->addConfiguration("ftserver.cfg", ftserver);
//
mConfigMgr->addConfiguration("gpg_prefs.cfg", (AuthGPGimpl *) AuthGPG::getAuthGPG());
mConfigMgr->loadConfiguration();
mConfigMgr->addConfiguration("peers.cfg", mPeerMgr);
mConfigMgr->addConfiguration("general.cfg", mGeneralConfig);