napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libcalamares] Compute length of JobQueue just once

Browse Source 
- Calculate the length once at the start -- this is because
   future work will modify the queue rather than just iterating
   over it.
 - Describe the slightly-surprising progress-percentage calculation.
This commit is contained in:
Adriaan de Groot 2019-06-15 13:38:51 +02:00
parent 2cffe2ec1a
commit 1962bbf08d
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libcalamares/JobQueue.cpp
View File

@ -40,6 +40,7 @@ public:
: QThread( queue ) : QThread( queue )
, m_queue( queue ) , m_queue( queue )
, m_jobIndex( 0 ) , m_jobIndex( 0 )
, m_jobCount( 0 )
{ {
} }
@ -48,6 +49,7 @@ public:
void setJobs( const JobList& jobs ) void setJobs( const JobList& jobs )
{ {
m_jobs = jobs; m_jobs = jobs;
m_jobCount = jobs.size();
} }
void run() override void run() override
@ -89,6 +91,7 @@ private:
JobList m_jobs; JobList m_jobs;
JobQueue* m_queue; JobQueue* m_queue;
int m_jobIndex; int m_jobIndex;
int m_jobCount;
void emitProgress( qreal jobPercent = 0 ) void emitProgress( qreal jobPercent = 0 )
{ {
@ -96,12 +99,14 @@ private:
// percentage computations. // percentage computations.
jobPercent = qBound( qreal( 0 ), jobPercent, qreal( 1 ) ); jobPercent = qBound( qreal( 0 ), jobPercent, qreal( 1 ) );
int jobCount = m_jobs.size(); QString message = m_jobIndex < m_jobCount
QString message = m_jobIndex < jobCount
? m_jobs.at( m_jobIndex )->prettyStatusMessage() ? m_jobs.at( m_jobIndex )->prettyStatusMessage()
: tr( "Done" ); : tr( "Done" );
qreal percent = ( m_jobIndex + jobPercent ) / qreal( jobCount ); // Gives a result in the range [ m_jobIndex .. m_jobIndex + 1.0 ] / jobCount,
// so when first job (index 0) completes, we're at 1/jobCount of the work
// (and the last job has index jobCount-1, so jobCount-1 + 1.0 / jobCount, or 100%)
qreal percent = ( m_jobIndex + jobPercent ) / qreal( m_jobCount );
QMetaObject::invokeMethod( m_queue, "progress", Qt::QueuedConnection, QMetaObject::invokeMethod( m_queue, "progress", Qt::QueuedConnection,
Q_ARG( qreal, percent ), Q_ARG( qreal, percent ),