X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FProftimer.c;h=3b499152d66b768e682ec7b8947e07b5d6438720;hb=7f24ae51ed36c5c0308a2d0de23e243f32a0043c;hp=390dd6953bd0d6029cb1040b7a8cefad0bd473e6;hpb=db61851c5472bf565cd1da900b33d6e033fd743d;p=ghc-hetmet.git

diff --git a/ghc/rts/Proftimer.c b/ghc/rts/Proftimer.c
index 390dd69..3b49915 100644
--- a/ghc/rts/Proftimer.c
+++ b/ghc/rts/Proftimer.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Proftimer.c,v 1.8 2001/11/22 14:25:12 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -13,7 +12,7 @@
 
 #include "Rts.h"
 #include "Profiling.h"
-#include "Itimer.h"
+#include "Timer.h"
 #include "Proftimer.h"
 #include "RtsFlags.h"
 
@@ -29,17 +28,13 @@ rtsBool performHeapProfile;
 void
 stopProfTimer( void )
 {
-    if (time_profiling) {
-	do_prof_ticks = rtsFalse;
-    }
+    do_prof_ticks = rtsFalse;
 }
 
 void
 startProfTimer( void )
 {
-    if (time_profiling) {
-	do_prof_ticks = rtsTrue;
-    }
+    do_prof_ticks = rtsTrue;
 }
 
 void
@@ -51,7 +46,8 @@ stopHeapProfTimer( void )
 void
 startHeapProfTimer( void )
 {
-    if (RtsFlags.ProfFlags.doHeapProfile) {
+    if (RtsFlags.ProfFlags.doHeapProfile && 
+	RtsFlags.ProfFlags.profileIntervalTicks > 0) {
 	do_heap_prof_ticks = rtsTrue;
     }
 }
@@ -68,13 +64,13 @@ initProfTimer( void )
 
     startHeapProfTimer();
 }
-    
+
 
 void
 handleProfTick(void)
 {
     if (do_prof_ticks) {
-	CCS_TICK(CCCS);
+	CCCS->time_ticks++;
     }
 
     if (do_heap_prof_ticks) {