ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 07:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make ThreadPool use std::atomic and heap_allocator()

Browse Source
This commit is contained in:
gingerBill
2021-08-22 23:01:01 +01:00
parent 5a2d582a09
commit daced956e3
1 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/thread_pool.cpp
+8 -18
View File
@@ -3,12 +3,6 @@
#define WORKER_TASK_PROC(name) isize name(void *data) #define WORKER_TASK_PROC(name) isize name(void *data)
typedef WORKER_TASK_PROC(WorkerTaskProc); typedef WORKER_TASK_PROC(WorkerTaskProc);
#if defined(GB_SYSTEM_WINDOWS)
#define THREAD_POOL_SYNC_FETCH_AND_ADD InterlockedAdd
#else
#define THREAD_POOL_SYNC_FETCH_AND_ADD __sync_fetch_and_add
#endif
struct WorkerTask { struct WorkerTask {
WorkerTask *next_task; WorkerTask *next_task;
WorkerTaskProc *do_work; WorkerTaskProc *do_work;
@@ -16,11 +10,7 @@ struct WorkerTask {
}; };
struct ThreadPool { struct ThreadPool {
#if defined(GB_SYSTEM_WINDOWS) std::atomic<isize> outstanding_task_count;
volatile LONG outstanding_task_count;
#else
volatile isize outstanding_task_count;
#endif
WorkerTask *next_task; WorkerTask *next_task;
BlockingMutex task_list_mutex; BlockingMutex task_list_mutex;
}; };
@@ -40,8 +30,8 @@ void thread_pool_thread_entry(ThreadPool *pool) {
pool->next_task = task->next_task; pool->next_task = task->next_task;
mutex_unlock(&pool->task_list_mutex); mutex_unlock(&pool->task_list_mutex);
task->do_work(task->data); task->do_work(task->data);
THREAD_POOL_SYNC_FETCH_AND_ADD(&pool->outstanding_task_count, -1); pool->outstanding_task_count.fetch_sub(1);
free(task); gb_free(heap_allocator(), task);
} else { } else {
mutex_unlock(&pool->task_list_mutex); mutex_unlock(&pool->task_list_mutex);
yield(); yield();
@@ -74,7 +64,7 @@ void thread_pool_thread_entry(ThreadPool *pool) {
void thread_pool_init(ThreadPool *pool, gbAllocator const &a, isize thread_count, char const *worker_prefix) { void thread_pool_init(ThreadPool *pool, gbAllocator const &a, isize thread_count, char const *worker_prefix) {
memset(pool, 0, sizeof(ThreadPool)); memset(pool, 0, sizeof(ThreadPool));
mutex_init(&pool->task_list_mutex); mutex_init(&pool->task_list_mutex);
pool->outstanding_task_count = 1; pool->outstanding_task_count.store(1);
for (int i = 0; i < thread_count; i++) { for (int i = 0; i < thread_count; i++) {
thread_pool_start_thread(pool); thread_pool_start_thread(pool);
@@ -86,20 +76,20 @@ void thread_pool_destroy(ThreadPool *pool) {
} }
void thread_pool_wait(ThreadPool *pool) { void thread_pool_wait(ThreadPool *pool) {
THREAD_POOL_SYNC_FETCH_AND_ADD(&pool->outstanding_task_count, -1); pool->outstanding_task_count.fetch_sub(1);
while (pool->outstanding_task_count) { while (pool->outstanding_task_count.load() != 0) {
yield(); yield();
} }
} }
void thread_pool_add_task(ThreadPool *pool, WorkerTaskProc *proc, void *data) { void thread_pool_add_task(ThreadPool *pool, WorkerTaskProc *proc, void *data) {
WorkerTask *task = (WorkerTask *) calloc(1, sizeof(WorkerTask)); WorkerTask *task = gb_alloc_item(heap_allocator(), WorkerTask);
task->do_work = proc; task->do_work = proc;
task->data = data; task->data = data;
mutex_lock(&pool->task_list_mutex); mutex_lock(&pool->task_list_mutex);
task->next_task = pool->next_task; task->next_task = pool->next_task;
pool->next_task = task; pool->next_task = task;
THREAD_POOL_SYNC_FETCH_AND_ADD(&pool->outstanding_task_count, 1); pool->outstanding_task_count.fetch_add(1);
mutex_unlock(&pool->task_list_mutex); mutex_unlock(&pool->task_list_mutex);
} }