rts_ccs_length

[ghc-hetmet.git] / rts / ProfHeap.c

diff --git a/rts/ProfHeap.c b/rts/ProfHeap.c
index 8f4c8ba..0ee53f3 100644 (file)
--- a/rts/ProfHeap.c
+++ b/rts/ProfHeap.c
@@ -386,9 +386,9 @@ printSample(rtsBool beginSample, StgDouble sampleValue)
 {
     StgDouble fractionalPart, integralPart;
     fractionalPart = modf(sampleValue, &integralPart);
-    fprintf(hp_file, "%s %d.%02d\n",
+    fprintf(hp_file, "%s %" FMT_Word64 ".%02" FMT_Word64 "\n",
             (beginSample ? "BEGIN_SAMPLE" : "END_SAMPLE"),
-            (int)integralPart, (int)(fractionalPart * 100));
+            (StgWord64)integralPart, (StgWord64)(fractionalPart * 100));
 }
 
 /* --------------------------------------------------------------------------
@@ -806,7 +806,7 @@ dumpCensus( Census *census )
 #ifdef PROFILING
        switch (RtsFlags.ProfFlags.doHeapProfile) {
        case HEAP_BY_CCS:
-           fprint_ccs(hp_file, (CostCentreStack *)ctr->identity, 25);
+           fprint_ccs(hp_file, (CostCentreStack *)ctr->identity, RtsFlags.ProfFlags.ccsLength);
            break;
        case HEAP_BY_MOD:
        case HEAP_BY_DESCR:
@@ -987,9 +987,19 @@ heapCensusChain( Census *census, bdescr *bd )
                size = sizeofW(StgTRecHeader);
                break;
 
-           case TVAR_WAIT_QUEUE:
+           case TVAR_WATCH_QUEUE:
                prim = rtsTrue;
-               size = sizeofW(StgTVarWaitQueue);
+               size = sizeofW(StgTVarWatchQueue);
+               break;
+               
+           case INVARIANT_CHECK_QUEUE:
+               prim = rtsTrue;
+               size = sizeofW(StgInvariantCheckQueue);
+               break;
+               
+           case ATOMIC_INVARIANT:
+               prim = rtsTrue;
+               size = sizeofW(StgAtomicInvariant);
                break;
                
            case TVAR: