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

Timestamp:

Nov 18, 2002, 1:55:23 PM (23 years ago)

Author:

darin

Message:

• fix worst speed problems on the sort page of the iBench JavaScript test

Sped up JavaScript iBench by 70%, the sort page by 88%.

• kjs/array_object.h: Add array-specific sort functions.
• kjs/array_object.cpp: (compareByStringForQSort): Added. (ArrayInstanceImp::sort): Added. (compareWithCompareFunctionForQSort): Added. (ArrayProtoFuncImp::call): Use ArrayInstanceImp::sort if the object being sorted is actually an array.

• kjs/object.h: Add argumentsPropertyName.
• kjs/object.cpp: Add argumentsPropertyName.
• kjs/function.cpp: (FunctionImp::FunctionImp): Use argumentsPropertyName to avoid making a UString. (FunctionImp::call): Ditto. (ActivationImp::ActivationImp): Ditto.
• kjs/function_object.cpp: (FunctionObjectImp::construct): Ditto.

• kjs/ustring.h: Added compare function for -1/0/+1 comparison.
• kjs/ustring.cpp: (KJS::compare): Added.

File:

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

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -191 +191 @@
       imp->mark();
   }
+}
+
+static ExecState *execForCompareByStringForQSort;
+
+static int compareByStringForQSort(const void *a, const void *b)
+{
+    ExecState *exec = execForCompareByStringForQSort;
+    return compare(Value(*(ValueImp **)a).toString(exec), Value(*(ValueImp **)b).toString(exec));
+}
+
+void ArrayInstanceImp::sort(ExecState *exec)
+{
+    execForCompareByStringForQSort = exec;
+    qsort(storage, length, sizeof(ValueImp *), compareByStringForQSort);
+    execForCompareByStringForQSort = 0;
+}
+
+struct CompareWithCompareFunctionArguments {
+    CompareWithCompareFunctionArguments(ExecState *e, ObjectImp *cf)
+        : exec(e)
+        , compareFunction(cf)
+        , globalObject(e->interpreter()->globalObject())
+    { }
+
+    ExecState *exec;
+    ObjectImp *compareFunction;
+    List arguments;
+    Object globalObject;
+};
+
+static CompareWithCompareFunctionArguments *compareWithCompareFunctionArguments;
+
+static int compareWithCompareFunctionForQSort(const void *a, const void *b)
+{
+    CompareWithCompareFunctionArguments *args = compareWithCompareFunctionArguments;
+    
+    args->arguments.clear();
+    args->arguments.append(Value(*(ValueImp **)a));
+    args->arguments.append(Value(*(ValueImp **)b));
+    return args->compareFunction->call(args->exec, args->globalObject, args->arguments)
+        .toInt32(args->exec);
+}
+
+void ArrayInstanceImp::sort(ExecState *exec, Object &compareFunction)
+{
+    CompareWithCompareFunctionArguments args(exec, compareFunction.imp());
+    compareWithCompareFunctionArguments = &args;
+    qsort(storage, length, sizeof(ValueImp *), compareWithCompareFunctionForQSort);
+    compareWithCompareFunctionArguments = 0;
 }
 
@@ -425 +474 @@
           useSortFunction = false;
       }
+    
+    if (thisObj.imp()->classInfo() == &ArrayInstanceImp::info) {
+      if (useSortFunction)
+        ((ArrayInstanceImp *)thisObj.imp())->sort(exec, sortFunction);
+      else
+        ((ArrayInstanceImp *)thisObj.imp())->sort(exec);
+      result = thisObj;
+      break;
+    }
 
     if (length == 0) {
       thisObj.put(exec, lengthPropertyName, Number(0), DontEnum | DontDelete);
-      result = Undefined();
+      result = thisObj;
       break;
     }