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

C++: do not run GC when exiting.

Browse Source 
This operation is quite costly if a lot of files are involved, and in
case of exiting Creator, it's also useless.

Change-Id: I97d178d47a3a2f6b214f7ebc45c871edd26b8286
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Erik Verbruggen
2013-04-19 16:56:12 +02:00
parent 564c9b2842
commit cd581ecd0b
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -626,6 +626,7 @@ CppModelManager *CppModelManager::instance()
CppModelManager::CppModelManager(QObject *parent) CppModelManager::CppModelManager(QObject *parent)
: CppModelManagerInterface(parent) : CppModelManagerInterface(parent)
, m_enableGC(true)
, m_completionAssistProvider(0) , m_completionAssistProvider(0)
, m_highlightingFactory(0) , m_highlightingFactory(0)
, m_indexingSupporter(0) , m_indexingSupporter(0)
@@ -656,6 +657,9 @@ CppModelManager::CppModelManager(QObject *parent)
connect(session, SIGNAL(aboutToUnloadSession(QString)), connect(session, SIGNAL(aboutToUnloadSession(QString)),
this, SLOT(onAboutToUnloadSession())); this, SLOT(onAboutToUnloadSession()));
connect(Core::ICore::instance(), SIGNAL(coreAboutToClose()),
this, SLOT(onCoreAboutToClose()));
qRegisterMetaType<CPlusPlus::Document::Ptr>("CPlusPlus::Document::Ptr"); qRegisterMetaType<CPlusPlus::Document::Ptr>("CPlusPlus::Document::Ptr");
// thread connections // thread connections
@@ -1209,8 +1213,16 @@ void CppModelManager::onAboutToUnloadSession()
GC(); GC();
} }
void CppModelManager::onCoreAboutToClose()
{
m_enableGC = false;
}
void CppModelManager::GC() void CppModelManager::GC()
{ {
if (!m_enableGC)
return;
Snapshot currentSnapshot = snapshot(); Snapshot currentSnapshot = snapshot();
QSet<QString> processed; QSet<QString> processed;
QStringList todo = projectFiles(); QStringList todo = projectFiles();

2
src/plugins/cpptools/cppmodelmanager.h
View File

@@ -171,6 +171,7 @@ private Q_SLOTS:
void onExtraDiagnosticsUpdated(const QString &fileName); void onExtraDiagnosticsUpdated(const QString &fileName);
void onAboutToRemoveProject(ProjectExplorer::Project *project); void onAboutToRemoveProject(ProjectExplorer::Project *project);
void onAboutToUnloadSession(); void onAboutToUnloadSession();
void onCoreAboutToClose();
void onProjectAdded(ProjectExplorer::Project *project); void onProjectAdded(ProjectExplorer::Project *project);
void postEditorUpdate(); void postEditorUpdate();
void updateEditorSelections(); void updateEditorSelections();
@@ -195,6 +196,7 @@ private:
private: private:
CPlusPlus::Snapshot m_snapshot; CPlusPlus::Snapshot m_snapshot;
bool m_enableGC;
// cache // cache
bool m_dirty; bool m_dirty;