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

Clang: Use document visibility as jobrequest conditions

Browse Source 
This is in preparation for a follow-up change that will add jobs that
also operate on invisible documents.

Change-Id: I2a0fc3b95cc5ab2e267429134a534df64c901376
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Nikolai Kosjar
2017-07-28 15:13:23 +02:00
parent 643854cb8b
commit c2cfc62f08
4 changed files with 42 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -174,6 +174,38 @@ void JobQueue::prioritizeRequests()
std::stable_sort(m_queue.begin(), m_queue.end(), lessThan);
}
static bool passesPreconditions(const JobRequest &request, const Document &document)
{
using Condition = JobRequest::Condition;
const JobRequest::Conditions conditions = request.conditions;
if (conditions.testFlag(Condition::DocumentVisible) && !document.isVisibleInEditor()) {
qCDebug(jobsLog) << "Not choosing due to invisble document:" << request;
return false;
}
if (conditions.testFlag(Condition::DocumentNotVisible) && document.isVisibleInEditor()) {
qCDebug(jobsLog) << "Not choosing due to visble document:" << request;
return false;
}
if (conditions.testFlag(Condition::CurrentDocumentRevision)) {
if (document.isDirty()) {
// TODO: If the document is dirty due to a project update,
// references are processes later than ideal.
qCDebug(jobsLog) << "Not choosing due to dirty document:" << request;
return false;
}
if (request.documentRevision != document.documentRevision()) {
qCDebug(jobsLog) << "Not choosing due to revision mismatch:" << request;
return false;
}
}
return true;
}
JobRequests JobQueue::takeJobRequestsToRunNow()
{
JobRequests jobsToRun;
@@ -188,7 +220,7 @@ JobRequests JobQueue::takeJobRequestsToRunNow()
const Document &document = m_documents.document(request.filePath,
request.projectPartId);
if (!document.isUsedByCurrentEditor() && !document.isVisibleInEditor())
if (!passesPreconditions(request, document))
continue;
const Utf8String id = document.translationUnit(request.preferredTranslationUnit).id();
@@ -198,20 +230,6 @@ JobRequests JobQueue::takeJobRequestsToRunNow()
if (isJobRunningForTranslationUnit(id))
continue;
if (request.conditions.testFlag(JobRequest::Condition::CurrentDocumentRevision)) {
if (document.isDirty()) {
// TODO: If the document is dirty due to a project update,
// references are processes later than ideal.
qCDebug(jobsLog) << "Not choosing due to dirty document:" << request;
continue;
}
if (request.documentRevision != document.documentRevision()) {
qCDebug(jobsLog) << "Not choosing due to revision mismatch:" << request;
continue;
}
}
translationUnitsScheduledForThisRun.insert(id);
jobsToRun += request;
i.remove();