Changeset 34712 in webkit for trunk/JavaScriptCore/profiler/Profile.cpp

Timestamp:

Jun 21, 2008, 12:04:22 AM (17 years ago)

Author:

[email protected]

Message:

Use member function pointers for the Profile::forEach function.
Eliminating a few static functions and simplified things a little.

Reviewed by Alexey Proskuryakov.

• JavaScriptCore.exp: Change the symbol for forEach.
• profiler/Profile.cpp: (KJS::Profile::forEach): Use a member function pointer.
• profiler/Profile.h: (KJS::Profile::sortTotalTimeDescending): Pass a function pointer. (KJS::Profile::sortTotalTimeAscending): Ditto. (KJS::Profile::sortSelfTimeDescending): Ditto. (KJS::Profile::sortSelfTimeAscending): Ditto. (KJS::Profile::sortCallsDescending): Ditto.
• profiler/ProfileNode.h: (KJS::ProfileNode::sortTotalTimeDescending): No longer static. (KJS::ProfileNode::sortTotalTimeAscending): Ditto. (KJS::ProfileNode::sortSelfTimeDescending): Ditto. (KJS::ProfileNode::sortSelfTimeAscending): Ditto. (KJS::ProfileNode::sortCallsDescending): Ditto.

File:

• trunk/JavaScriptCore/profiler/Profile.cpp (modified) (6 diffs)

trunk/JavaScriptCore/profiler/Profile.cpp

@@ -38 +38 @@
 static const char* NonJSExecution = "(idle)";
 
-static void calculateVisibleTotalTime(ProfileNode* n) { n->calculateVisibleTotalTime(); }
-static void restoreAll(ProfileNode* n) { n->restore(); }
-static void stopProfiling(ProfileNode* n) { n->stopProfiling(); }
-
 PassRefPtr<Profile> Profile::create(const UString& title, ExecState* originatingGlobalExec, unsigned pageGroupIdentifier, ProfilerClient* client)
 {
@@ -62 +58 @@
 void Profile::stopProfiling()
 {
-    forEach(KJS::stopProfiling);
+    forEach(&ProfileNode::stopProfiling);
     removeProfileStart();
     removeProfileEnd();
@@ -164 +160 @@
 }
 
-void Profile::forEach(UnaryFunction function)
+void Profile::forEach(void (ProfileNode::*function)())
 {
     ProfileNode* currentNode = m_head->firstChild();
@@ -172 +168 @@
     ProfileNode* endNode = m_head->traverseNextNodePostOrder();
     while (currentNode && currentNode != endNode) {
-        function(currentNode);
+        (currentNode->*function)();
         currentNode = currentNode->traverseNextNodePostOrder();
     } 
@@ -188 +184 @@
 
     // Set the visible time of all nodes so that the %s display correctly.
-    forEach(KJS::calculateVisibleTotalTime);
+    forEach(&ProfileNode::calculateVisibleTotalTime);
 }
 
@@ -208 +204 @@
 void Profile::restoreAll()
 {
-    forEach(KJS::restoreAll);
+    forEach(&ProfileNode::restore);
 }