diff --git a/mozilla/tools/trace-malloc/spacecategory.c b/mozilla/tools/trace-malloc/spacecategory.c index 7c5d5d801c9..51fa1cb931b 100644 --- a/mozilla/tools/trace-malloc/spacecategory.c +++ b/mozilla/tools/trace-malloc/spacecategory.c @@ -921,7 +921,7 @@ int displayCategoryReport(STRequest* inRequest, STCategoryNode *root, int depth) { PR_fprintf(inRequest->mFD, "\n" - " \n" + " \n" " \n" " \n" " \n" diff --git a/mozilla/tools/trace-malloc/spacetrace.c b/mozilla/tools/trace-malloc/spacetrace.c index 37707069820..47bf6eef732 100644 --- a/mozilla/tools/trace-malloc/spacetrace.c +++ b/mozilla/tools/trace-malloc/spacetrace.c @@ -2352,21 +2352,21 @@ void htmlHeader(STRequest* inRequest, const char* aTitle) "\n" "\n" "
\n" - "
CategoryComposite Byte Size%% of Total Size
" - "" - "\n" - , aTitle, + "
\n" + "Category:\n" + "%s\n", + aTitle, inRequest->mOptions.mCategoryName); - PR_fprintf(inRequest->mFD,"
\n"); + PR_fprintf(inRequest->mFD,"\n"); - PR_fprintf(inRequest->mFD,"\n"); + PR_fprintf(inRequest->mFD,"\n"); - PR_fprintf(inRequest->mFD,"
Category: %s"); + PR_fprintf(inRequest->mFD,""); htmlAnchor(inRequest, "index.html", "Index", NULL, "header-menuitem", &inRequest->mOptions); - PR_fprintf(inRequest->mFD,""); + PR_fprintf(inRequest->mFD,""); htmlAnchor(inRequest, "options.html", "Options", NULL, "header-menuitem", &inRequest->mOptions); - PR_fprintf(inRequest->mFD,"
\n"); + PR_fprintf(inRequest->mFD,"\n"); PR_fprintf(inRequest->mFD, "\n
\n"); } @@ -2686,7 +2686,7 @@ int displayTopAllocations(STRequest* inRequest, STRun* aRun, int aWantCallsite) STAllocation* current = NULL; PR_fprintf(inRequest->mFD, "\n"); - PR_fprintf(inRequest->mFD, "\n"); + PR_fprintf(inRequest->mFD, "\n"); PR_fprintf(inRequest->mFD, "\n"); PR_fprintf(inRequest->mFD, "\n"); PR_fprintf(inRequest->mFD, "\n"); @@ -2799,7 +2799,7 @@ int displayMemoryLeaks(STRequest* inRequest, STRun* aRun) STAllocation* current = NULL; PR_fprintf(inRequest->mFD, "
RankIndexByte Size
\n"); - PR_fprintf(inRequest->mFD, "\n"); + PR_fprintf(inRequest->mFD, "\n"); PR_fprintf(inRequest->mFD, "\n"); PR_fprintf(inRequest->mFD, "\n"); PR_fprintf(inRequest->mFD, "\n"); @@ -2944,15 +2944,16 @@ int displayCallsites(STRequest* inRequest, tmcallsite* aCallsite, int aFollow, P { headerDisplayed = __LINE__; - PR_fprintf(inRequest->mFD, "
RankIndexByte Size
\n"); - PR_fprintf(inRequest->mFD, "\n"); - PR_fprintf(inRequest->mFD, "\n"); - PR_fprintf(inRequest->mFD, "\n"); - PR_fprintf(inRequest->mFD, "\n"); - PR_fprintf(inRequest->mFD, "\n"); - PR_fprintf(inRequest->mFD, "\n"); - PR_fprintf(inRequest->mFD, "\n"); - PR_fprintf(inRequest->mFD, "\n"); + PR_fprintf(inRequest->mFD, + "
CallsiteComposite Byte SizeComposite SecondsComposite WeightHeap Object CountComposite Heap Operation Seconds
\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n"); } /* @@ -3067,7 +3068,7 @@ int displayAllocationDetails(STRequest* inRequest, STAllocation* aAllocation) PR_fprintf(inRequest->mFD, "Allocation %u Details:

\n", aAllocation->mRunIndex); - PR_fprintf(inRequest->mFD, "

CallsiteC. SizeC. SecondsC. WeightH.O. CountC.H. Operation (sec)
\n"); + PR_fprintf(inRequest->mFD, "
\n"); PR_fprintf(inRequest->mFD, "\n", bytesize); PR_fprintf(inRequest->mFD, "\n", ST_TIMEVAL_PRINTABLE(timeval)); PR_fprintf(inRequest->mFD, "\n", weight64); @@ -3362,17 +3363,17 @@ int displayTopCallsites(STRequest* inRequest, tmcallsite** aCallsites, PRUint32 { headerDisplayed = __LINE__; - PR_fprintf(inRequest->mFD, "
Final Size:%u
Lifespan Seconds:" ST_TIMEVAL_FORMAT "
Weight:%llu
\n"); - - PR_fprintf(inRequest->mFD, "\n"); - PR_fprintf(inRequest->mFD, "\n"); - PR_fprintf(inRequest->mFD, "\n"); - PR_fprintf(inRequest->mFD, "\n"); - PR_fprintf(inRequest->mFD, "\n"); - PR_fprintf(inRequest->mFD, "\n"); - PR_fprintf(inRequest->mFD, "\n"); - PR_fprintf(inRequest->mFD, "\n"); - PR_fprintf(inRequest->mFD, "\n"); + PR_fprintf(inRequest->mFD, + "
RankCallsiteComposite SizeComposite SecondsComposite WeightHeap Object CountHeap Operation Seconds
\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n"); } displayed++; @@ -3480,7 +3481,7 @@ int displayCallsiteDetails(STRequest* inRequest, tmcallsite* aCallsite) PR_fprintf(inRequest->mFD, "%s+%u(%u) Callsite Details:

\n", tmmethodnode_name(aCallsite->method), aCallsite->offset, (PRUint32)aCallsite->entry.key); } - PR_fprintf(inRequest->mFD, "

RankCallsiteC. SizeC. SecondsC. WeightH.O. CountC.H. Operation (sec)
\n"); + PR_fprintf(inRequest->mFD, "
\n"); PR_fprintf(inRequest->mFD, "\n", thisRun->mStats[inRequest->mContext->mIndex].mSize); PR_fprintf(inRequest->mFD, "\n", ST_TIMEVAL_PRINTABLE64(thisRun->mStats[inRequest->mContext->mIndex].mTimeval64)); PR_fprintf(inRequest->mFD, "\n", thisRun->mStats[inRequest->mContext->mIndex].mWeight64); @@ -5659,7 +5660,7 @@ void handleClient(void* inArg) ** mime type, otherwise, say it is text/html. */ PR_fprintf(aFD, "HTTP/1.1 200 OK%s", crlf); - PR_fprintf(aFD, "Server: %s%s", "$Id: spacetrace.c,v 1.40 2003-04-17 07:36:28 alecf%netscape.com Exp $", crlf); + PR_fprintf(aFD, "Server: %s%s", "$Id: spacetrace.c,v 1.41 2003-04-21 07:26:05 alecf%netscape.com Exp $", crlf); PR_fprintf(aFD, "Content-type: "); if(NULL != strstr(start, ".png")) { diff --git a/mozilla/tools/trace-malloc/spacetrace.css b/mozilla/tools/trace-malloc/spacetrace.css index dacafb4114f..d2b2e72f410 100644 --- a/mozilla/tools/trace-malloc/spacetrace.css +++ b/mozilla/tools/trace-malloc/spacetrace.css @@ -1,18 +1,25 @@ -/* header stuff */ -table.main { - position: relative; - right: 0px; - border-spacing: 0px; +body { + margin: 0px; + padding: 0px; } +/* header stuff */ .spacetrace-header { - border: 2px inset; - float: right; + background: green; + min-height: 2em; +} + +.navigate { + background: lightgrey; + position: absolute; + right: 0px; + margin: 0px; + padding: 2px; } .header-item { border: 2px outset; - background: lightgrey; + margin: 0px; } .header-item > a { @@ -21,14 +28,12 @@ table.main { } -.category-title, .header-item { - padding: 2px; - margin: 0px; +.header-item { font-weight: bold; } .category-title { - background: lightgrey; + font-weight: bold; } /* footer stuff */ @@ -49,20 +54,29 @@ table.main { /* headers at the top of specific call site pages */ -table.data-header { +table.summary { border: 1px solid black; } /* lists of callsites/etc */ table.data td { border-top: 1px solid; + padding: 5px; } table.data { clear: right; + border-collapse: collapse; +} + +tr.row-header { + background: #009090; + width: 100%; } table.data th { + padding: 5px; + margin: 0px; text-align: right; }
Composite Byte Size:%u
Composite Seconds:" ST_TIMEVAL_FORMAT "
Composite Weight:%llu