1 files changed, 113 insertions, 92 deletions

diff --git a/Source/JavaScriptCore/profiler/ProfileNode.h b/Source/JavaScriptCore/profiler/ProfileNode.h
index f5fef86f8..7ad149e17 100644
--- a/Source/JavaScriptCore/profiler/ProfileNode.h
+++ b/Source/JavaScriptCore/profiler/ProfileNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2008, 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,7 +10,7 @@
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
@@ -40,133 +40,154 @@ namespace JSC {
     class ExecState;
     class ProfileNode;
 
-    typedef Vector<RefPtr<ProfileNode> >::const_iterator StackIterator;
     typedef HashCountedSet<StringImpl*> FunctionCallHashCount;
 
     class ProfileNode : public RefCounted<ProfileNode> {
     public:
-        static PassRefPtr<ProfileNode> create(ExecState* callerCallFrame, const CallIdentifier& callIdentifier, ProfileNode* headNode, ProfileNode* parentNode)
+        static Ref<ProfileNode> create(ExecState* callerCallFrame, const CallIdentifier& callIdentifier, ProfileNode* parentNode)
         {
-            return adoptRef(new ProfileNode(callerCallFrame, callIdentifier, headNode, parentNode));
+            return adoptRef(*new ProfileNode(callerCallFrame, callIdentifier, parentNode));
         }
-        static PassRefPtr<ProfileNode> create(ExecState* callerCallFrame, ProfileNode* headNode, ProfileNode* node)
+
+        static Ref<ProfileNode> create(ExecState* callerCallFrame, ProfileNode* node)
         {
-            return adoptRef(new ProfileNode(callerCallFrame, headNode, node));
+            return adoptRef(*new ProfileNode(callerCallFrame, node));
         }
 
-        bool operator==(ProfileNode* node) { return m_callIdentifier == node->callIdentifier(); }
-
-        ProfileNode* willExecute(ExecState* callerCallFrame, const CallIdentifier&);
-        ProfileNode* didExecute();
+        struct Call {
+        public:
+            Call(double startTime, double elapsedTime = NAN)
+                : m_startTime(startTime)
+                , m_elapsedTime(elapsedTime)
+            {
+            }
+
+            double startTime() const { return m_startTime; }
+            void setStartTime(double time)
+            {
+                ASSERT_ARG(time, time >= 0.0 || std::isnan(time));
+                m_startTime = time;
+            }
+
+            double elapsedTime() const { return m_elapsedTime; }
+            void setElapsedTime(double time)
+            {
+                ASSERT_ARG(time, time >= 0.0 || std::isnan(time));
+                m_elapsedTime = time;
+            }
+
+        private:
+            double m_startTime;
+            double m_elapsedTime;
+        };
 
-        void stopProfiling();
+        bool operator==(ProfileNode* node) { return m_callIdentifier == node->callIdentifier(); }
 
-        // CallIdentifier members
         ExecState* callerCallFrame() const { return m_callerCallFrame; }
         const CallIdentifier& callIdentifier() const { return m_callIdentifier; }
-        unsigned long callUID() const { return m_callIdentifier.hash(); };
-        const String& functionName() const { return m_callIdentifier.m_name; }
-        const String& url() const { return m_callIdentifier.m_url; }
-        unsigned lineNumber() const { return m_callIdentifier.m_lineNumber; }
-
-        // Relationships
-        ProfileNode* head() const { return m_head; }
-        void setHead(ProfileNode* head) { m_head = head; }
+        unsigned id() const { return m_callIdentifier.hash(); }
+        const String& functionName() const { return m_callIdentifier.functionName(); }
+        const String& url() const { return m_callIdentifier.url(); }
+        unsigned lineNumber() const { return m_callIdentifier.lineNumber(); }
+        unsigned columnNumber() const { return m_callIdentifier.columnNumber(); }
+
         ProfileNode* parent() const { return m_parent; }
         void setParent(ProfileNode* parent) { m_parent = parent; }
-        ProfileNode* nextSibling() const { return m_nextSibling; }
-        void setNextSibling(ProfileNode* nextSibling) { m_nextSibling = nextSibling; }
 
-        // Time members
-        double startTime() const { return m_startTime; }
-        void setStartTime(double startTime) { m_startTime = startTime; }
-        double totalTime() const { return m_visibleTotalTime; }
-        double actualTotalTime() const { return m_actualTotalTime; }
-        void setTotalTime(double time) { m_actualTotalTime = time; m_visibleTotalTime = time; }
-        void setActualTotalTime(double time) { m_actualTotalTime = time; }
-        void setVisibleTotalTime(double time) { m_visibleTotalTime = time; }
-        double selfTime() const { return m_visibleSelfTime; }
-        double actualSelfTime() const { return m_actualSelfTime; }
-        void setSelfTime(double time) {m_actualSelfTime = time; m_visibleSelfTime = time; }
-        void setActualSelfTime(double time) { m_actualSelfTime = time; }
-        void setVisibleSelfTime(double time) { m_visibleSelfTime = time; }
-
-        double totalPercent() const { return (m_visibleTotalTime / (m_head ? m_head->totalTime() : totalTime())) * 100.0; }
-        double selfPercent() const { return (m_visibleSelfTime / (m_head ? m_head->totalTime() : totalTime())) * 100.0; }
-
-        unsigned numberOfCalls() const { return m_numberOfCalls; }
-        void setNumberOfCalls(unsigned number) { m_numberOfCalls = number; }
-
-        // Children members
-        const Vector<RefPtr<ProfileNode> >& children() const { return m_children; }
-        ProfileNode* firstChild() const { return m_children.size() ? m_children.first().get() : 0; }
-        ProfileNode* lastChild() const { return m_children.size() ? m_children.last().get() : 0; }
-        ProfileNode* findChild(ProfileNode*) const;
-        void removeChild(ProfileNode*);
-        void addChild(PassRefPtr<ProfileNode> prpChild);
-        void insertNode(PassRefPtr<ProfileNode> prpNode);
+        const Vector<Call>& calls() const { return m_calls; }
+        Call& lastCall() { ASSERT(!m_calls.isEmpty()); return m_calls.last(); }
+        void appendCall(Call call) { m_calls.append(call); }
 
-        // Visiblity
-        bool visible() const { return m_visible; }
-        void setVisible(bool visible) { m_visible = visible; }
+        const Vector<RefPtr<ProfileNode>>& children() const { return m_children; }
+        ProfileNode* firstChild() const { return m_children.size() ? m_children.first().get() : nullptr; }
+        ProfileNode* lastChild() const { return m_children.size() ? m_children.last().get() : nullptr; }
 
-        static void setTreeVisible(ProfileNode*, bool visible);
+        void removeChild(ProfileNode*);
+        void addChild(PassRefPtr<ProfileNode>);
+        // Reparent our child nodes to the passed node, and make it a child node of |this|.
+        void spliceNode(PassRefPtr<ProfileNode>);
 
-        // Sorting
-        ProfileNode* traverseNextNodePostOrder() const;
-        ProfileNode* traverseNextNodePreOrder(bool processChildren = true) const;
+#ifndef NDEBUG
+        struct ProfileSubtreeData {
+            HashMap<ProfileNode*, std::pair<double, double>> selfAndTotalTimes;
+            double rootTotalTime;
+        };
 
-        // Views
-        void calculateVisibleTotalTime();
-        bool focus(const CallIdentifier&);
-        void exclude(const CallIdentifier&);
-        void restore();
+        // Use these functions to dump the subtree rooted at this node.
+        void debugPrint();
+        void debugPrintSampleStyle();
 
-        void endAndRecordCall();
+        // These are used to recursively print entire subtrees using precomputed self and total times.
+        template <typename Functor> void forEachNodePostorder(Functor&);
 
-#ifndef NDEBUG
-        const char* c_str() const { return m_callIdentifier; }
-        void debugPrintData(int indentLevel) const;
-        double debugPrintDataSampleStyle(int indentLevel, FunctionCallHashCount&) const;
+        void debugPrintRecursively(int indentLevel, const ProfileSubtreeData&);
+        double debugPrintSampleStyleRecursively(int indentLevel, FunctionCallHashCount&, const ProfileSubtreeData&);
 #endif
 
     private:
-        ProfileNode(ExecState* callerCallFrame, const CallIdentifier&, ProfileNode* headNode, ProfileNode* parentNode);
-        ProfileNode(ExecState* callerCallFrame, ProfileNode* headNode, ProfileNode* nodeToCopy);
+        typedef Vector<RefPtr<ProfileNode>>::const_iterator StackIterator;
 
-        void startTimer();
-        void resetChildrensSiblings();
+        ProfileNode(ExecState* callerCallFrame, const CallIdentifier&, ProfileNode* parentNode);
+        ProfileNode(ExecState* callerCallFrame, ProfileNode* nodeToCopy);
 
-        RefPtr<ProfileNode>* childrenBegin() { return m_children.begin(); }
-        RefPtr<ProfileNode>* childrenEnd() { return m_children.end(); }
+#ifndef NDEBUG
+        ProfileNode* nextSibling() const { return m_nextSibling; }
+        void setNextSibling(ProfileNode* nextSibling) { m_nextSibling = nextSibling; }
 
-        // Sorting comparators
-        static inline bool totalTimeDescendingComparator(const RefPtr<ProfileNode>& a, const RefPtr<ProfileNode>& b) { return a->totalTime() > b->totalTime(); }
-        static inline bool totalTimeAscendingComparator(const RefPtr<ProfileNode>& a, const RefPtr<ProfileNode>& b) { return a->totalTime() < b->totalTime(); }
-        static inline bool selfTimeDescendingComparator(const RefPtr<ProfileNode>& a, const RefPtr<ProfileNode>& b) { return a->selfTime() > b->selfTime(); }
-        static inline bool selfTimeAscendingComparator(const RefPtr<ProfileNode>& a, const RefPtr<ProfileNode>& b) { return a->selfTime() < b->selfTime(); }
-        static inline bool callsDescendingComparator(const RefPtr<ProfileNode>& a, const RefPtr<ProfileNode>& b) { return a->numberOfCalls() > b->numberOfCalls(); }
-        static inline bool callsAscendingComparator(const RefPtr<ProfileNode>& a, const RefPtr<ProfileNode>& b) { return a->numberOfCalls() < b->numberOfCalls(); }
-        static inline bool functionNameDescendingComparator(const RefPtr<ProfileNode>& a, const RefPtr<ProfileNode>& b) { return codePointCompareLessThan(b->functionName(), a->functionName()); }
-        static inline bool functionNameAscendingComparator(const RefPtr<ProfileNode>& a, const RefPtr<ProfileNode>& b) { return codePointCompareLessThan(a->functionName(), b->functionName()); }
+        ProfileNode* traverseNextNodePostOrder() const;
+#endif
 
         ExecState* m_callerCallFrame;
         CallIdentifier m_callIdentifier;
-        ProfileNode* m_head;
         ProfileNode* m_parent;
+        Vector<Call> m_calls;
+        Vector<RefPtr<ProfileNode>> m_children;
+
+#ifndef NDEBUG
         ProfileNode* m_nextSibling;
+#endif
+    };
 
-        double m_startTime;
-        double m_actualTotalTime;
-        double m_visibleTotalTime;
-        double m_actualSelfTime;
-        double m_visibleSelfTime;
-        unsigned m_numberOfCalls;
+#ifndef NDEBUG
+    template <typename Functor> inline void ProfileNode::forEachNodePostorder(Functor& functor)
+    {
+        ProfileNode* currentNode = this;
+        // Go down to the first node of the traversal, and slowly walk back up.
+        for (ProfileNode* nextNode = currentNode; nextNode; nextNode = nextNode->firstChild())
+            currentNode = nextNode;
+
+        ProfileNode* endNode = this;
+        while (currentNode && currentNode != endNode) {
+            functor(currentNode);
+            currentNode = currentNode->traverseNextNodePostOrder();
+        }
 
-        bool m_visible;
+        functor(endNode);
+    }
 
-        Vector<RefPtr<ProfileNode> > m_children;
+    struct CalculateProfileSubtreeDataFunctor {
+        void operator()(ProfileNode* node)
+        {
+            double selfTime = 0.0;
+            for (const ProfileNode::Call& call : node->calls())
+                selfTime += call.elapsedTime();
+
+            double totalTime = selfTime;
+            for (RefPtr<ProfileNode> child : node->children()) {
+                auto it = m_data.selfAndTotalTimes.find(child.get());
+                if (it != m_data.selfAndTotalTimes.end())
+                    totalTime += it->value.second;
+            }
+
+            ASSERT(node);
+            m_data.selfAndTotalTimes.set(node, std::make_pair(selfTime, totalTime));
+        }
+
+        ProfileNode::ProfileSubtreeData returnValue() { return WTFMove(m_data); }
+
+        ProfileNode::ProfileSubtreeData m_data;
     };
+#endif
 
 } // namespace JSC