Skip to content

Commit a2c2054

Browse files
trondntrondn
committed
const getters in ExecutorPool
Change-Id: I48a4e9c5d54317df591d225670a13f2faa283fd0 Reviewed-on: https://review.couchbase.org/c/kv_engine/+/190410 Reviewed-by: Dave Rigby <daver@couchbase.com> Tested-by: Build Bot <build@couchbase.com>
1 parent 2e3209e commit a2c2054

File tree

5 files changed

+32
-32
lines changed

5 files changed

+32
-32
lines changed

‎executor/cb3_executorpool.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@
2525
#include <chrono>
2626
#include <sstream>
2727

28-
size_t CB3ExecutorPool::getNumNonIO() {
28+
size_t CB3ExecutorPool::getNumNonIO() const {
2929
return calcNumNonIO(numWorkers[NONIO_TASK_IDX].load());
3030
}
3131

32-
size_t CB3ExecutorPool::getNumAuxIO() {
32+
size_t CB3ExecutorPool::getNumAuxIO() const {
3333
return calcNumAuxIO(numWorkers[AUXIO_TASK_IDX].load());
3434
}
3535

36-
size_t CB3ExecutorPool::getNumWriters() {
36+
size_t CB3ExecutorPool::getNumWriters() const {
3737
return calcNumWriters(
3838
ThreadPoolConfig::ThreadCount(numWorkers[WRITER_TASK_IDX].load()));
3939
}
4040

41-
size_t CB3ExecutorPool::getNumReaders() {
41+
size_t CB3ExecutorPool::getNumReaders() const {
4242
return calcNumReaders(
4343
ThreadPoolConfig::ThreadCount(numWorkers[READER_TASK_IDX].load()));
4444
}

‎executor/cb3_executorpool.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -164,18 +164,18 @@ class CB3ExecutorPool : public ExecutorPool {
164164
CookieIface& cookie,
165165
const AddStatFn& add_stat) override;
166166

167-
size_t getNumWorkersStat() override {
167+
size_t getNumWorkersStat() const override {
168168
std::lock_guard<std::mutex> lh(tMutex);
169169
return threadQ.size();
170170
}
171171

172-
size_t getNumReaders() override;
172+
size_t getNumReaders() const override;
173173

174-
size_t getNumWriters() override;
174+
size_t getNumWriters() const override;
175175

176-
size_t getNumAuxIO() override;
176+
size_t getNumAuxIO() const override;
177177

178-
size_t getNumNonIO() override;
178+
size_t getNumNonIO() const override;
179179

180180
std::string_view getName() const override {
181181
return "CB3";
@@ -197,11 +197,11 @@ class CB3ExecutorPool : public ExecutorPool {
197197
adjustWorkers(NONIO_TASK_IDX, v);
198198
}
199199

200-
size_t getNumReadyTasks() override {
200+
size_t getNumReadyTasks() const override {
201201
return totReadyTasks;
202202
}
203203

204-
size_t getNumSleepers() override {
204+
size_t getNumSleepers() const override {
205205
return numSleepers;
206206
}
207207

‎executor/executorpool.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,19 +70,19 @@ class ExecutorPool {
7070
* Returns the total number of worker threads which currently exist
7171
* across all thread types.
7272
*/
73-
virtual size_t getNumWorkersStat() = 0;
73+
virtual size_t getNumWorkersStat() const = 0;
7474

7575
/// @returns the number of Reader IO threads.
76-
virtual size_t getNumReaders() = 0;
76+
virtual size_t getNumReaders() const = 0;
7777

7878
/// @returns the number of Writer IO threads.
79-
virtual size_t getNumWriters() = 0;
79+
virtual size_t getNumWriters() const = 0;
8080

8181
/// @returns the number of Auxillary IO threads.
82-
virtual size_t getNumAuxIO() = 0;
82+
virtual size_t getNumAuxIO() const = 0;
8383

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

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

9999
/// @returns the number of threads currently sleeping.
100-
virtual size_t getNumSleepers() = 0;
100+
virtual size_t getNumSleepers() const = 0;
101101

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

105105
/// @returns the name of the executor pool backed
106106
virtual std::string_view getName() const = 0;

‎executor/folly_executorpool.cc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -723,24 +723,24 @@ FollyExecutorPool::~FollyExecutorPool() {
723723
futurePool.reset();
724724
}
725725

726-
size_t FollyExecutorPool::getNumWorkersStat() {
726+
size_t FollyExecutorPool::getNumWorkersStat() const {
727727
return readerPool->numThreads() + writerPool->numThreads() +
728728
auxPool->numThreads() + nonIoPool->numThreads();
729729
}
730730

731-
size_t FollyExecutorPool::getNumReaders() {
731+
size_t FollyExecutorPool::getNumReaders() const {
732732
return calcNumReaders(ThreadPoolConfig::ThreadCount(maxReaders));
733733
}
734734

735-
size_t FollyExecutorPool::getNumWriters() {
735+
size_t FollyExecutorPool::getNumWriters() const {
736736
return calcNumWriters(ThreadPoolConfig::ThreadCount(maxWriters));
737737
}
738738

739-
size_t FollyExecutorPool::getNumAuxIO() {
739+
size_t FollyExecutorPool::getNumAuxIO() const {
740740
return auxPool->getPoolStats().threadCount;
741741
}
742742

743-
size_t FollyExecutorPool::getNumNonIO() {
743+
size_t FollyExecutorPool::getNumNonIO() const {
744744
return nonIoPool->getPoolStats().threadCount;
745745
}
746746

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

767-
size_t FollyExecutorPool::getNumSleepers() {
767+
size_t FollyExecutorPool::getNumSleepers() const {
768768
return readerPool->getPoolStats().idleThreadCount +
769769
writerPool->getPoolStats().idleThreadCount +
770770
auxPool->getPoolStats().idleThreadCount +
771771
nonIoPool->getPoolStats().idleThreadCount;
772772
}
773773

774-
size_t FollyExecutorPool::getNumReadyTasks() {
774+
size_t FollyExecutorPool::getNumReadyTasks() const {
775775
return readerPool->getPendingTaskCount() +
776776
writerPool->getPendingTaskCount() + auxPool->getPendingTaskCount() +
777777
nonIoPool->getPendingTaskCount();

‎executor/folly_executorpool.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -157,17 +157,17 @@ class FollyExecutorPool : public ExecutorPool {
157157

158158
~FollyExecutorPool() override;
159159

160-
size_t getNumWorkersStat() override;
161-
size_t getNumReaders() override;
162-
size_t getNumWriters() override;
163-
size_t getNumAuxIO() override;
164-
size_t getNumNonIO() override;
160+
size_t getNumWorkersStat() const override;
161+
size_t getNumReaders() const override;
162+
size_t getNumWriters() const override;
163+
size_t getNumAuxIO() const override;
164+
size_t getNumNonIO() const override;
165165
void setNumReaders(ThreadPoolConfig::ThreadCount v) override;
166166
void setNumWriters(ThreadPoolConfig::ThreadCount v) override;
167167
void setNumAuxIO(uint16_t v) override;
168168
void setNumNonIO(uint16_t v) override;
169-
size_t getNumSleepers() override;
170-
size_t getNumReadyTasks() override;
169+
size_t getNumSleepers() const override;
170+
size_t getNumReadyTasks() const override;
171171
std::string_view getName() const override {
172172
return "Folly";
173173
}

0 commit comments

Comments
 (0)