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

new attempt to fix thread issues

Browse source
This commit is contained in:
csoler 2016-05-11 22:18:02 -04:00
parent 383e40324d
commit 96012ef81f
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libretroshare/src/util/rsthreads.cc
View file

@ -127,7 +127,13 @@ void RsTickingThread::fullstop()
#ifdef DEBUG_THREADS #ifdef DEBUG_THREADS
THREAD_DEBUG << " waiting stop" << std::endl; THREAD_DEBUG << " waiting stop" << std::endl;
#endif #endif
mHasStoppedSemaphore.wait(); if(pthread_equal(mTid,pthread_self()))
{
std::cerr << "(WW) RsTickingThread::fullstop() called by same thread. This is unexpected." << std::endl;
return ;
}
mHasStoppedSemaphore.wait_no_relock();
#ifdef DEBUG_THREADS #ifdef DEBUG_THREADS
THREAD_DEBUG << " finished!" << std::endl; THREAD_DEBUG << " finished!" << std::endl;
#endif #endif

9
libretroshare/src/util/rsthreads.h
View file

@ -211,7 +211,9 @@ public:
return s->val ; return s->val ;
} }
void wait() // waits but does not re-locks the semaphore
void wait_no_relock()
{ {
static const uint32_t max_waiting_time_before_warning=1000 *5 ; // 5 secs static const uint32_t max_waiting_time_before_warning=1000 *5 ; // 5 secs
uint32_t tries=0; uint32_t tries=0;
@ -224,10 +226,7 @@ public:
RS_STACK_MUTEX(s->mtx) ; RS_STACK_MUTEX(s->mtx) ;
if(s->val > 0) if(s->val > 0)
{ return ;
--(s->val) ;
return ;
}
} }
} }