X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Frts%2FProfHeap.c;h=27a1a4131251f2a76c89a437bcbcb903e2a8ab20;hb=3058c4a9633090cc1c74d1bf99429ef845b2c1bb;hp=4f3545a18bbd3ea9f7c1c0d904835a24819684db;hpb=0bffc410964e1688ad80d277d53400659e697ab5;p=ghc-hetmet.git

diff --git a/ghc/rts/ProfHeap.c b/ghc/rts/ProfHeap.c
index 4f3545a..27a1a41 100644
--- a/ghc/rts/ProfHeap.c
+++ b/ghc/rts/ProfHeap.c
@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------------------
- * $Id: ProfHeap.c,v 1.40 2002/12/11 15:36:47 simonmar Exp $
+ * $Id: ProfHeap.c,v 1.48 2003/09/23 15:38:36 simonmar Exp $
  *
- * (c) The GHC Team, 1998-2000
+ * (c) The GHC Team, 1998-2003
  *
  * Support for heap profiling
  *
@@ -407,7 +407,7 @@ initHeapProfiling(void)
 
     initEra( &censuses[era] );
 
-    fprintf(hp_file, "JOB \"%s", prog_argv[0]);
+    fprintf(hp_file, "JOB \"%s", prog_name);
 
 #ifdef PROFILING
     {
@@ -432,7 +432,7 @@ initHeapProfiling(void)
     fprintf(hp_file, "END_SAMPLE 0.00\n");
 
 #ifdef DEBUG_HEAP_PROF
-    DEBUG_LoadSymbols(prog_argv[0]);
+    DEBUG_LoadSymbols(prog_name);
 #endif
 
 #ifdef PROFILING
@@ -479,13 +479,24 @@ endHeapProfiling(void)
 
 
 #ifdef PROFILING
+static size_t
+buf_append(char *p, const char *q, char *end)
+{
+    int m;
+
+    for (m = 0; p < end; p++, q++, m++) {
+	*p = *q;
+	if (*q == '\0') { break; }
+    }
+    return m;
+}
+
 static void
 fprint_ccs(FILE *fp, CostCentreStack *ccs, nat max_length)
 {
-    char buf[max_length+1];
+    char buf[max_length+1], *p, *buf_end;
     nat next_offset = 0;
     nat written;
-    char *template;
 
     // MAIN on its own gets printed as "MAIN", otherwise we ignore MAIN.
     if (ccs == CCS_MAIN) {
@@ -495,6 +506,9 @@ fprint_ccs(FILE *fp, CostCentreStack *ccs, nat max_length)
 
     fprintf(fp, "(%d)", ccs->ccsID);
 
+    p = buf;
+    buf_end = buf + max_length + 1;
+
     // keep printing components of the stack until we run out of space
     // in the buffer.  If we run out of space, end with "...".
     for (; ccs != NULL && ccs != CCS_MAIN; ccs = ccs->prevStack) {
@@ -502,31 +516,16 @@ fprint_ccs(FILE *fp, CostCentreStack *ccs, nat max_length)
 	// CAF cost centres print as M.CAF, but we leave the module
 	// name out of all the others to save space.
 	if (!strcmp(ccs->cc->label,"CAF")) {
-#ifdef HAVE_SNPRINTF
-	    written = snprintf(buf+next_offset, 
-			       (int)max_length-3-(int)next_offset,
-			       "%s.CAF", ccs->cc->module);
-#else
-	    written = sprintf(buf+next_offset, 
-			       "%s.CAF", ccs->cc->module);
-#endif
+	    p += buf_append(p, ccs->cc->module, buf_end);
+	    p += buf_append(p, ".CAF", buf_end);
 	} else {
 	    if (ccs->prevStack != NULL && ccs->prevStack != CCS_MAIN) {
-		template = "%s/";
-	    } else {
-		template = "%s";
+		p += buf_append(p, "/", buf_end);
 	    }
-#ifdef HAVE_SNPRINTF
-	    written = snprintf(buf+next_offset, 
-			       (int)max_length-3-(int)next_offset,
-			       template, ccs->cc->label);
-#else
-	    written = sprintf(buf+next_offset, 
-			       template, ccs->cc->label);
-#endif
+	    p += buf_append(p, ccs->cc->label, buf_end);
 	}
-
-	if (next_offset+written >= max_length-4) {
+	
+	if (p >= buf_end) {
 	    sprintf(buf+max_length-4, "...");
 	    break;
 	} else {
@@ -593,12 +592,18 @@ closureSatisfiesConstraints( StgClosure* p )
    if (RtsFlags.ProfFlags.retainerSelector) {
        RetainerSet *rs;
        nat i;
-       rs = retainerSetOf((StgClosure *)p);
-       if (rs != NULL) {
-	   for (i = 0; i < rs->num; i++) {
-	       b = strMatchesSelector( rs->element[i]->cc->label,
-					 RtsFlags.ProfFlags.retainerSelector );
-	       if (b) return rtsTrue;
+       // We must check that the retainer set is valid here.  One
+       // reason it might not be valid is if this closure is a
+       // a newly deceased weak pointer (i.e. a DEAD_WEAK), since
+       // these aren't reached by the retainer profiler's traversal.
+       if (isRetainerSetFieldValid((StgClosure *)p)) {
+	   rs = retainerSetOf((StgClosure *)p);
+	   if (rs != NULL) {
+	       for (i = 0; i < rs->num; i++) {
+		   b = strMatchesSelector( rs->element[i]->cc->label,
+					   RtsFlags.ProfFlags.retainerSelector );
+		   if (b) return rtsTrue;
+	       }
 	   }
        }
        return rtsFalse;
@@ -820,6 +825,15 @@ heapCensusChain( Census *census, bdescr *bd )
     rtsBool prim;
 
     for (; bd != NULL; bd = bd->link) {
+
+	// HACK: ignore pinned blocks, because they contain gaps.
+	// It's not clear exactly what we'd like to do here, since we
+	// can't tell which objects in the block are actually alive.
+	// Perhaps the whole block should be counted as SYSTEM memory.
+	if (bd->flags & BF_PINNED) {
+	    continue;
+	}
+
 	p = bd->start;
 	while (p < bd->free) {
 	    info = get_itbl((StgClosure *)p);
@@ -831,6 +845,7 @@ heapCensusChain( Census *census, bdescr *bd )
 	    case FUN:
 	    case THUNK:
 	    case IND_PERM:
+	    case IND_OLDGEN:
 	    case IND_OLDGEN_PERM:
 	    case CAF_BLACKHOLE:
 	    case SE_CAF_BLACKHOLE:
@@ -856,6 +871,10 @@ heapCensusChain( Census *census, bdescr *bd )
 		break;
 		
 	    case BCO:
+		prim = rtsTrue;
+		size = bco_sizeW((StgBCO *)p);
+		break;
+
 	    case MVAR:
 	    case WEAK:
 	    case FOREIGN:
@@ -894,9 +913,20 @@ heapCensusChain( Census *census, bdescr *bd )
 		
 	    case TSO:
 		prim = rtsTrue;
+#ifdef DEBUG_HEAP_PROF
 		size = tso_sizeW((StgTSO *)p);
 		break;
-		
+#else
+		if (RtsFlags.ProfFlags.includeTSOs) {
+		    size = tso_sizeW((StgTSO *)p);
+		    break;
+		} else {
+		    // Skip this TSO and move on to the next object
+		    p += tso_sizeW((StgTSO *)p);
+		    continue;
+		}
+#endif
+
 	    default:
 		barf("heapCensus");
 	    }
@@ -1007,7 +1037,7 @@ heapCensus( void )
 	      heapCensusChain( census, generations[g].steps[s].blocks );
 	      // Are we interested in large objects?  might be
 	      // confusing to include the stack in a heap profile.
-	      // heapCensusChain( census, generations[g].steps[s].large_objects );
+	      heapCensusChain( census, generations[g].steps[s].large_objects );
 	  }
       }
   }