X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FTrace.h;h=0e142f5238c82dc32b48e340b489c7e32c760f2d;hb=66579ff945831c5fc9a17c58c722ff01f2268d76;hp=19e492c26edb9536d92a5e6b5e296a1406ff67cd;hpb=5a2769f0273dd389977e8283375e7920d183bdd4;p=ghc-hetmet.git

diff --git a/rts/Trace.h b/rts/Trace.h
index 19e492c..0e142f5 100644
--- a/rts/Trace.h
+++ b/rts/Trace.h
@@ -45,11 +45,11 @@ void traceEnd (void);
 #ifdef DEBUG
 #define debugTrace(class, str, ...) trace(class,str, ## __VA_ARGS__)
 // variable arg macros are C99, and supported by gcc.
-#define debugTraceBegin(class, str, ...) traceBegin(class,str, ## __VA_ARGS__)
+#define debugTraceBegin(str, ...) traceBegin(str, ## __VA_ARGS__)
 #define debugTraceEnd() traceEnd()
 #else
 #define debugTrace(class, str, ...) /* nothing */
-#define debugTraceBegin(class, str, ...) /* nothing */
+#define debugTraceBegin(str, ...) /* nothing */
 #define debugTraceEnd() /* nothing */
 #endif
 
@@ -73,41 +73,11 @@ void traceEnd (void);
 #define DEBUG_par		   (1<<11)
 #define DEBUG_linker		   (1<<12)
 #define DEBUG_squeeze              (1<<13)
+#define DEBUG_hpc                  (1<<14)
 
-// PAR debugging flags, set with +RTS -qD<something>
-#define PAR_DEBUG_verbose	   (1<<14)
-#define PAR_DEBUG_bq		   (1<<15)
-#define PAR_DEBUG_schedule         (1<<16)
-#define PAR_DEBUG_free       	   (1<<17)
-#define PAR_DEBUG_resume     	   (1<<18)
-#define PAR_DEBUG_weight     	   (1<<19)
-#define PAR_DEBUG_fetch      	   (1<<21)
-#define PAR_DEBUG_fish       	   (1<<22)
-#define PAR_DEBUG_tables     	   (1<<23)
-#define PAR_DEBUG_packet     	   (1<<24)
-#define PAR_DEBUG_pack       	   (1<<25)
-#define PAR_DEBUG_paranoia         (1<<26)
-
-// GRAN and PAR don't coexist, so we re-use the PAR values for GRAN.
-#define GRAN_DEBUG_event_trace     (1<<14)  
-#define GRAN_DEBUG_event_stats     (1<<15)
-#define GRAN_DEBUG_bq              (1<<16)
-#define GRAN_DEBUG_pack            (1<<17)
-#define GRAN_DEBUG_checkSparkQ     (1<<18)
-#define GRAN_DEBUG_thunkStealing   (1<<19)
-#define GRAN_DEBUG_randomSteal     (1<<20)	
-#define GRAN_DEBUG_findWork        (1<<21)	
-#define GRAN_DEBUG_unused     	   (1<<22)
-#define GRAN_DEBUG_pri     	   (1<<23)
-#define GRAN_DEBUG_checkLight      (1<<24)	
-#define GRAN_DEBUG_sortedQ         (1<<25)	
-#define GRAN_DEBUG_blockOnFetch    (1<<26)
-#define GRAN_DEBUG_packBuffer      (1<<27)
-#define GRAN_DEBUG_BOF_sanity      (1<<28)
-
-// Profiling flags
-#define TRACE_sched                (1<<29)
-
+// Tracing flags
+#define TRACE_sched                (1<<20)
+#define TRACE_gc                   (1<<21)
 
 // -----------------------------------------------------------------------------
 // PRIVATE below here