Ignore:
Timestamp:
Jan 25, 2014, 10:30:38 PM (11 years ago)
Author:
[email protected]
Message:

Remove dead code from the JSC profiler.

​https://bugs.webkit.org/show_bug.cgi?id=127643

Reviewed by Mark Lam.

Source/JavaScriptCore:

  • profiler/Profile.cpp:
  • profiler/Profile.h:
  • profiler/ProfileGenerator.cpp:

(JSC::ProfileGenerator::stopProfiling):

  • profiler/ProfileNode.cpp:

(JSC::ProfileNode::ProfileNode):
(JSC::ProfileNode::stopProfiling):
(JSC::ProfileNode::endAndRecordCall):
(JSC::ProfileNode::debugPrintData):
(JSC::ProfileNode::debugPrintDataSampleStyle):

  • profiler/ProfileNode.h:

(JSC::ProfileNode::totalTime):
(JSC::ProfileNode::setTotalTime):
(JSC::ProfileNode::selfTime):
(JSC::ProfileNode::setSelfTime):
(JSC::ProfileNode::totalPercent):
(JSC::ProfileNode::selfPercent):
Remove support for things like focus and exclude. The Inspector does those in JS now.

Source/WebCore:

Passes existing tests in fast/profiler.

  • bindings/js/ScriptProfile.cpp:

(WebCore::buildInspectorObjectFor): Remove visible.

  • inspector/ScriptProfileNode.idl: Ditto.
  • inspector/protocol/Profiler.json: Ditto.

Source/WebInspectorUI:

  • Versions/Inspector-iOS-7.0.json: Remove visible from CPUProfileNode.

LayoutTests:

  • fast/profiler/resources/profiler-test-JS-resources.js:

(printProfileNodeWithoutTime): Don't use visible. It was always true.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/profiler/ProfileNode.h

    r157653 r162796  
    4949            return adoptRef(new ProfileNode(callerCallFrame, callIdentifier, headNode, parentNode));
    5050        }
     51
    5152        static PassRefPtr<ProfileNode> create(ExecState* callerCallFrame, ProfileNode* headNode, ProfileNode* node)
    5253        {
    … …  
    7273        ProfileNode* head() const { return m_head; }
    7374        void setHead(ProfileNode* head) { m_head = head; }
     75
    7476        ProfileNode* parent() const { return m_parent; }
    7577        void setParent(ProfileNode* parent) { m_parent = parent; }
     78
    7679        ProfileNode* nextSibling() const { return m_nextSibling; }
    7780        void setNextSibling(ProfileNode* nextSibling) { m_nextSibling = nextSibling; }
    … …  
    8083        double startTime() const { return m_startTime; }
    8184        void setStartTime(double startTime) { m_startTime = startTime; }
    82         double totalTime() const { return m_visibleTotalTime; }
    83         double actualTotalTime() const { return m_actualTotalTime; }
    84         void setTotalTime(double time) { m_actualTotalTime = time; m_visibleTotalTime = time; }
    85         void setActualTotalTime(double time) { m_actualTotalTime = time; }
    86         void setVisibleTotalTime(double time) { m_visibleTotalTime = time; }
    87         double selfTime() const { return m_visibleSelfTime; }
    88         double actualSelfTime() const { return m_actualSelfTime; }
    89         void setSelfTime(double time) {m_actualSelfTime = time; m_visibleSelfTime = time; }
    90         void setActualSelfTime(double time) { m_actualSelfTime = time; }
    91         void setVisibleSelfTime(double time) { m_visibleSelfTime = time; }
    9285
    93         double totalPercent() const { return (m_visibleTotalTime / (m_head ? m_head->totalTime() : totalTime())) * 100.0; }
    94         double selfPercent() const { return (m_visibleSelfTime / (m_head ? m_head->totalTime() : totalTime())) * 100.0; }
     86        double totalTime() const { return m_totalTime; }
     87        void setTotalTime(double time) { m_totalTime = time; }
     88
     89        double selfTime() const { return m_selfTime; }
     90        void setSelfTime(double time) { m_selfTime = time; }
     91
     92        double totalPercent() const { return (m_totalTime / (m_head ? m_head->totalTime() : totalTime())) * 100.0; }
     93        double selfPercent() const { return (m_selfTime / (m_head ? m_head->totalTime() : totalTime())) * 100.0; }
    9594
    9695        unsigned numberOfCalls() const { return m_numberOfCalls; }
    97         void setNumberOfCalls(unsigned number) { m_numberOfCalls = number; }
    9896
    9997        // Children members
    … …  
    10199        ProfileNode* firstChild() const { return m_children.size() ? m_children.first().get() : 0; }
    102100        ProfileNode* lastChild() const { return m_children.size() ? m_children.last().get() : 0; }
    103         ProfileNode* findChild(ProfileNode*) const;
    104101        void removeChild(ProfileNode*);
    105102        void addChild(PassRefPtr<ProfileNode> prpChild);
    106103        void insertNode(PassRefPtr<ProfileNode> prpNode);
    107104
    108         // Visiblity
    109         bool visible() const { return m_visible; }
    110         void setVisible(bool visible) { m_visible = visible; }
    111 
    112         static void setTreeVisible(ProfileNode*, bool visible);
    113 
    114         // Sorting
    115105        ProfileNode* traverseNextNodePostOrder() const;
    116         ProfileNode* traverseNextNodePreOrder(bool processChildren = true) const;
    117 
    118         // Views
    119         void calculateVisibleTotalTime();
    120         bool focus(const CallIdentifier&);
    121         void exclude(const CallIdentifier&);
    122         void restore();
    123106
    124107        void endAndRecordCall();
    … …  
    139122        void resetChildrensSiblings();
    140123
    141         RefPtr<ProfileNode>* childrenBegin() { return m_children.begin(); }
    142         RefPtr<ProfileNode>* childrenEnd() { return m_children.end(); }
    143 
    144         // Sorting comparators
    145         static inline bool totalTimeDescendingComparator(const RefPtr<ProfileNode>& a, const RefPtr<ProfileNode>& b) { return a->totalTime() > b->totalTime(); }
    146         static inline bool totalTimeAscendingComparator(const RefPtr<ProfileNode>& a, const RefPtr<ProfileNode>& b) { return a->totalTime() < b->totalTime(); }
    147         static inline bool selfTimeDescendingComparator(const RefPtr<ProfileNode>& a, const RefPtr<ProfileNode>& b) { return a->selfTime() > b->selfTime(); }
    148         static inline bool selfTimeAscendingComparator(const RefPtr<ProfileNode>& a, const RefPtr<ProfileNode>& b) { return a->selfTime() < b->selfTime(); }
    149         static inline bool callsDescendingComparator(const RefPtr<ProfileNode>& a, const RefPtr<ProfileNode>& b) { return a->numberOfCalls() > b->numberOfCalls(); }
    150         static inline bool callsAscendingComparator(const RefPtr<ProfileNode>& a, const RefPtr<ProfileNode>& b) { return a->numberOfCalls() < b->numberOfCalls(); }
    151         static inline bool functionNameDescendingComparator(const RefPtr<ProfileNode>& a, const RefPtr<ProfileNode>& b) { return codePointCompareLessThan(b->functionName(), a->functionName()); }
    152         static inline bool functionNameAscendingComparator(const RefPtr<ProfileNode>& a, const RefPtr<ProfileNode>& b) { return codePointCompareLessThan(a->functionName(), b->functionName()); }
    153 
    154124        ExecState* m_callerCallFrame;
    155125        CallIdentifier m_callIdentifier;
    … …  
    159129
    160130        double m_startTime;
    161         double m_actualTotalTime;
    162         double m_visibleTotalTime;
    163         double m_actualSelfTime;
    164         double m_visibleSelfTime;
     131        double m_totalTime;
     132        double m_selfTime;
    165133        unsigned m_numberOfCalls;
    166 
    167         bool m_visible;
    168134
    169135        Vector<RefPtr<ProfileNode>> m_children;
Note: See TracChangeset for help on using the changeset viewer.