mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-19 06:20:44 -04:00
Reverted some of my last changes:
- removing the core lock in RsServer::ConfigGetDataRates - changes in p3ConfigMgr::loadConfig git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4726 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
e150e31401
commit
f3a0924461
3 changed files with 15 additions and 30 deletions
|
@ -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);
|
||||
|
||||
/* unlock Mutexes */
|
||||
// iface.unlockData(); /* UNLOCK */
|
||||
// unlockRsCore(); /* UNLOCK */
|
||||
iface.unlockData(); /* UNLOCK */
|
||||
unlockRsCore(); /* UNLOCK */
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue