Martchus
/
arch-repo-manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do enable staging in the current batch when processing the very first package 

Likely not really relevant because the function should only be called when
processing the 2nd or further packages. However, this way it seems a little
bit less error prone.
This commit is contained in:
Martchus 2021-02-13 12:52:54 +01:00
parent b556c39cd7
commit 97001740e2
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
librepomgr/buildactions/buildactionprivate.h
View File

@ -510,7 +510,7 @@ struct LIBREPOMGR_EXPORT BatchProcessingSession : public MultiSession<std::strin
private:
const std::unordered_set<std::string_view> &m_relevantPackages;
std::mutex m_mutex;
std::vector<std::vector<std::string>>::iterator m_batchIterator, m_batchEnd;
std::vector<std::vector<std::string>>::iterator m_batchBegin, m_batchIterator, m_batchEnd;
std::vector<std::string>::iterator m_packageIterator, m_packageEnd;
bool m_skipBatchesAfterFailure;
bool m_hasFailuresInPreviousBatches;

5
librepomgr/buildactions/conductbuild.cpp
View File

@ -75,6 +75,7 @@ BatchProcessingSession::BatchProcessingSession(const std::unordered_set<string_v
bool skipBatchesAfterFailure)
: MultiSession<std::string>(ioContext, std::move(handler))
, m_relevantPackages(relevantPackages)
, m_batchBegin(batches.begin())
, m_batchIterator(batches.begin())
, m_batchEnd(batches.end())
, m_packageIterator(m_batchIterator != m_batchEnd ? m_batchIterator->begin() : decltype(m_packageIterator)())
@ -168,7 +169,7 @@ const std::string *BatchProcessingSession::getCurrentPackageNameIfValidAndReleva
/*!
* \brief
* Enables staging for the next batch. Enables staging for the current batch if the current package is the first package of
* current batch.
* current batch and the current batch is not the first batch.
* \remarks
* - The behavior regarding the current batch was chosen because we call selectNextPackage() *before* enableStagingInNextBatch().
* - This function might be called from multiple threads at the same time.
@ -178,7 +179,7 @@ void BatchProcessingSession::enableStagingInNextBatch()
m_enableStagingInNextBatch = true;
if (!m_stagingEnabled) {
std::lock_guard<std::mutex> lock(m_mutex);
m_stagingEnabled = m_batchIterator != m_batchEnd && m_packageIterator == m_batchIterator->begin();
m_stagingEnabled = m_batchIterator != m_batchEnd && m_batchIterator != m_batchBegin && m_packageIterator == m_batchIterator->begin();
}
}