Changeset 2786 in webkit for trunk/JavaScriptCore/kjs/array_object.cpp

Timestamp:

Nov 20, 2002, 1:49:31 PM (23 years ago)

Author:

darin

Message:

• oops, checked in big regression instead of 5% speedup

• kjs/function.cpp: (ActivationImp::ActivationImp): Make a marking list, not a refing list.

• a cut at the sparse array implementation

• kjs/array_instance.h: Keep storageLength separate from length.
• kjs/array_object.cpp: (ArrayInstanceImp::ArrayInstanceImp): Start with storageLength == length. (ArrayInstanceImp::get): Check against storage length. (ArrayInstanceImp::put): Ditto. (ArrayInstanceImp::hasProperty): Ditto. (ArrayInstanceImp::deleteProperty): Ditto. (ArrayInstanceImp::setLength): Only enlarge storage length up to a cutoff. (ArrayInstanceImp::mark): Use storageLength. (ArrayInstanceImp::pushUndefinedObjectsToEnd): Added FIXME.

File:

• trunk/JavaScriptCore/kjs/array_object.cpp (modified) (10 diffs)

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -38 +38 @@
 // ------------------------------ ArrayInstanceImp -----------------------------
 
+const unsigned sparseArrayCutoff = 10000;
+
 const ClassInfo ArrayInstanceImp::info = {"Array", 0, 0, 0};
 
@@ -43 +45 @@
   : ObjectImp(proto)
   , length(initialLength)
-  , capacity(length)
-  , storage(length ? (ValueImp **)calloc(length, sizeof(ValueImp *)) : 0)
+  , storageLength(initialLength)
+  , capacity(storageLength)
+  , storage(capacity ? (ValueImp **)calloc(capacity, sizeof(ValueImp *)) : 0)
 {
 }
@@ -51 +54 @@
   : ObjectImp(proto)
   , length(list.size())
-  , capacity(length)
-  , storage(length ? (ValueImp **)malloc(sizeof(ValueImp *) * length) : 0)
+  , storageLength(length)
+  , capacity(storageLength)
+  , storage(capacity ? (ValueImp **)malloc(sizeof(ValueImp *) * capacity) : 0)
 {
   ListIterator it = list.begin();
@@ -76 +80 @@
     if (index >= length)
       return Undefined();
+    if (index < storageLength) {
+      ValueImp *v = storage[index];
+      return v ? Value(v) : Undefined();
+    }
+  }
+
+  return ObjectImp::get(exec, propertyName);
+}
+
+Value ArrayInstanceImp::get(ExecState *exec, unsigned index) const
+{
+  if (index >= length)
+    return Undefined();
+  if (index < storageLength) {
     ValueImp *v = storage[index];
     return v ? Value(v) : Undefined();
   }
-
-  return ObjectImp::get(exec, propertyName);
-}
-
-Value ArrayInstanceImp::get(ExecState *exec, unsigned index) const
-{
-  if (index >= length)
-    return Undefined();
-  ValueImp *v = storage[index];
-  return v ? Value(v) : Undefined();
+  
+  return ObjectImp::get(exec, Identifier::from(index));
 }
 
@@ -104 +114 @@
     if (length <= index)
       setLength(index + 1);
+    if (index < storageLength) {
+      storage[index] = value.imp();
+      return;
+    }
+  }
+  
+  ObjectImp::put(exec, propertyName, value, attr);
+}
+
+void ArrayInstanceImp::put(ExecState *exec, unsigned index, const Value &value, int attr)
+{
+  if (length <= index)
+    setLength(index + 1);
+  if (index < storageLength) {
     storage[index] = value.imp();
     return;
   }
   
-  ObjectImp::put(exec, propertyName, value, attr);
-}
-
-void ArrayInstanceImp::put(ExecState *exec, unsigned index, const Value &value, int attr)
-{
-  if (length <= index)
-    setLength(index + 1);
-  storage[index] = value.imp();
+  ObjectImp::put(exec, Identifier::from(index), value, attr);
 }
 
@@ -128 +145 @@
     if (index >= length)
       return false;
+    if (index < storageLength) {
+      ValueImp *v = storage[index];
+      return v && v != UndefinedImp::staticUndefined;
+    }
+  }
+  
+  return ObjectImp::hasProperty(exec, propertyName);
+}
+
+bool ArrayInstanceImp::hasProperty(ExecState *exec, unsigned index) const
+{
+  if (index >= length)
+    return false;
+  if (index < storageLength) {
     ValueImp *v = storage[index];
     return v && v != UndefinedImp::staticUndefined;
   }
   
-  return ObjectImp::hasProperty(exec, propertyName);
-}
-
-bool ArrayInstanceImp::hasProperty(ExecState *exec, unsigned index) const
-{
-  if (index >= length)
-    return false;
-  ValueImp *v = storage[index];
-  return v && v != UndefinedImp::staticUndefined;
+  return ObjectImp::hasProperty(exec, Identifier::from(index));
 }
 
@@ -153 +176 @@
     if (index >= length)
       return true;
+    if (index < storageLength) {
+      storage[index] = 0;
+      return true;
+    }
+  }
+  
+  return ObjectImp::deleteProperty(exec, propertyName);
+}
+
+bool ArrayInstanceImp::deleteProperty(ExecState *exec, unsigned index)
+{
+  if (index >= length)
+    return true;
+  if (index < storageLength) {
     storage[index] = 0;
     return true;
   }
   
-  return ObjectImp::deleteProperty(exec, propertyName);
-}
-
-bool ArrayInstanceImp::deleteProperty(ExecState *exec, unsigned index)
-{
-  if (index >= length)
-    return true;
-  storage[index] = 0;
-  return true;
+  return ObjectImp::deleteProperty(exec, Identifier::from(index));
 }
 
 void ArrayInstanceImp::setLength(unsigned newLength)
 {
-  if (newLength < length) {
-    memset(storage + newLength, 0, sizeof(ValueImp *) * (length - newLength));
-  }
-  if (newLength > capacity) {
-    unsigned newCapacity = (newLength * 3 + 1) / 2;
-    storage = (ValueImp **)realloc(storage, newCapacity * sizeof (ValueImp *));
-    memset(storage + capacity, 0, sizeof(ValueImp *) * (newCapacity - capacity));
-    capacity = newCapacity;
-  }
+  if (newLength <= sparseArrayCutoff || newLength == length + 1) {
+    if (newLength < storageLength) {
+      memset(storage + newLength, 0, sizeof(ValueImp *) * (storageLength - newLength));
+    }
+    if (newLength > capacity) {
+      unsigned newCapacity = (newLength * 3 + 1) / 2;
+      storage = (ValueImp **)realloc(storage, newCapacity * sizeof (ValueImp *));
+      memset(storage + capacity, 0, sizeof(ValueImp *) * (newCapacity - capacity));
+      capacity = newCapacity;
+    }
+    storageLength = newLength;
+  }
+  
+  // FIXME: Need to remove items from the property map when making a sparse
+  // list shorter.
+  
   length = newLength;
 }
@@ -185 +221 @@
 {
   ObjectImp::mark();
-  unsigned l = length;
+  unsigned l = storageLength;
   for (unsigned i = 0; i < l; ++i) {
     ValueImp *imp = storage[i];
@@ -253 +289 @@
 
     unsigned o = 0;
-    for (unsigned i = 0; i != length; ++i) {
+    
+    for (unsigned i = 0; i != storageLength; ++i) {
         ValueImp *v = storage[i];
         if (v && v != undefined) {
@@ -261 +298 @@
         }
     }
-    if (o != length)
-        memset(storage + o, 0, sizeof(ValueImp *) * (length - o));
+    
+    // FIXME: Get sparse items down here.
+    
+    if (o != storageLength)
+        memset(storage + o, 0, sizeof(ValueImp *) * (storageLength - o));
+    
     return o;
 }