mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-12 17:14:00 +02:00
Code Issues Releases Wiki Activity

Readability++, Comments++

Browse Source
This commit is contained in:
Uwe L. Korn
2014-10-12 16:27:49 +01:00
parent b62a930962
commit cb373ca65c
1 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/libtomahawk/database/Database.cpp
View File

@@ -242,17 +242,38 @@ Database::enqueue( const Tomahawk::dbcmd_ptr& lc )
{ {
workerThread = m_workerThreads.at( i ); workerThread = m_workerThreads.at( i );
if ( workerThread && workerThread->worker() && !workerThread->worker()->busy() ) if ( !workerThread || !workerThread->worker() )
{ {
// We have no valid worker for the current thread so skip it.
continue;
}
if ( !workerThread->worker()->busy() )
{
// Case 1: We have a workerThread with no outstanding jobs.
// As this is the optimal situation we do not need to look at
// the other workers.
happyWorker = workerThread->worker(); happyWorker = workerThread->worker();
break; break;
} }
else
{
busyThreads++; busyThreads++;
if ( ( !happyWorker && workerThread && workerThread->worker() ) || if ( !happyWorker )
( workerThread && workerThread->worker() && workerThread->worker()->outstandingJobs() < happyWorker->outstandingJobs() ) ) {
// Case 2: We have not yet got a happyWorker but the current
// workerThread has a worker so use it as a fallback.
happyWorker = workerThread->worker(); happyWorker = workerThread->worker();
} }
else if ( workerThread->worker()->outstandingJobs() < happyWorker->outstandingJobs() )
{
// Case 3: We have a worker and the current worker is less busy
// than the previous minimum.
happyWorker = workerThread->worker();
}
}
}
tDebug( LOGVERBOSE ) << "Enqueueing command to thread:" << happyWorker << busyThreads << lc->commandname(); tDebug( LOGVERBOSE ) << "Enqueueing command to thread:" << happyWorker << busyThreads << lc->commandname();
Q_ASSERT( happyWorker ); Q_ASSERT( happyWorker );