X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FProftimer.c;h=3b499152d66b768e682ec7b8947e07b5d6438720;hb=c883f6969ad957637649f3af1a2b6977555bdd32;hp=ae63670418897915dba3940c75ccc6481bbdc8c9;hpb=b9d8ddb91c9360e3165244520f31dcd28c396825;p=ghc-hetmet.git

diff --git a/ghc/rts/Proftimer.c b/ghc/rts/Proftimer.c
index ae63670..3b49915 100644
--- a/ghc/rts/Proftimer.c
+++ b/ghc/rts/Proftimer.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Proftimer.c,v 1.6 2000/04/03 15:54:49 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -9,34 +8,78 @@
 
 #if defined (PROFILING)
 
+#include "PosixSource.h"
+
 #include "Rts.h"
 #include "Profiling.h"
-#include "Itimer.h"
+#include "Timer.h"
 #include "Proftimer.h"
+#include "RtsFlags.h"
+
+static rtsBool do_prof_ticks = rtsFalse;       // enable profiling ticks
+static rtsBool do_heap_prof_ticks = rtsFalse;  // enable heap profiling ticks
 
-rtsBool do_prof_ticks = rtsFalse;       /* enable profiling ticks */
+// Number of ticks until next heap census
+static int ticks_to_heap_profile;
+
+// Time for a heap profile on the next context switch
+rtsBool performHeapProfile;
 
 void
-stopProfTimer(void)
-{				/* Stops time profile */
-    if (time_profiling) {
-	do_prof_ticks = rtsFalse;
-    }
-};
+stopProfTimer( void )
+{
+    do_prof_ticks = rtsFalse;
+}
+
+void
+startProfTimer( void )
+{
+    do_prof_ticks = rtsTrue;
+}
+
+void
+stopHeapProfTimer( void )
+{
+    do_heap_prof_ticks = rtsFalse;
+}
 
 void
-startProfTimer(void)
-{				/* Starts time profile */
-    if (time_profiling) {
-	do_prof_ticks = rtsTrue;
+startHeapProfTimer( void )
+{
+    if (RtsFlags.ProfFlags.doHeapProfile && 
+	RtsFlags.ProfFlags.profileIntervalTicks > 0) {
+	do_heap_prof_ticks = rtsTrue;
     }
-};
+}
+
+void
+initProfTimer( void )
+{
+    performHeapProfile = rtsFalse;
+
+    RtsFlags.ProfFlags.profileIntervalTicks = 
+	RtsFlags.ProfFlags.profileInterval / TICK_MILLISECS;
+
+    ticks_to_heap_profile = RtsFlags.ProfFlags.profileIntervalTicks;
+
+    startHeapProfTimer();
+}
+
 
 void
 handleProfTick(void)
 {
     if (do_prof_ticks) {
-	CCS_TICK(CCCS);
+	CCCS->time_ticks++;
+    }
+
+    if (do_heap_prof_ticks) {
+	ticks_to_heap_profile--;
+	if (ticks_to_heap_profile <= 0) {
+	    ticks_to_heap_profile = RtsFlags.ProfFlags.profileIntervalTicks;
+	    performHeapProfile = rtsTrue;
+	}
     }
 }
+
 #endif /* PROFILING */