CppTools: Introduce LocatorData

Until now the locator filters CppLocatorFilter, CppClassesFilter and
CppFunctionsFilter used unnecessarily their own SearchSymbols instance.
The results were also saved separately, which was unfavorable since e.g.
the functions and classes data could be shared.

Starting with this patch an instance of LocatorData will serve all
mentioned filters.

This saves about 20MB of memory after indexing the Qt Creator project.

Change-Id: I8a34b67eb9fe0e5c68ba6e7c8f576389c78efc6f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2013-08-23 15:07:19 +02:00
committed by Erik Verbruggen
parent de1ec22424
commit fc731a3a67
14 changed files with 318 additions and 130 deletions

View File

@@ -0,0 +1,87 @@
/****************************************************************************
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#ifndef CPPLOCATORDATA_H
#define CPPLOCATORDATA_H
#include <QHash>
#include <QVector>
#include <cplusplus/CppDocument.h>
#include "cppmodelmanager.h"
#include "searchsymbols.h"
namespace CppTools {
namespace Internal {
class CppLocatorData : public QObject
{
Q_OBJECT
public:
explicit CppLocatorData(CppModelManager *modelManager);
QList<ModelItemInfo> enums();
QList<ModelItemInfo> classes();
QList<ModelItemInfo> functions();
private slots:
void onDocumentUpdated(const CPlusPlus::Document::Ptr &document);
void onAboutToRemoveFiles(const QStringList &files);
private:
void flushPendingDocument(bool force);
QList<ModelItemInfo> allModelItemInfos(const QHash<QString,
QList<ModelItemInfo> > &items) const;
QString findOrInsertFilePath(const QString &path)
{ return *m_filePaths.insert(path); }
void removeFilePath(const QString &path)
{ m_filePaths.remove(path); }
private:
CppModelManager *m_modelManager;
QSet<QString> m_filePaths; // Used to avoid QString duplication
SearchSymbols m_search;
QHash<QString, QList<ModelItemInfo> > m_allEnums;
QHash<QString, QList<ModelItemInfo> > m_allClasses;
QHash<QString, QList<ModelItemInfo> > m_allFunctions;
mutable QMutex m_pendingDocumentsMutex;
QVector<CPlusPlus::Document::Ptr> m_pendingDocuments;
};
} // namespace Internal
} // namespace CppTools
#endif // CPPLOCATORDATA_H