C++: put dependency table calculation into the future.

Task-number: QTCREATORBUG-2300

src/plugins/cpptools/cppfindreferences.cpp

@@ -181,12 +181,14 @@ QList<int> CppFindReferences::references(Symbol *symbol, const LookupContext &co
 static void find_helper(QFutureInterface<Usage> &future,
                         const CppTools::CppModelManagerInterface::WorkingCopy workingCopy,
                         const LookupContext context,
-                        const DependencyTable dependencyTable,
+                        CppFindReferences *findRefs,
                         Symbol *symbol)
 {
     const Identifier *symbolId = symbol->identifier();
     Q_ASSERT(symbolId != 0);
 
+    const Snapshot snapshot = context.snapshot();
+
     const QString sourceFile = QString::fromUtf8(symbol->fileName(), symbol->fileNameLength());
     QStringList files(sourceFile);
 
@@ -202,13 +204,14 @@ static void find_helper(QFutureInterface<Usage> &future,
                 files.append(doc->fileName());
         }
     } else {
+        DependencyTable dependencyTable = findRefs->updateDependencyTable(snapshot);
         files += dependencyTable.filesDependingOn(sourceFile);
     }
     files.removeDuplicates();
 
     future.setProgressRange(0, files.size());
 
-    ProcessFile process(workingCopy, context.snapshot(), context.thisDocument(), symbol);
+    ProcessFile process(workingCopy, snapshot, context.thisDocument(), symbol);
     UpdateUI reduce(&future);
 
     QtConcurrent::blockingMappedReduced<QList<Usage> > (files, process, reduce);
@@ -216,21 +219,6 @@ static void find_helper(QFutureInterface<Usage> &future,
     future.setProgressValue(files.size());
 }
 
-static CPlusPlus::DependencyTable dependencyTable(DependencyTable previous, const CPlusPlus::Snapshot &snapshot)
-{
-    if (previous.isValidFor(snapshot))
-        return previous;
-
-    DependencyTable table;
-    table.build(snapshot);
-    return table;
-}
-
-void CppFindReferences::updateDependencyTable()
-{
-    m_deps = dependencyTable(m_deps, _modelManager->snapshot());
-}
-
 void CppFindReferences::findUsages(CPlusPlus::Symbol *symbol, const CPlusPlus::LookupContext &context)
 {
     Find::SearchResult *search = _resultWindow->startNewSearch(Find::SearchResultWindow::SearchOnly);
@@ -272,11 +260,9 @@ void CppFindReferences::findAll_helper(Symbol *symbol, const LookupContext &cont
 
     Core::ProgressManager *progressManager = Core::ICore::instance()->progressManager();
 
-    updateDependencyTable(); // ensure the dependency table is updated
-
     QFuture<Usage> result;
 
-    result = QtConcurrent::run(&find_helper, workingCopy, context, m_deps, symbol);
+    result = QtConcurrent::run(&find_helper, workingCopy, context, this, symbol);
     m_watcher.setFuture(result);
 
     Core::FutureProgress *progress = progressManager->addTask(result, tr("Searching"),
@@ -396,14 +382,17 @@ public:
 } // end of anonymous namespace
 
 static void findMacroUses_helper(QFutureInterface<Usage> &future,
-                        const CppTools::CppModelManagerInterface::WorkingCopy workingCopy,
-                        const Snapshot snapshot,
-                        DependencyTable dependencyTable,
-                        const Macro macro)
+                                 const CppTools::CppModelManagerInterface::WorkingCopy workingCopy,
+                                 const Snapshot snapshot,
+                                 CppFindReferences *findRefs,
+                                 const Macro macro)
 {
+    // ensure the dependency table is updated
+    DependencyTable dependencies = findRefs->updateDependencyTable(snapshot);
+
     const QString& sourceFile = macro.fileName();
     QStringList files(sourceFile);
-    files += dependencyTable.filesDependingOn(sourceFile);
+    files += dependencies.filesDependingOn(sourceFile);
     files.removeDuplicates();
 
     future.setProgressRange(0, files.size());
@@ -425,7 +414,7 @@ void CppFindReferences::findMacroUses(const Macro &macro)
             this, SLOT(openEditor(Find::SearchResultItem)));
 
     const Snapshot snapshot = _modelManager->snapshot();
-    const CppTools::CppModelManagerInterface::WorkingCopy workingCopy = _modelManager->workingCopy();
+    const CppModelManagerInterface::WorkingCopy workingCopy = _modelManager->workingCopy();
 
     // add the macro definition itself
     {
@@ -435,10 +424,8 @@ void CppFindReferences::findMacroUses(const Macro &macro)
                                  source.mid(macro.offset(), macro.length()), 0, macro.length());
     }
 
-    updateDependencyTable(); // ensure the dependency table is updated
-
     QFuture<Usage> result;
-    result = QtConcurrent::run(&findMacroUses_helper, workingCopy, snapshot, m_deps, macro);
+    result = QtConcurrent::run(&findMacroUses_helper, workingCopy, snapshot, this, macro);
     m_watcher.setFuture(result);
 
     Core::ProgressManager *progressManager = Core::ICore::instance()->progressManager();
@@ -447,3 +434,28 @@ void CppFindReferences::findMacroUses(const Macro &macro)
     connect(progress, SIGNAL(clicked()), _resultWindow, SLOT(popup()));
 }
 
+DependencyTable CppFindReferences::updateDependencyTable(CPlusPlus::Snapshot snapshot)
+{
+    DependencyTable oldDeps = dependencyTable();
+    if (oldDeps.isValidFor(snapshot))
+        return oldDeps;
+
+    DependencyTable newDeps;
+    newDeps.build(snapshot);
+    setDependencyTable(newDeps);
+    return newDeps;
+}
+
+DependencyTable CppFindReferences::dependencyTable() const
+{
+    QMutexLocker locker(&m_depsLock);
+    Q_UNUSED(locker);
+    return m_deps;
+}
+
+void CppFindReferences::setDependencyTable(const CPlusPlus::DependencyTable &newTable)
+{
+    QMutexLocker locker(&m_depsLock);
+    Q_UNUSED(locker);
+    m_deps = newTable;
+}

src/plugins/cpptools/cppfindreferences.h

@@ -30,6 +30,7 @@
 #ifndef CPPFINDREFERENCES_H
 #define CPPFINDREFERENCES_H
 
+#include <QtCore/QMutex>
 #include <QtCore/QObject>
 #include <QtCore/QPointer>
 #include <QtCore/QFuture>
@@ -71,20 +72,25 @@ public:
 
     void findMacroUses(const CPlusPlus::Macro &macro);
 
+    CPlusPlus::DependencyTable updateDependencyTable(CPlusPlus::Snapshot snapshot);
+
 private Q_SLOTS:
     void displayResults(int first, int last);
     void searchFinished();
     void openEditor(const Find::SearchResultItem &item);
     void onReplaceButtonClicked(const QString &text, const QList<Find::SearchResultItem> &items);
-    void updateDependencyTable();
 
 private:
     void findAll_helper(CPlusPlus::Symbol *symbol, const CPlusPlus::LookupContext &context);
+    CPlusPlus::DependencyTable dependencyTable() const;
+    void setDependencyTable(const CPlusPlus::DependencyTable &newTable);
 
 private:
     QPointer<CppModelManagerInterface> _modelManager;
     Find::SearchResultWindow *_resultWindow;
     QFutureWatcher<CPlusPlus::Usage> m_watcher;
+
+    mutable QMutex m_depsLock;
     CPlusPlus::DependencyTable m_deps;
 };