Diffstat (limited to 'noncore/multimedia/opieplayer2/threadutil.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/threadutil.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/noncore/multimedia/opieplayer2/threadutil.cpp b/noncore/multimedia/opieplayer2/threadutil.cpp index a5cc92d..7a9e1a4 100644 --- a/noncore/multimedia/opieplayer2/threadutil.cpp +++ b/noncore/multimedia/opieplayer2/threadutil.cpp @@ -117,64 +117,64 @@ void WaitCondition::wakeOne() { pthread_cond_signal( &d->waitCondition ); } void WaitCondition::wakeAll() { pthread_cond_broadcast( &d->waitCondition ); } struct Thread::Data { Data() : isRunning( false ) {} pthread_t self; Mutex guard; bool isRunning; WaitCondition finishCondition; }; extern "C" { -void _threadutil_terminate_thread( void *arg ) +static void terminate_thread( void *arg ) { - Thread *thr = ( Thread* )arg; + Thread::Data *data = ( Thread::Data* )arg; - assert( thr ); + assert( data ); - AutoLock locker( thr->d->guard ); - thr->d->isRunning = false; - thr->d->finishCondition.wakeAll(); + AutoLock locker( data->guard ); + data->isRunning = false; + data->finishCondition.wakeAll(); } void *_threadutil_start_thread( void *arg ) { Thread *thr = ( Thread* )arg; - pthread_cleanup_push( _threadutil_terminate_thread, thr ); + pthread_cleanup_push( terminate_thread, thr->d ); thr->d->isRunning = true; thr->run(); pthread_cleanup_pop( true ); Thread::exit(); return 0; // never reached } } Thread::Thread() : d( new Data ) { } Thread::~Thread() { assert( d->isRunning == false ); delete d; } void Thread::start() |