Zxc200611/pocketpy
1
0
Fork 0
mirror of https://github.com/pocketpy/pocketpy synced 2025-12-06 18:20:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix data race

Browse Source
This commit is contained in:
blueloveTH 2025-11-25 13:35:30 +08:00
parent 18d1585440
commit b74d336e53
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/threads.c
View File

@ -136,12 +136,13 @@ static c11_thrd_retval_t _thrdpool_worker(void* arg) {
break; break;
} }
} }
atomic_fetch_add_explicit(&p_tasks->completed_count, completed_count, memory_order_relaxed); // sync point
atomic_fetch_add_explicit(&p_tasks->completed_count, completed_count, memory_order_release);
c11_thrdpool_debug_log(p_worker->index, c11_thrdpool_debug_log(p_worker->index,
"Execution complete, waiting for `sync_val` reset..."); "Execution complete, waiting for `sync_val` reset...");
while(true) { while(true) {
int sync_val = atomic_load(&p_tasks->sync_val); int sync_val = atomic_load_explicit(&p_tasks->sync_val, memory_order_relaxed);
if(sync_val == 0) break; if(sync_val == 0) break;
if(sync_val == -1) return 0; // force kill if(sync_val == -1) return 0; // force kill
c11_thrd__yield(); c11_thrd__yield();
@ -154,13 +155,13 @@ static c11_thrd_retval_t _thrdpool_worker(void* arg) {
void c11_thrdpool__ctor(c11_thrdpool* pool, int length) { void c11_thrdpool__ctor(c11_thrdpool* pool, int length) {
pool->length = length; pool->length = length;
atomic_store(&pool->ready_workers_num, 0); atomic_store_explicit(&pool->ready_workers_num, 0, memory_order_relaxed);
pool->workers = PK_MALLOC(sizeof(c11_thrdpool_worker) * length); pool->workers = PK_MALLOC(sizeof(c11_thrdpool_worker) * length);
c11_mutex__ctor(&pool->workers_mutex); c11_mutex__ctor(&pool->workers_mutex);
c11_cond__ctor(&pool->workers_cond); c11_cond__ctor(&pool->workers_cond);
atomic_store(&pool->tasks.sync_val, 0); atomic_store_explicit(&pool->tasks.sync_val, 0, memory_order_relaxed);
for(int i = 0; i < length; i++) { for(int i = 0; i < length; i++) {
c11_thrdpool_worker* p_worker = &pool->workers[i]; c11_thrdpool_worker* p_worker = &pool->workers[i];
@ -176,7 +177,7 @@ void c11_thrdpool__ctor(c11_thrdpool* pool, int length) {
void c11_thrdpool__dtor(c11_thrdpool* pool) { void c11_thrdpool__dtor(c11_thrdpool* pool) {
c11_mutex__lock(&pool->workers_mutex); c11_mutex__lock(&pool->workers_mutex);
atomic_store(&pool->tasks.sync_val, -1); atomic_store_explicit(&pool->tasks.sync_val, -1, memory_order_relaxed);
c11_thrdpool_debug_log(-1, "Terminating all workers..."); c11_thrdpool_debug_log(-1, "Terminating all workers...");
c11_cond__broadcast(&pool->workers_cond); c11_cond__broadcast(&pool->workers_cond);
c11_mutex__unlock(&pool->workers_mutex); c11_mutex__unlock(&pool->workers_mutex);
@ -212,12 +213,11 @@ void c11_thrdpool__map(c11_thrdpool* pool, c11_thrdpool_func_t func, void** args
// wait for complete // wait for complete
c11_thrdpool_debug_log(-1, "Waiting for %d tasks to complete...", num_tasks); c11_thrdpool_debug_log(-1, "Waiting for %d tasks to complete...", num_tasks);
while(atomic_load_explicit(&pool->tasks.completed_count, memory_order_relaxed) < num_tasks) { while(atomic_load_explicit(&pool->tasks.completed_count, memory_order_acquire) < num_tasks) {
c11_thrd__yield(); c11_thrd__yield();
} }
// the last sync point atomic_store_explicit(&pool->tasks.sync_val, 0, memory_order_relaxed);
atomic_store(&pool->tasks.sync_val, 0);
c11_thrdpool_debug_log(-1, "All %d tasks completed, `sync_val` was reset.", num_tasks); c11_thrdpool_debug_log(-1, "All %d tasks completed, `sync_val` was reset.", num_tasks);
} }

5
src2/test_threads.c
View File

@ -24,7 +24,7 @@ int main(int argc, char** argv) {
long long* data = PK_MALLOC(sizeof(long long) * num_tasks); long long* data = PK_MALLOC(sizeof(long long) * num_tasks);
void** args = PK_MALLOC(sizeof(void*) * num_tasks); void** args = PK_MALLOC(sizeof(void*) * num_tasks);
for(int i = 0; i < 3; i++) { for(int i = 0; i < 10; i++) {
for(int i = 0; i < num_tasks; i++) { for(int i = 0; i < num_tasks; i++) {
data[i] = i; data[i] = i;
args[i] = &data[i]; args[i] = &data[i];
@ -42,6 +42,9 @@ int main(int argc, char** argv) {
data[100], data[100],
data[400]); data[400]);
printf(" Elapsed time for %d tasks: %.6f seconds\n", num_tasks, elapsed); printf(" Elapsed time for %d tasks: %.6f seconds\n", num_tasks, elapsed);
for(int i = 0; i < 5000000; i++) {
c11_thrd__yield();
}
} }
c11_thrdpool__dtor(&pool); c11_thrdpool__dtor(&pool);