X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FProfiling.c;h=bec04fe51f504b2c5936ff9dc2e7d6f2924626cb;hb=4bd153f2dd93745183584054e17c6ff169691a49;hp=a7466c7aa25a496ba5bc0941174d28f1be8e8b53;hpb=cffcb52b7b7518db39d64394270392d06215cf90;p=ghc-hetmet.git

diff --git a/ghc/rts/Profiling.c b/ghc/rts/Profiling.c
index a7466c7..bec04fe 100644
--- a/ghc/rts/Profiling.c
+++ b/ghc/rts/Profiling.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Profiling.c,v 1.37 2003/08/22 22:24:13 sof Exp $
  *
  * (c) The GHC Team, 1998-2000
  *
@@ -266,7 +265,7 @@ initProfilingLogFile(void)
 
     /* open the log file */
     if ((prof_file = fopen(prof_filename, "w")) == NULL) {
-	fprintf(stderr, "Can't open profiling report file %s\n", prof_filename);
+	debugBelch("Can't open profiling report file %s\n", prof_filename);
 	RtsFlags.CcFlags.doCostCentres = 0;
         // The following line was added by Sung; retainer/LDV profiling may need
         // two output files, i.e., <program>.prof/hp.
@@ -297,7 +296,7 @@ initProfilingLogFile(void)
 	
 	/* open the log file */
 	if ((hp_file = fopen(hp_filename, "w")) == NULL) {
-	    fprintf(stderr, "Can't open profiling report file %s\n", 
+	    debugBelch("Can't open profiling report file %s\n", 
 		    hp_filename);
 	    RtsFlags.ProfFlags.doHeapProfile = 0;
 	    return;
@@ -328,19 +327,19 @@ endProfiling ( void )
    -------------------------------------------------------------------------- */
 rtsBool entering_PAP;
 
-CostCentreStack *
-EnterFunCCS ( CostCentreStack *cccs, CostCentreStack *ccsfn )
+void
+EnterFunCCS ( CostCentreStack *ccsfn )
 {
   /* PAP_entry has already set CCCS for us */
   if (entering_PAP) {
     entering_PAP = rtsFalse;
-    return CCCS;
+    return;
   }
 
   if (ccsfn->root->is_caf == CC_IS_CAF) {
-    return AppendCCS(cccs,ccsfn);
+    CCCS = AppendCCS(CCCS,ccsfn);
   } else {
-    return ccsfn;
+    CCCS = ccsfn;
   }
 }
 
@@ -355,9 +354,9 @@ PushCostCentre ( CostCentreStack *ccs, CostCentre *cc )
 #define PushCostCentre _PushCostCentre
 {
   IF_DEBUG(prof, 
-	   fprintf(stderr,"Pushing %s on ", cc->label);
-	   fprintCCS(stderr,ccs);
-	   fprintf(stderr,"\n"));
+	   debugBelch("Pushing %s on ", cc->label);
+	   debugCCS(ccs);
+	   debugBelch("\n"));
   return PushCostCentre(ccs,cc);
 }
 #endif
@@ -417,11 +416,11 @@ AppendCCS ( CostCentreStack *ccs1, CostCentreStack *ccs2 )
 {
   IF_DEBUG(prof, 
 	   if (ccs1 != ccs2) {
-	     fprintf(stderr,"Appending ");
-	     fprintCCS(stderr,ccs1);
-	     fprintf(stderr," to ");
-	     fprintCCS(stderr,ccs2);
-	     fprintf(stderr,"\n");});
+	     debugBelch("Appending ");
+	     debugCCS(ccs1);
+	     debugBelch(" to ");
+	     debugCCS(ccs2);
+	     debugBelch("\n");});
   return AppendCCS(ccs1,ccs2);
 }
 #endif
@@ -461,8 +460,7 @@ static CostCentreStack *
 ActualPush_ ( CostCentreStack *ccs, CostCentre *cc, CostCentreStack *new_ccs )
 {
   /* assign values to each member of the structure */
-  ASSIGN_CCS_ID(new_ccs->ccsID);
-  
+  new_ccs->ccsID = CCS_ID++;
   new_ccs->cc = cc;
   new_ccs->prevStack = ccs;
   
@@ -665,7 +663,7 @@ report_per_cc_costs( void )
 	  );
       
       if (RtsFlags.CcFlags.doCostCentres >= COST_CENTRES_VERBOSE) {
-	  fprintf(prof_file, "  %5ld %9lld", cc->time_ticks, cc->mem_alloc);
+	fprintf(prof_file, "  %5llu %9llu", (StgWord64)(cc->time_ticks), cc->mem_alloc);
       }
       fprintf(prof_file, "\n");
   }
@@ -779,7 +777,7 @@ reportCCS(CostCentreStack *ccs, nat indent)
 	    );
 
     if (RtsFlags.CcFlags.doCostCentres >= COST_CENTRES_VERBOSE) {
-      fprintf(prof_file, "  %5ld %9lld", ccs->time_ticks, ccs->mem_alloc*sizeof(W_));
+      fprintf(prof_file, "  %5llu %9llu", (StgWord64)(ccs->time_ticks), ccs->mem_alloc*sizeof(W_));
 #if defined(PROFILING_DETAIL_COUNTS)
       fprintf(prof_file, "  %8ld %8ld %8ld %8ld %8ld %8ld %8ld",
 	      ccs->mem_allocs, ccs->thunk_count,
@@ -895,8 +893,8 @@ reportCCS_XML(CostCentreStack *ccs)
 
   cc = ccs->cc;
   
-  fprintf(prof_file, " 1 %d %llu %lu %llu", 
-	  ccs->ccsID, ccs->scc_count, ccs->time_ticks, ccs->mem_alloc);
+  fprintf(prof_file, " 1 %d %llu %llu %llu", 
+	  ccs->ccsID, ccs->scc_count, (StgWord64)(ccs->time_ticks), ccs->mem_alloc);
 
   for (i = ccs->indexTable; i != 0; i = i->next) {
     if (!i->back_edge) {
@@ -918,4 +916,19 @@ fprintCCS( FILE *f, CostCentreStack *ccs )
   fprintf(f,">");
 }
 
+#ifdef DEBUG
+void
+debugCCS( CostCentreStack *ccs )
+{
+  debugBelch("<");
+  for (; ccs && ccs != CCS_MAIN; ccs = ccs->prevStack ) {
+      debugBelch("%s.%s", ccs->cc->module, ccs->cc->label);
+      if (ccs->prevStack && ccs->prevStack != CCS_MAIN) {
+	  debugBelch(",");
+      }
+  }
+  debugBelch(">");
+}
+#endif // DEBUG
+
 #endif /* PROFILING */