author | simon <simon> | 2002-12-10 11:07:46 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-10 11:07:46 (UTC) |
commit | f468c3bc69655aefa0ec5783405355dd3dde4afc (patch) (unidiff) | |
tree | b358fb36cb4547a0bf2c100573e4846fbc32211c /noncore | |
parent | 448426777d9e35826898791d03b4bc71335427ff (diff) | |
download | opie-f468c3bc69655aefa0ec5783405355dd3dde4afc.zip opie-f468c3bc69655aefa0ec5783405355dd3dde4afc.tar.gz opie-f468c3bc69655aefa0ec5783405355dd3dde4afc.tar.bz2 |
- added ThreadUtil::Thread class
-rw-r--r-- | noncore/multimedia/opieplayer2/threadutil.cpp | 99 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/threadutil.h | 28 |
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 | |||
@@ -3,48 +3,49 @@ | |||
3 | 3 | ||
4 | This library is free software; you can redistribute it and/or | 4 | This library is free software; you can redistribute it and/or |
5 | modify it under the terms of the GNU Library General Public | 5 | modify it under the terms of the GNU Library General Public |
6 | License as published by the Free Software Foundation; either | 6 | License as published by the Free Software Foundation; either |
7 | version 2 of the License, or (at your option) any later version. | 7 | version 2 of the License, or (at your option) any later version. |
8 | 8 | ||
9 | This library is distributed in the hope that it will be useful, | 9 | This library is distributed in the hope that it will be useful, |
10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
12 | Library General Public License for more details. | 12 | Library General Public License for more details. |
13 | 13 | ||
14 | You should have received a copy of the GNU Library General Public License | 14 | You should have received a copy of the GNU Library General Public License |
15 | along with this library; see the file COPYING.LIB. If not, write to | 15 | along with this library; see the file COPYING.LIB. If not, write to |
16 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 16 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
17 | Boston, MA 02111-1307, USA. | 17 | Boston, MA 02111-1307, USA. |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include "threadutil.h" | 20 | #include "threadutil.h" |
21 | 21 | ||
22 | #include <qsocketnotifier.h> | 22 | #include <qsocketnotifier.h> |
23 | 23 | ||
24 | #include <pthread.h> | 24 | #include <pthread.h> |
25 | #include <assert.h> | 25 | #include <assert.h> |
26 | #include <unistd.h> | 26 | #include <unistd.h> |
27 | #include <errno.h> | ||
27 | 28 | ||
28 | using namespace ThreadUtil; | 29 | using namespace ThreadUtil; |
29 | 30 | ||
30 | struct Mutex::Data | 31 | struct Mutex::Data |
31 | { | 32 | { |
32 | Data() | 33 | Data() |
33 | { | 34 | { |
34 | pthread_mutex_init( &mutex, 0 ); | 35 | pthread_mutex_init( &mutex, 0 ); |
35 | } | 36 | } |
36 | ~Data() | 37 | ~Data() |
37 | { | 38 | { |
38 | pthread_mutex_destroy( &mutex ); | 39 | pthread_mutex_destroy( &mutex ); |
39 | } | 40 | } |
40 | 41 | ||
41 | pthread_mutex_t mutex; | 42 | pthread_mutex_t mutex; |
42 | }; | 43 | }; |
43 | 44 | ||
44 | Mutex::Mutex() | 45 | Mutex::Mutex() |
45 | : d( new Data ) | 46 | : d( new Data ) |
46 | { | 47 | { |
47 | } | 48 | } |
48 | 49 | ||
49 | Mutex::~Mutex() | 50 | Mutex::~Mutex() |
50 | { | 51 | { |
@@ -101,48 +102,146 @@ WaitCondition::~WaitCondition() | |||
101 | } | 102 | } |
102 | 103 | ||
103 | bool WaitCondition::wait() | 104 | bool WaitCondition::wait() |
104 | { | 105 | { |
105 | Mutex m; | 106 | Mutex m; |
106 | m.lock(); | 107 | m.lock(); |
107 | return wait( m ); | 108 | return wait( m ); |
108 | } | 109 | } |
109 | 110 | ||
110 | bool WaitCondition::wait( Mutex &mutex ) | 111 | bool WaitCondition::wait( Mutex &mutex ) |
111 | { | 112 | { |
112 | return pthread_cond_wait( &d->waitCondition, &mutex.d->mutex ); | 113 | return pthread_cond_wait( &d->waitCondition, &mutex.d->mutex ); |
113 | } | 114 | } |
114 | 115 | ||
115 | void WaitCondition::wakeOne() | 116 | void WaitCondition::wakeOne() |
116 | { | 117 | { |
117 | pthread_cond_signal( &d->waitCondition ); | 118 | pthread_cond_signal( &d->waitCondition ); |
118 | } | 119 | } |
119 | 120 | ||
120 | void WaitCondition::wakeAll() | 121 | void WaitCondition::wakeAll() |
121 | { | 122 | { |
122 | pthread_cond_broadcast( &d->waitCondition ); | 123 | pthread_cond_broadcast( &d->waitCondition ); |
123 | } | 124 | } |
124 | 125 | ||
126 | struct Thread::Data | ||
127 | { | ||
128 | Data() : isRunning( false ) | ||
129 | {} | ||
130 | |||
131 | pthread_t self; | ||
132 | Mutex guard; | ||
133 | bool isRunning; | ||
134 | |||
135 | WaitCondition finishCondition; | ||
136 | }; | ||
137 | |||
138 | extern "C" | ||
139 | { | ||
140 | |||
141 | void _threadutil_terminate_thread( void *arg ) | ||
142 | { | ||
143 | Thread *thr = ( Thread* )arg; | ||
144 | |||
145 | assert( thr ); | ||
146 | |||
147 | AutoLock locker( thr->d->guard ); | ||
148 | thr->d->isRunning = false; | ||
149 | thr->d->finishCondition.wakeAll(); | ||
150 | } | ||
151 | |||
152 | void *_threadutil_start_thread( void *arg ) | ||
153 | { | ||
154 | Thread *thr = ( Thread* )arg; | ||
155 | |||
156 | pthread_cleanup_push( _threadutil_terminate_thread, thr ); | ||
157 | |||
158 | thr->d->isRunning = true; | ||
159 | thr->run(); | ||
160 | |||
161 | pthread_cleanup_pop( true ); | ||
162 | |||
163 | Thread::exit(); | ||
164 | return 0; // never reached | ||
165 | } | ||
166 | |||
167 | } | ||
168 | |||
169 | Thread::Thread() | ||
170 | : d( new Data ) | ||
171 | { | ||
172 | } | ||
173 | |||
174 | Thread::~Thread() | ||
175 | { | ||
176 | assert( d->isRunning == false ); | ||
177 | delete d; | ||
178 | } | ||
179 | |||
180 | void Thread::start() | ||
181 | { | ||
182 | AutoLock lock( d->guard ); | ||
183 | |||
184 | if ( d->isRunning ) { | ||
185 | qDebug( "ThreadUtil::Thread::start() called for running thread." ); | ||
186 | return; | ||
187 | } | ||
188 | |||
189 | pthread_attr_t attributes; | ||
190 | pthread_attr_init( &attributes ); | ||
191 | pthread_attr_setscope( &attributes, PTHREAD_SCOPE_SYSTEM ); | ||
192 | int err = pthread_create( &d->self, &attributes, _threadutil_start_thread, ( void* )this ); | ||
193 | if ( err != 0 ) { | ||
194 | qDebug( "ThreadUtil::Thread::start() : can't create thread: %s", strerror( err ) ); | ||
195 | pthread_attr_destroy( &attributes ); | ||
196 | return; | ||
197 | } | ||
198 | pthread_attr_destroy( &attributes ); | ||
199 | } | ||
200 | |||
201 | void Thread::terminate() | ||
202 | { | ||
203 | AutoLock lock( d->guard ); | ||
204 | if ( !d->isRunning ) | ||
205 | return; | ||
206 | |||
207 | pthread_cancel( d->self ); | ||
208 | } | ||
209 | |||
210 | bool Thread::wait() | ||
211 | { | ||
212 | AutoLock lock( d->guard ); | ||
213 | if ( !d->isRunning ) | ||
214 | return true; | ||
215 | |||
216 | return d->finishCondition.wait( d->guard ); | ||
217 | } | ||
218 | |||
219 | void Thread::exit() | ||
220 | { | ||
221 | pthread_exit( 0 ); | ||
222 | } | ||
223 | |||
125 | OnewayNotifier::OnewayNotifier() | 224 | OnewayNotifier::OnewayNotifier() |
126 | { | 225 | { |
127 | int fds[ 2 ]; | 226 | int fds[ 2 ]; |
128 | pipe( fds ); | 227 | pipe( fds ); |
129 | m_readFd = fds[ 0 ]; | 228 | m_readFd = fds[ 0 ]; |
130 | m_writeFd = fds[ 1 ]; | 229 | m_writeFd = fds[ 1 ]; |
131 | 230 | ||
132 | m_notifier = new QSocketNotifier( m_readFd, QSocketNotifier::Read ); | 231 | m_notifier = new QSocketNotifier( m_readFd, QSocketNotifier::Read ); |
133 | connect( m_notifier, SIGNAL( activated( int ) ), | 232 | connect( m_notifier, SIGNAL( activated( int ) ), |
134 | this, SLOT( wakeUp() ) ); | 233 | this, SLOT( wakeUp() ) ); |
135 | } | 234 | } |
136 | 235 | ||
137 | OnewayNotifier::~OnewayNotifier() | 236 | OnewayNotifier::~OnewayNotifier() |
138 | { | 237 | { |
139 | delete m_notifier; | 238 | delete m_notifier; |
140 | 239 | ||
141 | ::close( m_readFd ); | 240 | ::close( m_readFd ); |
142 | ::close( m_writeFd ); | 241 | ::close( m_writeFd ); |
143 | } | 242 | } |
144 | 243 | ||
145 | void OnewayNotifier::notify() | 244 | void OnewayNotifier::notify() |
146 | { | 245 | { |
147 | const char c = 42; | 246 | const char c = 42; |
148 | ::write( m_writeFd, &c, 1 ); | 247 | ::write( m_writeFd, &c, 1 ); |
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 | |||
@@ -5,48 +5,54 @@ | |||
5 | modify it under the terms of the GNU Library General Public | 5 | modify it under the terms of the GNU Library General Public |
6 | License as published by the Free Software Foundation; either | 6 | License as published by the Free Software Foundation; either |
7 | version 2 of the License, or (at your option) any later version. | 7 | version 2 of the License, or (at your option) any later version. |
8 | 8 | ||
9 | This library is distributed in the hope that it will be useful, | 9 | This library is distributed in the hope that it will be useful, |
10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
12 | Library General Public License for more details. | 12 | Library General Public License for more details. |
13 | 13 | ||
14 | You should have received a copy of the GNU Library General Public License | 14 | You should have received a copy of the GNU Library General Public License |
15 | along with this library; see the file COPYING.LIB. If not, write to | 15 | along with this library; see the file COPYING.LIB. If not, write to |
16 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 16 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
17 | Boston, MA 02111-1307, USA. | 17 | Boston, MA 02111-1307, USA. |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #ifndef THREADUTIL_H | 20 | #ifndef THREADUTIL_H |
21 | #define THREADUTIL_H | 21 | #define THREADUTIL_H |
22 | 22 | ||
23 | #include <qvaluelist.h> | 23 | #include <qvaluelist.h> |
24 | #include <qobject.h> | 24 | #include <qobject.h> |
25 | #include <qguardedptr.h> | 25 | #include <qguardedptr.h> |
26 | 26 | ||
27 | class QSocketNotifier; | 27 | class QSocketNotifier; |
28 | 28 | ||
29 | extern "C" | ||
30 | { | ||
31 | void *_threadutil_start_thread( void* ); | ||
32 | void _threadutil_terminate_thread( void* ); | ||
33 | } | ||
34 | |||
29 | namespace ThreadUtil | 35 | namespace ThreadUtil |
30 | { | 36 | { |
31 | 37 | ||
32 | class Mutex | 38 | class Mutex |
33 | { | 39 | { |
34 | friend class WaitCondition; | 40 | friend class WaitCondition; |
35 | public: | 41 | public: |
36 | Mutex(); | 42 | Mutex(); |
37 | ~Mutex(); | 43 | ~Mutex(); |
38 | 44 | ||
39 | void lock(); | 45 | void lock(); |
40 | void unlock(); | 46 | void unlock(); |
41 | bool tryLock(); | 47 | bool tryLock(); |
42 | bool isLocked(); | 48 | bool isLocked(); |
43 | 49 | ||
44 | private: | 50 | private: |
45 | struct Data; | 51 | struct Data; |
46 | Data *d; | 52 | Data *d; |
47 | 53 | ||
48 | Mutex( const Mutex & ); | 54 | Mutex( const Mutex & ); |
49 | Mutex &operator=( const Mutex & ); | 55 | Mutex &operator=( const Mutex & ); |
50 | }; | 56 | }; |
51 | 57 | ||
52 | class AutoLock | 58 | class AutoLock |
@@ -60,48 +66,70 @@ namespace ThreadUtil | |||
60 | private: | 66 | private: |
61 | Mutex &m_mutex; | 67 | Mutex &m_mutex; |
62 | }; | 68 | }; |
63 | 69 | ||
64 | class WaitCondition | 70 | class WaitCondition |
65 | { | 71 | { |
66 | public: | 72 | public: |
67 | WaitCondition(); | 73 | WaitCondition(); |
68 | ~WaitCondition(); | 74 | ~WaitCondition(); |
69 | 75 | ||
70 | bool wait(); | 76 | bool wait(); |
71 | bool wait( Mutex &mutex ); | 77 | bool wait( Mutex &mutex ); |
72 | 78 | ||
73 | void wakeOne(); | 79 | void wakeOne(); |
74 | void wakeAll(); | 80 | void wakeAll(); |
75 | 81 | ||
76 | private: | 82 | private: |
77 | struct Data; | 83 | struct Data; |
78 | Data *d; | 84 | Data *d; |
79 | 85 | ||
80 | WaitCondition( const WaitCondition & ); | 86 | WaitCondition( const WaitCondition & ); |
81 | WaitCondition &operator=( const WaitCondition & ); | 87 | WaitCondition &operator=( const WaitCondition & ); |
82 | }; | 88 | }; |
83 | 89 | ||
90 | class Thread | ||
91 | { | ||
92 | friend void *::_threadutil_start_thread( void* ); | ||
93 | friend void ::_threadutil_terminate_thread( void* ); | ||
94 | public: | ||
95 | Thread(); | ||
96 | virtual ~Thread(); | ||
97 | |||
98 | void start(); | ||
99 | void terminate(); | ||
100 | |||
101 | bool wait(); | ||
102 | |||
103 | static void exit(); | ||
104 | protected: | ||
105 | virtual void run() = 0; | ||
106 | |||
107 | private: | ||
108 | struct Data; | ||
109 | Data *d; | ||
110 | }; | ||
111 | |||
84 | class OnewayNotifier : public QObject | 112 | class OnewayNotifier : public QObject |
85 | { | 113 | { |
86 | Q_OBJECT | 114 | Q_OBJECT |
87 | public: | 115 | public: |
88 | OnewayNotifier(); | 116 | OnewayNotifier(); |
89 | ~OnewayNotifier(); | 117 | ~OnewayNotifier(); |
90 | 118 | ||
91 | void notify(); | 119 | void notify(); |
92 | 120 | ||
93 | signals: | 121 | signals: |
94 | void awake(); | 122 | void awake(); |
95 | 123 | ||
96 | private slots: | 124 | private slots: |
97 | void wakeUp(); | 125 | void wakeUp(); |
98 | 126 | ||
99 | private: | 127 | private: |
100 | int m_readFd; | 128 | int m_readFd; |
101 | int m_writeFd; | 129 | int m_writeFd; |
102 | QSocketNotifier *m_notifier; | 130 | QSocketNotifier *m_notifier; |
103 | }; | 131 | }; |
104 | 132 | ||
105 | 133 | ||
106 | class Channel; | 134 | class Channel; |
107 | 135 | ||