author | simon <simon> | 2002-12-11 11:05:52 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-11 11:05:52 (UTC) |
commit | dd7fcdf1589c8513055f6475d3a1f33075d971d8 (patch) (side-by-side diff) | |
tree | 3b4927a023eea68d1c529b4852ce2cdd1801db49 | |
parent | 616e7437498c7adcad77d9b79e9c450a75b260ca (diff) | |
download | opie-dd7fcdf1589c8513055f6475d3a1f33075d971d8.zip opie-dd7fcdf1589c8513055f6475d3a1f33075d971d8.tar.gz opie-dd7fcdf1589c8513055f6475d3a1f33075d971d8.tar.bz2 |
- gcc2 is not my friend, given that it can't deal with friend declarations
properly :) (a.k.a: make it compile with gcc2, step 2)
-rw-r--r-- | noncore/multimedia/opieplayer2/threadutil.cpp | 17 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/threadutil.h | 6 |
2 files changed, 11 insertions, 12 deletions
diff --git a/noncore/multimedia/opieplayer2/threadutil.cpp b/noncore/multimedia/opieplayer2/threadutil.cpp index 7a9e1a4..ff38b1e 100644 --- a/noncore/multimedia/opieplayer2/threadutil.cpp +++ b/noncore/multimedia/opieplayer2/threadutil.cpp @@ -130,12 +130,16 @@ struct Thread::Data pthread_t self; Mutex guard; bool isRunning; WaitCondition finishCondition; + + Thread *thr; + + void run() { thr->run(); } }; extern "C" { static void terminate_thread( void *arg ) @@ -146,32 +150,33 @@ static void terminate_thread( void *arg ) AutoLock locker( data->guard ); data->isRunning = false; data->finishCondition.wakeAll(); } -void *_threadutil_start_thread( void *arg ) +static void *start_thread( void *arg ) { - Thread *thr = ( Thread* )arg; + Thread::Data *data = ( Thread::Data* )arg; - pthread_cleanup_push( terminate_thread, thr->d ); + pthread_cleanup_push( terminate_thread, data ); - thr->d->isRunning = true; - thr->run(); + data->isRunning = true; + data->run(); pthread_cleanup_pop( true ); Thread::exit(); return 0; // never reached } } Thread::Thread() : d( new Data ) { + d->thr = this; } Thread::~Thread() { assert( d->isRunning == false ); delete d; @@ -186,13 +191,13 @@ void Thread::start() return; } pthread_attr_t attributes; pthread_attr_init( &attributes ); pthread_attr_setscope( &attributes, PTHREAD_SCOPE_SYSTEM ); - int err = pthread_create( &d->self, &attributes, _threadutil_start_thread, ( void* )this ); + int err = pthread_create( &d->self, &attributes, start_thread, ( void* )d ); if ( err != 0 ) { qDebug( "ThreadUtil::Thread::start() : can't create thread: %s", strerror( err ) ); pthread_attr_destroy( &attributes ); return; } pthread_attr_destroy( &attributes ); diff --git a/noncore/multimedia/opieplayer2/threadutil.h b/noncore/multimedia/opieplayer2/threadutil.h index 21ae6b2..2fd0c68 100644 --- a/noncore/multimedia/opieplayer2/threadutil.h +++ b/noncore/multimedia/opieplayer2/threadutil.h @@ -23,17 +23,12 @@ #include <qvaluelist.h> #include <qobject.h> #include <qguardedptr.h> class QSocketNotifier; -extern "C" -{ - void *_threadutil_start_thread( void* ); -} - namespace ThreadUtil { class Mutex { friend class WaitCondition; @@ -85,13 +80,12 @@ namespace ThreadUtil WaitCondition( const WaitCondition & ); WaitCondition &operator=( const WaitCondition & ); }; class Thread { - friend void *::_threadutil_start_thread( void* ); public: struct Data; Thread(); virtual ~Thread(); |