diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2014-05-29 20:05:51 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2014-05-29 20:05:51 -0700 |
| commit | 723095b0e4c5838c7eefd757af56ab2a7c614801 (patch) | |
| tree | 1581da2255fe571fc567992feb3422cebf3f59c7 /rts/RtsStartup.c | |
| parent | 0c1974c8262f1609ecb7dec438d8cd167f788a5c (diff) | |
| download | haskell-723095b0e4c5838c7eefd757af56ab2a7c614801.tar.gz | |
Per-capability nursery weak pointer lists, fixes #9075
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Diffstat (limited to 'rts/RtsStartup.c')
| -rw-r--r-- | rts/RtsStartup.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/rts/RtsStartup.c b/rts/RtsStartup.c index 15e48a690d..06e888c1b2 100644 --- a/rts/RtsStartup.c +++ b/rts/RtsStartup.c @@ -304,7 +304,7 @@ hs_add_root(void (*init_root)(void) STG_UNUSED) static void hs_exit_(rtsBool wait_foreign) { - nat g; + nat g, i; if (hs_init_count <= 0) { errorBelch("warning: too many hs_exit()s"); @@ -336,6 +336,9 @@ hs_exit_(rtsBool wait_foreign) exitScheduler(wait_foreign); /* run C finalizers for all active weak pointers */ + for (i = 0; i < n_capabilities; i++) { + runAllCFinalizers(capabilities[i]->weak_ptr_list_hd); + } for (g = 0; g < RtsFlags.GcFlags.generations; g++) { runAllCFinalizers(generations[g].weak_ptr_list); } |