improvements to PAPI support

- major (multithreaded) GC is measured separately from minor GC
- events to measure can now be specified on the command line, e.g
     prog +RTS -a+PAPI_TOT_CYC

1 files changed, 4 insertions, 4 deletions

diff --git a/rts/RtsStartup.c b/rts/RtsStartup.c
index d1025a3a8b..070275b534 100644
--- a/rts/RtsStartup.c
+++ b/rts/RtsStartup.c
@@ -167,10 +167,6 @@ hs_init(int *argc, char **argv[])
     argv++; argc--;
 #endif
 
-#ifdef USE_PAPI
-    papi_init();
-#endif
-
     /* Set the RTS flags to default values. */
 
     initRtsFlagsDefaults();
@@ -185,6 +181,10 @@ hs_init(int *argc, char **argv[])
 	setProgArgv(*argc,*argv);
     }
 
+#ifdef USE_PAPI
+    papi_init();
+#endif
+
     /* initTracing must be after setupRtsFlags() */
     initTracing();