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

suppressed deadlock (mutex explicitely locked before thread exit)

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2466 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-03-01 20:35:32 +00:00
parent ce4141648a
commit 7b183f41a1
1 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

36
libretroshare/src/tcponudp/extaddrfinder.cc
View file

@ -146,12 +146,14 @@ void* doExtAddrSearch(void *p)
{ {
// thread safe copy results. // thread safe copy results.
// //
af->_addrMtx.lock(); {
*(af->_found) = false ; RsStackMutex mtx(af->_addrMtx) ;
*(af->mFoundTS) = time(NULL) ;
*(af->_searching) = false ; *(af->_found) = false ;
*(af->mFoundTS) = time(NULL) ;
*(af->_searching) = false ;
}
pthread_exit(NULL); pthread_exit(NULL);
af->_addrMtx.unlock();
return NULL ; return NULL ;
} }
@ -161,20 +163,22 @@ void* doExtAddrSearch(void *p)
if(!inet_aton(res[res.size()/2].c_str(),&(af->_addr->sin_addr))) if(!inet_aton(res[res.size()/2].c_str(),&(af->_addr->sin_addr)))
{ {
std::cerr << "ExtAddrFinder: Could not convert " << res[res.size()/2] << " into an address." << std::endl ; std::cerr << "ExtAddrFinder: Could not convert " << res[res.size()/2] << " into an address." << std::endl ;
af->_addrMtx.lock(); {
*(af->_found) = false ; RsStackMutex mtx(af->_addrMtx) ;
*(af->mFoundTS) = time(NULL) ; *(af->_found) = false ;
*(af->_searching) = false ; *(af->mFoundTS) = time(NULL) ;
af->_addrMtx.unlock(); *(af->_searching) = false ;
}
pthread_exit(NULL); pthread_exit(NULL);
return NULL ; return NULL ;
} }
af->_addrMtx.lock(); {
*(af->_found) = true ; RsStackMutex mtx(af->_addrMtx) ;
*(af->mFoundTS) = time(NULL) ; *(af->_found) = true ;
*(af->_searching) = false ; *(af->mFoundTS) = time(NULL) ;
af->_addrMtx.unlock(); *(af->_searching) = false ;
}
pthread_exit(NULL); pthread_exit(NULL);
return NULL ; return NULL ;
@ -205,7 +209,7 @@ bool ExtAddrFinder::hasValidIP(struct sockaddr_in *addr)
//timeout the current ip //timeout the current ip
time_t delta = time(NULL) - *mFoundTS; time_t delta = time(NULL) - *mFoundTS;
if(delta > MAX_IP_STORE) {//launch a research if((uint32_t)delta > MAX_IP_STORE) {//launch a research
if( _addrMtx.trylock()) if( _addrMtx.trylock())
{ {
if(!*_searching) if(!*_searching)