diff options
author | Henning Baldersheim <balder@oath.com> | 2018-09-07 12:58:45 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@oath.com> | 2018-09-07 12:58:45 +0200 |
commit | d14286806d0f351449d9f8a8056a87b82961901d (patch) | |
tree | 605c3d8c0626528d1d3cbd1fe46732cb01321309 /searchcore | |
parent | 12c96220ead6e917250c178250e81cf668b5d411 (diff) |
Use std::make_shared
Diffstat (limited to 'searchcore')
6 files changed, 11 insertions, 35 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/initializer/initializer_task.cpp b/searchcore/src/vespa/searchcore/proton/initializer/initializer_task.cpp index 52c249fe13b..4f14f709d29 100644 --- a/searchcore/src/vespa/searchcore/proton/initializer/initializer_task.cpp +++ b/searchcore/src/vespa/searchcore/proton/initializer/initializer_task.cpp @@ -10,11 +10,7 @@ InitializerTask::InitializerTask() { } - -InitializerTask::~InitializerTask() -{ -} - +InitializerTask::~InitializerTask() = default; void InitializerTask::addDependency(SP dependency) @@ -22,5 +18,4 @@ InitializerTask::addDependency(SP dependency) _dependencies.emplace_back(std::move(dependency)); } -} // namespace proton::initializer - +} diff --git a/searchcore/src/vespa/searchcore/proton/initializer/initializer_task.h b/searchcore/src/vespa/searchcore/proton/initializer/initializer_task.h index b84db9d6402..ecf98b86fc4 100644 --- a/searchcore/src/vespa/searchcore/proton/initializer/initializer_task.h +++ b/searchcore/src/vespa/searchcore/proton/initializer/initializer_task.h @@ -4,9 +4,7 @@ #include <memory> #include <vector> -namespace proton { - -namespace initializer { +namespace proton::initializer { /* * Class representign an initializer task, used to load a data @@ -35,6 +33,4 @@ public: virtual void run() = 0; }; -} // namespace proton::initializer - -} // namespace proton +} diff --git a/searchcore/src/vespa/searchcore/proton/initializer/task_runner.cpp b/searchcore/src/vespa/searchcore/proton/initializer/task_runner.cpp index 770f00dc264..86c2b525113 100644 --- a/searchcore/src/vespa/searchcore/proton/initializer/task_runner.cpp +++ b/searchcore/src/vespa/searchcore/proton/initializer/task_runner.cpp @@ -92,8 +92,7 @@ TaskRunner::runTask(InitializerTask::SP task) vespalib::ThreadStackExecutor executor(1, 128 * 1024); std::promise<void> promise; auto future = promise.get_future(); - runTask(task, executor, - makeLambdaTask([&]() { promise.set_value(); })); + runTask(task, executor, makeLambdaTask([&]() { promise.set_value(); })); future.wait(); } @@ -119,8 +118,7 @@ TaskRunner::runTask(InitializerTask::SP rootTask, vespalib::Executor &contextExecutor, vespalib::Executor::Task::UP doneTask) { - Context::SP context(std::make_shared<Context>(rootTask, contextExecutor, - std::move(doneTask))); + auto context(std::make_shared<Context>(rootTask, contextExecutor, std::move(doneTask))); context->execute(makeLambdaTask([=]() { pollTask(context); } )); } diff --git a/searchcore/src/vespa/searchcore/proton/initializer/task_runner.h b/searchcore/src/vespa/searchcore/proton/initializer/task_runner.h index 3b52936917c..f28c46334bc 100644 --- a/searchcore/src/vespa/searchcore/proton/initializer/task_runner.h +++ b/searchcore/src/vespa/searchcore/proton/initializer/task_runner.h @@ -6,9 +6,7 @@ #include <vespa/vespalib/stllike/hash_set.h> #include <cassert> -namespace proton { - -namespace initializer { +namespace proton::initializer { /* * Class to run multiple init tasks with dependent tasks. @@ -46,20 +44,15 @@ class TaskRunner { void schedulePoll(); }; void getReadyTasks(const InitializerTask::SP task, TaskList &readyTasks, TaskSet &checked); - void setTaskRunning(InitializerTask &task); - void setTaskDone(InitializerTask &task, Context::SP context); - void internalRunTask(InitializerTask::SP task, Context::SP context); - void internalRunTasks(const TaskList &taskList, Context::SP context); - void pollTask(Context::SP context); public: TaskRunner(vespalib::Executor &executor); - virtual ~TaskRunner(); + ~TaskRunner(); // Depecreated blocking API void runTask(InitializerTask::SP task); @@ -70,6 +63,4 @@ public: vespalib::Executor::Task::UP doneTask); }; -} // namespace proton::initializer - -} // namespace proton +} diff --git a/searchcore/src/vespa/searchcore/proton/server/ddbstate.cpp b/searchcore/src/vespa/searchcore/proton/server/ddbstate.cpp index 09b81f373df..73fff1cfd42 100644 --- a/searchcore/src/vespa/searchcore/proton/server/ddbstate.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/ddbstate.cpp @@ -33,10 +33,7 @@ DDBState::DDBState() } -DDBState::~DDBState() -{ - -} +DDBState::~DDBState() = default; bool diff --git a/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.cpp index 4bece3e6860..72fcf812ebc 100644 --- a/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.cpp @@ -31,8 +31,7 @@ TransactionLogManager::TransactionLogManager(const vespalib::string &tlsSpec, { } -TransactionLogManager::~TransactionLogManager() { -} +TransactionLogManager::~TransactionLogManager() = default; void TransactionLogManager::init(SerialNum oldestConfigSerial, |