Clang: Connect alive timer

You had to set the no alive timer environment variable.

Change-Id: I1994087a68d8293963f9f48fa1632f7c6822b146
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2016-12-05 15:19:39 +01:00
parent cf885a138c
commit e8960b9bd3
3 changed files with 14 additions and 1 deletions

View File

@@ -73,6 +73,7 @@ bool ClangRefactoringPlugin::initialize(const QStringList & /*arguments*/, QStri
d.reset(new ClangRefactoringPluginData); d.reset(new ClangRefactoringPluginData);
d->refactoringClient.setRefactoringEngine(&d->engine); d->refactoringClient.setRefactoringEngine(&d->engine);
d->refactoringClient.setRefactoringConnectionClient(&d->connectionClient);
ExtensionSystem::PluginManager::addObject(&d->qtCreatorfindFilter); ExtensionSystem::PluginManager::addObject(&d->qtCreatorfindFilter);
connectBackend(); connectBackend();
@@ -89,6 +90,7 @@ void ClangRefactoringPlugin::extensionsInitialized()
ExtensionSystem::IPlugin::ShutdownFlag ClangRefactoringPlugin::aboutToShutdown() ExtensionSystem::IPlugin::ShutdownFlag ClangRefactoringPlugin::aboutToShutdown()
{ {
ExtensionSystem::PluginManager::removeObject(&d->qtCreatorfindFilter); ExtensionSystem::PluginManager::removeObject(&d->qtCreatorfindFilter);
d->refactoringClient.setRefactoringConnectionClient(nullptr);
d->refactoringClient.setRefactoringEngine(nullptr); d->refactoringClient.setRefactoringEngine(nullptr);
d.reset(); d.reset();

View File

@@ -25,6 +25,7 @@
#include "refactoringclient.h" #include "refactoringclient.h"
#include <refactoringconnectionclient.h>
#include <sourcelocationsforrenamingmessage.h> #include <sourcelocationsforrenamingmessage.h>
#include <sourcerangesanddiagnosticsforquerymessage.h> #include <sourcerangesanddiagnosticsforquerymessage.h>
@@ -32,7 +33,8 @@ namespace ClangRefactoring {
void RefactoringClient::alive() void RefactoringClient::alive()
{ {
if (connectionClient)
connectionClient->resetProcessAliveTimer();
} }
void RefactoringClient::sourceLocationsForRenamingMessage( void RefactoringClient::sourceLocationsForRenamingMessage(
@@ -96,6 +98,12 @@ uint RefactoringClient::resultCounter() const
return resultCounter_; return resultCounter_;
} }
void RefactoringClient::setRefactoringConnectionClient(
ClangBackEnd::RefactoringConnectionClient *connectionClient)
{
this->connectionClient = connectionClient;
}
namespace { namespace {
Utils::SmallString concatenateFilePath(const ClangBackEnd::FilePath &filePath) Utils::SmallString concatenateFilePath(const ClangBackEnd::FilePath &filePath)

View File

@@ -35,6 +35,7 @@
namespace ClangBackEnd { namespace ClangBackEnd {
class FilePath; class FilePath;
class RefactoringConnectionClient;
class SourceRangesContainer; class SourceRangesContainer;
class SourceRangeWithTextContainer; class SourceRangeWithTextContainer;
} }
@@ -65,6 +66,7 @@ public:
uint expectedResultCount() const; uint expectedResultCount() const;
uint resultCounter() const; uint resultCounter() const;
void setRefactoringConnectionClient(ClangBackEnd::RefactoringConnectionClient *connectionClient);
UNIT_TEST_PUBLIC: UNIT_TEST_PUBLIC:
void addSearchResult(const ClangBackEnd::SourceRangeWithTextContainer &sourceRange, void addSearchResult(const ClangBackEnd::SourceRangeWithTextContainer &sourceRange,
@@ -78,6 +80,7 @@ private:
private: private:
CppTools::RefactoringEngineInterface::RenameCallback localRenamingCallback; CppTools::RefactoringEngineInterface::RenameCallback localRenamingCallback;
ClangBackEnd::RefactoringConnectionClient *connectionClient = nullptr;
ClangRefactoring::SearchHandle *searchHandle_ = nullptr; ClangRefactoring::SearchHandle *searchHandle_ = nullptr;
ClangRefactoring::RefactoringEngine *refactoringEngine = nullptr; ClangRefactoring::RefactoringEngine *refactoringEngine = nullptr;
uint expectedResultCount_ = 0; uint expectedResultCount_ = 0;