From b6071004df1f4baf253ba64522484d00b2150d6d Mon Sep 17 00:00:00 2001 From: Jacob Dufault Date: Fri, 29 Dec 2017 09:56:34 -0600 Subject: [PATCH] Rename IndexMain to Indexer_Main --- src/import_pipeline.cc | 16 ++++++++-------- src/import_pipeline.h | 16 ++++++++-------- src/messages/initialize.cc | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/import_pipeline.cc b/src/import_pipeline.cc index dffd5b03..1c67d5ef 100644 --- a/src/import_pipeline.cc +++ b/src/import_pipeline.cc @@ -436,14 +436,14 @@ bool IndexMergeIndexUpdates() { } } -void IndexMain(Config* config, - FileConsumer::SharedState* file_consumer_shared, - TimestampManager* timestamp_manager, - ImportManager* import_manager, - ImportPipelineStatus* status, - Project* project, - WorkingFiles* working_files, - MultiQueueWaiter* waiter) { +void Indexer_Main(Config* config, + FileConsumer::SharedState* file_consumer_shared, + TimestampManager* timestamp_manager, + ImportManager* import_manager, + ImportPipelineStatus* status, + Project* project, + WorkingFiles* working_files, + MultiQueueWaiter* waiter) { auto* queue = QueueManager::instance(); // Build one index per-indexer, as building the index acquires a global lock. ClangIndex index; diff --git a/src/import_pipeline.h b/src/import_pipeline.h index 9789e790..314b91b5 100644 --- a/src/import_pipeline.h +++ b/src/import_pipeline.h @@ -29,14 +29,14 @@ void IndexWithTuFromCodeCompletion( const std::string& path, const std::vector& args); -void IndexMain(Config* config, - FileConsumer::SharedState* file_consumer_shared, - TimestampManager* timestamp_manager, - ImportManager* import_manager, - ImportPipelineStatus* status, - Project* project, - WorkingFiles* working_files, - MultiQueueWaiter* waiter); +void Indexer_Main(Config* config, + FileConsumer::SharedState* file_consumer_shared, + TimestampManager* timestamp_manager, + ImportManager* import_manager, + ImportPipelineStatus* status, + Project* project, + WorkingFiles* working_files, + MultiQueueWaiter* waiter); bool QueryDb_ImportMain(Config* config, QueryDatabase* db, diff --git a/src/messages/initialize.cc b/src/messages/initialize.cc index 42df24a7..abc24111 100644 --- a/src/messages/initialize.cc +++ b/src/messages/initialize.cc @@ -173,7 +173,7 @@ struct InitializeHandler : BaseMessageHandler { LOG_S(INFO) << "Starting " << config->indexerCount << " indexers"; for (int i = 0; i < config->indexerCount; ++i) { WorkThread::StartThread("indexer" + std::to_string(i), [=]() { - IndexMain(config, file_consumer_shared, timestamp_manager, + Indexer_Main(config, file_consumer_shared, timestamp_manager, import_manager, import_pipeline_status, project, working_files, waiter); });