Changeset 31147 in webkit for trunk/JavaScriptCore/kjs/lookup.cpp

Timestamp:

Mar 18, 2008, 9:23:21 PM (17 years ago)

Author:

Darin Adler

Message:

JavaScriptCore:

2008-03-18 Darin Adler <Darin Adler>

Reviewed by Maciej.

• Speed up JavaScript built-in properties by changing the hash table to take advantage of the identifier objects

5% speedup for Acid3 test 26

• JavaScriptCore.exp: Updated.
• kjs/create_hash_table: Compute size of hash table large enough so that there are no collisions, but don't generate the hash table.
• kjs/identifier.h: Made the add function that returns a PassRefPtr public.
• kjs/lexer.cpp: (KJS::Lexer::lex): Updated for change to HashTable interface.
• kjs/lookup.cpp: (KJS::HashTable::changeKeysToIdentifiers): Added. Finds the identifier for each property so the equality comparision can be done with pointer comparision.
• kjs/lookup.h: Made the key be a union of char* with UString::Rep* so it can hold identifiers. Added a keysAreIdentifiers flag to the HashTable. Changed the Lookup functions to be member functions of HashTable instead.
• kjs/object.cpp: (KJS::JSObject::deleteProperty): Update for change to HashTable. (KJS::JSObject::findPropertyHashEntry): Ditto. (KJS::JSObject::getPropertyAttributes): Ditto. (KJS::JSObject::getPropertyNames): Ditto.

WebCore:

2008-03-18 Darin Adler <Darin Adler>

Reviewed by Maciej.

• Speed up JavaScript built-in properties by changing the hash table to take advantage of the identifier objects

5% speedup for Acid3 test 26

• bindings/js/JSDOMWindowBase.cpp: (WebCore::JSDOMWindowBase::getOwnPropertySlot): Update for change to HashTable. (WebCore::JSDOMWindowBase::put): Ditto.
• bindings/js/JSDOMWindowCustom.cpp: (WebCore::JSDOMWindow::customGetOwnPropertySlot): Ditto.
• bindings/js/JSHTMLInputElementBase.cpp: (WebCore::JSHTMLInputElementBase::getOwnPropertySlot): Ditto.
• bindings/js/JSHistoryCustom.cpp: (WebCore::JSHistory::customGetOwnPropertySlot): Ditto.
• bindings/js/JSLocation.cpp: (WebCore::JSLocation::customGetOwnPropertySlot): Ditto. (WebCore::JSLocation::put): Ditto.
• bindings/js/kjs_binding.cpp: (WebCore::nonCachingStaticFunctionGetter): Ditto.

• bindings/scripts/CodeGeneratorJS.pm: Same changes as in the create_hash_table script.

File:

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

trunk/JavaScriptCore/kjs/lookup.cpp

@@ -1 @@
-// -*- c-basic-offset: 2 -*-
 /*
- *  Copyright (C) 1999-2000 Harri Porten ([email protected])
- *  Copyright (C) 2003, 2007 Apple Inc. All rights reserved.
+ *  Copyright (C) 2008 Apple Inc. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
@@ -23 +21 @@
 #include "lookup.h"
 
-#include <wtf/Assertions.h>
-
 namespace KJS {
 
-static inline bool keysMatch(const UChar* c, unsigned len, const char* s)
+void HashTable::createTable() const
 {
-  // FIXME: This can run off the end of |s| if |c| has a U+0000 character in it.
-  const char* end = s + len;
-  for (; s != end; c++, s++)
-    if (*c != *s)
-      return false;
-  return *s == 0;
-}
-
-static inline const HashEntry* findEntry(const struct HashTable* table, unsigned int hash,
-                                         const UChar* c, unsigned int len)
-{
-  ASSERT(table->type == 3);
-    
-  const HashEntry* e = &table->entries[hash & table->hashSizeMask];
-
-  if (!e->s)
-    return 0;
-
-  do {
-    // compare strings
-    if (keysMatch(c, len, e->s))
-      return e;
-
-    // try next bucket
-    e = e->next;
-  } while (e);
-  return 0;
-}
-
-const HashEntry* Lookup::findEntry(const struct HashTable* table, const Identifier& s)
-{
-  return KJS::findEntry(table, s.ustring().rep()->computedHash(), s.data(), s.size());
-}
-
-int Lookup::find(const struct HashTable *table, const UChar *c, unsigned int len)
-{
-  const HashEntry *entry = KJS::findEntry(table, UString::Rep::computeHash(c, len), c, len);
-  if (entry)
-    return entry->value.intValue;
-  return -1;
-}
-
-int Lookup::find(const struct HashTable* table, const Identifier& s)
-{
-  const HashEntry* entry = KJS::findEntry(table, s.ustring().rep()->computedHash(), s.data(), s.size());
-  if (entry)
-    return entry->value.intValue;
-  return -1;
+    ASSERT(!table);
+    HashEntry* entries = new HashEntry[hashSizeMask + 1];
+    for (int i = 0; i <= hashSizeMask; ++i)
+        entries[i].key = 0;
+    for (int i = 0; values[i].key; ++i) {
+        UString::Rep* identifier = Identifier::add(values[i].key).releaseRef();
+        int hashIndex = identifier->computedHash() & hashSizeMask;
+        ASSERT(!entries[hashIndex].key);
+        entries[hashIndex].key = identifier;
+        entries[hashIndex].integerValue = values[i].value;
+        entries[hashIndex].attributes = values[i].attributes;
+        entries[hashIndex].length = values[i].length;
+    }
+    table = entries;
 }