From 73a39095ff6bef282d44b4a1296e6578bff54404 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Tue, 19 Oct 2021 12:52:21 +0000 Subject: Use the ExecutorStats type directly. --- .../src/vespa/vespalib/util/adaptive_sequenced_executor.cpp | 6 +++--- .../src/vespa/vespalib/util/adaptive_sequenced_executor.h | 7 +++---- .../src/vespa/vespalib/util/foreground_thread_executor.h | 2 +- staging_vespalib/src/vespa/vespalib/util/sequencedtaskexecutor.cpp | 4 ++-- staging_vespalib/src/vespa/vespalib/util/sequencedtaskexecutor.h | 3 +-- staging_vespalib/src/vespa/vespalib/util/singleexecutor.cpp | 6 +++--- staging_vespalib/src/vespa/vespalib/util/singleexecutor.h | 4 ++-- 7 files changed, 15 insertions(+), 17 deletions(-) (limited to 'staging_vespalib') diff --git a/staging_vespalib/src/vespa/vespalib/util/adaptive_sequenced_executor.cpp b/staging_vespalib/src/vespa/vespalib/util/adaptive_sequenced_executor.cpp index e4b64b19739..869ff0456e1 100644 --- a/staging_vespalib/src/vespa/vespalib/util/adaptive_sequenced_executor.cpp +++ b/staging_vespalib/src/vespa/vespalib/util/adaptive_sequenced_executor.cpp @@ -324,12 +324,12 @@ AdaptiveSequencedExecutor::setTaskLimit(uint32_t task_limit) } } -AdaptiveSequencedExecutor::Stats +ExecutorStats AdaptiveSequencedExecutor::getStats() { auto guard = std::lock_guard(_mutex); - Stats stats = _stats; - _stats = Stats(); + ExecutorStats stats = _stats; + _stats = ExecutorStats(); _stats.queueSize.add(_self.pending_tasks); return stats; } diff --git a/staging_vespalib/src/vespa/vespalib/util/adaptive_sequenced_executor.h b/staging_vespalib/src/vespa/vespalib/util/adaptive_sequenced_executor.h index 4e0388caf8a..fdcdf35fbbb 100644 --- a/staging_vespalib/src/vespa/vespalib/util/adaptive_sequenced_executor.h +++ b/staging_vespalib/src/vespa/vespalib/util/adaptive_sequenced_executor.h @@ -22,8 +22,7 @@ namespace vespalib { class AdaptiveSequencedExecutor : public ISequencedTaskExecutor { private: - using Stats = vespalib::ExecutorStats; - using Task = vespalib::Executor::Task; + using Task = Executor::Task; struct TaggedTask { Task::UP task; @@ -128,7 +127,7 @@ private: vespalib::ArrayQueue _worker_stack; EventBarrier _barrier; Self _self; - Stats _stats; + ExecutorStats _stats; Config _cfg; void maybe_block_self(std::unique_lock &lock); @@ -147,7 +146,7 @@ public: void executeTask(ExecutorId id, Task::UP task) override; void sync() override; void setTaskLimit(uint32_t task_limit) override; - vespalib::ExecutorStats getStats() override; + ExecutorStats getStats() override; Config get_config() const; }; diff --git a/staging_vespalib/src/vespa/vespalib/util/foreground_thread_executor.h b/staging_vespalib/src/vespa/vespalib/util/foreground_thread_executor.h index f3dbd512047..3bd5ca3d49a 100644 --- a/staging_vespalib/src/vespa/vespalib/util/foreground_thread_executor.h +++ b/staging_vespalib/src/vespa/vespalib/util/foreground_thread_executor.h @@ -22,7 +22,7 @@ public: return Task::UP(); } size_t getNumThreads() const override { return 0; } - Stats getStats() override { + ExecutorStats getStats() override { return ExecutorStats(ExecutorStats::QueueSizeT(), _accepted.load(std::memory_order_relaxed), 0); } void setTaskLimit(uint32_t taskLimit) override { (void) taskLimit; } diff --git a/staging_vespalib/src/vespa/vespalib/util/sequencedtaskexecutor.cpp b/staging_vespalib/src/vespa/vespalib/util/sequencedtaskexecutor.cpp index adb4356c4c8..727894397a7 100644 --- a/staging_vespalib/src/vespa/vespalib/util/sequencedtaskexecutor.cpp +++ b/staging_vespalib/src/vespa/vespalib/util/sequencedtaskexecutor.cpp @@ -99,10 +99,10 @@ SequencedTaskExecutor::wakeup() { } } -SequencedTaskExecutor::Stats +ExecutorStats SequencedTaskExecutor::getStats() { - Stats accumulatedStats; + ExecutorStats accumulatedStats; for (auto &executor :* _executors) { accumulatedStats += executor->getStats(); } diff --git a/staging_vespalib/src/vespa/vespalib/util/sequencedtaskexecutor.h b/staging_vespalib/src/vespa/vespalib/util/sequencedtaskexecutor.h index 38844535021..7b49f7aac75 100644 --- a/staging_vespalib/src/vespa/vespalib/util/sequencedtaskexecutor.h +++ b/staging_vespalib/src/vespa/vespalib/util/sequencedtaskexecutor.h @@ -16,7 +16,6 @@ class SyncableThreadExecutor; class SequencedTaskExecutor final : public ISequencedTaskExecutor { public: - using Stats = vespalib::ExecutorStats; using ISequencedTaskExecutor::getExecutorId; using OptimizeFor = vespalib::Executor::OptimizeFor; @@ -26,7 +25,7 @@ public: void executeTask(ExecutorId id, vespalib::Executor::Task::UP task) override; ExecutorId getExecutorId(uint64_t componentId) const override; void sync() override; - Stats getStats() override; + ExecutorStats getStats() override; void wakeup() override; /* diff --git a/staging_vespalib/src/vespa/vespalib/util/singleexecutor.cpp b/staging_vespalib/src/vespa/vespalib/util/singleexecutor.cpp index 7fba68e2092..803ec4f3f7c 100644 --- a/staging_vespalib/src/vespa/vespalib/util/singleexecutor.cpp +++ b/staging_vespalib/src/vespa/vespalib/util/singleexecutor.cpp @@ -158,13 +158,13 @@ SingleExecutor::wait_for_room(Lock & lock) { } } -ThreadExecutor::Stats +ExecutorStats SingleExecutor::getStats() { Lock lock(_mutex); uint64_t accepted = _wp.load(std::memory_order_relaxed); - Stats stats(_queueSize, (accepted - _lastAccepted), 0); + ExecutorStats stats(_queueSize, (accepted - _lastAccepted), 0); _lastAccepted = accepted; - _queueSize = Stats::QueueSizeT() ; + _queueSize = ExecutorStats::QueueSizeT() ; return stats; } diff --git a/staging_vespalib/src/vespa/vespalib/util/singleexecutor.h b/staging_vespalib/src/vespa/vespalib/util/singleexecutor.h index 20e5a560e52..8e9c1ae3fa1 100644 --- a/staging_vespalib/src/vespa/vespalib/util/singleexecutor.h +++ b/staging_vespalib/src/vespa/vespalib/util/singleexecutor.h @@ -29,7 +29,7 @@ public: uint32_t getTaskLimit() const override { return _taskLimit.load(std::memory_order_relaxed); } uint32_t get_watermark() const { return _watermark; } duration get_reaction_time() const { return _reactionTime; } - Stats getStats() override; + ExecutorStats getStats() override; SingleExecutor & shutdown() override; private: using Lock = std::unique_lock; @@ -55,7 +55,7 @@ private: std::condition_variable _producerCondition; vespalib::Thread _thread; uint64_t _lastAccepted; - Stats::QueueSizeT _queueSize; + ExecutorStats::QueueSizeT _queueSize; std::atomic _wakeupConsumerAt; std::atomic _producerNeedWakeupAt; std::atomic _wp; -- cgit v1.2.3