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

fixed initialisation of semaphores in created thread object

Browse Source
This commit is contained in:
Cyril Soler 2016-05-12 10:26:38 -04:00
parent 96012ef81f
commit 1d476de806
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libretroshare/src/util/rsthreads.cc
View File

@ -40,7 +40,7 @@
* #define DEBUG_THREADS 1 * #define DEBUG_THREADS 1
* #define RSMUTEX_ABORT 1 // Catch wrong pthreads mode. * #define RSMUTEX_ABORT 1 // Catch wrong pthreads mode.
*******/ *******/
#define THREAD_DEBUG std::cerr << "[caller thread ID: " << std::hex << pthread_self() << ", thread ID: " << mTid << std::dec << "] " #define THREAD_DEBUG std::cerr << "[this=" << (void*)this << ", caller thread ID: " << std::hex << pthread_self() << ", thread ID: " << mTid << std::dec << "] "
#ifdef RSMUTEX_ABORT #ifdef RSMUTEX_ABORT
#include <stdlib.h> #include <stdlib.h>
@ -75,15 +75,19 @@ RsThread::RsThread()
#else #else
mTid = 0; mTid = 0;
#endif #endif
// The thread is certainly not running. This avoids to lock down when calling shutdown on a thread that has never started.
#ifdef DEBUG_THREADS
THREAD_DEBUG << "[Thread ID:" << std::hex << pthread_self() << std::dec << "] thread object created. Initing stopped=1, should_stop=0" << std::endl;
#endif
mHasStoppedSemaphore.set(1) ;
mShouldStopSemaphore.set(0) ;
} }
bool RsThread::isRunning() bool RsThread::isRunning()
{ {
// do we need a mutex for this ? // do we need a mutex for this ?
int sval = mHasStoppedSemaphore.value() ; int sval = mHasStoppedSemaphore.value() ;
#ifdef DEBUG_THREADS
THREAD_DEBUG << " isRunning(): returning " << !sval << std::endl;
#endif
return !sval ; return !sval ;
} }
@ -129,11 +133,11 @@ void RsTickingThread::fullstop()
#endif #endif
if(pthread_equal(mTid,pthread_self())) if(pthread_equal(mTid,pthread_self()))
{ {
std::cerr << "(WW) RsTickingThread::fullstop() called by same thread. This is unexpected." << std::endl; THREAD_DEBUG << "(WW) RsTickingThread::fullstop() called by same thread. This is unexpected." << std::endl;
return ; return ;
} }
mHasStoppedSemaphore.wait_no_relock(); mHasStoppedSemaphore.wait_no_relock(); // Wait for semaphore value to become 1, but does not decrement it when obtained.
#ifdef DEBUG_THREADS #ifdef DEBUG_THREADS
THREAD_DEBUG << " finished!" << std::endl; THREAD_DEBUG << " finished!" << std::endl;
#endif #endif
@ -144,9 +148,8 @@ void RsThread::start()
void *data = (void *)this ; void *data = (void *)this ;
#ifdef DEBUG_THREADS #ifdef DEBUG_THREADS
THREAD_DEBUG << "pqithreadstreamer::start() initing should_stop=0, has_stopped=1" << std::endl; THREAD_DEBUG << "pqithreadstreamer::start() initing should_stop=0" << std::endl;
#endif #endif
mHasStoppedSemaphore.set(0) ;
mShouldStopSemaphore.set(0) ; mShouldStopSemaphore.set(0) ;
int err ; int err ;
@ -174,14 +177,16 @@ RsTickingThread::RsTickingThread()
void RsSingleJobThread::runloop() void RsSingleJobThread::runloop()
{ {
mShouldStopSemaphore.set(0) ; mHasStoppedSemaphore.set(0) ;
run() ; run() ;
} }
void RsTickingThread::runloop() void RsTickingThread::runloop()
{ {
mHasStoppedSemaphore.set(0) ; // first time we are 100% the thread is actually running.
#ifdef DEBUG_THREADS #ifdef DEBUG_THREADS
THREAD_DEBUG << "pqithreadstream::runloop()" << std::endl; THREAD_DEBUG << "RsTickingThread::runloop(). Setting stopped=0" << std::endl;
#endif #endif
while(1) while(1)
@ -218,7 +223,7 @@ void RsQueueThread::data_tick()
{ {
mLastWork = now; mLastWork = now;
mLastSleep = (uint32_t) (mMinSleep + (mLastSleep - mMinSleep) / 2.0); mLastSleep = (uint32_t) (mMinSleep + (mLastSleep - mMinSleep) / 2.0);
#ifdef DEBUG_THREADS #ifdef DEBUG_TICKING
THREAD_DEBUG << "RsQueueThread::data_tick() done work: sleeping for: " << mLastSleep << " ms" << std::endl; THREAD_DEBUG << "RsQueueThread::data_tick() done work: sleeping for: " << mLastSleep << " ms" << std::endl;
#endif #endif
@ -234,7 +239,7 @@ void RsQueueThread::data_tick()
{ {
mLastSleep = mMaxSleep; mLastSleep = mMaxSleep;
} }
#ifdef DEBUG_THREADS #ifdef DEBUG_TICKING
THREAD_DEBUG << "RsQueueThread::data_tick() no work: sleeping for: " << mLastSleep << " ms" << std::endl; THREAD_DEBUG << "RsQueueThread::data_tick() no work: sleeping for: " << mLastSleep << " ms" << std::endl;
#endif #endif
} }