diff options
11 files changed, 32 insertions, 23 deletions
diff --git a/messagebus/src/vespa/messagebus/network/rpctarget.cpp b/messagebus/src/vespa/messagebus/network/rpctarget.cpp index b91ba43f036..159b86365c3 100644 --- a/messagebus/src/vespa/messagebus/network/rpctarget.cpp +++ b/messagebus/src/vespa/messagebus/network/rpctarget.cpp @@ -32,7 +32,7 @@ RPCTarget::resolveVersion(duration timeout, RPCTarget::IVersionHandler &handler) std::unique_lock guard(_lock); state = _state.load(std::memory_order_relaxed); if (state == VERSION_RESOLVED || state == PROCESSING_HANDLERS) { - while (_state.load(std::memory_order::memory_order_relaxed) == PROCESSING_HANDLERS) { + while (_state.load(std::memory_order_relaxed) == PROCESSING_HANDLERS) { _cond.wait(guard); } hasVersion = true; diff --git a/searchcore/src/vespa/searchcore/proton/initializer/task_runner.cpp b/searchcore/src/vespa/searchcore/proton/initializer/task_runner.cpp index 06d875151cc..089294967ee 100644 --- a/searchcore/src/vespa/searchcore/proton/initializer/task_runner.cpp +++ b/searchcore/src/vespa/searchcore/proton/initializer/task_runner.cpp @@ -75,8 +75,8 @@ TaskRunner::internalRunTask(InitializerTask::SP task, Context::SP context) // run by context executor assert(task->getState() == State::BLOCKED); setTaskRunning(*task); - auto done(makeLambdaTask([=]() { setTaskDone(*task, context); })); - _executor.execute(makeLambdaTask([=, done(std::move(done))]() mutable + auto done(makeLambdaTask([this, task, context]() { setTaskDone(*task, context); })); + _executor.execute(makeLambdaTask([task, context, done(std::move(done))]() mutable { task->run(); context->execute(std::move(done)); })); } @@ -124,7 +124,7 @@ TaskRunner::runTask(InitializerTask::SP rootTask, vespalib::Executor::Task::UP doneTask) { auto context(std::make_shared<Context>(rootTask, contextExecutor, std::move(doneTask))); - context->execute(makeLambdaTask([=]() { pollTask(context); } )); + context->execute(makeLambdaTask([this, context=std::move(context)]() { pollTask(context); } )); } } diff --git a/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.cpp b/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.cpp index 88aea2bd86c..4b284595e99 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.cpp @@ -35,8 +35,8 @@ TaskDocidRangeScheduler::next_task(size_t thread_id) ++_next_task; } _assigned[thread_id] += work.size(); - size_t todo = _unassigned.load(std::memory_order::memory_order_relaxed); - _unassigned.store(clamped_sub(todo, work.size()), std::memory_order::memory_order_relaxed); + size_t todo = _unassigned.load(std::memory_order_relaxed); + _unassigned.store(clamped_sub(todo, work.size()), std::memory_order_relaxed); return work; } @@ -57,7 +57,7 @@ AdaptiveDocidRangeScheduler::take_idle(const Guard &) { size_t thread_id = _idle.back(); _idle.pop_back(); - _num_idle.store(_idle.size(), std::memory_order::memory_order_relaxed); + _num_idle.store(_idle.size(), std::memory_order_relaxed); assert(_workers[thread_id].is_idle); return thread_id; } @@ -68,7 +68,7 @@ AdaptiveDocidRangeScheduler::make_idle(const Guard &, size_t thread_id) assert(!_workers[thread_id].is_idle); _workers[thread_id].is_idle = true; _idle.push_back(thread_id); - _num_idle.store(_idle.size(), std::memory_order::memory_order_relaxed); + _num_idle.store(_idle.size(), std::memory_order_relaxed); } void @@ -113,7 +113,7 @@ AdaptiveDocidRangeScheduler::AdaptiveDocidRangeScheduler(size_t num_threads, uin } } -AdaptiveDocidRangeScheduler::~AdaptiveDocidRangeScheduler() {} +AdaptiveDocidRangeScheduler::~AdaptiveDocidRangeScheduler() = default; DocidRange AdaptiveDocidRangeScheduler::first_range(size_t thread_id) diff --git a/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.h b/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.h index 19e5ec0343d..7597476ec67 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.h +++ b/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.h @@ -60,7 +60,7 @@ public: IdleObserver() : _num_idle(_always_zero) {} IdleObserver(const std::atomic<size_t> &num_idle) : _num_idle(num_idle) {} bool is_always_zero() const { return (&_num_idle == &_always_zero); } - size_t get() const { return _num_idle.load(std::memory_order::memory_order_relaxed); } + size_t get() const { return _num_idle.load(std::memory_order_relaxed); } }; /** @@ -154,7 +154,7 @@ public: DocidRange first_range(size_t thread_id) override { return next_task(thread_id); } DocidRange next_range(size_t thread_id) override { return next_task(thread_id); } size_t total_size(size_t thread_id) const override { return _assigned[thread_id]; } - size_t unassigned_size() const override { return _unassigned.load(std::memory_order::memory_order_relaxed); } + size_t unassigned_size() const override { return _unassigned.load(std::memory_order_relaxed); } IdleObserver make_idle_observer() const override { return IdleObserver(); } DocidRange share_range(size_t, DocidRange todo) override { return todo; } }; diff --git a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_forwarder.cpp b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_forwarder.cpp index 22af1dc1692..39716f93bc6 100644 --- a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_forwarder.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_forwarder.cpp @@ -44,7 +44,7 @@ DiskMemUsageForwarder::removeDiskMemUsageListener(IDiskMemUsageListener *listene void DiskMemUsageForwarder::notifyDiskMemUsage(DiskMemUsageState state) { - _executor.execute(makeLambdaTask([=]() { forward(state); })); + _executor.execute(makeLambdaTask([this, state]() { forward(state); })); } diff --git a/searchcore/src/vespa/searchcore/proton/server/proton_configurer.cpp b/searchcore/src/vespa/searchcore/proton/server/proton_configurer.cpp index a7dada3047c..3d7e5e7af57 100644 --- a/searchcore/src/vespa/searchcore/proton/server/proton_configurer.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/proton_configurer.cpp @@ -72,7 +72,7 @@ ProtonConfigurer::setAllowReconfig(bool allowReconfig) _allowReconfig = allowReconfig; if (allowReconfig) { // Ensure that pending config is applied - _executor.execute(makeLambdaTask([=]() { performReconfigure(); })); + _executor.execute(makeLambdaTask([this]() { performReconfigure(); })); } } if (!allowReconfig) { @@ -102,7 +102,7 @@ ProtonConfigurer::reconfigure(std::shared_ptr<ProtonConfigSnapshot> configSnapsh std::lock_guard<std::mutex> guard(_mutex); _pendingConfigSnapshot = configSnapshot; if (_allowReconfig) { - _executor.execute(makeLambdaTask([=]() { performReconfigure(); })); + _executor.execute(makeLambdaTask([&]() { performReconfigure(); })); } } diff --git a/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp b/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp index 7cfad4f1ac1..b66822f39cc 100644 --- a/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp @@ -65,7 +65,7 @@ SearchableFeedView::putIndexedFields(SerialNum serialNum, search::DocumentIdT li return; } _writeService.index().execute( - makeLambdaTask([=] { + makeLambdaTask([this, serialNum, lid, newDoc, onWriteDone] { performIndexPut(serialNum, lid, newDoc, onWriteDone); })); } @@ -100,7 +100,7 @@ SearchableFeedView::performIndexPut(SerialNum serialNum, search::DocumentIdT lid void SearchableFeedView::heartBeatIndexedFields(SerialNum serialNum) { - _writeService.index().execute(makeLambdaTask([=] { performIndexHeartBeat(serialNum); })); + _writeService.index().execute(makeLambdaTask([this, serialNum] { performIndexHeartBeat(serialNum); })); } void @@ -126,7 +126,7 @@ SearchableFeedView::removeIndexedFields(SerialNum serialNum, search::DocumentIdT return; } _writeService.index().execute( - makeLambdaTask([=]() { + makeLambdaTask([this, serialNum, lid, onWriteDone]() { performIndexRemove(serialNum, lid, onWriteDone); })); } @@ -166,7 +166,7 @@ SearchableFeedView::removeIndexedFields(SerialNum serialNum, const LidVector &li return; _writeService.index().execute( - makeLambdaTask([=]() { + makeLambdaTask([this, serialNum, lidsToRemove, onWriteDone]() { performIndexRemove(serialNum, lidsToRemove, onWriteDone); })); } @@ -200,7 +200,7 @@ void SearchableFeedView::internalForceCommit(SerialNum serialNum, OnForceCommitDoneType onCommitDone) { Parent::internalForceCommit(serialNum, onCommitDone); - _writeService.index().execute(makeLambdaTask([=]() { performIndexForceCommit(serialNum, onCommitDone); })); + _writeService.index().execute(makeLambdaTask([this, serialNum, onCommitDone]() { performIndexForceCommit(serialNum, onCommitDone); })); _writeService.index().wakeup(); } diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp index 7c3c796bda3..de5d9d4b644 100644 --- a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp @@ -687,7 +687,7 @@ StoreOnlyFeedView::removeDocuments(const RemoveDocumentsOperation &op, bool remo std::shared_ptr<search::IDestructorCallback> onWriteDone; vespalib::Executor::Task::UP removeBatchDoneTask; if (explicitReuseLids) { - removeBatchDoneTask = makeLambdaTask([=]() { _metaStore.removeBatchComplete(lidsToRemove); }); + removeBatchDoneTask = makeLambdaTask([this, lidsToRemove]() { _metaStore.removeBatchComplete(lidsToRemove); }); } else { removeBatchDoneTask = makeLambdaTask([]() {}); } diff --git a/searchlib/src/vespa/searchlib/attribute/multivalueattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multivalueattribute.hpp index bafb859a246..1def5dab060 100644 --- a/searchlib/src/vespa/searchlib/attribute/multivalueattribute.hpp +++ b/searchlib/src/vespa/searchlib/attribute/multivalueattribute.hpp @@ -251,7 +251,7 @@ template <typename B, typename M> void MultiValueAttribute<B, M>::clearDocs(DocId lidLow, DocId lidLimit) { - _mvMapping.clearDocs(lidLow, lidLimit, [=](uint32_t docId) { this->clearDoc(docId); }); + _mvMapping.clearDocs(lidLow, lidLimit, [this](uint32_t docId) { this->clearDoc(docId); }); } diff --git a/searchlib/src/vespa/searchlib/common/geo_location.h b/searchlib/src/vespa/searchlib/common/geo_location.h index 261951caf3e..506434e75e0 100644 --- a/searchlib/src/vespa/searchlib/common/geo_location.h +++ b/searchlib/src/vespa/searchlib/common/geo_location.h @@ -20,6 +20,7 @@ struct GeoLocation static constexpr int32_t range_high = std::numeric_limits<int32_t>::max(); static constexpr uint32_t radius_inf = std::numeric_limits<uint32_t>::max(); struct Point { + Point(int32_t x_in, int32_t y_in) : x(x_in), y(y_in) {} const int32_t x; const int32_t y; Point() = delete; @@ -79,7 +80,7 @@ struct GeoLocation int32_t x = 0; int32_t y = 0; vespalib::geo::ZCurve::decode(zcurve_encoded_xy, &x, &y); - return inside_limit(Point{x, y}); + return inside_limit(Point(x, y)); } private: diff --git a/vespalog/src/vespa/log/bufferedlogger.cpp b/vespalog/src/vespa/log/bufferedlogger.cpp index 5c243b86f86..63663e0705b 100644 --- a/vespalog/src/vespa/log/bufferedlogger.cpp +++ b/vespalog/src/vespa/log/bufferedlogger.cpp @@ -38,6 +38,10 @@ public: uint64_t _timestamp; Logger* _logger; + Entry(const Entry &); + Entry & operator=(const Entry &); + Entry(Entry &&) noexcept; + Entry & operator=(Entry &&) noexcept; Entry(Logger::LogLevel level, const char* file, int line, const std::string& token, const std::string& message, uint64_t timestamp, Logger&); @@ -137,7 +141,11 @@ BackingBuffer::Entry::Entry(Logger::LogLevel level, const char* file, int line, { } -BackingBuffer::Entry::~Entry() { } +BackingBuffer::Entry::Entry(const Entry &) = default; +BackingBuffer::Entry & BackingBuffer::Entry::operator =(const Entry &) = default; +BackingBuffer::Entry::Entry(Entry &&) noexcept = default; +BackingBuffer::Entry & BackingBuffer::Entry::operator=(Entry &&) noexcept = default; +BackingBuffer::Entry::~Entry() = default; bool BackingBuffer::Entry::operator==(const Entry& entry) const |