Skip to content

Commit 8954eae

Browse files
committed
name change
1 parent 4a2686e commit 8954eae

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

include/concurrencpp/executors/worker_thread_executor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace concurrencpp {
1919
alignas(CRCPP_CACHE_LINE_ALIGNMENT) std::mutex m_lock;
2020
std::deque<task> m_public_queue;
2121
bool m_abort;
22-
std::atomic<details::queue_status> m_status;
22+
std::atomic<details::queue_status> m_public_queue_status;
2323
details::thread m_thread;
2424
const std::function<void(std::string_view)> m_thread_started_callback;
2525
const std::function<void(std::string_view)> m_thread_terminated_callback;

source/executors/worker_thread_executor.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ using concurrencpp::worker_thread_executor;
1212
worker_thread_executor::worker_thread_executor(const std::function<void(std::string_view thread_name)>& thread_started_callback,
1313
const std::function<void(std::string_view thread_name)>& thread_terminated_callback) :
1414
derivable_executor<concurrencpp::worker_thread_executor>(details::consts::k_worker_thread_executor_name),
15-
m_private_atomic_abort(false), m_abort(false), m_status(details::queue_status::empty), m_thread_started_callback(thread_started_callback),
15+
m_private_atomic_abort(false), m_abort(false), m_public_queue_status(details::queue_status::empty), m_thread_started_callback(thread_started_callback),
1616
m_thread_terminated_callback(thread_terminated_callback) {}
1717

1818
void worker_thread_executor::notify_task_exists() noexcept {
1919
auto expected = details::queue_status::empty;
20-
const auto swapped = m_status.compare_exchange_strong(expected,
20+
const auto swapped = m_public_queue_status.compare_exchange_strong(expected,
2121
details::queue_status::task_available,
2222
std::memory_order_relaxed,
2323
std::memory_order_relaxed);
2424
if (swapped) {
25-
details::atomic_notify_one(m_status);
25+
details::atomic_notify_one(m_public_queue_status);
2626
}
2727
}
2828

@@ -56,7 +56,7 @@ void worker_thread_executor::work_loop() {
5656

5757
auto yield_fn = [this]() noexcept -> bool {
5858
for (size_t i = 0; i < 2 * 1024; i++) {
59-
const auto status = m_status.load(std::memory_order_relaxed);
59+
const auto status = m_public_queue_status.load(std::memory_order_relaxed);
6060
if (status != details::queue_status::empty) {
6161
return true;
6262
}
@@ -70,13 +70,13 @@ void worker_thread_executor::work_loop() {
7070
while (true) {
7171
assert(m_private_queue.empty());
7272

73-
auto status = m_status.load(std::memory_order_relaxed);
73+
auto status = m_public_queue_status.load(std::memory_order_relaxed);
7474
if (status == details::queue_status::abort) {
7575
return;
7676
}
7777

7878
if (status == details::queue_status::task_available) {
79-
const auto swapped = m_status.compare_exchange_strong(status,
79+
const auto swapped = m_public_queue_status.compare_exchange_strong(status,
8080
details::queue_status::empty,
8181
std::memory_order_relaxed,
8282
std::memory_order_relaxed);
@@ -103,7 +103,7 @@ void worker_thread_executor::work_loop() {
103103
}
104104

105105
assert(status == details::queue_status::empty);
106-
details::atomic_wait(m_status, details::queue_status::empty, std::memory_order_relaxed);
106+
details::atomic_wait(m_public_queue_status, details::queue_status::empty, std::memory_order_relaxed);
107107
}
108108
}
109109

@@ -124,7 +124,7 @@ void worker_thread_executor::enqueue_local(std::span<concurrencpp::task> tasks)
124124
}
125125

126126
void worker_thread_executor::enqueue_foreign(concurrencpp::task& task) {
127-
if (m_status.load(std::memory_order_relaxed) == details::queue_status::abort) {
127+
if (m_public_queue_status.load(std::memory_order_relaxed) == details::queue_status::abort) {
128128
details::throw_runtime_shutdown_exception(name);
129129
}
130130

@@ -145,7 +145,7 @@ void worker_thread_executor::enqueue_foreign(concurrencpp::task& task) {
145145
}
146146

147147
void worker_thread_executor::enqueue_foreign(std::span<concurrencpp::task> tasks) {
148-
if (m_status.load(std::memory_order_relaxed) == details::queue_status::abort) {
148+
if (m_public_queue_status.load(std::memory_order_relaxed) == details::queue_status::abort) {
149149
details::throw_runtime_shutdown_exception(name);
150150
}
151151

@@ -186,18 +186,18 @@ int worker_thread_executor::max_concurrency_level() const noexcept {
186186
}
187187

188188
bool worker_thread_executor::shutdown_requested() const {
189-
return m_status.load(std::memory_order_relaxed) == details::queue_status::abort;
189+
return m_public_queue_status.load(std::memory_order_relaxed) == details::queue_status::abort;
190190
}
191191

192192
void worker_thread_executor::shutdown() {
193-
const auto status = m_status.exchange(details::queue_status::abort, std::memory_order_relaxed);
193+
const auto status = m_public_queue_status.exchange(details::queue_status::abort, std::memory_order_relaxed);
194194
if (status == details::queue_status::abort) {
195195
return; // shutdown had been called before.
196196
}
197197

198198
m_private_atomic_abort.store(true, std::memory_order_relaxed);
199199

200-
details::atomic_notify_one(m_status);
200+
details::atomic_notify_one(m_public_queue_status);
201201

202202
decltype(m_thread) worker;
203203
{

0 commit comments

Comments
 (0)