Fix up missing _Atomic calls

barche · barche · commit 4e25d207bc84 · 2021-10-27T21:47:03.000+02:00
diff --git a/src/gc.c b/src/gc.c
@@ -181,7 +181,7 @@ bigval_t *big_objects_marked = NULL;
 // `to_finalize` should not have tagged pointers.
 arraylist_t finalizer_list_marked;
 arraylist_t to_finalize;
-int jl_gc_have_pending_finalizers = 0;
+JL_DLLEXPORT _Atomic(int) jl_gc_have_pending_finalizers = 0;
 
 NOINLINE uintptr_t gc_get_stack_ptr(void)
 {
diff --git a/src/julia_threads.h b/src/julia_threads.h
@@ -217,7 +217,7 @@ typedef struct _jl_tls_states_t {
     uv_mutex_t sleep_lock;
     uv_cond_t wake_signal;
     volatile sig_atomic_t defer_signal;
-    struct _jl_task_t *current_task;
+    _Atomic(struct _jl_task_t*) current_task;
     struct _jl_task_t *next_task;
     struct _jl_task_t *previous_task;
     struct _jl_task_t *root_task;
@@ -347,7 +347,7 @@ JL_DLLEXPORT void jl_gc_enable_finalizers(struct _jl_task_t *ct, int on);
 JL_DLLEXPORT void jl_gc_disable_finalizers_internal(void);
 JL_DLLEXPORT void jl_gc_enable_finalizers_internal(void);
 JL_DLLEXPORT void jl_gc_run_pending_finalizers(struct _jl_task_t *ct);
-extern JL_DLLEXPORT int jl_gc_have_pending_finalizers;
+extern JL_DLLEXPORT _Atomic(int) jl_gc_have_pending_finalizers;
 
 JL_DLLEXPORT void jl_wakeup_thread(int16_t tid);
 
diff --git a/src/partr.c b/src/partr.c
@@ -59,7 +59,7 @@ extern int jl_gc_mark_queue_obj_explicit(jl_gc_mark_cache_t *gc_cache,
 typedef struct taskheap_tag {
     uv_mutex_t lock;
     jl_task_t **tasks;
-    int32_t ntasks;
+    _Atomic(int32_t) ntasks;
     _Atomic(int16_t) prio;
 } taskheap_t;
 
@@ -414,7 +414,7 @@ static int may_sleep(jl_ptls_t ptls) JL_NOTSAFEPOINT
     return jl_atomic_load_relaxed(&ptls->sleep_check_state) == sleeping;
 }
 
-extern unsigned _threadedregion;
+extern _Atomic(unsigned) _threadedregion;
 
 JL_DLLEXPORT jl_task_t *jl_task_get_next(jl_value_t *trypoptask, jl_value_t *q)
 {
diff --git a/src/threading.c b/src/threading.c
@@ -527,7 +527,7 @@ void jl_start_threads(void)
     uv_barrier_wait(&thread_init_done);
 }
 
-unsigned volatile _threadedregion; // HACK: keep track of whether it is safe to do IO
+_Atomic(unsigned) _threadedregion; // HACK: keep track of whether it is safe to do IO
 
 JL_DLLEXPORT int jl_in_threaded_region(void)
 {

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ bigval_t *big_objects_marked = NULL;`
`181`	`181`	// `to_finalize` should not have tagged pointers.
`182`	`182`	`arraylist_t finalizer_list_marked;`
`183`	`183`	`arraylist_t to_finalize;`
`184`		`-int jl_gc_have_pending_finalizers = 0;`
	`184`	`+JL_DLLEXPORT _Atomic(int) jl_gc_have_pending_finalizers = 0;`
`185`	`185`
`186`	`186`	`NOINLINE uintptr_t gc_get_stack_ptr(void)`
`187`	`187`	`{`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ extern int jl_gc_mark_queue_obj_explicit(jl_gc_mark_cache_t *gc_cache,`
`59`	`59`	`typedef struct taskheap_tag {`
`60`	`60`	`uv_mutex_t lock;`
`61`	`61`	`jl_task_t **tasks;`
`62`		`- int32_t ntasks;`
	`62`	`+ _Atomic(int32_t) ntasks;`
`63`	`63`	`_Atomic(int16_t) prio;`
`64`	`64`	`} taskheap_t;`
`65`	`65`
`@@ -414,7 +414,7 @@ static int may_sleep(jl_ptls_t ptls) JL_NOTSAFEPOINT`
`414`	`414`	`return jl_atomic_load_relaxed(&ptls->sleep_check_state) == sleeping;`
`415`	`415`	`}`
`416`	`416`
`417`		`-extern unsigned _threadedregion;`
	`417`	`+extern _Atomic(unsigned) _threadedregion;`
`418`	`418`
`419`	`419`	`JL_DLLEXPORT jl_task_t jl_task_get_next(jl_value_t trypoptask, jl_value_t *q)`
`420`	`420`	`{`
Original file line number	Diff line number	Diff line change
`@@ -527,7 +527,7 @@ void jl_start_threads(void)`
`527`	`527`	`uv_barrier_wait(&thread_init_done);`
`528`	`528`	`}`
`529`	`529`
`530`		`-unsigned volatile _threadedregion; // HACK: keep track of whether it is safe to do IO`
	`530`	`+_Atomic(unsigned) _threadedregion; // HACK: keep track of whether it is safe to do IO`
`531`	`531`
`532`	`532`	`JL_DLLEXPORT int jl_in_threaded_region(void)`
`533`	`533`	`{`