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

Clang: Fix canceling of clang query

Browse Source 
Every AST unit is created and queried asynchronously, like before, but
we don't wait anymore but use a timer to process new sources. So the server
will not be blocked and can process other messages like cancel.

Change-Id: If0e69466c78f628190f59fd32a03cab1c3a4d0a3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2017-06-26 14:00:32 +02:00
committed by Tim Jenssen
parent a30a18177b
commit f5d68398d5
10 changed files with 645 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/tools/clangrefactoringbackend/source/refactoringserver.h
View File

@@ -25,9 +25,12 @@
#pragma once
#include "clangquerygatherer.h"
#include <refactoringserverinterface.h>
#include <future>
#include <QTimer>
#include <vector>
namespace ClangBackEnd {
@@ -51,18 +54,19 @@ public:
bool isCancelingJobs() const;
void supersedePollEventLoop(std::function<void()> &&pollEventLoop);
void pollSourceRangesAndDiagnosticsForQueryMessages();
void waitThatSourceRangesAndDiagnosticsForQueryMessagesAreFinished();
bool pollTimerIsActive() const;
private:
void gatherSourceRangesAndDiagnosticsForQueryMessage(std::vector<V2::FileContainer> &&sources,
std::vector<V2::FileContainer> &&unsaved,
Utils::SmallString &&query);
std::size_t waitForNewSourceRangesAndDiagnosticsForQueryMessage(std::vector<Future> &futures);
void gatherSourceRangesAndDiagnosticsForQueryMessages(std::vector<V2::FileContainer> &&sources,
std::vector<V2::FileContainer> &&unsaved,
Utils::SmallString &&query);
private:
std::function<void()> pollEventLoop;
std::atomic_bool cancelWork{false};
ClangQueryGatherer m_gatherer;
QTimer m_pollTimer;
};
} // namespace ClangBackEnd