feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Rename JobRequest::Requirements to ExpirationsReasons

Browse Source 
...to avoid ambiguity in regard to a new enum in a follow-up change.

Change-Id: I4f732b5200ed674b6708510ac8de0a795afe52da
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Nikolai Kosjar
2017-06-01 16:18:58 +02:00
parent e8ce2e62d2
commit de5cbacae5
7 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/tools/clangbackend/ipcsource/clangjobqueue.cpp
View File

@@ -66,20 +66,20 @@ int JobQueue::size() const
JobRequests JobQueue::processQueue()
{
removeOutDatedRequests();
removeExpiredRequests();
prioritizeRequests();
const JobRequests jobsToRun = takeJobRequestsToRunNow();
return jobsToRun;
}
void JobQueue::removeOutDatedRequests()
void JobQueue::removeExpiredRequests()
{
JobRequests cleanedRequests;
foreach (const JobRequest &jobRequest, m_queue) {
try {
if (!isJobRequestOutDated(jobRequest))
if (!isJobRequestExpired(jobRequest))
cleanedRequests.append(jobRequest);
} catch (const std::exception &exception) {
qWarning() << "Error in Jobs::removeOutDatedRequests for"
@@ -90,12 +90,12 @@ void JobQueue::removeOutDatedRequests()
m_queue = cleanedRequests;
}
bool JobQueue::isJobRequestOutDated(const JobRequest &jobRequest) const
bool JobQueue::isJobRequestExpired(const JobRequest &jobRequest) const
{
const JobRequest::Requirements requirements = jobRequest.requirements;
const JobRequest::ExpirationReasons expirationReasons = jobRequest.expirationReasons;
const UnsavedFiles unsavedFiles = m_documents.unsavedFiles();
if (requirements.testFlag(JobRequest::CurrentUnsavedFiles)) {
if (expirationReasons.testFlag(JobRequest::UnsavedFilesChanged)) {
if (jobRequest.unsavedFilesChangeTimePoint != unsavedFiles.lastChangeTimePoint()) {
qCDebug(jobsLog) << "Removing due to outdated unsaved files:" << jobRequest;
return true;
@@ -104,7 +104,7 @@ bool JobQueue::isJobRequestOutDated(const JobRequest &jobRequest) const
bool projectCheckedAndItExists = false;
if (requirements.testFlag(JobRequest::DocumentValid)) {
if (expirationReasons.testFlag(JobRequest::DocumentClosed)) {
if (!m_documents.hasDocument(jobRequest.filePath, jobRequest.projectPartId)) {
qCDebug(jobsLog) << "Removing due to already closed document:" << jobRequest;
return true;
@@ -123,7 +123,7 @@ bool JobQueue::isJobRequestOutDated(const JobRequest &jobRequest) const
return true;
}
if (requirements.testFlag(JobRequest::CurrentDocumentRevision)) {
if (expirationReasons.testFlag(JobRequest::DocumentRevisionChanged)) {
if (document.documentRevision() != jobRequest.documentRevision) {
qCDebug(jobsLog) << "Removing due to changed document revision:" << jobRequest;
return true;
@@ -131,7 +131,7 @@ bool JobQueue::isJobRequestOutDated(const JobRequest &jobRequest) const
}
}
if (requirements.testFlag(JobRequest::CurrentProject)) {
if (expirationReasons.testFlag(JobRequest::ProjectChanged)) {
if (!projectCheckedAndItExists && !m_projectParts.hasProjectPart(jobRequest.projectPartId)) {
qCDebug(jobsLog) << "Removing due to already closed project:" << jobRequest;
return true;