diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 917b754f..f74f3412 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -529,8 +529,8 @@ add_files( utility/scheduling/TaskDecoratorRepeat.h utility/scheduling/TaskDecoratorDelay.cpp utility/scheduling/TaskDecoratorDelay.h - utility/scheduling/TaskFindValue.cpp - utility/scheduling/TaskFindValue.h + utility/scheduling/TaskFindKeyOnBlackboard.cpp + utility/scheduling/TaskFindKeyOnBlackboard.h utility/scheduling/TaskGroup.cpp utility/scheduling/TaskGroup.h utility/scheduling/TaskGroupParallel.cpp @@ -541,7 +541,7 @@ add_files( utility/scheduling/TaskGroupSequence.h utility/scheduling/TaskLambda.cpp utility/scheduling/TaskLambda.h - utility/scheduling/TaskReturnSuccessWhile.h + utility/scheduling/TaskReturnSuccessIf.h utility/scheduling/TaskRunner.cpp utility/scheduling/TaskRunner.h utility/scheduling/TaskScheduler.cpp diff --git a/src/lib/data/indexer/Indexer.h b/src/lib/data/indexer/Indexer.h index 1506b430..b2119b12 100644 --- a/src/lib/data/indexer/Indexer.h +++ b/src/lib/data/indexer/Indexer.h @@ -12,20 +12,13 @@ class Indexer : public IndexerBase { public: - virtual ~Indexer(); + IndexerCommandType getSupportedIndexerCommandType() const override; - virtual IndexerCommandType getSupportedIndexerCommandType() const; - - virtual std::shared_ptr index(std::shared_ptr indexerCommand); + std::shared_ptr index(std::shared_ptr indexerCommand) override; virtual std::shared_ptr doIndex(std::shared_ptr indexerCommand) = 0; }; -template -Indexer::~Indexer() -{ -} - template IndexerCommandType Indexer::getSupportedIndexerCommandType() const { diff --git a/src/lib/data/indexer/TaskBuildIndex.h b/src/lib/data/indexer/TaskBuildIndex.h index 141c263e..c6436d39 100644 --- a/src/lib/data/indexer/TaskBuildIndex.h +++ b/src/lib/data/indexer/TaskBuildIndex.h @@ -29,13 +29,13 @@ public: ); protected: - virtual void doEnter(std::shared_ptr blackboard); - virtual TaskState doUpdate(std::shared_ptr blackboard); - virtual void doExit(std::shared_ptr blackboard); - virtual void doReset(std::shared_ptr blackboard); - virtual void terminate(); + void doEnter(std::shared_ptr blackboard) override; + TaskState doUpdate(std::shared_ptr blackboard) override; + void doExit(std::shared_ptr blackboard) override; + void doReset(std::shared_ptr blackboard) override; + void terminate() override; - virtual void handleMessage(MessageInterruptTasks* message); + void handleMessage(MessageInterruptTasks* message) override; void runIndexerProcess(int processId, const std::wstring& logFilePath); void runIndexerThread(int processId); diff --git a/src/lib/data/indexer/TaskFillIndexerCommandQueue.h b/src/lib/data/indexer/TaskFillIndexerCommandQueue.h index fdb4a319..e0eedf0c 100644 --- a/src/lib/data/indexer/TaskFillIndexerCommandQueue.h +++ b/src/lib/data/indexer/TaskFillIndexerCommandQueue.h @@ -23,12 +23,12 @@ public: ); protected: - virtual void doEnter(std::shared_ptr blackboard); - virtual TaskState doUpdate(std::shared_ptr blackboard); - virtual void doExit(std::shared_ptr blackboard); - virtual void doReset(std::shared_ptr blackboard); + void doEnter(std::shared_ptr blackboard) override; + TaskState doUpdate(std::shared_ptr blackboard) override; + void doExit(std::shared_ptr blackboard) override; + void doReset(std::shared_ptr blackboard) override; - virtual void handleMessage(MessageInterruptTasks* message); + void handleMessage(MessageInterruptTasks* message) override; void fillCommandQueue(); diff --git a/src/lib/data/parser/TaskParseWrapper.h b/src/lib/data/parser/TaskParseWrapper.h index 295f1ae0..9d6da888 100644 --- a/src/lib/data/parser/TaskParseWrapper.h +++ b/src/lib/data/parser/TaskParseWrapper.h @@ -19,10 +19,10 @@ public: TaskParseWrapper(std::weak_ptr storage, std::shared_ptr dialogView); private: - virtual void doEnter(std::shared_ptr blackboard); - virtual TaskState doUpdate(std::shared_ptr blackboard); - virtual void doExit(std::shared_ptr blackboard); - virtual void doReset(std::shared_ptr blackboard); + void doEnter(std::shared_ptr blackboard) override; + TaskState doUpdate(std::shared_ptr blackboard) override; + void doExit(std::shared_ptr blackboard) override; + void doReset(std::shared_ptr blackboard) override; std::weak_ptr m_storage; std::shared_ptr m_dialogView; diff --git a/src/lib/project/Project.cpp b/src/lib/project/Project.cpp index f0f71943..e34d185d 100644 --- a/src/lib/project/Project.cpp +++ b/src/lib/project/Project.cpp @@ -29,12 +29,12 @@ #include "utility/messaging/type/MessageRefresh.h" #include "utility/messaging/type/MessageStatus.h" #include "utility/scheduling/TaskDecoratorRepeat.h" -#include "utility/scheduling/TaskFindValue.h" +#include "utility/scheduling/TaskFindKeyOnBlackboard.h" #include "utility/scheduling/TaskGroupSelector.h" #include "utility/scheduling/TaskGroupSequence.h" #include "utility/scheduling/TaskGroupParallel.h" #include "utility/scheduling/TaskLambda.h" -#include "utility/scheduling/TaskReturnSuccessWhile.h" +#include "utility/scheduling/TaskReturnSuccessIf.h" #include "utility/scheduling/TaskSetValue.h" #include "utility/ScopedFunctor.h" #include "utility/text/TextAccess.h" @@ -488,7 +488,7 @@ void Project::buildIndex(const RefreshInfo& info, std::shared_ptr di std::make_shared()->addChildTasks( // block until there are indexer commands to process std::make_shared(TaskDecoratorRepeat::CONDITION_WHILE_SUCCESS, Task::STATE_SUCCESS)->addChildTask( - std::make_shared>("indexer_command_queue_started", TaskReturnSuccessWhile::CONDITION_EQUALS, false) + std::make_shared>("indexer_command_queue_started", TaskReturnSuccessIf::CONDITION_EQUALS, false) ), std::make_shared(TaskDecoratorRepeat::CONDITION_WHILE_SUCCESS, Task::STATE_SUCCESS)->addChildTask( std::make_shared(indexerThreadCount, storageProvider, dialogView, m_appUUID, multiProcess) @@ -507,13 +507,13 @@ void Project::buildIndex(const RefreshInfo& info, std::shared_ptr di std::make_shared()->addChildTasks( // block until there are indexers running std::make_shared(TaskDecoratorRepeat::CONDITION_WHILE_SUCCESS, Task::STATE_SUCCESS)->addChildTask( - std::make_shared>("indexer_count", TaskReturnSuccessWhile::CONDITION_EQUALS, 0) + std::make_shared>("indexer_count", TaskReturnSuccessIf::CONDITION_EQUALS, 0) ), // merge until all indexers stopped and nothing left to merge std::make_shared(TaskDecoratorRepeat::CONDITION_WHILE_SUCCESS, Task::STATE_SUCCESS)->addChildTask( std::make_shared()->addChildTasks( std::make_shared(storageProvider), - std::make_shared>("indexer_count", TaskReturnSuccessWhile::CONDITION_GREATER_THAN, 0) + std::make_shared>("indexer_count", TaskReturnSuccessIf::CONDITION_GREATER_THAN, 0) ) ) ) @@ -524,16 +524,16 @@ void Project::buildIndex(const RefreshInfo& info, std::shared_ptr di std::make_shared()->addChildTasks( // block until there are indexers running std::make_shared(TaskDecoratorRepeat::CONDITION_WHILE_SUCCESS, Task::STATE_SUCCESS)->addChildTask( - std::make_shared>("indexer_count", TaskReturnSuccessWhile::CONDITION_EQUALS, 0) + std::make_shared>("indexer_count", TaskReturnSuccessIf::CONDITION_EQUALS, 0) ), std::make_shared(TaskDecoratorRepeat::CONDITION_WHILE_SUCCESS, Task::STATE_SUCCESS)->addChildTask( std::make_shared()->addChildTasks( // stopping when indexer count is zero, regardless wether there are still storages left to insert. - std::make_shared>("indexer_count", TaskReturnSuccessWhile::CONDITION_GREATER_THAN, 0), + std::make_shared>("indexer_count", TaskReturnSuccessIf::CONDITION_GREATER_THAN, 0), std::make_shared()->addChildTasks( std::make_shared(storageProvider, tempStorage), // continuing when indexer count is greater than zero, even if there are no storages right now. - std::make_shared>("indexer_count", TaskReturnSuccessWhile::CONDITION_GREATER_THAN, 0) + std::make_shared>("indexer_count", TaskReturnSuccessIf::CONDITION_GREATER_THAN, 0) ) ) ) @@ -563,7 +563,7 @@ void Project::buildIndex(const RefreshInfo& info, std::shared_ptr di taskSequential->addTask(std::make_shared()->addChildTasks( std::make_shared()->addChildTasks( - std::make_shared("keep_database"), + std::make_shared("keep_database"), std::make_shared([dialogView, this]() { Task::dispatch(std::make_shared([dialogView, this]() { swapToTempStorage(dialogView); @@ -571,7 +571,7 @@ void Project::buildIndex(const RefreshInfo& info, std::shared_ptr di }) ), std::make_shared()->addChildTasks( - std::make_shared("discard_database"), + std::make_shared("discard_database"), std::make_shared([this]() { Task::dispatch(std::make_shared([this]() { discardTempStorage(); diff --git a/src/lib/utility/scheduling/TaskFindKeyOnBlackboard.cpp b/src/lib/utility/scheduling/TaskFindKeyOnBlackboard.cpp new file mode 100644 index 00000000..91c43733 --- /dev/null +++ b/src/lib/utility/scheduling/TaskFindKeyOnBlackboard.cpp @@ -0,0 +1,25 @@ +#include "utility/scheduling/TaskFindKeyOnBlackboard.h" + +#include "utility/scheduling/Blackboard.h" + +TaskFindKeyOnBlackboard::TaskFindKeyOnBlackboard(const std::string& key) + : m_key(key) +{ +} + +void TaskFindKeyOnBlackboard::doEnter(std::shared_ptr blackboard) +{ +} + +Task::TaskState TaskFindKeyOnBlackboard::doUpdate(std::shared_ptr blackboard) +{ + return (blackboard->exists(m_key)) ? STATE_SUCCESS : STATE_FAILURE; +} + +void TaskFindKeyOnBlackboard::doExit(std::shared_ptr blackboard) +{ +} + +void TaskFindKeyOnBlackboard::doReset(std::shared_ptr blackboard) +{ +} diff --git a/src/lib/utility/scheduling/TaskFindValue.h b/src/lib/utility/scheduling/TaskFindKeyOnBlackboard.h similarity index 62% rename from src/lib/utility/scheduling/TaskFindValue.h rename to src/lib/utility/scheduling/TaskFindKeyOnBlackboard.h index 3467fae3..18c56eab 100644 --- a/src/lib/utility/scheduling/TaskFindValue.h +++ b/src/lib/utility/scheduling/TaskFindKeyOnBlackboard.h @@ -1,5 +1,5 @@ -#ifndef TASK_FIND_VALUE_H -#define TASK_FIND_VALUE_H +#ifndef TASK_FIND_KEY_ON_BLACKBOARD_H +#define TASK_FIND_KEY_ON_BLACKBOARD_H #include @@ -7,11 +7,11 @@ class Blackboard; -class TaskFindValue: +class TaskFindKeyOnBlackboard: public Task { public: - TaskFindValue(const std::string& valueName); + TaskFindKeyOnBlackboard(const std::string& valueName); private: void doEnter(std::shared_ptr blackboard) override; @@ -19,7 +19,7 @@ private: void doExit(std::shared_ptr blackboard) override; void doReset(std::shared_ptr blackboard) override; - const std::string m_valueName; + const std::string m_key; }; -#endif // TASK_FIND_VALUE_H +#endif // TASK_FIND_KEY_ON_BLACKBOARD_H diff --git a/src/lib/utility/scheduling/TaskFindValue.cpp b/src/lib/utility/scheduling/TaskFindValue.cpp deleted file mode 100644 index c6365acc..00000000 --- a/src/lib/utility/scheduling/TaskFindValue.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#include "utility/scheduling/TaskFindValue.h" - -#include "utility/scheduling/Blackboard.h" - -TaskFindValue::TaskFindValue(const std::string& valueName) - : m_valueName(valueName) -{ -} - -void TaskFindValue::doEnter(std::shared_ptr blackboard) -{ -} - -Task::TaskState TaskFindValue::doUpdate(std::shared_ptr blackboard) -{ - return (blackboard->exists(m_valueName)) ? STATE_SUCCESS : STATE_FAILURE; -} - -void TaskFindValue::doExit(std::shared_ptr blackboard) -{ -} - -void TaskFindValue::doReset(std::shared_ptr blackboard) -{ -} diff --git a/src/lib/utility/scheduling/TaskGroupParallel.cpp b/src/lib/utility/scheduling/TaskGroupParallel.cpp index 0c0fb9d1..f7c6e638 100644 --- a/src/lib/utility/scheduling/TaskGroupParallel.cpp +++ b/src/lib/utility/scheduling/TaskGroupParallel.cpp @@ -11,10 +11,6 @@ TaskGroupParallel::TaskGroupParallel() { } -TaskGroupParallel::~TaskGroupParallel() -{ -} - void TaskGroupParallel::addTask(std::shared_ptr task) { m_tasks.push_back(std::make_shared(std::make_shared(task))); diff --git a/src/lib/utility/scheduling/TaskGroupParallel.h b/src/lib/utility/scheduling/TaskGroupParallel.h index 67b49c20..9394777a 100644 --- a/src/lib/utility/scheduling/TaskGroupParallel.h +++ b/src/lib/utility/scheduling/TaskGroupParallel.h @@ -13,7 +13,6 @@ class TaskGroupParallel { public: TaskGroupParallel(); - virtual ~TaskGroupParallel(); void addTask(std::shared_ptr task) override; diff --git a/src/lib/utility/scheduling/TaskReturnSuccessWhile.h b/src/lib/utility/scheduling/TaskReturnSuccessIf.h similarity index 63% rename from src/lib/utility/scheduling/TaskReturnSuccessWhile.h rename to src/lib/utility/scheduling/TaskReturnSuccessIf.h index 15cebec0..5a0bf878 100644 --- a/src/lib/utility/scheduling/TaskReturnSuccessWhile.h +++ b/src/lib/utility/scheduling/TaskReturnSuccessIf.h @@ -1,11 +1,11 @@ -#ifndef TASK_RETURN_SUCCESS_WHILE_H -#define TASK_RETURN_SUCCESS_WHILE_H +#ifndef TASK_RETURN_SUCCESS_IF_H +#define TASK_RETURN_SUCCESS_IF_H #include "utility/scheduling/Task.h" #include "utility/scheduling/Blackboard.h" template -class TaskReturnSuccessWhile: +class TaskReturnSuccessIf: public Task { public: @@ -15,7 +15,7 @@ public: CONDITION_EQUALS }; - TaskReturnSuccessWhile(const std::string& lhsValueName, ConditionType condition, T rhsValue); + TaskReturnSuccessIf(const std::string& lhsValueName, ConditionType condition, T rhsValue); private: void doEnter(std::shared_ptr blackboard) override; @@ -29,7 +29,7 @@ private: }; template -TaskReturnSuccessWhile::TaskReturnSuccessWhile(const std::string& lhsValueName, ConditionType condition, T rhsValue) +TaskReturnSuccessIf::TaskReturnSuccessIf(const std::string& lhsValueName, ConditionType condition, T rhsValue) : m_lhsValueName(lhsValueName) , m_condition(condition) , m_rhsValue(rhsValue) @@ -37,12 +37,12 @@ TaskReturnSuccessWhile::TaskReturnSuccessWhile(const std::string& lhsValueNam } template -void TaskReturnSuccessWhile::doEnter(std::shared_ptr blackboard) +void TaskReturnSuccessIf::doEnter(std::shared_ptr blackboard) { } template -Task::TaskState TaskReturnSuccessWhile::doUpdate(std::shared_ptr blackboard) +Task::TaskState TaskReturnSuccessIf::doUpdate(std::shared_ptr blackboard) { const int SLEEP_TIME_MS = 25; std::this_thread::sleep_for(std::chrono::microseconds(SLEEP_TIME_MS)); @@ -69,13 +69,13 @@ Task::TaskState TaskReturnSuccessWhile::doUpdate(std::shared_ptr } template -void TaskReturnSuccessWhile::doExit(std::shared_ptr blackboard) +void TaskReturnSuccessIf::doExit(std::shared_ptr blackboard) { } template -void TaskReturnSuccessWhile::doReset(std::shared_ptr blackboard) +void TaskReturnSuccessIf::doReset(std::shared_ptr blackboard) { } -#endif // TASK_RETURN_SUCCESS_WHILE_H +#endif // TASK_RETURN_SUCCESS_IF_H diff --git a/src/lib_cxx/data/indexer/IndexerCommandCxx.h b/src/lib_cxx/data/indexer/IndexerCommandCxx.h index 73fc5605..672d3263 100644 --- a/src/lib_cxx/data/indexer/IndexerCommandCxx.h +++ b/src/lib_cxx/data/indexer/IndexerCommandCxx.h @@ -26,8 +26,8 @@ public: const std::vector& frameworkSearchPaths, const std::vector& compilerFlags); - virtual IndexerCommandType getIndexerCommandType() const override; - virtual size_t getByteSize(size_t stringSize) const override; + IndexerCommandType getIndexerCommandType() const override; + size_t getByteSize(size_t stringSize) const override; const std::set& getIndexedPaths() const; const std::set& getExcludeFilters() const; diff --git a/src/lib_cxx/data/indexer/IndexerCxx.h b/src/lib_cxx/data/indexer/IndexerCxx.h index e31d2654..e8ef0bf4 100644 --- a/src/lib_cxx/data/indexer/IndexerCxx.h +++ b/src/lib_cxx/data/indexer/IndexerCxx.h @@ -9,8 +9,7 @@ class IndexerCxx: public Indexer { public: - virtual ~IndexerCxx() = default; - virtual std::shared_ptr doIndex(std::shared_ptr indexerCommand); + std::shared_ptr doIndex(std::shared_ptr indexerCommand) override; }; #endif // INDEXER_CXX_H diff --git a/src/lib_java/data/indexer/IndexerCommandJava.h b/src/lib_java/data/indexer/IndexerCommandJava.h index 9a2f4a59..d04fccc6 100644 --- a/src/lib_java/data/indexer/IndexerCommandJava.h +++ b/src/lib_java/data/indexer/IndexerCommandJava.h @@ -19,8 +19,8 @@ public: const std::wstring& languageStandard, const std::vector& classPath); - virtual IndexerCommandType getIndexerCommandType() const override; - virtual size_t getByteSize(size_t stringSize) const override; + IndexerCommandType getIndexerCommandType() const override; + size_t getByteSize(size_t stringSize) const override; std::wstring getLanguageStandard() const; diff --git a/src/lib_java/data/indexer/IndexerJava.h b/src/lib_java/data/indexer/IndexerJava.h index 800645e7..db690790 100644 --- a/src/lib_java/data/indexer/IndexerJava.h +++ b/src/lib_java/data/indexer/IndexerJava.h @@ -10,7 +10,7 @@ class IndexerJava: public Indexer { public: virtual ~IndexerJava(); - virtual std::shared_ptr doIndex(std::shared_ptr indexerCommand); + std::shared_ptr doIndex(std::shared_ptr indexerCommand) override; }; #endif // INDEXER_JAVA_H