fly/flightgear
1
0
Fork 0
Code Activity

From Benoit Laniel: replace SG threading constructs with OpenThreads

Browse source
This commit is contained in:
timoore 2008-06-12 08:24:39 +00:00
parent 0317d992b9
commit a9319336ba
4 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Environment/environment_ctrl.cxx
View file

@ -356,7 +356,8 @@ FGMetarEnvironmentCtrl::FGMetarEnvironmentCtrl ()
{
#if defined(ENABLE_THREADS)
thread = new MetarThread(this);
thread->start( 1 );
thread->setProcessorAffinity(1);
thread->start();
#endif // ENABLE_THREADS
}

4
src/Environment/environment_ctrl.hxx
View file

@ -32,7 +32,7 @@
#include <simgear/environment/metar.hxx>
#if defined(ENABLE_THREADS)
# include <simgear/threads/SGThread.hxx>
# include <OpenThreads/Thread>
# include <simgear/threads/SGQueue.hxx>
#endif
@ -233,7 +233,7 @@ private:
* This class represents the thread of execution responsible for
* fetching the metar data.
*/
class MetarThread : public SGThread
class MetarThread : public OpenThreads::Thread
{
public:
MetarThread( FGMetarEnvironmentCtrl* f ) : fetcher(f) {}

3
src/Sound/voice.cxx
View file

@ -71,7 +71,8 @@ void FGVoiceMgr::init()
}
#if defined(ENABLE_THREADS)
_thread->start(1);
_thread->setProcessorAffinity(1);
_thread->start();
#endif
}

13
src/Sound/voice.hxx
View file

@ -37,7 +37,10 @@
#include <Main/fg_props.hxx>
#if defined(ENABLE_THREADS)
# include <simgear/threads/SGThread.hxx>
# include <OpenThreads/Thread>
# include <OpenThreads/Mutex>
# include <OpenThreads/ScopedLock>
# include <OpenThreads/Condition>
# include <simgear/threads/SGQueue.hxx>
#else
# include <queue>
@ -74,16 +77,16 @@ private:
#if defined(ENABLE_THREADS)
class FGVoiceMgr::FGVoiceThread : public SGThread {
class FGVoiceMgr::FGVoiceThread : public OpenThreads::Thread {
public:
FGVoiceThread(FGVoiceMgr *mgr) : _mgr(mgr) {}
void run();
void wake_up() { _jobs.signal(); }
private:
void wait_for_jobs() { SGGuard<SGMutex> g(_mutex); _jobs.wait(_mutex); }
SGPthreadCond _jobs;
SGMutex _mutex;
void wait_for_jobs() { OpenThreads::ScopedLock<OpenThreads::Mutex> g(_mutex); _jobs.wait(&_mutex); }
OpenThreads::Condition _jobs;
OpenThreads::Mutex _mutex;
FGVoiceMgr *_mgr;
};
#endif