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, 5 insertions, 3 deletions

diff --git a/rts/Papi.h b/rts/Papi.h
index eaabdf5495..fc92a913d5 100644
--- a/rts/Papi.h
+++ b/rts/Papi.h
@@ -16,10 +16,12 @@ void papi_init_eventset(int * event_set);
 void papi_init(void);
 void papi_start_mutator_count(void);
 void papi_stop_mutator_count(void);
+
 void papi_start_gc_count(void);
-void papi_stop_gc_count(void);
+void papi_stop_gc0_count(void);
+void papi_stop_gc1_count(void);
 
 // for multithreaded GC, each sub-thread uses these functions to count
 // events and aggregate them into the main GC counters.
-void papi_thread_start_gc_count(int event_set);
-void papi_thread_stop_gc_count(int event_set);
+void papi_thread_start_gc1_count(int event_set);
+void papi_thread_stop_gc1_count(int event_set);