Changeset 236241 in webkit

Timestamp:

Sep 19, 2018, 11:14:59 PM (8 years ago)

Author:

rniwa@webkit.org

Message:

Improve node statistics for rare data
​https://bugs.webkit.org/show_bug.cgi?id=189775

Reviewed by Simon Fraser.

Report reasons we created NodeRareData and ElementRareData in node statistics.

Added NodeRareData::useTypes and ElementRareData::useTypes which returns OptionSet<NodeRareData::UseType>
indicating which instance member of the rare data is currently in use.

• dom/Element.cpp:
• dom/Element.h:
• dom/ElementRareData.h:

(WebCore::defaultMinimumSizeForResizing):
(WebCore::ElementRareData::useTypes const):

• dom/Node.cpp:

(WebCore::stringForRareDataUseType):
(WebCore::Node::dumpStatistics):

• dom/NodeRareData.cpp:
• dom/NodeRareData.h:

(WebCore::NodeRareData::useTypes const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.cpp (modified) (1 diff)
• dom/Element.h (modified) (1 diff)
• dom/ElementRareData.h (modified) (3 diffs)
• dom/Node.cpp (modified) (5 diffs)
• dom/NodeRareData.cpp (modified) (1 diff)
• dom/NodeRareData.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-09-19  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Improve node statistics for rare data
+        https://bugs.webkit.org/show_bug.cgi?id=189775
+
+        Reviewed by Simon Fraser.
+
+        Report reasons we created NodeRareData and ElementRareData in node statistics.
+
+        Added NodeRareData::useTypes and ElementRareData::useTypes which returns OptionSet<NodeRareData::UseType>
+        indicating which instance member of the rare data is currently in use.
+
+        * dom/Element.cpp:
+        * dom/Element.h:
+        * dom/ElementRareData.h:
+        (WebCore::defaultMinimumSizeForResizing):
+        (WebCore::ElementRareData::useTypes const):
+        * dom/Node.cpp:
+        (WebCore::stringForRareDataUseType):
+        (WebCore::Node::dumpStatistics):
+        * dom/NodeRareData.cpp:
+        * dom/NodeRareData.h:
+        (WebCore::NodeRareData::useTypes const):
+
 2018-09-19  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -3443 +3443 @@
 #endif
 
-#ifdef DUMP_NODE_STATISTICS
+#if DUMP_NODE_STATISTICS
 bool Element::hasNamedNodeMap() const
 {

trunk/Source/WebCore/dom/Element.h

@@ -105 +105 @@
 #endif
 
-#ifdef DUMP_NODE_STATISTICS
+#if DUMP_NODE_STATISTICS
     bool hasNamedNodeMap() const;
 #endif

trunk/Source/WebCore/dom/ElementRareData.h

@@ -33 +33 @@
 
 namespace WebCore {
+
+inline IntSize defaultMinimumSizeForResizing()
+{
+    return IntSize(LayoutUnit::max(), LayoutUnit::max());
+}
 
 class ElementRareData : public NodeRareData {
@@ -121 +126 @@
     IntersectionObserverData* intersectionObserverData() { return m_intersectionObserverData.get(); }
     void setIntersectionObserverData(std::unique_ptr<IntersectionObserverData>&& data) { m_intersectionObserverData = WTFMove(data); }
+#endif
+
+#if DUMP_NODE_STATISTICS
+    OptionSet<UseType> useTypes() const
+    {
+        auto result = NodeRareData::useTypes();
+        if (m_tabIndexWasSetExplicitly)
+            result.add(UseType::TabIndex);
+        if (m_styleAffectedByActive || m_styleAffectedByEmpty || m_styleAffectedByFocusWithin || m_childrenAffectedByHover
+            || m_childrenAffectedByDrag || m_childrenAffectedByLastChildRules || m_childrenAffectedByForwardPositionalRules
+            || m_descendantsAffectedByForwardPositionalRules || m_childrenAffectedByBackwardPositionalRules
+            || m_descendantsAffectedByBackwardPositionalRules || m_childrenAffectedByPropertyBasedBackwardPositionalRules)
+            result.add(UseType::StyleFlags);
+        if (m_minimumSizeForResizing != defaultMinimumSizeForResizing())
+            result.add(UseType::MinimumSize);
+        if (!m_savedLayerScrollPosition.isZero())
+            result.add(UseType::ScrollingPosition);
+        if (m_computedStyle)
+            result.add(UseType::ComputedStyle);
+        if (m_dataset)
+            result.add(UseType::Dataset);
+        if (m_classList)
+            result.add(UseType::ClassList);
+        if (m_shadowRoot)
+            result.add(UseType::ShadowRoot);
+        if (m_customElementReactionQueue)
+            result.add(UseType::CustomElementQueue);
+        if (m_attributeMap)
+            result.add(UseType::AttributeMap);
+        if (m_intersectionObserverData)
+            result.add(UseType::InteractionObserver);
+        if (m_beforePseudoElement || m_afterPseudoElement)
+            result.add(UseType::PseudoElements);
+        return result;
+    }
 #endif
 
@@ -166 +206 @@
 };
 
-inline IntSize defaultMinimumSizeForResizing()
-{
-    return IntSize(LayoutUnit::max(), LayoutUnit::max());
-}
-
 inline ElementRareData::ElementRareData(RenderElement* renderer)
     : NodeRareData(renderer)

trunk/Source/WebCore/dom/Node.cpp

@@ -92 +92 @@
     return liveNodes;
 }
+
+static const char* stringForRareDataUseType(NodeRareData::UseType useType)
+{
+    switch (useType) {
+    case NodeRareData::UseType::ConnectedFrameCount:
+        return "ConnectedFrameCount";
+    case NodeRareData::UseType::NodeList:
+        return "NodeList";
+    case NodeRareData::UseType::MutationObserver:
+        return "MutationObserver";
+    case NodeRareData::UseType::TabIndex:
+        return "TabIndex";
+    case NodeRareData::UseType::StyleFlags:
+        return "StyleFlags";
+    case NodeRareData::UseType::MinimumSize:
+        return "MinimumSize";
+    case NodeRareData::UseType::ScrollingPosition:
+        return "ScrollingPosition";
+    case NodeRareData::UseType::ComputedStyle:
+        return "ComputedStyle";
+    case NodeRareData::UseType::Dataset:
+        return "Dataset";
+    case NodeRareData::UseType::ClassList:
+        return "ClassList";
+    case NodeRareData::UseType::ShadowRoot:
+        return "ShadowRoot";
+    case NodeRareData::UseType::CustomElementQueue:
+        return "CustomElementQueue";
+    case NodeRareData::UseType::AttributeMap:
+        return "AttributeMap";
+    case NodeRareData::UseType::InteractionObserver:
+        return "InteractionObserver";
+    case NodeRareData::UseType::PseudoElements:
+        return "PseudoElements";
+    }
+    return nullptr;
+}
+
 #endif
 
@@ -118 +156 @@
     size_t elementsWithNamedNodeMap = 0;
 
+    HashMap<uint16_t, size_t> rareDataSingleUseTypeCounts;
+    size_t mixedRareDataUseCount = 0;
+
     for (auto* node : liveNodeSet()) {
         if (node->hasRareData()) {
@@ -126 +167 @@
                     ++elementsWithNamedNodeMap;
             }
+            auto* rareData = node->rareData();
+            auto useTypes = is<Element>(node) ? static_cast<ElementRareData*>(rareData)->useTypes() : rareData->useTypes();
+            unsigned useTypeCount = 0;
+            for (auto type : useTypes) {
+                UNUSED_PARAM(type);
+                useTypeCount++;
+            }
+            if (useTypeCount == 1) {
+                auto result = rareDataSingleUseTypeCounts.add(static_cast<uint16_t>(*useTypes.begin()), 0);
+                result.iterator->value++;
+            } else
+                mixedRareDataUseCount++;
         }
 
@@ -144 +197 @@
                     for (unsigned i = 0; i < length; ++i) {
                         const Attribute& attr = elementData->attributeAt(i);
-                        if (!attr.isEmpty())
+                        if (element.attrIfExists(attr.name()))
                             ++attributesWithAttr;
                     }
@@ -189 +242 @@
 
     printf("Number of Nodes: %d\n\n", liveNodeSet().size());
-    printf("Number of Nodes with RareData: %zu\n\n", nodesWithRareData);
+    printf("Number of Nodes with RareData: %zu\n", nodesWithRareData);
+    printf("  Mixed use: %zu\n", mixedRareDataUseCount);
+    for (auto it : rareDataSingleUseTypeCounts)
+        printf("  %s: %zu\n", stringForRareDataUseType(static_cast<NodeRareData::UseType>(it.key)), it.value);
+    printf("\n");
+
 
     printf("NodeType distribution:\n");

trunk/Source/WebCore/dom/NodeRareData.cpp

@@ -41 +41 @@
 COMPILE_ASSERT(sizeof(NodeRareData) == sizeof(SameSizeAsNodeRareData), NodeRareDataShouldStaySmall);
 
+// Ensure the 10 bits reserved for the m_connectedFrameCount cannot overflow
+static_assert(Page::maxNumberOfFrames < 1024, "Frame limit should fit in rare data count");
+
 } // namespace WebCore

trunk/Source/WebCore/dom/NodeRareData.h

@@ -27 +27 @@
 #include "LiveNodeList.h"
 #include "MutationObserverRegistration.h"
-#include "Page.h"
 #include "QualifiedName.h"
 #include "TagCollection.h"
@@ -251 +250 @@
     WTF_MAKE_NONCOPYABLE(NodeRareData); WTF_MAKE_FAST_ALLOCATED;
 public:
+#if defined(DUMP_NODE_STATISTICS) && DUMP_NODE_STATISTICS
+    enum class UseType : uint16_t {
+        ConnectedFrameCount = 1 << 0,
+        NodeList = 1 << 1,
+        MutationObserver = 1 << 2,
+
+        TabIndex = 1 << 3,
+        StyleFlags = 1 << 4,
+        MinimumSize = 1 << 5,
+        ScrollingPosition = 1 << 6,
+        ComputedStyle = 1 << 7,
+        Dataset = 1 << 8,
+        ClassList = 1 << 9,
+        ShadowRoot = 1 << 10,
+        CustomElementQueue = 1 << 11,
+        AttributeMap = 1 << 12,
+        InteractionObserver = 1 << 13,
+        PseudoElements = 1 << 14,
+    };
+#endif
+
     NodeRareData(RenderObject* renderer)
         : NodeRareDataBase(renderer)
@@ -284 +304 @@
         m_connectedFrameCount -= amount;
     }
+
+#if DUMP_NODE_STATISTICS
+    OptionSet<UseType> useTypes() const
+    {
+        OptionSet<UseType> result;
+        if (m_connectedFrameCount)
+            result.add(UseType::ConnectedFrameCount);
+        if (m_nodeLists)
+            result.add(UseType::NodeList);
+        if (m_mutationObserverData)
+            result.add(UseType::MutationObserver);
+        return result;
+    }
+#endif
 
 private:
@@ -315 +349 @@
 }
 
-// Ensure the 10 bits reserved for the m_connectedFrameCount cannot overflow
-static_assert(Page::maxNumberOfFrames < 1024, "Frame limit should fit in rare data count");
-
 } // namespace WebCore