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

Fix job queue crash

Browse Source 
* Don't add jobs when job queue is full
* Icrease job queue size from 1024 to 8192
This commit is contained in:
Lukas W
2018-04-29 17:01:51 +02:00
parent fce9326192
commit ccd4ff3c2c
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/MixerWorkerThread.h
View File

@@ -62,7 +62,7 @@ public:
void wait();
private:
#define JOB_QUEUE_SIZE 1024
#define JOB_QUEUE_SIZE 8192
QAtomicPointer<ThreadableJob> m_items[JOB_QUEUE_SIZE];
AtomicInt m_queueSize;
AtomicInt m_itemsDone;

11
src/core/MixerWorkerThread.cpp
View File

@@ -25,6 +25,7 @@
#include "MixerWorkerThread.h"
#include "denormals.h"
#include <QDebug>
#include <QMutex>
#include <QWaitCondition>
#include "ThreadableJob.h"
@@ -54,7 +55,13 @@ void MixerWorkerThread::JobQueue::addJob( ThreadableJob * _job )
// update job state
_job->queue();
// actually queue the job via atomic operations
m_items[m_queueSize.fetchAndAddOrdered(1)] = _job;
auto index = m_queueSize.fetchAndAddOrdered(1);
if (index < JOB_QUEUE_SIZE) {
m_items[index] = _job;
} else {
qWarning() << "Job queue is full!";
m_itemsDone.fetchAndAddOrdered(1);
}
}
}
@@ -66,7 +73,7 @@ void MixerWorkerThread::JobQueue::run()
while( processedJob && (int) m_itemsDone < (int) m_queueSize )
{
processedJob = false;
for( int i = 0; i < m_queueSize; ++i )
for( int i = 0; i < m_queueSize && i < JOB_QUEUE_SIZE; ++i )
{
ThreadableJob * job = m_items[i].fetchAndStoreOrdered( NULL );
if( job )