summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-11 10:58:16 (UTC)
committer simon <simon>2002-12-11 10:58:16 (UTC)
commit616e7437498c7adcad77d9b79e9c450a75b260ca (patch) (side-by-side diff)
treeb5a5291eabfc779b671a7436a377cc4a455b95bf
parent6ee0a61001307e71f51d1e8c7beaa81a94df89aa (diff)
downloadopie-616e7437498c7adcad77d9b79e9c450a75b260ca.zip
opie-616e7437498c7adcad77d9b79e9c450a75b260ca.tar.gz
opie-616e7437498c7adcad77d9b79e9c450a75b260ca.tar.bz2
- make it compile for gcc2: step1
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/threadutil.cpp14
-rw-r--r--noncore/multimedia/opieplayer2/threadutil.h5
2 files changed, 9 insertions, 10 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
@@ -109,80 +109,80 @@ bool WaitCondition::wait()
}
bool WaitCondition::wait( Mutex &mutex )
{
return pthread_cond_wait( &d->waitCondition, &mutex.d->mutex );
}
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()
{
AutoLock lock( d->guard );
if ( d->isRunning ) {
qDebug( "ThreadUtil::Thread::start() called for running thread." );
return;
}
diff --git a/noncore/multimedia/opieplayer2/threadutil.h b/noncore/multimedia/opieplayer2/threadutil.h
index b67b61d..21ae6b2 100644
--- a/noncore/multimedia/opieplayer2/threadutil.h
+++ b/noncore/multimedia/opieplayer2/threadutil.h
@@ -1,142 +1,141 @@
/* This file is part of the KDE project
Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#ifndef THREADUTIL_H
#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();
~Mutex();
void lock();
void unlock();
bool tryLock();
bool isLocked();
private:
struct Data;
Data *d;
Mutex( const Mutex & );
Mutex &operator=( const Mutex & );
};
class AutoLock
{
public:
AutoLock( Mutex &mutex ) : m_mutex( mutex ) { m_mutex.lock(); }
~AutoLock() { m_mutex.unlock(); }
Mutex *operator &() const { return &m_mutex; }
private:
Mutex &m_mutex;
};
class WaitCondition
{
public:
WaitCondition();
~WaitCondition();
bool wait();
bool wait( Mutex &mutex );
void wakeOne();
void wakeAll();
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:
+ struct Data;
+
Thread();
virtual ~Thread();
void start();
void terminate();
bool wait();
bool isRunning() const;
static void exit();
protected:
virtual void run() = 0;
private:
- struct Data;
Data *d;
};
class OnewayNotifier : public QObject
{
Q_OBJECT
public:
OnewayNotifier();
~OnewayNotifier();
void notify();
signals:
void awake();
private slots:
void wakeUp();
private:
int m_readFd;
int m_writeFd;
QSocketNotifier *m_notifier;
};
class Channel;
class ChannelMessage
{
friend class Channel;
public:
ChannelMessage( int type = -1 );