From 79eccf3d6a1ca9fd8261fa6beced384301a1927c Mon Sep 17 00:00:00 2001 From: csoler Date: Mon, 30 Nov 2009 21:27:50 +0000 Subject: [PATCH] corrected deadlock git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.4.x@1856 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/rsserver/p3face-config.cc | 5 ++--- libretroshare/src/upnp/upnphandler.cc | 10 ++++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/libretroshare/src/rsserver/p3face-config.cc b/libretroshare/src/rsserver/p3face-config.cc index 3f15cbd1d..6967de517 100644 --- a/libretroshare/src/rsserver/p3face-config.cc +++ b/libretroshare/src/rsserver/p3face-config.cc @@ -142,15 +142,14 @@ int RsServer::UpdateAllConfig() /* Notify of Changes */ // iface.setChanged(RsIface::Config); - rsicontrol->getNotify().notifyListChange(NOTIFY_LIST_CONFIG, NOTIFY_TYPE_MOD); /* unlock Mutexes */ iface.unlockData(); /* UNLOCK */ unlockRsCore(); /* UNLOCK */ + rsicontrol->getNotify().notifyListChange(NOTIFY_LIST_CONFIG, NOTIFY_TYPE_MOD); + return 1; - - } void RsServer::ConfigFinalSave() diff --git a/libretroshare/src/upnp/upnphandler.cc b/libretroshare/src/upnp/upnphandler.cc index a95218d84..c7fd3daf4 100644 --- a/libretroshare/src/upnp/upnphandler.cc +++ b/libretroshare/src/upnp/upnphandler.cc @@ -467,22 +467,24 @@ void upnphandler::restart() bool upnphandler::getEnabled() { - dataMtx.lock(); /*** LOCK MUTEX ***/ +// no need to lock for reading a boolean +// dataMtx.lock(); /*** LOCK MUTEX ***/ bool on = toEnable; - dataMtx.unlock(); /*** UNLOCK MUTEX ***/ +// dataMtx.unlock(); /*** UNLOCK MUTEX ***/ return on; } bool upnphandler::getActive() { - dataMtx.lock(); /*** LOCK MUTEX ***/ +// no need to lock for reading a boolean +// dataMtx.lock(); /*** LOCK MUTEX ***/ bool on = (upnpState == RS_UPNP_S_ACTIVE); - dataMtx.unlock(); /*** UNLOCK MUTEX ***/ +// dataMtx.unlock(); /*** UNLOCK MUTEX ***/ return on; }