fix bug in thread self-wakeup (#32382)

JeffBezanson · web-flow · commit 75c10e435b2b · 2019-06-21T13:18:20.000-04:00
diff --git a/src/partr.c b/src/partr.c
@@ -343,10 +343,12 @@ static int sleep_check_after_threshold(uint64_t *start_cycles)
 /* ensure thread tid is awake if necessary */
 JL_DLLEXPORT void jl_wakeup_thread(int16_t tid)
 {
-    int16_t self = jl_get_ptls_states()->tid;
+    jl_ptls_t ptls = jl_get_ptls_states();
+    int16_t self = ptls->tid;
     int16_t uvlock = jl_atomic_load_acquire(&jl_uv_mutex.owner);
     if (tid == self) {
         // we're already awake, but make sure we'll exit uv_run
+        jl_atomic_store(&ptls->sleep_check_state, not_sleeping);
         if (uvlock == self)
             uv_stop(jl_global_event_loop());
     }

Original file line number	Diff line number	Diff line change
`@@ -343,10 +343,12 @@ static int sleep_check_after_threshold(uint64_t *start_cycles)`
`343`	`343`	`/* ensure thread tid is awake if necessary */`
`344`	`344`	`JL_DLLEXPORT void jl_wakeup_thread(int16_t tid)`
`345`	`345`	`{`
`346`		`- int16_t self = jl_get_ptls_states()->tid;`
	`346`	`+ jl_ptls_t ptls = jl_get_ptls_states();`
	`347`	`+ int16_t self = ptls->tid;`
`347`	`348`	`int16_t uvlock = jl_atomic_load_acquire(&jl_uv_mutex.owner);`
`348`	`349`	`if (tid == self) {`
`349`	`350`	`// we're already awake, but make sure we'll exit uv_run`
	`351`	`+ jl_atomic_store(&ptls->sleep_check_state, not_sleeping);`
`350`	`352`	`if (uvlock == self)`
`351`	`353`	`uv_stop(jl_global_event_loop());`
`352`	`354`	`}`