JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / tools / ProfileTreeNode.h

diff --git a/tools/ProfileTreeNode.h b/tools/ProfileTreeNode.h
index 9de39ad8a298622c433a67eb64a72204de19e6c2..88d57f3dd4e79769d1d06c3a859101b555c6a83f 100644 (file)
--- a/tools/ProfileTreeNode.h
+++ b/tools/ProfileTreeNode.h
@@ -30,7 +30,7 @@ namespace JSC {
 
 class ProfileTreeNode {
     typedef HashMap<String, ProfileTreeNode> Map;
 
 class ProfileTreeNode {
     typedef HashMap<String, ProfileTreeNode> Map;

-    typedef std::pair<String, ProfileTreeNode> MapEntry;
+    typedef Map::KeyValuePairType MapEntry;

 
 public:
     ProfileTreeNode()
 
 public:
     ProfileTreeNode()


@@ -51,7 +51,7 @@ public:
     
         ProfileTreeNode newEntry;
         Map::AddResult result = m_children->add(String(name), newEntry);
     
         ProfileTreeNode newEntry;
         Map::AddResult result = m_children->add(String(name), newEntry);

-        ProfileTreeNode* childInMap = &result.iterator->second;
+        ProfileTreeNode* childInMap = &result.iterator->value;

         ++childInMap->m_count;
         return childInMap;
     }
         ++childInMap->m_count;
         return childInMap;
     }


@@ -72,7 +72,7 @@ public:
             return 0;
         uint64_t childCount = 0;
         for (Map::iterator it = m_children->begin(); it != m_children->end(); ++it)
             return 0;
         uint64_t childCount = 0;
         for (Map::iterator it = m_children->begin(); it != m_children->end(); ++it)

-            childCount += it->second.count();
+            childCount += it->value.count();

         return childCount;
     }
     
         return childCount;
     }
     


@@ -95,21 +95,21 @@ private:
             // Print the number of samples, the name of this node, and the number of samples that are stack-top
             // in this node (samples directly within this node, excluding samples in children.
             for (unsigned i = 0; i < indent; ++i)
             // Print the number of samples, the name of this node, and the number of samples that are stack-top
             // in this node (samples directly within this node, excluding samples in children.
             for (unsigned i = 0; i < indent; ++i)

-                dataLog("    ");
-            dataLog("% 8lld: %s (%lld stack top)\n",
-                static_cast<long long>(entry->second.count()),
-                entry->first.utf8().data(),
-                static_cast<long long>(entry->second.count() - entry->second.childCount()));
+                dataLogF("    ");
+            dataLogF("% 8lld: %s (%lld stack top)\n",
+                static_cast<long long>(entry->value.count()),
+                entry->key.utf8().data(),
+                static_cast<long long>(entry->value.count() - entry->value.childCount()));

 
             // Recursively dump the child nodes.
 
             // Recursively dump the child nodes.

-            entry->second.dumpInternal(indent + 1);
+            entry->value.dumpInternal(indent + 1);

         }
     }
 
     static int compareEntries(const void* a, const void* b)
     {
         }
     }
 
     static int compareEntries(const void* a, const void* b)
     {

-        uint64_t da = (*static_cast<MapEntry* const *>(a))->second.count();
-        uint64_t db = (*static_cast<MapEntry* const *>(b))->second.count();
+        uint64_t da = (*static_cast<MapEntry* const *>(a))->value.count();
+        uint64_t db = (*static_cast<MapEntry* const *>(b))->value.count();

         return (da < db) - (da > db);
     }
 
         return (da < db) - (da > db);
     }