Changeset 33532 in webkit for trunk/JavaScriptCore/profiler/ProfileNode.cpp

Timestamp:

May 16, 2008, 3:23:09 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-05-16 Kevin McCullough <​[email protected]>

Reviewed by Tim.

<rdar://problem/5770054> JavaScript profiler (10928)
Implement sorting for the profiler.
I chose to sort the profileNodes in place since there is no reason they
need to retain their original order.

• JavaScriptCore.exp: Export the symbols.
• profiler/Profile.h: Add the different ways a profile can be sorted. (KJS::Profile::sortTotalTimeDescending): (KJS::Profile::sortTotalTimeAscending): (KJS::Profile::sortSelfTimeDescending): (KJS::Profile::sortSelfTimeAscending): (KJS::Profile::sortCallsDescending): (KJS::Profile::sortCallsAscending):
• profiler/ProfileNode.cpp: Implement those ways. (KJS::totalTimeDescendingComparator): (KJS::ProfileNode::sortTotalTimeDescending): (KJS::totalTimeAscendingComparator): (KJS::ProfileNode::sortTotalTimeAscending): (KJS::selfTimeDescendingComparator): (KJS::ProfileNode::sortSelfTimeDescending): (KJS::selfTimeAscendingComparator): (KJS::ProfileNode::sortSelfTimeAscending): (KJS::callsDescendingComparator): (KJS::ProfileNode::sortCallsDescending): (KJS::callsAscendingComparator): (KJS::ProfileNode::sortCallsAscending):
• profiler/ProfileNode.h: No longer use a Deque since it cannot be sorted by std::sort and there was no reason not to use a Vector. I previously had though I would do prepending but am not. (KJS::ProfileNode::selfTime): (KJS::ProfileNode::totalPercent): (KJS::ProfileNode::selfPercent): (KJS::ProfileNode::children):
• profiler/Profiler.cpp: Removed these functions as they can be called directoy on the Profile object after getting the Vector of them. (KJS::getStackNames):
• profiler/Profiler.h:

WebCore:

2008-05-16 Kevin McCullough <​[email protected]>

Reviewed by Tim.

<rdar://problem/5770054> JavaScript profiler (10928)
Use a Vector instead of a Deque since we don't use the extra capabilities
of the Deque.

• page/JavaScriptProfileNode.cpp: (WebCore::getChildren): (WebCore::toJS):

File:

• trunk/JavaScriptCore/profiler/ProfileNode.cpp (modified) (1 diff)

trunk/JavaScriptCore/profiler/ProfileNode.cpp

@@ -111 +111 @@
 }
 
+#pragma mark Sorting methods
+
+static inline bool totalTimeDescendingComparator(const RefPtr<ProfileNode>& a, const RefPtr<ProfileNode>& b)
+{
+    return a->totalTime() > b->totalTime();
+}
+
+void ProfileNode::sortTotalTimeDescending()
+{
+    std::sort(m_children.begin(), m_children.end(), totalTimeDescendingComparator);
+
+    for (StackIterator currentChild = m_children.begin(); currentChild != m_children.end(); ++currentChild)
+        (*currentChild)->sortTotalTimeDescending();
+}
+
+static inline bool totalTimeAscendingComparator(const RefPtr<ProfileNode>& a, const RefPtr<ProfileNode>& b)
+{
+    return a->totalTime() < b->totalTime();
+}
+
+void ProfileNode::sortTotalTimeAscending()
+{
+    std::sort(m_children.begin(), m_children.end(), totalTimeAscendingComparator);
+
+    for (StackIterator currentChild = m_children.begin(); currentChild != m_children.end(); ++currentChild)
+        (*currentChild)->sortTotalTimeAscending();
+}
+
+static inline bool selfTimeDescendingComparator(const RefPtr<ProfileNode>& a, const RefPtr<ProfileNode>& b)
+{
+    return a->selfTime() > b->selfTime();
+}
+
+void ProfileNode::sortSelfTimeDescending()
+{
+    std::sort(m_children.begin(), m_children.end(), selfTimeDescendingComparator);
+
+    for (StackIterator currentChild = m_children.begin(); currentChild != m_children.end(); ++currentChild)
+        (*currentChild)->sortSelfTimeDescending();
+}
+
+static inline bool selfTimeAscendingComparator(const RefPtr<ProfileNode>& a, const RefPtr<ProfileNode>& b)
+{
+    return a->selfTime() < b->selfTime();
+}
+
+void ProfileNode::sortSelfTimeAscending()
+{
+    std::sort(m_children.begin(), m_children.end(), selfTimeAscendingComparator);
+
+    for (StackIterator currentChild = m_children.begin(); currentChild != m_children.end(); ++currentChild)
+        (*currentChild)->sortSelfTimeAscending();
+}
+
+static inline bool callsDescendingComparator(const RefPtr<ProfileNode>& a, const RefPtr<ProfileNode>& b)
+{
+    return a->numberOfCalls() > b->numberOfCalls();
+}
+
+void ProfileNode::sortCallsDescending()
+{
+    std::sort(m_children.begin(), m_children.end(), callsDescendingComparator);
+
+    for (StackIterator currentChild = m_children.begin(); currentChild != m_children.end(); ++currentChild)
+        (*currentChild)->sortCallsDescending();
+}
+
+static inline bool callsAscendingComparator(const RefPtr<ProfileNode>& a, const RefPtr<ProfileNode>& b)
+{
+    return a->numberOfCalls() < b->numberOfCalls();
+}
+
+void ProfileNode::sortCallsAscending()
+{
+    std::sort(m_children.begin(), m_children.end(), callsAscendingComparator);
+
+    for (StackIterator currentChild = m_children.begin(); currentChild != m_children.end(); ++currentChild)
+        (*currentChild)->sortCallsAscending();
+}
+
 void ProfileNode::printDataInspectorStyle(int indentLevel) const
 {