Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-10-29 19:42:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reuse loaded file contents in indexer; clear large state before caching.

Browse Source
This commit is contained in:
Jacob Dufault 2017-07-30 11:31:41 -07:00
parent 85f3c00376
commit 1f3f69b221
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/command_line.cc
View File

@ -834,6 +834,8 @@ struct CacheManager {
} }
std::shared_ptr<Entry> UpdateAndReturnOldFile(std::shared_ptr<Entry> entry) { std::shared_ptr<Entry> UpdateAndReturnOldFile(std::shared_ptr<Entry> entry) {
entry->file->ClearLargeState();
const auto it = files_.find(entry->file->path); const auto it = files_.find(entry->file->path);
if (it != files_.end()) { if (it != files_.end()) {
std::shared_ptr<Entry> old = std::move(it->second); std::shared_ptr<Entry> old = std::move(it->second);
@ -895,7 +897,6 @@ bool IndexMain_DoIndex(Config* config,
} }
assert(current_index); assert(current_index);
// assert(previous_index);
// TODO: get real value for is_interactive // TODO: get real value for is_interactive
Index_DoIdMap response(std::move(current_index), request->perf, Index_DoIdMap response(std::move(current_index), request->perf,
@ -1162,6 +1163,10 @@ std::vector<IndexProcess_Response> DoParseFile(
// //
// We do this to minimize the race between indexing a file and capturing the // We do this to minimize the race between indexing a file and capturing the
// file contents. // file contents.
//
// TODO: We might be able to optimize perf by only copying for files in
// working_files. We can pass that same set of files to the indexer as
// well. We then default to a fast file-copy if not in working set.
std::vector<FileContents> file_contents; std::vector<FileContents> file_contents;
for (const auto& it : cache_loader->caches) { for (const auto& it : cache_loader->caches) {
const std::unique_ptr<IndexFile>& index = it.second; const std::unique_ptr<IndexFile>& index = it.second;

7
src/indexer.cc
View File

@ -356,6 +356,10 @@ std::string IndexFile::ToString() {
return Serialize(*this); return Serialize(*this);
} }
void IndexFile::ClearLargeState() {
file_contents_ = "";
}
IndexType::IndexType(IndexTypeId id, const std::string& usr) IndexType::IndexType(IndexTypeId id, const std::string& usr)
: def(usr), id(id) { : def(usr), id(id) {
assert(usr.size() > 0); assert(usr.size() > 0);
@ -1603,6 +1607,9 @@ std::vector<std::unique_ptr<IndexFile>> Parse(
FileConsumer file_consumer(file_consumer_shared, file); FileConsumer file_consumer(file_consumer_shared, file);
IndexParam param(&tu, &file_consumer); IndexParam param(&tu, &file_consumer);
for (const FileContents& contents : file_contents) {
param.file_contents[contents.path] = contents.content;
}
CXFile cx_file = clang_getFile(tu.cx_tu, file.c_str()); CXFile cx_file = clang_getFile(tu.cx_tu, file.c_str());
param.primary_file = ConsumeFile(&param, cx_file); param.primary_file = ConsumeFile(&param, cx_file);

1
src/indexer.h
View File

@ -498,6 +498,7 @@ struct IndexFile {
IndexVar* Resolve(IndexVarId id); IndexVar* Resolve(IndexVarId id);
std::string ToString(); std::string ToString();
void ClearLargeState();
}; };
struct FileContents { struct FileContents {