Changeset 9009 in webkit for trunk/JavaScriptCore/kjs/ustring.cpp

Timestamp:

Apr 14, 2005, 6:26:26 PM (20 years ago)

Author:

mjs

Message:

Reviewed by Richard.

<rdar://problem/4089734> JavaScript iBench can be sped up ~10% with custom allocator

• use custom single-threaded malloc for all non-GC JavaScriptCore allocations, for a 9.1% speedup on JavaScript iBench

• JavaScriptCore.pbproj/project.pbxproj:
• kjs/collector.cpp: (KJS::Collector::allocate): Use dlmalloc to allocate the collector blocks. (KJS::Collector::collect): And dlfree to free it.
• kjs/fast_malloc.cpp: Added, just the standard dlmalloc here.
• kjs/fast_malloc.h: Added. Declarations for the functions. Also added a handy macro to give a class custom operator new/delete
• kjs/identifier.cpp: (KJS::Identifier::add): Use dlmalloc/dlfree.
• kjs/nodes.h: make nodes KJS_FAST_ALLOCATED.
• kjs/property_map.cpp: (KJS::PropertyMap::~PropertyMap): Use dlmalloc/dlfree. (KJS::PropertyMap::rehash): ditto
• kjs/scope_chain.h:
• kjs/ustring.cpp: (KJS::UString::Rep::createCopying): New named constructor that copies a passed-in buffer, to hide allocation details from webcore. (KJS::UString::UString): use createCopying when appropriate. (KJS::UString::Rep::destroy): Use dlmalloc/dlfree. (KJS::UString::expandedSize): likewise (KJS::UString::expandCapacity): likewise (KJS::UString::expandPreCapacity): likewise (KJS::UString::spliceSubstringsWithSeparators): likewise (KJS::UString::append): likewise (KJS::UString::operator=): likewise (KJS::UString::detach): likewise
• kjs/ustring.h: make UString and UString::Rep KJS_FAST_ALLOCATED.

File:

• trunk/JavaScriptCore/kjs/ustring.cpp (modified) (19 diffs)

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -36 +36 @@
 #endif
 
+#include "fast_malloc.h"
 #include "ustring.h"
 #include "operations.h"
@@ -45 +46 @@
 
 #include <unicode/uchar.h>
-
-// malloc_good_size is not prototyped anywhere!
-extern "C" {
-  size_t malloc_good_size(size_t size);
-}
 
 #endif
@@ -194 +190 @@
     return callerBetterNotModifyThis;
   }
+}
+
+UString::Rep *UString::Rep::createCopying(const UChar *d, int l)
+{
+  int sizeInBytes = l * sizeof(UChar);
+  UChar *copyD = static_cast<UChar *>(kjs_fast_malloc(sizeInBytes));
+  memcpy(copyD, d, sizeInBytes);
+
+  return create(copyD, l);
 }
 
@@ -249 +254 @@
     baseString->deref();
   } else {
-    free(buf);
+    kjs_fast_free(buf);
   }
   delete this;
@@ -331 +336 @@
 {
   int s = (size * 11 / 10) + 1 + otherSize;
-#if APPLE_CHANGES
-  s = malloc_good_size(s * sizeof(UChar)) / sizeof(UChar);
-#endif
   return s;
 }
@@ -353 +355 @@
   if (requiredLength > r->capacity) {
     int newCapacity = expandedSize(requiredLength, r->preCapacity);
-    r->buf = static_cast<UChar *>(realloc(r->buf, newCapacity * sizeof(UChar)));
+    r->buf = static_cast<UChar *>(kjs_fast_realloc(r->buf, newCapacity * sizeof(UChar)));
     r->capacity = newCapacity - r->preCapacity;
   }
@@ -369 +371 @@
     int delta = newCapacity - r->capacity - r->preCapacity;
 
-    UChar *newBuf = static_cast<UChar *>(malloc(newCapacity * sizeof(UChar)));
+    UChar *newBuf = static_cast<UChar *>(kjs_fast_malloc(newCapacity * sizeof(UChar)));
     memcpy(newBuf + delta, r->buf, (r->capacity + r->preCapacity) * sizeof(UChar));
-    free(r->buf);
+    kjs_fast_free(r->buf);
     r->buf = newBuf;
 
@@ -389 +391 @@
 UString::UString(char c)
 {
-    UChar *d = static_cast<UChar *>(malloc(sizeof(UChar)));
+    UChar *d = static_cast<UChar *>(kjs_fast_malloc(sizeof(UChar)));
     d[0] = c;
     rep = Rep::create(d, 1);
@@ -405 +407 @@
     return;
   }
-  UChar *d = static_cast<UChar *>(malloc(sizeof(UChar) * length));
+  UChar *d = static_cast<UChar *>(kjs_fast_malloc(sizeof(UChar) * length));
   for (int i = 0; i < length; i++)
     d[i].uc = c[i];
@@ -417 +419 @@
     return;
   }
-  UChar *d = static_cast<UChar *>(malloc(sizeof(UChar) *length));
-  memcpy(d, c, length * sizeof(UChar));
-  rep = Rep::create(d, length);
+  rep = Rep::createCopying(c, length);
 }
 
@@ -428 +428 @@
     return;
   }
-  UChar *d;
   if (copy) {
-    d = static_cast<UChar *>(malloc(sizeof(UChar) * length));
-    memcpy(d, c, length * sizeof(UChar));
-  } else
-    d = c;
-  rep = Rep::create(d, length);
+    rep = Rep::createCopying(c, length);
+  } else {
+    rep = Rep::create(c, length);
+  }
 }
 
@@ -474 +472 @@
     // a does not qualify for append, and b does not qualify for prepend, gotta make a whole new string
     int newCapacity = expandedSize(length, 0);
-    UChar *d = static_cast<UChar *>(malloc(sizeof(UChar) * newCapacity));
+    UChar *d = static_cast<UChar *>(kjs_fast_malloc(sizeof(UChar) * newCapacity));
     memcpy(d, a.data(), aSize * sizeof(UChar));
     memcpy(d + aSize, b.data(), bSize * sizeof(UChar));
@@ -620 +618 @@
   }
 
-  UChar *buffer = static_cast<UChar *>(malloc(totalLength * sizeof(UChar)));
+  UChar *buffer = static_cast<UChar *>(kjs_fast_malloc(totalLength * sizeof(UChar)));
 
   int maxCount = MAX(rangeCount, separatorCount);
@@ -673 +671 @@
     // this is shared with someone using more capacity, gotta make a whole new string
     int newCapacity = expandedSize(length, 0);
-    UChar *d = static_cast<UChar *>(malloc(sizeof(UChar) * newCapacity));
+    UChar *d = static_cast<UChar *>(kjs_fast_malloc(sizeof(UChar) * newCapacity));
     memcpy(d, data(), thisSize * sizeof(UChar));
     memcpy(const_cast<UChar *>(d + thisSize), t.data(), tSize * sizeof(UChar));
@@ -717 +715 @@
     // this is shared with someone using more capacity, gotta make a whole new string
     int newCapacity = expandedSize(length, 0);
-    UChar *d = static_cast<UChar *>(malloc(sizeof(UChar) * newCapacity));
+    UChar *d = static_cast<UChar *>(kjs_fast_malloc(sizeof(UChar) * newCapacity));
     memcpy(d, data(), thisSize * sizeof(UChar));
     for (int i = 0; i < tSize; ++i)
@@ -738 +736 @@
     // this is empty - must make a new rep because we don't want to pollute the shared empty one 
     int newCapacity = expandedSize(1, 0);
-    UChar *d = static_cast<UChar *>(malloc(sizeof(UChar) * newCapacity));
+    UChar *d = static_cast<UChar *>(kjs_fast_malloc(sizeof(UChar) * newCapacity));
     d[0] = c;
     release();
@@ -761 +759 @@
     // this is shared with someone using more capacity, gotta make a whole new string
     int newCapacity = expandedSize((length + 1), 0);
-    UChar *d = static_cast<UChar *>(malloc(sizeof(UChar) * newCapacity));
+    UChar *d = static_cast<UChar *>(kjs_fast_malloc(sizeof(UChar) * newCapacity));
     memcpy(d, data(), length * sizeof(UChar));
     d[length] = c;
@@ -823 +821 @@
   } else {
     release();
-    d = static_cast<UChar *>(malloc(sizeof(UChar) * l));
+    d = static_cast<UChar *>(kjs_fast_malloc(sizeof(UChar) * l));
     rep = Rep::create(d, l);
   }
@@ -1138 +1136 @@
   if (rep->rc > 1 || rep->baseString) {
     int l = size();
-    UChar *n = static_cast<UChar *>(malloc(sizeof(UChar) * l));
+    UChar *n = static_cast<UChar *>(kjs_fast_malloc(sizeof(UChar) * l));
     memcpy(n, data(), l * sizeof(UChar));
     release();