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

[libcalamares] Destroy jobs once they have run

Browse Source
This commit is contained in:
Adriaan de Groot 2019-06-15 17:42:47 +02:00
parent 1962bbf08d
commit 5c6c67a974
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libcalamares/JobQueue.cpp
View File

@ -46,10 +46,10 @@ public:
virtual ~JobThread() override; virtual ~JobThread() override;
void setJobs( const JobList& jobs ) void setJobs( JobList&& jobs )
{ {
m_jobs = jobs; m_jobs = jobs;
m_jobCount = jobs.size(); m_jobCount = jobs.count();
} }
void run() override void run() override
@ -59,16 +59,18 @@ public:
QString details; QString details;
m_jobIndex = 0; m_jobIndex = 0;
for( auto job : m_jobs ) while ( !m_jobs.isEmpty() )
{ {
auto job = m_jobs.takeFirst();
if ( anyFailed && !job->isEmergency() ) if ( anyFailed && !job->isEmergency() )
{ {
cDebug() << "Skipping non-emergency job" << job->prettyName(); cDebug() << "Skipping non-emergency job" << job->prettyName();
job.clear();
continue; continue;
} }
emitProgress(); emitProgress();
cDebug() << "Starting" << ( anyFailed ? "EMERGENCY JOB" : "job" ) << job->prettyName(); cDebug() << "Starting" << ( anyFailed ? "EMERGENCY JOB" : "job" ) << job->prettyName() << " (there are" << m_jobs.count() << " left)";
connect( job.data(), &Job::progress, this, &JobThread::emitProgress ); connect( job.data(), &Job::progress, this, &JobThread::emitProgress );
JobResult result = job->exec(); JobResult result = job->exec();
if ( !anyFailed && !result ) if ( !anyFailed && !result )
@ -79,6 +81,7 @@ public:
} }
if ( !anyFailed ) if ( !anyFailed )
++m_jobIndex; ++m_jobIndex;
job.clear();
} }
if ( anyFailed ) if ( anyFailed )
emitFailed( message, details ); emitFailed( message, details );
@ -178,7 +181,7 @@ void
JobQueue::start() JobQueue::start()
{ {
Q_ASSERT( !m_thread->isRunning() ); Q_ASSERT( !m_thread->isRunning() );
m_thread->setJobs( m_jobs ); m_thread->setJobs( std::move( m_jobs ) );
m_jobs.clear(); m_jobs.clear();
m_thread->start(); m_thread->start();
} }