- added ThreadUtil::Thread class

2 files changed, 127 insertions, 0 deletions

diff --git a/noncore/multimedia/opieplayer2/threadutil.cpp b/noncore/multimedia/opieplayer2/threadutil.cpp
index 4055c74..5687f42 100644
--- a/noncore/multimedia/opieplayer2/threadutil.cpp
+++ b/noncore/multimedia/opieplayer2/threadutil.cpp
@@ -19,16 +19,17 @@
 
 #include "threadutil.h"
 
 #include <qsocketnotifier.h>
 
 #include <pthread.h>
 #include <assert.h>
 #include <unistd.h>
+#include <errno.h>
 
 using namespace ThreadUtil;
 
 struct Mutex::Data
 {
     Data()
     {
         pthread_mutex_init( &mutex, 0 );
@@ -117,16 +118,114 @@ 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 )
+{
+    Thread *thr = ( Thread* )arg;
+
+    assert( thr );
+
+    AutoLock locker( thr->d->guard );
+    thr->d->isRunning = false;
+    thr->d->finishCondition.wakeAll();
+}
+
+void *_threadutil_start_thread( void *arg )
+{
+    Thread *thr = ( Thread* )arg;
+
+    pthread_cleanup_push( _threadutil_terminate_thread, thr );
+
+    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()
+{
+    AutoLock lock( d->guard );
+
+    if ( d->isRunning ) {
+        qDebug( "ThreadUtil::Thread::start() called for running thread." );
+        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 );
+    if ( err != 0 ) {
+        qDebug( "ThreadUtil::Thread::start() : can't create thread: %s", strerror( err ) );
+        pthread_attr_destroy( &attributes );
+        return;
+    }
+    pthread_attr_destroy( &attributes );
+}
+
+void Thread::terminate()
+{
+    AutoLock lock( d->guard );
+    if ( !d->isRunning )
+        return;
+
+    pthread_cancel( d->self );
+}
+
+bool Thread::wait()
+{
+    AutoLock lock( d->guard );
+    if ( !d->isRunning )
+        return true;
+
+    return d->finishCondition.wait( d->guard );
+}
+
+void Thread::exit()
+{
+    pthread_exit( 0 );
+}
+
 OnewayNotifier::OnewayNotifier()
 {
     int fds[ 2 ];
     pipe( fds );
     m_readFd = fds[ 0 ];
     m_writeFd = fds[ 1 ];
 
     m_notifier = new QSocketNotifier( m_readFd, QSocketNotifier::Read );
diff --git a/noncore/multimedia/opieplayer2/threadutil.h b/noncore/multimedia/opieplayer2/threadutil.h
index 5cc4cdc..b537cc1 100644
--- a/noncore/multimedia/opieplayer2/threadutil.h
+++ b/noncore/multimedia/opieplayer2/threadutil.h
@@ -21,16 +21,22 @@
 #define THREADUTIL_H
 
 #include <qvaluelist.h>
 #include <qobject.h>
 #include <qguardedptr.h>
 
 class QSocketNotifier;
 
+extern "C"
+{
+    void *_threadutil_start_thread( void* );
+    void _threadutil_terminate_thread( void* );
+}
+
 namespace ThreadUtil
 {
 
     class Mutex
     {
         friend class WaitCondition;
     public:
         Mutex();
@@ -76,16 +82,38 @@ namespace ThreadUtil
     private:
         struct Data;
         Data *d;
 
         WaitCondition( const WaitCondition & );
         WaitCondition &operator=( const WaitCondition & );
     };
 
+    class Thread
+    {
+        friend void *::_threadutil_start_thread( void* );
+        friend void ::_threadutil_terminate_thread( void* );
+    public:
+        Thread();
+        virtual ~Thread();
+
+        void start();
+        void terminate();
+
+        bool wait();
+
+        static void exit();
+    protected:
+        virtual void run() = 0;
+
+    private:
+        struct Data;
+        Data *d;
+    };
+
     class OnewayNotifier : public QObject
     {
         Q_OBJECT
     public:
         OnewayNotifier();
         ~OnewayNotifier();
 
         void notify();