hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Do not busy wait when writing buffer in mixer

Browse Source
This commit is contained in:
Javier Serrano Polo
2016-07-02 21:57:55 +02:00
parent 46c2aa32ea
commit 8497d39eec
3 changed files with 17 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/Mixer.h
View File

@@ -409,7 +409,6 @@ private:
bool m_clearSignal;
bool m_changesSignal;
bool m_waitForMixer;
unsigned int m_changes;
QMutex m_changesMutex;
QMutex m_doChangesMutex;
@@ -417,6 +416,8 @@ private:
QWaitCondition m_changesMixerCondition;
QWaitCondition m_changesRequestCondition;
bool m_waitingForWrite;
friend class LmmsCore;
friend class MixerWorkerThread;

12
include/fifo_buffer.h
View File

@@ -57,18 +57,6 @@ public:
m_reader_sem.release();
}
bool tryWrite( T _element )
{
if( m_writer_sem.tryAcquire() )
{
m_buffer[m_writer_index++] = _element;
m_writer_index %= m_size;
m_reader_sem.release();
return true;
}
return false;
}
T read()
{
m_reader_sem.acquire();

31
src/core/Mixer.cpp
View File

@@ -84,9 +84,9 @@ Mixer::Mixer( bool renderOnly ) :
m_metronomeActive(false),
m_clearSignal( false ),
m_changesSignal( false ),
m_waitForMixer( true ),
m_changes( 0 ),
m_doChangesMutex( QMutex::Recursive )
m_doChangesMutex( QMutex::Recursive ),
m_waitingForWrite( false )
{
for( int i = 0; i < 2; ++i )
{
@@ -739,14 +739,13 @@ void Mixer::requestChangeInModel()
m_changesMutex.unlock();
m_doChangesMutex.lock();
if ( m_isProcessing && m_waitForMixer )
m_waitChangesMutex.lock();
if ( m_isProcessing && !m_waitingForWrite && !m_changesSignal )
{
m_waitForMixer = false;
m_waitChangesMutex.lock();
m_changesSignal = true;
m_changesRequestCondition.wait( &m_waitChangesMutex );
m_waitChangesMutex.unlock();
}
m_waitChangesMutex.unlock();
}
@@ -763,7 +762,6 @@ void Mixer::doneChangeInModel()
if( !moreChanges )
{
m_waitForMixer = true;
m_changesSignal = false;
m_changesMixerCondition.wakeOne();
}
@@ -1077,15 +1075,16 @@ void Mixer::fifoWriter::run()
void Mixer::fifoWriter::write( surroundSampleFrame * buffer )
{
while( !m_fifo->tryWrite( buffer ) )
{
if( m_mixer->m_changesSignal )
{
m_mixer->runChangesInModel();
continue;
}
yieldCurrentThread();
}
m_mixer->m_waitChangesMutex.lock();
m_mixer->m_waitingForWrite = true;
m_mixer->m_waitChangesMutex.unlock();
m_mixer->runChangesInModel();
m_fifo->write( buffer );
m_mixer->m_doChangesMutex.lock();
m_mixer->m_waitingForWrite = false;
m_mixer->m_doChangesMutex.unlock();
}