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

Fixed deadlock between p3connmgr::mtx and libbitdht::mtx

Browse Source 
* shifted dht stats call outside of p3connmgr's mtx.

NB: As Dht callback functions hold DHT lock, then lock p3ConnectMgr...
    we cannot have any opposite locks (p3connmgr, then DHT) or we have
    potential for a deadlock.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3861 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2010-11-23 19:32:19 +00:00
parent 6589b49025
commit d9847e2622
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libretroshare/src/pqi/p3connmgr.cc
View File

@ -3912,11 +3912,18 @@ bool p3ConnectMgr::getDHTEnabled()
void p3ConnectMgr::getNetStatus(pqiNetStatus &status) void p3ConnectMgr::getNetStatus(pqiNetStatus &status)
{ {
/* cannot lock local stack, then call DHT... as this can cause lock up */
/* must extract data... then update mNetFlags */
bool dhtOk = netAssistConnectActive();
uint32_t netsize, rsnetsize;
netAssistConnectStats(netsize, rsnetsize);
RsStackMutex stack(connMtx); /****** STACK LOCK MUTEX *******/ RsStackMutex stack(connMtx); /****** STACK LOCK MUTEX *******/
/* quick update of the stuff that can change! */ /* quick update of the stuff that can change! */
mNetFlags.mDhtOk = netAssistConnectActive(); mNetFlags.mDhtOk = dhtOk;
netAssistConnectStats(mNetFlags.mDhtNetworkSize, mNetFlags.mDhtRsNetworkSize); netAssistConnectStats(netsize, rsnetsize);
status = mNetFlags; status = mNetFlags;
} }