Changeset 13541 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Mar 28, 2006, 4:09:20 PM (19 years ago)

Author:

darin

Message:

Reviewed by Geoff.

• change some code that resulted in init routines on Mac OS X -- if the framework has init routines it will use memory and slow down applications that link with WebKit even in cases where those applications don't use WebKit

• kjs/date_object.cpp: Changed constants that were derived by multiplying other constants to use immediate numbers instead. Apparently, double constant expressions of the type we had here are evaluated at load time.

• kjs/list.cpp: Can't use OwnArrayPtr in ListImp because of the global instances of ListImp, so go back to using a plain old pointer. (KJS::List::List): Set overflow to 0 when initializing ListImp. (KJS::List::release): Replace a clear call with a delete and explicit set to 0. (KJS::List::append): Use raw pointers, and do a delete [] instead of finessing it with a swap of OwnArrayPtr. (KJS::List::copyFrom): Remove now-unneeded get(). (KJS::List::copyTail): Ditto.

• kjs/ustring.cpp: Changed UString::Rep::empty initializer a bit so that it doesn't get a static initializer routine. Had to get rid of one level of constant to get the compiler to understand it could initialize without any code.

• added a build step that checks for init routines

• JavaScriptCore.xcodeproj/project.pbxproj: Deleted now-unused custom build rule that was replaced by the generate-derived-sources script a while back. Added a custom build phase that invokes the check-for-global-initializers script.

Location:

trunk/JavaScriptCore/kjs

Files:

• date_object.cpp (modified) (1 diff)
• list.cpp (modified) (8 diffs)
• ustring.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/date_object.cpp

@@ -131 +131 @@
 const double secondsPerMinute = 60;
 const double msPerSecond = 1000;
-const double msPerMinute = msPerSecond * secondsPerMinute;
-const double msPerHour = msPerMinute * minutesPerHour;
-const double msPerDay = msPerHour * hoursPerDay;
+const double msPerMinute = 60 * 1000;
+const double msPerHour = 60 * 60 * 1000;
+const double msPerDay = 24 * 60 * 60 * 1000;
+
 static const char * const weekdayName[7] = { "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" };
 static const char * const monthName[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
-    
+
 static double makeTime(tm *, double ms, bool utc);
 static double parseDate(const UString &);

trunk/JavaScriptCore/kjs/list.cpp

@@ -25 +25 @@
 #include "internal.h"
 #include <algorithm>
-#include <kxmlcore/OwnArrayPtr.h>
 
 #define DUMP_STATISTICS 0
@@ -43 +42 @@
     ListImpState state;
     int capacity;
-    OwnArrayPtr<JSValue*> overflow;
+    JSValue** overflow;
 
     union {
@@ -172 +171 @@
     imp->valueRefCount = 1;
     imp->capacity = 0;
+    imp->overflow = 0;
+
 #if DUMP_STATISTICS
     if (++numLists > numListsHighWaterMark)
@@ -186 +187 @@
     imp->valueRefCount = !needsMarking;
     imp->capacity = 0;
+    imp->overflow = 0;
 
 #if DUMP_STATISTICS
@@ -211 +213 @@
 #endif
 
-    imp->overflow.clear();
+    delete [] imp->overflow;
+    imp->overflow = 0;
 
     if (imp->state == usedInPool) {
@@ -272 +275 @@
     if (i >= imp->capacity) {
         int newCapacity = i * 2;
-        OwnArrayPtr<JSValue*> newOverflow(new JSValue* [newCapacity - inlineValuesSize]);
-        JSValue** oldOverflow = imp->overflow.get();
+        JSValue** newOverflow = new JSValue* [newCapacity - inlineValuesSize];
+        JSValue** oldOverflow = imp->overflow;
         int oldOverflowSize = i - inlineValuesSize;
         for (int j = 0; j != oldOverflowSize; j++)
             newOverflow[j] = oldOverflow[j];
-        imp->overflow.swap(newOverflow);
+        delete [] oldOverflow;
+        imp->overflow = newOverflow;
         imp->capacity = newCapacity;
     }
@@ -301 +305 @@
         append(imp->values[i]);
 
-    JSValue** overflow = imp->overflow.get();
+    JSValue** overflow = imp->overflow;
     int overflowSize = size - inlineSize;
     for (int i = 0; i != overflowSize; ++i)
@@ -320 +324 @@
         copy.append(imp->values[i]);
 
-    JSValue** overflow = imp->overflow.get();
+    JSValue** overflow = imp->overflow;
     int overflowSize = size - inlineSize;
     for (int i = 0; i < overflowSize; ++i)

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -137 +137 @@
 // Hack here to avoid a global with a constructor; point to an unsigned short instead of a UChar.
 static unsigned short almostUChar;
-static UChar *const nonNullUCharPointer = reinterpret_cast<UChar *>(&almostUChar);
 UString::Rep UString::Rep::null = { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 };
-UString::Rep UString::Rep::empty = { 0, 0, 1, 0, 0, 0, nonNullUCharPointer, 0, 0, 0, 0 };
+UString::Rep UString::Rep::empty = { 0, 0, 1, 0, 0, 0, reinterpret_cast<UChar*>(&almostUChar), 0, 0, 0, 0 };
 const int normalStatBufferSize = 4096;
 static char *statBuffer = 0;