Changeset 37981 in webkit for trunk/JavaScriptCore

Timestamp:

Oct 29, 2008, 3:27:31 PM (17 years ago)

Author:

[email protected]

Message:

2008-10-29 Sam Weinig <​[email protected]>

Reviewed by Cameron Zwarich.

Fix for ​https://bugs.webkit.org/show_bug.cgi?id=21958
Pack bits in StructureID to reduce the size of each StructureID by 2 words.

• runtime/PropertyMap.h: (JSC::PropertyMap::propertyMapSize):
• runtime/StructureID.cpp: (JSC::StructureID::dumpStatistics): Add additional size statistics when dumping. (JSC::StructureID::StructureID):
• runtime/StructureID.h:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/PropertyMap.h (modified) (1 diff)
• runtime/StructureID.cpp (modified) (5 diffs)
• runtime/StructureID.h (modified) (3 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-10-29  Sam Weinig  <[email protected]>
+
+        Reviewed by Cameron Zwarich.
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=21958
+        Pack bits in StructureID to reduce the size of each StructureID by 2 words.
+
+        * runtime/PropertyMap.h:
+        (JSC::PropertyMap::propertyMapSize):
+        * runtime/StructureID.cpp:
+        (JSC::StructureID::dumpStatistics): Add additional size statistics when dumping.
+        (JSC::StructureID::StructureID):
+        * runtime/StructureID.h:
+
 2008-10-29  Kevin Ollivier  <[email protected]>
 

trunk/JavaScriptCore/runtime/PropertyMap.h

@@ -104 +104 @@
         unsigned storageSize() const { return m_table ? m_table->keyCount + m_deletedOffsets.size() : 0; }
 
+        size_t propertyMapSize() const
+        {
+            return sizeof(PropertyMap) + (m_table ? PropertyMapHashTable::allocationSize(m_table->size) : 0);
+        }
+
         static const unsigned emptyEntryIndex = 0;
 

trunk/JavaScriptCore/runtime/StructureID.cpp

@@ -61 +61 @@
     unsigned numberUsingSingleSlot = 0;
     unsigned numberSingletons = 0;
+    unsigned totalPropertyMapsSize = 0;
 
     HashSet<StructureID*>::const_iterator end = liveStructureIDSet.end();
@@ -74 +75 @@
                 ++numberSingletons;
         }
+
+        totalPropertyMapsSize += structureID->propertyMap().propertyMapSize();
     }
 
@@ -80 +83 @@
     printf("Number of StructureIDs that are leaf nodes: %d\n", numberLeaf);
     printf("Number of StructureIDs that singletons: %d\n", numberSingletons);
+
+    printf("Size of a single StructureIDs: %d\n", static_cast<unsigned>(sizeof(StructureID)));
+    printf("Size of sum of all property maps: %d\n", totalPropertyMapsSize);
+    printf("Size of average of all property maps: %f\n", static_cast<double>(totalPropertyMapsSize) / static_cast<double>(liveStructureIDSet.size()));
 }
 #endif
@@ -85 +92 @@
 StructureID::StructureID(JSValue* prototype, const TypeInfo& typeInfo)
     : m_typeInfo(typeInfo)
-    , m_isDictionary(false)
-    , m_hasGetterSetterProperties(false)
     , m_prototype(prototype)
     , m_cachedPrototypeChain(0)
@@ -92 +97 @@
     , m_nameInPrevious(0)
     , m_transitionCount(0)
-    , m_usingSingleTransitionSlot(true)
     , m_propertyStorageCapacity(JSObject::inlineStorageCapacity)
     , m_cachedTransistionOffset(WTF::notFound)
+    , m_isDictionary(false)
+    , m_hasGetterSetterProperties(false)
+    , m_usingSingleTransitionSlot(true)
+    , m_attributesInPrevious(0)
 {
     ASSERT(m_prototype);

trunk/JavaScriptCore/runtime/StructureID.h

@@ -150 +150 @@
         TypeInfo m_typeInfo;
 
-        bool m_isDictionary;
-
-        bool m_hasGetterSetterProperties;
-
         JSValue* m_prototype;
         RefPtr<StructureIDChain> m_cachedPrototypeChain;
@@ -159 +155 @@
         RefPtr<StructureID> m_previous;
         UString::Rep* m_nameInPrevious;
-        unsigned m_attributesInPrevious;
 
         size_t m_transitionCount;
-        bool m_usingSingleTransitionSlot;
         union {
             StructureID* singleTransition;
@@ -174 +168 @@
 
         size_t m_cachedTransistionOffset;
+
+        bool m_isDictionary : 1;
+        bool m_hasGetterSetterProperties : 1;
+        bool m_usingSingleTransitionSlot : 1;
+        unsigned m_attributesInPrevious : 5;
     };