threads: move safepoint into loop

vtjnash · vtjnash · commit a9412439c37f · 2021-06-29T17:48:21.000-04:00
Fixes #41407
diff --git a/src/partr.c b/src/partr.c
@@ -159,6 +159,7 @@ static inline jl_task_t *multiq_deletemin(void)
     int16_t prio1, prio2;
     jl_task_t *task;
  retry:
+    jl_gc_safepoint();
     for (i = 0; i < heap_p; ++i) {
         rn1 = cong(heap_p, cong_unbias, &ptls->rngseed);
         rn2 = cong(heap_p, cong_unbias, &ptls->rngseed);
@@ -397,7 +398,6 @@ static jl_task_t *get_next_task(jl_value_t *trypoptask, jl_value_t *q)
         jl_set_task_tid(task, self);
         return task;
     }
-    jl_gc_safepoint();
     return multiq_deletemin();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,7 @@ static inline jl_task_t *multiq_deletemin(void)`
`159`	`159`	`int16_t prio1, prio2;`
`160`	`160`	`jl_task_t *task;`
`161`	`161`	`retry:`
	`162`	`+ jl_gc_safepoint();`
`162`	`163`	`for (i = 0; i < heap_p; ++i) {`
`163`	`164`	`rn1 = cong(heap_p, cong_unbias, &ptls->rngseed);`
`164`	`165`	`rn2 = cong(heap_p, cong_unbias, &ptls->rngseed);`
`@@ -397,7 +398,6 @@ static jl_task_t get_next_task(jl_value_t trypoptask, jl_value_t *q)`
`397`	`398`	`jl_set_task_tid(task, self);`
`398`	`399`	`return task;`
`399`	`400`	`}`
`400`		`- jl_gc_safepoint();`
`401`	`401`	`return multiq_deletemin();`
`402`	`402`	`}`
`403`	`403`