Changeset 27711 in webkit for trunk/JavaScriptCore

Timestamp:

Nov 12, 2007, 12:00:29 AM (18 years ago)

Author:

oliver

Message:

Add special fastZeroedMalloc function to replace a
number of fastCalloc calls where one argument was 1.

Reviewed by Darin.

This results in a 0.4% progression in SunSpider, more
than making up for the earlier regression caused by
additional overflow checks.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.exp (modified) (1 diff)
• kjs/array_instance.cpp (modified) (1 diff)
• kjs/property_map.cpp (modified) (2 diffs)
• wtf/FastMalloc.cpp (modified) (2 diffs)
• wtf/FastMalloc.h (modified) (1 diff)
• wtf/HashTable.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-11-11  Oliver Hunt  <[email protected]>
+
+        Reviewed by Darin.
+
+        Add special fastZeroedMalloc function to replace a 
+        number of fastCalloc calls where one argument was 1.
+        
+        This results in a 0.4% progression in SunSpider, more
+        than making up for the earlier regression caused by 
+        additional overflow checks.
+
+        * JavaScriptCore.exp:
+        * kjs/array_instance.cpp:
+        * kjs/property_map.cpp:
+        * wtf/FastMalloc.cpp:
+        * wtf/FastMalloc.h:
+        * wtf/HashTable.h:
+
 2007-11-11  Adam Roben  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.exp

@@ -231 +231 @@
 __ZN3WTF10fastMallocEm
 __ZN3WTF11fastReallocEPvm
+__ZN3WTF16fastZeroedMallocEm
 __ZN3WTF8fastFreeEPv
 __ZNK3KJS11Interpreter12builtinArrayEv

trunk/JavaScriptCore/kjs/array_instance.cpp

@@ -76 +76 @@
     m_length = initialLength;
     m_vectorLength = initialCapacity;
-    m_storage = static_cast<ArrayStorage*>(fastCalloc(storageSize(initialCapacity), 1));
+    m_storage = static_cast<ArrayStorage*>(fastZeroedMalloc(storageSize(initialCapacity)));
 
     Collector::reportExtraMemoryCost(initialCapacity * sizeof(JSValue*));

trunk/JavaScriptCore/kjs/property_map.cpp

@@ -510 +510 @@
 #endif
 
-    m_u.table = static_cast<Table*>(fastCalloc(1, Table::allocationSize(newTableSize)));
+    m_u.table = static_cast<Table*>(fastZeroedMalloc(Table::allocationSize(newTableSize)));
     m_u.table->size = newTableSize;
     m_u.table->sizeMask = newTableSize - 1;
@@ -535 +535 @@
     Table* oldTable = m_u.table;
     
-    m_u.table = static_cast<Table*>(fastCalloc(1, Table::allocationSize(newTableSize)));
+    m_u.table = static_cast<Table*>(fastZeroedMalloc(Table::allocationSize(newTableSize)));
     m_u.table->size = newTableSize;
     m_u.table->sizeMask = newTableSize - 1;

trunk/JavaScriptCore/wtf/FastMalloc.cpp

@@ -128 +128 @@
 #endif // NDEBUG
 
+#include <string.h>
+
+namespace WTF {
+void *fastZeroedMalloc(size_t n) 
+{
+    void *result = fastMalloc(n);
+    if (!result)
+        return 0;
+    memset(result, 0, n);
+#ifndef WTF_CHANGES
+    MallocHook::InvokeNewHook(result, n);
+#endif
+    return result;
+}
+    
+}
+
 #if FORCE_SYSTEM_MALLOC
 
@@ -190 +207 @@
 #include <stddef.h>
 #include <stdio.h>
-#include <string.h>
 #if COMPILER(MSVC)
 #define WIN32_LEAN_AND_MEAN

trunk/JavaScriptCore/wtf/FastMalloc.h

@@ -31 +31 @@
 
     void *fastMalloc(size_t n);
+    void *fastZeroedMalloc(size_t n);
     void *fastCalloc(size_t n_elements, size_t element_size);
     void fastFree(void* p);

trunk/JavaScriptCore/wtf/HashTable.h

@@ -827 +827 @@
         // gcc doesn't appear to support that
         if (Traits::emptyValueIsZero)
-            return static_cast<ValueType *>(fastCalloc(size, sizeof(ValueType)));
+            return static_cast<ValueType *>(fastZeroedMalloc(size * sizeof(ValueType)));
         ValueType* result = static_cast<ValueType*>(fastMalloc(size * sizeof(ValueType)));
         for (int i = 0; i < size; i++)