*/
stat_startInit();
-#if defined(DEBUG)
- /* Start off by initialising the allocator debugging so we can
- * use it anywhere */
- initAllocator();
-#endif
-
/* Set the RTS flags to default values. */
initRtsFlagsDefaults();
*/
getStablePtr((StgPtr)runIO_closure);
getStablePtr((StgPtr)runNonIO_closure);
+
+ getStablePtr((StgPtr)runFinalizerBatch_closure);
+
getStablePtr((StgPtr)stackOverflow_closure);
getStablePtr((StgPtr)heapOverflow_closure);
- getStablePtr((StgPtr)runFinalizerBatch_closure);
getStablePtr((StgPtr)unpackCString_closure);
getStablePtr((StgPtr)blockedIndefinitelyOnMVar_closure);
getStablePtr((StgPtr)nonTermination_closure);
getStablePtr((StgPtr)blockedIndefinitelyOnSTM_closure);
+ getStablePtr((StgPtr)nestedAtomically_closure);
+
+ getStablePtr((StgPtr)runSparks_closure);
+ getStablePtr((StgPtr)ensureIOManagerIsRunning_closure);
+#ifndef mingw32_HOST_OS
+ getStablePtr((StgPtr)runHandlers_closure);
+#endif
/* initialise the shared Typeable store */
initGlobalStore();
/* stop the ticker */
stopTimer();
- exitTimer();
+ exitTimer(wait_foreign);
// set the terminal settings back to what they were
#if !defined(mingw32_HOST_OS)
/* free hash table storage */
exitHashTable();
- // Finally, free all our storage
- freeStorage();
-
-#if defined(DEBUG)
- /* and shut down the allocator debugging */
- shutdownAllocator();
-#endif
+ // Finally, free all our storage. However, we only free the heap
+ // memory if we have waited for foreign calls to complete;
+ // otherwise a foreign call in progress may still be referencing
+ // heap memory (e.g. by being passed a ByteArray#).
+ freeStorage(wait_foreign);
}