Skip to content

Commit

Permalink
const getters in ExecutorPool
Browse files Browse the repository at this point in the history
Change-Id: I48a4e9c5d54317df591d225670a13f2faa283fd0
Reviewed-on: https://review.couchbase.org/c/kv_engine/+/190410
Reviewed-by: Dave Rigby <[email protected]>
Tested-by: Build Bot <[email protected]>
  • Loading branch information
trondn committed May 3, 2023
1 parent 2e3209e commit a2c2054
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 32 deletions.
8 changes: 4 additions & 4 deletions executor/cb3_executorpool.cc
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,20 @@
#include <chrono>
#include <sstream>

size_t CB3ExecutorPool::getNumNonIO() {
size_t CB3ExecutorPool::getNumNonIO() const {
return calcNumNonIO(numWorkers[NONIO_TASK_IDX].load());
}

size_t CB3ExecutorPool::getNumAuxIO() {
size_t CB3ExecutorPool::getNumAuxIO() const {
return calcNumAuxIO(numWorkers[AUXIO_TASK_IDX].load());
}

size_t CB3ExecutorPool::getNumWriters() {
size_t CB3ExecutorPool::getNumWriters() const {
return calcNumWriters(
ThreadPoolConfig::ThreadCount(numWorkers[WRITER_TASK_IDX].load()));
}

size_t CB3ExecutorPool::getNumReaders() {
size_t CB3ExecutorPool::getNumReaders() const {
return calcNumReaders(
ThreadPoolConfig::ThreadCount(numWorkers[READER_TASK_IDX].load()));
}
Expand Down
14 changes: 7 additions & 7 deletions executor/cb3_executorpool.h
Original file line number Diff line number Diff line change
Expand Up @@ -164,18 +164,18 @@ class CB3ExecutorPool : public ExecutorPool {
CookieIface& cookie,
const AddStatFn& add_stat) override;

size_t getNumWorkersStat() override {
size_t getNumWorkersStat() const override {
std::lock_guard<std::mutex> lh(tMutex);
return threadQ.size();
}

size_t getNumReaders() override;
size_t getNumReaders() const override;

size_t getNumWriters() override;
size_t getNumWriters() const override;

size_t getNumAuxIO() override;
size_t getNumAuxIO() const override;

size_t getNumNonIO() override;
size_t getNumNonIO() const override;

std::string_view getName() const override {
return "CB3";
Expand All @@ -197,11 +197,11 @@ class CB3ExecutorPool : public ExecutorPool {
adjustWorkers(NONIO_TASK_IDX, v);
}

size_t getNumReadyTasks() override {
size_t getNumReadyTasks() const override {
return totReadyTasks;
}

size_t getNumSleepers() override {
size_t getNumSleepers() const override {
return numSleepers;
}

Expand Down
14 changes: 7 additions & 7 deletions executor/executorpool.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,19 @@ class ExecutorPool {
* Returns the total number of worker threads which currently exist
* across all thread types.
*/
virtual size_t getNumWorkersStat() = 0;
virtual size_t getNumWorkersStat() const = 0;

/// @returns the number of Reader IO threads.
virtual size_t getNumReaders() = 0;
virtual size_t getNumReaders() const = 0;

/// @returns the number of Writer IO threads.
virtual size_t getNumWriters() = 0;
virtual size_t getNumWriters() const = 0;

/// @returns the number of Auxillary IO threads.
virtual size_t getNumAuxIO() = 0;
virtual size_t getNumAuxIO() const = 0;

/// @returns the number of Non-IO threads.
virtual size_t getNumNonIO() = 0;
virtual size_t getNumNonIO() const = 0;

/// Set the number of Reader IO threads to the specified number.
virtual void setNumReaders(ThreadPoolConfig::ThreadCount v) = 0;
Expand All @@ -97,10 +97,10 @@ class ExecutorPool {
virtual void setNumNonIO(uint16_t v) = 0;

/// @returns the number of threads currently sleeping.
virtual size_t getNumSleepers() = 0;
virtual size_t getNumSleepers() const = 0;

/// @returns the number of Tasks ready to run.
virtual size_t getNumReadyTasks() = 0;
virtual size_t getNumReadyTasks() const = 0;

/// @returns the name of the executor pool backed
virtual std::string_view getName() const = 0;
Expand Down
14 changes: 7 additions & 7 deletions executor/folly_executorpool.cc
Original file line number Diff line number Diff line change
Expand Up @@ -723,24 +723,24 @@ FollyExecutorPool::~FollyExecutorPool() {
futurePool.reset();
}

size_t FollyExecutorPool::getNumWorkersStat() {
size_t FollyExecutorPool::getNumWorkersStat() const {
return readerPool->numThreads() + writerPool->numThreads() +
auxPool->numThreads() + nonIoPool->numThreads();
}

size_t FollyExecutorPool::getNumReaders() {
size_t FollyExecutorPool::getNumReaders() const {
return calcNumReaders(ThreadPoolConfig::ThreadCount(maxReaders));
}

size_t FollyExecutorPool::getNumWriters() {
size_t FollyExecutorPool::getNumWriters() const {
return calcNumWriters(ThreadPoolConfig::ThreadCount(maxWriters));
}

size_t FollyExecutorPool::getNumAuxIO() {
size_t FollyExecutorPool::getNumAuxIO() const {
return auxPool->getPoolStats().threadCount;
}

size_t FollyExecutorPool::getNumNonIO() {
size_t FollyExecutorPool::getNumNonIO() const {
return nonIoPool->getPoolStats().threadCount;
}

Expand All @@ -764,14 +764,14 @@ void FollyExecutorPool::setNumNonIO(uint16_t v) {
nonIoPool->setNumThreads(maxNonIO);
}

size_t FollyExecutorPool::getNumSleepers() {
size_t FollyExecutorPool::getNumSleepers() const {
return readerPool->getPoolStats().idleThreadCount +
writerPool->getPoolStats().idleThreadCount +
auxPool->getPoolStats().idleThreadCount +
nonIoPool->getPoolStats().idleThreadCount;
}

size_t FollyExecutorPool::getNumReadyTasks() {
size_t FollyExecutorPool::getNumReadyTasks() const {
return readerPool->getPendingTaskCount() +
writerPool->getPendingTaskCount() + auxPool->getPendingTaskCount() +
nonIoPool->getPendingTaskCount();
Expand Down
14 changes: 7 additions & 7 deletions executor/folly_executorpool.h
Original file line number Diff line number Diff line change
Expand Up @@ -157,17 +157,17 @@ class FollyExecutorPool : public ExecutorPool {

~FollyExecutorPool() override;

size_t getNumWorkersStat() override;
size_t getNumReaders() override;
size_t getNumWriters() override;
size_t getNumAuxIO() override;
size_t getNumNonIO() override;
size_t getNumWorkersStat() const override;
size_t getNumReaders() const override;
size_t getNumWriters() const override;
size_t getNumAuxIO() const override;
size_t getNumNonIO() const override;
void setNumReaders(ThreadPoolConfig::ThreadCount v) override;
void setNumWriters(ThreadPoolConfig::ThreadCount v) override;
void setNumAuxIO(uint16_t v) override;
void setNumNonIO(uint16_t v) override;
size_t getNumSleepers() override;
size_t getNumReadyTasks() override;
size_t getNumSleepers() const override;
size_t getNumReadyTasks() const override;
std::string_view getName() const override {
return "Folly";
}
Expand Down

0 comments on commit a2c2054

Please sign in to comment.