Changeset 35653 in webkit for trunk/JavaScriptCore/VM/SamplingTool.cpp

Timestamp:

Aug 9, 2008, 2:14:54 PM (17 years ago)

Author:

[email protected]

Message:

2008-08-09 Cameron Zwarich <​[email protected]>

Reviewed by Maciej.

Fix some style issues in the sampling tool.

• VM/SamplingTool.cpp: (KJS::sleepForMicroseconds): (KJS::SamplingTool::dump):

File:

• trunk/JavaScriptCore/VM/SamplingTool.cpp (modified) (5 diffs)

trunk/JavaScriptCore/VM/SamplingTool.cpp

@@ -56 +56 @@
 static void sleepForMicroseconds(unsigned us)
 {
-    unsigned ms = us/1000;
+    unsigned ms = us / 1000;
     if (us && !ms)
         ms = 1;
@@ -170 +170 @@
     Vector<ScopeSampleRecord*> codeBlockSamples(scopeCount);
     ScopeSampleRecordMap::iterator iter = m_scopeSampleMap->begin();
-    for (int i=0; i < scopeCount; ++i, ++iter) {
+    for (int i = 0; i < scopeCount; ++i, ++iter) {
         codeBlockSamples[i] = iter->second;
         totalCodeBlockSamples += codeBlockSamples[i]->m_totalCount;
@@ -185 +185 @@
     long long opcodeSampleCounts[numOpcodeIDs] = { 0 };
 
-    fprintf(stdout, "\nBlock sampling results\n\n"); 
-    fprintf(stdout, "Total blocks sampled (total samples): %lld (%lld)\n\n", totalCodeBlockSamples, m_totalSamples);
+    printf("\nBlock sampling results\n\n"); 
+    printf("Total blocks sampled (total samples): %lld (%lld)\n\n", totalCodeBlockSamples, m_totalSamples);
 
     for (int i=0; i < scopeCount; i++) {
-        ScopeSampleRecord *record = codeBlockSamples[i];
+        ScopeSampleRecord* record = codeBlockSamples[i];
         CodeBlock* codeBlock = record->m_codeBlock;
 
@@ -197 +197 @@
         if ((blockPercent >= 1) && codeBlock) {
             Instruction* code = codeBlock->instructions.begin();
-            fprintf(stdout, "#%d: %s:%d: sampled %d times - %.3f%% (%.3f%%)\n", i+1, record->m_scope->sourceURL().UTF8String().c_str(), codeBlock->lineNumberForVPC(code), record->m_totalCount, blockPercent, totalPercent);
+            printf("#%d: %s:%d: sampled %d times - %.3f%% (%.3f%%)\n", i + 1, record->m_scope->sourceURL().UTF8String().c_str(), codeBlock->lineNumberForVPC(code), record->m_totalCount, blockPercent, totalPercent);
             if (i < 10) {
                 HashMap<unsigned,unsigned> lineCounts;
@@ -257 +257 @@
     // (4) Print Opcode sampling results.
     
-    fprintf(stdout, "\nOpcode sampling results\n\n"); 
+    printf("\nOpcode sampling results\n\n"); 
     
-    fprintf(stdout, "Total opcodes sampled (total samples): %lld (%lld)\n\n", totalOpcodeSamples, m_totalSamples);
-    fprintf(stdout, "Opcodes in order:\n\n");
+    printf("Total opcodes sampled (total samples): %lld (%lld)\n\n", totalOpcodeSamples, m_totalSamples);
+    printf("Opcodes in order:\n\n");
     for (int i = 0; i < numOpcodeIDs; ++i) {
         long long count = opcodeSampleCounts[i];
-        fprintf(stdout, "%s:%s%6lld\t%.3f%%\t(%.3f%%)\n", opcodeNames[i], padOpcodeName((OpcodeID)i, 20), count, ((double)count * 100)/totalOpcodeSamples, ((double)count * 100)/m_totalSamples);    
-    }
-    fprintf(stdout, "\n");
-    fprintf(stdout, "Opcodes by sample count:\n\n");
+        printf("%s:%s%6lld\t%.3f%%\t(%.3f%%)\n", opcodeNames[i], padOpcodeName(reinterpret_cast<OpcodeID>(i), 20), count, (static_cast<double>(count) * 100) / totalOpcodeSamples, (static_cast<double>(count) * 100) / m_totalSamples);    
+    }
+    printf("\n");
+    printf("Opcodes by sample count:\n\n");
     for (int i = 0; i < numOpcodeIDs; ++i) {
         OpcodeID opcode = opcodeSampleInfo[i].opcode;
         long long count = opcodeSampleInfo[i].count;
-        fprintf(stdout, "%s:%s%6lld\t%.3f%%\t(%.3f%%)\n", opcodeNames[opcode], padOpcodeName(opcode, 20), count, ((double)count * 100)/totalOpcodeSamples, ((double)count * 100)/m_totalSamples);    
-    }
-    fprintf(stdout, "\n");
+        printf("%s:%s%6lld\t%.3f%%\t(%.3f%%)\n", opcodeNames[opcode], padOpcodeName(opcode, 20), count, (static_cast<double>(count) * 100) / totalOpcodeSamples, (static_cast<double>(count) * 100) / m_totalSamples);    
+    }
+    printf("\n");
 }