Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-07-15 16:57:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set gc_cont and num args prior to blocking

Browse source 
This change shouldn't hurt anything and guarantees the collector thread is not trying to use gc_cont before it is set properly.
This commit is contained in:
Justin Ethier 2017-01-30 14:24:57 +00:00
parent 1e823c0d3f
commit 2b04c3b253
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gc.c
View file

@ -1771,6 +1771,8 @@ void gc_merge_all_heaps(gc_thread_data *dest, gc_thread_data *src)
*/ */
void gc_mutator_thread_blocked(gc_thread_data * thd, object cont) void gc_mutator_thread_blocked(gc_thread_data * thd, object cont)
{ {
thd->gc_cont = cont;
thd->gc_num_args = 0; // Will be set later, after collection
if (!ck_pr_cas_int((int *)&(thd->thread_state), if (!ck_pr_cas_int((int *)&(thd->thread_state),
CYC_THREAD_STATE_RUNNABLE, CYC_THREAD_STATE_BLOCKED)) { CYC_THREAD_STATE_RUNNABLE, CYC_THREAD_STATE_BLOCKED)) {
fprintf(stderr, fprintf(stderr,
@ -1778,8 +1780,6 @@ void gc_mutator_thread_blocked(gc_thread_data * thd, object cont)
thd->thread_state); thd->thread_state);
exit(1); exit(1);
} }
thd->gc_cont = cont;
thd->gc_num_args = 0; // Will be set later, after collection
} }
void Cyc_apply_from_buf(void *data, int argc, object prim, object * buf); void Cyc_apply_from_buf(void *data, int argc, object prim, object * buf);