Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-11-25 17:11:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better logging, add notes about a bug.

Browse Source
This commit is contained in:
Jacob Dufault 2017-09-14 00:22:06 -07:00
parent d6a8071da4
commit a06f730958
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/command_line.cc
View File

@ -925,7 +925,7 @@ std::vector<Index_DoIdMap> DoParseFile(
assert(!dependency.empty()); assert(!dependency.empty());
if (file_needs_parse(dependency) == FileParseQuery::NeedsParse) { if (file_needs_parse(dependency) == FileParseQuery::NeedsParse) {
LOG_S(INFO) << "Timestamp has changed for " << dependency; LOG_S(INFO) << "Timestamp has changed for " << dependency << " (via " << previous_index->path << ")";
needs_reparse = true; needs_reparse = true;
// SUBTLE: Do not break here, as |file_consumer_shared| is updated // SUBTLE: Do not break here, as |file_consumer_shared| is updated
// inside of |file_needs_parse|. // inside of |file_needs_parse|.
@ -945,13 +945,25 @@ std::vector<Index_DoIdMap> DoParseFile(
if (!file_consumer_shared->Mark(dependency)) if (!file_consumer_shared->Mark(dependency))
continue; continue;
LOG_S(INFO) << "Emitting index result for " << dependency; LOG_S(INFO) << "Emitting index result for " << dependency << " (via " << previous_index->path << ")";
result.push_back(Index_DoIdMap(cache_loader->TryTakeOrLoad(dependency), perf, is_interactive, false /*write_to_disk*/)); result.push_back(Index_DoIdMap(cache_loader->TryTakeOrLoad(dependency), perf, is_interactive, false /*write_to_disk*/));
} }
return result; return result;
} }
} }
// TODO: fix indexing issue.
// - threaded_queue.h timestamp change from command_line.cc (force repase)
// - threaded_queue.h timestamp change from clang_complete.cc (force reparse)
// - threaded_queue.h cached index emitted from ipc_manager (load cache)
//
// RESULT:
// - we indexed command_line.cc and clang_complete.cc but did not update threaded_queue.h
//
// Ideas:
// - find the set of changes, try to commit/lock those changes, redo logic if failed.
LOG_S(INFO) << "Parsing " << path; LOG_S(INFO) << "Parsing " << path;
// Load file contents for all dependencies into memory. If the dependencies // Load file contents for all dependencies into memory. If the dependencies
@ -1101,6 +1113,7 @@ bool IndexMain_DoCreateIndexUpdate(
// Write current index to disk if requested. // Write current index to disk if requested.
if (response->write_to_disk) { if (response->write_to_disk) {
LOG_S(INFO) << "Writing cached index to disk for " << response->current->file->path;
time.Reset(); time.Reset();
WriteToCache(config, *response->current->file); WriteToCache(config, *response->current->file);
response->perf.index_save_to_disk = time.ElapsedMicrosecondsAndReset(); response->perf.index_save_to_disk = time.ElapsedMicrosecondsAndReset();
@ -3048,7 +3061,9 @@ void LanguageServerMain(const std::string& bin_name, Config* config, MultiQueueW
int main(int argc, char** argv) { int main(int argc, char** argv) {
loguru::init(argc, argv); loguru::init(argc, argv);
loguru::add_file("cquery.log", loguru::Truncate, loguru::Verbosity_MAX);
loguru::g_flush_interval_ms = 0; loguru::g_flush_interval_ms = 0;
// loguru::g_stderr_verbosity = 1;
MultiQueueWaiter waiter; MultiQueueWaiter waiter;
IpcManager::CreateInstance(&waiter); IpcManager::CreateInstance(&waiter);

3
src/threaded_queue.h
View File

@ -9,6 +9,9 @@
#include <mutex> #include <mutex>
#include <condition_variable> #include <condition_variable>
using std::experimental::optional;
using std::experimental::nullopt;
// TODO: cleanup includes. // TODO: cleanup includes.
struct BaseThreadQueue { struct BaseThreadQueue {