Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-13 08:29:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

enabled recursive lock behavior on main bitdht thread to handle self-lock in DHT callbacks

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3849 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-11-21 22:46:47 +00:00
parent 42fb103738
commit 8a3d3f8c0d
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libbitdht/src/udp/udpbitdht.cc
View File

@ -51,7 +51,7 @@
/*************************************/
UdpBitDht::UdpBitDht(UdpPublisher *pub, bdNodeId *id, std::string appVersion, std::string bootstrapfile, bdDhtFunctions *fns)
:UdpSubReceiver(pub), mFns(fns)
:UdpSubReceiver(pub), dhtMtx(true), mFns(fns)
{
std::string usedVersion;
@ -210,6 +210,7 @@ void UdpBitDht::run()
}
{
bdStackMutex stack(dhtMtx); /********** MUTEX LOCKED *************/
mBitDhtManager->iteration();
}
sleep(1);

28
libbitdht/src/util/bdthreads.h
View File

@ -27,6 +27,7 @@
*/
#include <iostream>
#include <pthread.h>
#include <inttypes.h>
@ -36,14 +37,29 @@ class bdMutex
{
public:
bdMutex() { pthread_mutex_init(&realMutex, NULL); }
~bdMutex() { pthread_mutex_destroy(&realMutex); }
void lock() { pthread_mutex_lock(&realMutex); }
void unlock() { pthread_mutex_unlock(&realMutex); }
bool trylock() { return (0 == pthread_mutex_trylock(&realMutex)); }
bdMutex(bool recursive = false)
{
if(recursive)
{
pthread_mutexattr_t att ;
pthread_mutexattr_init(&att) ;
pthread_mutexattr_settype(&att,PTHREAD_MUTEX_RECURSIVE) ;
if( pthread_mutex_init(&realMutex, &att))
std::cerr << "ERROR: Could not initialize mutex !" << std::endl ;
}
else
if( pthread_mutex_init(&realMutex, NULL))
std::cerr << "ERROR: Could not initialize mutex !" << std::endl ;
}
~bdMutex() { pthread_mutex_destroy(&realMutex); }
void lock() { pthread_mutex_lock(&realMutex); }
void unlock() { pthread_mutex_unlock(&realMutex); }
bool trylock() { return (0 == pthread_mutex_trylock(&realMutex)); }
private:
pthread_mutex_t realMutex;
pthread_mutex_t realMutex;
};
class bdStackMutex