X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FRtsStartup.c;h=070275b534f7825efae60ae1cabd882e59954e30;hb=64d2f63295d25b55056c5c4698fcdb37150fbe05;hp=cdb45c60f2ca68c385d0691c8ddfeca9f5e28998;hpb=8d71be7cbd079f5eab23484a53a43b59dd0399e5;p=ghc-hetmet.git

diff --git a/rts/RtsStartup.c b/rts/RtsStartup.c
index cdb45c6..070275b 100644
--- a/rts/RtsStartup.c
+++ b/rts/RtsStartup.c
@@ -33,6 +33,7 @@
 #include "RtsTypeable.h"
 #include "Stable.h"
 #include "Hpc.h"
+#include "FileLock.h"
 
 #if defined(RTS_GTK_FRONTPANEL)
 #include "FrontPanel.h"
@@ -166,30 +167,6 @@ hs_init(int *argc, char **argv[])
     argv++; argc--;
 #endif
 
-    /* Initialise the performance tracking library */
-#ifdef USE_PAPI
-    {
-	int ver;
-	if ((ver = PAPI_library_init(PAPI_VER_CURRENT)) != PAPI_VER_CURRENT) {
-	    if (ver > 0) {
-		errorBelch("PAPI_library_init: wrong version: %x", ver);
-		stg_exit(EXIT_FAILURE);
-	    } else {
-		sysErrorBelch("PAPI_library_init");
-		stg_exit(EXIT_FAILURE);
-	    }
-	}
-    }
-#ifdef THREADED_RTS
-    {
-	int err;
-	if ((err = PAPI_thread_init(osThreadId)) < 0) {
-	    barf("PAPI_thread_init: %d",err);
-	}
-    }
-#endif
-#endif
-
     /* Set the RTS flags to default values. */
 
     initRtsFlagsDefaults();
@@ -204,6 +181,10 @@ hs_init(int *argc, char **argv[])
 	setProgArgv(*argc,*argv);
     }
 
+#ifdef USE_PAPI
+    papi_init();
+#endif
+
     /* initTracing must be after setupRtsFlags() */
     initTracing();
 
@@ -238,6 +219,11 @@ hs_init(int *argc, char **argv[])
     /* initialise the shared Typeable store */
     initTypeableStore();
 
+    /* initialise file locking, if necessary */
+#if !defined(mingw32_HOST_OS)    
+    initFileLocking();
+#endif
+
 #if defined(DEBUG)
     /* initialise thread label table (tso->char*) */
     initThreadLabelTable();
@@ -275,10 +261,6 @@ hs_init(int *argc, char **argv[])
     x86_init_fpu();
 #endif
 
-#if defined(THREADED_RTS)
-    ioManagerStart();
-#endif
-
     /* Record initialization times */
     stat_endInit();
 }
@@ -328,7 +310,9 @@ hs_add_root(void (*init_root)(void))
 {
     bdescr *bd;
     nat init_sp;
-    Capability *cap = &MainCapability;
+    Capability *cap;
+
+    cap = rts_lock();
 
     if (hs_init_count <= 0) {
 	barf("hs_add_root() must be called after hs_init()");
@@ -354,6 +338,13 @@ hs_add_root(void (*init_root)(void))
     // This must be done after module initialisation.
     // ToDo: make this work in the presence of multiple hs_add_root()s.
     initProfiling2();
+
+    rts_unlock(cap);
+
+    // ditto.
+#if defined(THREADED_RTS)
+    ioManagerStart();
+#endif
 }
 
 /* ----------------------------------------------------------------------------
@@ -462,6 +453,11 @@ hs_exit_(rtsBool wait_foreign)
     /* free shared Typeable store */
     exitTypeableStore();
 
+    /* free file locking tables, if necessary */
+#if !defined(mingw32_HOST_OS)    
+    freeFileLocking();
+#endif
+
     /* free the stable pointer table */
     exitStablePtrTable();
 
@@ -487,7 +483,7 @@ hs_exit_(rtsBool wait_foreign)
     // Originally, this was in report_ccs_profiling().  Now, retainer
     // profiling might tack some extra stuff on to the end of this file
     // during endProfiling().
-    fclose(prof_file);
+    if (prof_file != NULL) fclose(prof_file);
 #endif
 
 #if defined(TICKY_TICKY)