mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-05-19 04:06:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

properly terminate worker-threads at mixer-destruction

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1230 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-06-30 16:52:10 +00:00
parent 1cfd589658
commit 5e77d6b547
1 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/core/mixer.cpp
View File

@@ -171,6 +171,10 @@ public:
m_jobQueue = _q;
}
virtual void quit( void )
{
m_quit = TRUE;
}
private:
virtual void run( void )
@@ -178,7 +182,7 @@ private:
sampleFrame * working_buf = (sampleFrame *) aligned_malloc(
m_mixer->framesPerPeriod() *
sizeof( sampleFrame ) );
while( 1 )
while( m_quit == FALSE )
{
m_queueReadySem->acquire();
for( jobQueueItems::iterator it =
@@ -231,6 +235,7 @@ private:
aligned_free( working_buf );
}
volatile bool m_quit;
mixer * m_mixer;
QSemaphore * m_queueReadySem;
QSemaphore * m_workersDoneSem;
@@ -240,6 +245,31 @@ private:
#define FILL_JOB_QUEUE(_jq,_vec_type,_vec,_job_type,_condition) \
for( _vec_type::iterator it = _vec.begin(); \
it != _vec.end(); ++it ) \
{ \
if( _condition ) \
{ \
_jq.items.push_back( \
mixerWorkerThread::jobQueueItem( _job_type, \
(void *)*it ) );\
} \
}
#define DISTRIBUTE_JOB_QUEUE(_jq) \
for( int i = 0; i < m_numWorkers; ++i ) \
{ \
m_workers[i]->setJobQueue( &_jq ); \
} \
m_queueReadySem.release( m_numWorkers ); \
#define WAIT_FOR_JOBS() \
m_workersDoneSem.acquire( m_numWorkers );
mixer::mixer( void ) :
m_framesPerPeriod( DEFAULT_BUFFER_SIZE ),
m_workingBuf( NULL ),
@@ -315,6 +345,19 @@ mixer::mixer( void ) :
mixer::~mixer()
{
if( m_multiThreaded )
{
// distribute an empty job-queue so that worker-threads
// get out of their processing-loop
mixerWorkerThread::jobQueue jq;
for( int w = 0; w < m_numWorkers; ++w )
{
m_workers[w]->quit();
DISTRIBUTE_JOB_QUEUE(jq);
m_workers[w]->wait();
}
}
while( m_fifo->available() )
{
delete[] m_fifo->read();
@@ -422,30 +465,6 @@ bool mixer::criticalXRuns( void ) const
#define FILL_JOB_QUEUE(_jq,_vec_type,_vec,_job_type,_condition) \
for( _vec_type::iterator it = _vec.begin(); \
it != _vec.end(); ++it ) \
{ \
if( _condition ) \
{ \
_jq.items.push_back( \
mixerWorkerThread::jobQueueItem( _job_type, \
(void *)*it ) );\
} \
}
#define DISTRIBUTE_JOB_QUEUE(_jq) \
for( int i = 0; i < m_numWorkers; ++i ) \
{ \
m_workers[i]->setJobQueue( &_jq ); \
} \
m_queueReadySem.release( m_numWorkers ); \
#define WAIT_FOR_JOBS() \
m_workersDoneSem.acquire( m_numWorkers );
const surroundSampleFrame * mixer::renderNextBuffer( void )
{
microTimer timer;