[haiku-webkit-commits] r477 - webkit/trunk/WebKit/haiku/WebPositive/support

  • From: webkit@xxxxxxxxxxxxxxx
  • To: haiku-webkit-commits@xxxxxxxxxxxxx
  • Date: Mon, 03 May 2010 16:52:02 +0000

Author: stippi
Date: Mon May  3 16:52:02 2010
New Revision: 477
URL: http://mmlr.dyndns.org/changeset/477

Log:
Added a few utility classes from Haiku. To be removed when WebPositive moves
into Haiku. Added new file HashKeys.h which implements commonly used HashKey
classes. Additionally to the ones found in HashMap.h, it has a HashKeyString
class, which wraps a BString and provides the GetHashCode() method.

Added:
   webkit/trunk/WebKit/haiku/WebPositive/support/AutoLocker.h
   webkit/trunk/WebKit/haiku/WebPositive/support/HashKeys.h
   webkit/trunk/WebKit/haiku/WebPositive/support/HashMap.h
   webkit/trunk/WebKit/haiku/WebPositive/support/HashSet.h
   webkit/trunk/WebKit/haiku/WebPositive/support/OpenHashTable.h

Added: webkit/trunk/WebKit/haiku/WebPositive/support/AutoLocker.h
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ webkit/trunk/WebKit/haiku/WebPositive/support/AutoLocker.h  Mon May  3 
16:52:02 2010        (r477)
@@ -0,0 +1,178 @@
+/*
+ * Copyright 2005-2007, Ingo Weinhold, bonefish@xxxxxxxxxxxxx
+ * All rights reserved. Distributed under the terms of the MIT License.
+ */
+#ifndef _AUTO_LOCKER_H
+#define _AUTO_LOCKER_H
+
+
+#include <stddef.h>
+
+
+namespace BPrivate {
+
+// AutoLockerStandardLocking
+template<typename Lockable>
+class AutoLockerStandardLocking {
+public:
+       inline bool Lock(Lockable* lockable)
+       {
+               return lockable->Lock();
+       }
+
+       inline void Unlock(Lockable* lockable)
+       {
+               lockable->Unlock();
+       }
+};
+
+// AutoLockerReadLocking
+template<typename Lockable>
+class AutoLockerReadLocking {
+public:
+       inline bool Lock(Lockable* lockable)
+       {
+               return lockable->ReadLock();
+       }
+
+       inline void Unlock(Lockable* lockable)
+       {
+               lockable->ReadUnlock();
+       }
+};
+
+// AutoLockerWriteLocking
+template<typename Lockable>
+class AutoLockerWriteLocking {
+public:
+       inline bool Lock(Lockable* lockable)
+       {
+               return lockable->WriteLock();
+       }
+
+       inline void Unlock(Lockable* lockable)
+       {
+               lockable->WriteUnlock();
+       }
+};
+
+// AutoLocker
+template<typename Lockable,
+                typename Locking = AutoLockerStandardLocking<Lockable> >
+class AutoLocker {
+private:
+       typedef AutoLocker<Lockable, Locking>   ThisClass;
+public:
+       inline AutoLocker()
+               :
+               fLockable(NULL),
+               fLocked(false)
+       {
+       }
+
+       inline AutoLocker(const Locking& locking)
+               :
+               fLockable(NULL),
+               fLocking(locking),
+               fLocked(false)
+       {
+       }
+
+       inline AutoLocker(Lockable* lockable, bool alreadyLocked = false,
+               bool lockIfNotLocked = true)
+               :
+               fLockable(lockable),
+               fLocked(fLockable && alreadyLocked)
+       {
+               if (!alreadyLocked && lockIfNotLocked)
+                       Lock();
+       }
+
+       inline AutoLocker(Lockable& lockable, bool alreadyLocked = false,
+               bool lockIfNotLocked = true)
+               :
+               fLockable(&lockable),
+               fLocked(fLockable && alreadyLocked)
+       {
+               if (!alreadyLocked && lockIfNotLocked)
+                       Lock();
+       }
+
+       inline ~AutoLocker()
+       {
+               Unlock();
+       }
+
+       inline void SetTo(Lockable* lockable, bool alreadyLocked,
+               bool lockIfNotLocked = true)
+       {
+               Unlock();
+               fLockable = lockable;
+               fLocked = (lockable && alreadyLocked);
+               if (!alreadyLocked && lockIfNotLocked)
+                       Lock();
+       }
+
+       inline void SetTo(Lockable& lockable, bool alreadyLocked,
+               bool lockIfNotLocked = true)
+       {
+               SetTo(&lockable, alreadyLocked, lockIfNotLocked);
+       }
+
+       inline void Unset()
+       {
+               Unlock();
+               Detach();
+       }
+
+       inline bool Lock()
+       {
+               if (fLockable && !fLocked)
+                       fLocked = fLocking.Lock(fLockable);
+               return fLocked;
+       }
+
+       inline void Unlock()
+       {
+               if (fLockable && fLocked) {
+                       fLocking.Unlock(fLockable);
+                       fLocked = false;
+               }
+       }
+
+       inline void Detach()
+       {
+               fLockable = NULL;
+               fLocked = false;
+       }
+
+       inline AutoLocker<Lockable, Locking>& operator=(Lockable* lockable)
+       {
+               SetTo(lockable);
+               return *this;
+       }
+
+       inline AutoLocker<Lockable, Locking>& operator=(Lockable& lockable)
+       {
+               SetTo(&lockable);
+               return *this;
+       }
+
+       inline bool IsLocked() const    { return fLocked; }
+
+       inline operator bool() const    { return fLocked; }
+
+protected:
+       Lockable*       fLockable;
+       Locking         fLocking;
+       bool            fLocked;
+};
+
+
+}      // namespace BPrivate
+
+using BPrivate::AutoLocker;
+using BPrivate::AutoLockerReadLocking;
+using BPrivate::AutoLockerWriteLocking;
+
+#endif // _AUTO_LOCKER_H

Added: webkit/trunk/WebKit/haiku/WebPositive/support/HashKeys.h
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ webkit/trunk/WebKit/haiku/WebPositive/support/HashKeys.h    Mon May  3 
16:52:02 2010        (r477)
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2010, Stephan Aßmus <superstippi@xxxxxx>. All rights reserved.
+ * Copyright 2004-2007, Ingo Weinhold <ingo_weinhold@xxxxxx>. All rights 
reserved.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef HASH_KEYS_H
+#define HASH_KEYS_H
+
+#include <String.h>
+
+
+namespace BPrivate {
+
+#if 0
+// TODO: Move here from HashMap.h and adapt all clients.
+// HashKey32
+template<typename Value>
+struct HashKey32 {
+       HashKey32() {}
+       HashKey32(const Value& value) : value(value) {}
+
+       uint32 GetHashCode() const
+       {
+               return (uint32)value;
+       }
+
+       HashKey32<Value> operator=(const HashKey32<Value>& other)
+       {
+               value = other.value;
+               return *this;
+       }
+
+       bool operator==(const HashKey32<Value>& other) const
+       {
+               return (value == other.value);
+       }
+
+       bool operator!=(const HashKey32<Value>& other) const
+       {
+               return (value != other.value);
+       }
+
+       Value   value;
+};
+
+
+// HashKey64
+template<typename Value>
+struct HashKey64 {
+       HashKey64() {}
+       HashKey64(const Value& value) : value(value) {}
+
+       uint32 GetHashCode() const
+       {
+               uint64 v = (uint64)value;
+               return (uint32)(v >> 32) ^ (uint32)v;
+       }
+
+       HashKey64<Value> operator=(const HashKey64<Value>& other)
+       {
+               value = other.value;
+               return *this;
+       }
+
+       bool operator==(const HashKey64<Value>& other) const
+       {
+               return (value == other.value);
+       }
+
+       bool operator!=(const HashKey64<Value>& other) const
+       {
+               return (value != other.value);
+       }
+
+       Value   value;
+};
+#endif
+
+
+struct HashKeyString {
+       HashKeyString() {}
+       HashKeyString(const BString& value) : value(value) {}
+       HashKeyString(const char* string) : value(string) {}
+
+       uint32 GetHashCode() const
+       {
+               // from the Dragon Book: a slightly modified hashpjw()
+               uint32 hash = 0;
+               const char* string = value.String();
+               if (string != NULL) {
+                       for (; *string; string++) {
+                               uint32 g = hash & 0xf0000000;
+                               if (g != 0)
+                                       hash ^= g >> 24;
+                               hash = (hash << 4) + *string;
+                       }
+               }
+               return hash;
+       }
+
+       HashKeyString operator=(const HashKeyString& other)
+       {
+               value = other.value;
+               return *this;
+       }
+
+       bool operator==(const HashKeyString& other) const
+       {
+               return (value == other.value);
+       }
+
+       bool operator!=(const HashKeyString& other) const
+       {
+               return (value != other.value);
+       }
+
+       BString value;
+};
+
+}      // namespace BPrivate
+
+using BPrivate::HashKeyString;
+
+#endif // HASH_KEYS_H

Added: webkit/trunk/WebKit/haiku/WebPositive/support/HashMap.h
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ webkit/trunk/WebKit/haiku/WebPositive/support/HashMap.h     Mon May  3 
16:52:02 2010        (r477)
@@ -0,0 +1,481 @@
+// HashMap.h
+//
+// Copyright (c) 2004-2007, Ingo Weinhold (bonefish@xxxxxxxxxxxxxxx)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+// Except as contained in this notice, the name of a copyright holder shall
+// not be used in advertising or otherwise to promote the sale, use or other
+// dealings in this Software without prior written authorization of the
+// copyright holder.
+
+#ifndef HASH_MAP_H
+#define HASH_MAP_H
+
+
+#include <Locker.h>
+
+#include "AutoLocker.h"
+#include "OpenHashTable.h"
+
+
+namespace BPrivate {
+
+// HashMapElement
+template<typename Key, typename Value>
+class HashMapElement : public OpenHashElement {
+private:
+       typedef HashMapElement<Key, Value> Element;
+public:
+
+       HashMapElement() : OpenHashElement(), fKey(), fValue()
+       {
+               fNext = -1;
+       }
+
+       inline uint32 Hash() const
+       {
+               return fKey.GetHashCode();
+       }
+
+       inline bool operator==(const OpenHashElement &_element) const
+       {
+               const Element &element = static_cast<const Element&>(_element);
+               return (fKey == element.fKey);
+       }
+
+       inline void Adopt(Element &element)
+       {
+               fKey = element.fKey;
+               fValue = element.fValue;
+       }
+
+       Key             fKey;
+       Value   fValue;
+};
+
+// HashMap
+template<typename Key, typename Value>
+class HashMap {
+public:
+       class Entry {
+       public:
+               Entry() {}
+               Entry(const Key& key, Value value) : key(key), value(value) {}
+
+               Key             key;
+               Value   value;
+       };
+
+       class Iterator {
+       private:
+               typedef HashMapElement<Key, Value>      Element;
+       public:
+               Iterator(const Iterator& other)
+                       :
+                       fMap(other.fMap),
+                       fIndex(other.fIndex),
+                       fElement(other.fElement),
+                       fLastElement(other.fElement)
+               {
+               }
+
+               bool HasNext() const
+               {
+                       return fElement;
+               }
+
+               Entry Next()
+               {
+                       if (!fElement)
+                               return Entry();
+                       Entry result(fElement->fKey, fElement->fValue);
+                       _FindNext();
+                       return result;
+               }
+
+               Value* NextValue()
+               {
+                       if (fElement == NULL)
+                               return NULL;
+
+                       Value* value = &fElement->fValue;
+                       _FindNext();
+                       return value;
+               }
+
+               Entry Remove()
+               {
+                       if (!fLastElement)
+                               return Entry();
+                       Entry result(fLastElement->fKey, fLastElement->fValue);
+                       fMap->fTable.Remove(fLastElement, true);
+                       fLastElement = NULL;
+                       return result;
+               }
+
+               Iterator& operator=(const Iterator& other)
+               {
+                       fMap = other.fMap;
+                       fIndex = other.fIndex;
+                       fElement = other.fElement;
+                       fLastElement = other.fLastElement;
+                       return *this;
+               }
+
+       private:
+               Iterator(const HashMap<Key, Value>* map)
+                       :
+                       fMap(const_cast<HashMap<Key, Value>*>(map)),
+                       fIndex(0),
+                       fElement(NULL),
+                       fLastElement(NULL)
+               {
+                       // find first
+                       _FindNext();
+               }
+
+               void _FindNext()
+               {
+                       fLastElement = fElement;
+                       if (fElement && fElement->fNext >= 0) {
+                               fElement = 
fMap->fTable.ElementAt(fElement->fNext);
+                               return;
+                       }
+                       fElement = NULL;
+                       int32 arraySize = fMap->fTable.ArraySize();
+                       for (; !fElement && fIndex < arraySize; fIndex++)
+                               fElement = fMap->fTable.FindFirst(fIndex);
+               }
+
+       private:
+               friend class HashMap<Key, Value>;
+
+               HashMap<Key, Value>*    fMap;
+               int32                                   fIndex;
+               Element*                                fElement;
+               Element*                                fLastElement;
+       };
+
+       HashMap();
+       ~HashMap();
+
+       status_t InitCheck() const;
+
+       status_t Put(const Key& key, Value value);
+       Value Remove(const Key& key);
+       void Clear();
+       Value Get(const Key& key) const;
+       bool Get(const Key& key, Value*& _value) const;
+
+       bool ContainsKey(const Key& key) const;
+
+       int32 Size() const;
+
+       Iterator GetIterator() const;
+
+protected:
+       typedef HashMapElement<Key, Value>      Element;
+       friend class Iterator;
+
+private:
+       Element *_FindElement(const Key& key) const;
+
+protected:
+       OpenHashElementArray<Element>                                           
        fElementArray;
+       OpenHashTable<Element, OpenHashElementArray<Element> >  fTable;
+};
+
+// SynchronizedHashMap
+template<typename Key, typename Value>
+class SynchronizedHashMap : public BLocker {
+public:
+       typedef struct HashMap<Key, Value>::Entry Entry;
+       typedef struct HashMap<Key, Value>::Iterator Iterator;
+
+       SynchronizedHashMap() : BLocker("synchronized hash map")        {}
+       ~SynchronizedHashMap()  { Lock(); }
+
+       status_t InitCheck() const
+       {
+               return fMap.InitCheck();
+       }
+
+       status_t Put(const Key& key, Value value)
+       {
+               MapLocker locker(this);
+               if (!locker.IsLocked())
+                       return B_ERROR;
+               return fMap.Put(key, value);
+       }
+
+       Value Remove(const Key& key)
+       {
+               MapLocker locker(this);
+               if (!locker.IsLocked())
+                       return Value();
+               return fMap.Remove(key);
+       }
+
+       void Clear()
+       {
+               MapLocker locker(this);
+               return fMap.Clear();
+       }
+
+       Value Get(const Key& key) const
+       {
+               const BLocker* lock = this;
+               MapLocker locker(const_cast<BLocker*>(lock));
+               if (!locker.IsLocked())
+                       return Value();
+               return fMap.Get(key);
+       }
+
+       bool ContainsKey(const Key& key) const
+       {
+               const BLocker* lock = this;
+               MapLocker locker(const_cast<BLocker*>(lock));
+               if (!locker.IsLocked())
+                       return false;
+               return fMap.ContainsKey(key);
+       }
+
+       int32 Size() const
+       {
+               const BLocker* lock = this;
+               MapLocker locker(const_cast<BLocker*>(lock));
+               return fMap.Size();
+       }
+
+       Iterator GetIterator()
+       {
+               return fMap.GetIterator();
+       }
+
+       // for debugging only
+       const HashMap<Key, Value>& GetUnsynchronizedMap() const { return fMap; }
+       HashMap<Key, Value>& GetUnsynchronizedMap()                             
{ return fMap; }
+
+protected:
+       typedef AutoLocker<BLocker> MapLocker;
+
+       HashMap<Key, Value>     fMap;
+};
+
+// HashKey32
+template<typename Value>
+struct HashKey32 {
+       HashKey32() {}
+       HashKey32(const Value& value) : value(value) {}
+
+       uint32 GetHashCode() const
+       {
+               return (uint32)value;
+       }
+
+       HashKey32<Value> operator=(const HashKey32<Value>& other)
+       {
+               value = other.value;
+               return *this;
+       }
+
+       bool operator==(const HashKey32<Value>& other) const
+       {
+               return (value == other.value);
+       }
+
+       bool operator!=(const HashKey32<Value>& other) const
+       {
+               return (value != other.value);
+       }
+
+       Value   value;
+};
+
+
+// HashKey64
+template<typename Value>
+struct HashKey64 {
+       HashKey64() {}
+       HashKey64(const Value& value) : value(value) {}
+
+       uint32 GetHashCode() const
+       {
+               uint64 v = (uint64)value;
+               return (uint32)(v >> 32) ^ (uint32)v;
+       }
+
+       HashKey64<Value> operator=(const HashKey64<Value>& other)
+       {
+               value = other.value;
+               return *this;
+       }
+
+       bool operator==(const HashKey64<Value>& other) const
+       {
+               return (value == other.value);
+       }
+
+       bool operator!=(const HashKey64<Value>& other) const
+       {
+               return (value != other.value);
+       }
+
+       Value   value;
+};
+
+
+// HashMap
+
+// constructor
+template<typename Key, typename Value>
+HashMap<Key, Value>::HashMap()
+       :
+       fElementArray(1000),
+       fTable(1000, &fElementArray)
+{
+}
+
+// destructor
+template<typename Key, typename Value>
+HashMap<Key, Value>::~HashMap()
+{
+}
+
+// InitCheck
+template<typename Key, typename Value>
+status_t
+HashMap<Key, Value>::InitCheck() const
+{
+       return (fTable.InitCheck() && fElementArray.InitCheck()
+                       ? B_OK : B_NO_MEMORY);
+}
+
+// Put
+template<typename Key, typename Value>
+status_t
+HashMap<Key, Value>::Put(const Key& key, Value value)
+{
+       Element* element = _FindElement(key);
+       if (element) {
+               // already contains the key: just set the new value
+               element->fValue = value;
+               return B_OK;
+       }
+       // does not contain the key yet: add an element
+       element = fTable.Add(key.GetHashCode());
+       if (!element)
+               return B_NO_MEMORY;
+       element->fKey = key;
+       element->fValue = value;
+       return B_OK;
+}
+
+// Remove
+template<typename Key, typename Value>
+Value
+HashMap<Key, Value>::Remove(const Key& key)
+{
+       Value value = Value();
+       if (Element* element = _FindElement(key)) {
+               value = element->fValue;
+               fTable.Remove(element);
+       }
+       return value;
+}
+
+// Clear
+template<typename Key, typename Value>
+void
+HashMap<Key, Value>::Clear()
+{
+       fTable.RemoveAll();
+}
+
+// Get
+template<typename Key, typename Value>
+Value
+HashMap<Key, Value>::Get(const Key& key) const
+{
+       if (Element* element = _FindElement(key))
+               return element->fValue;
+       return Value();
+}
+
+// Get
+template<typename Key, typename Value>
+bool
+HashMap<Key, Value>::Get(const Key& key, Value*& _value) const
+{
+       if (Element* element = _FindElement(key)) {
+               _value = &element->fValue;
+               return true;
+       }
+
+       return false;
+}
+
+// ContainsKey
+template<typename Key, typename Value>
+bool
+HashMap<Key, Value>::ContainsKey(const Key& key) const
+{
+       return _FindElement(key);
+}
+
+// Size
+template<typename Key, typename Value>
+int32
+HashMap<Key, Value>::Size() const
+{
+       return fTable.CountElements();
+}
+
+// GetIterator
+template<typename Key, typename Value>
+struct HashMap<Key, Value>::Iterator
+HashMap<Key, Value>::GetIterator() const
+{
+       return Iterator(this);
+}
+
+// _FindElement
+template<typename Key, typename Value>
+struct HashMap<Key, Value>::Element *
+HashMap<Key, Value>::_FindElement(const Key& key) const
+{
+       Element* element = fTable.FindFirst(key.GetHashCode());
+       while (element && element->fKey != key) {
+               if (element->fNext >= 0)
+                       element = fTable.ElementAt(element->fNext);
+               else
+                       element = NULL;
+       }
+       return element;
+}
+
+}      // namespace BPrivate
+
+using BPrivate::HashMap;
+using BPrivate::HashKey32;
+using BPrivate::HashKey64;
+using BPrivate::SynchronizedHashMap;
+
+#endif // HASH_MAP_H

Added: webkit/trunk/WebKit/haiku/WebPositive/support/HashSet.h
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ webkit/trunk/WebKit/haiku/WebPositive/support/HashSet.h     Mon May  3 
16:52:02 2010        (r477)
@@ -0,0 +1,342 @@
+// HashSet.h
+//
+// Copyright (c) 2004, Ingo Weinhold (bonefish@xxxxxxxxxxxxxxx)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+// Except as contained in this notice, the name of a copyright holder shall
+// not be used in advertising or otherwise to promote the sale, use or other
+// dealings in this Software without prior written authorization of the
+// copyright holder.
+
+#ifndef HASH_SET_H
+#define HASH_SET_H
+
+#include <Locker.h>
+
+#include "AutoLocker.h"
+#include "OpenHashTable.h"
+
+
+namespace BPrivate {
+
+// HashSetElement
+template<typename Key>
+class HashSetElement : public OpenHashElement {
+private:
+       typedef HashSetElement<Key> Element;
+public:
+
+       HashSetElement() : OpenHashElement(), fKey()
+       {
+               fNext = -1;
+       }
+
+       inline uint32 Hash() const
+       {
+               return fKey.GetHashCode();
+       }
+
+       inline bool operator==(const OpenHashElement &_element) const
+       {
+               const Element &element = static_cast<const Element&>(_element);
+               return (fKey == element.fKey);
+       }
+
+       inline void Adopt(Element &element)
+       {
+               fKey = element.fKey;
+       }
+
+       Key             fKey;
+};
+
+// HashSet
+template<typename Key>
+class HashSet {
+public:
+       class Iterator {
+       private:
+               typedef HashSetElement<Key>     Element;
+       public:
+               Iterator(const Iterator& other)
+                       : fSet(other.fSet),
+                         fIndex(other.fIndex),
+                         fElement(other.fElement),
+                         fLastElement(other.fElement)
+               {
+               }
+
+               bool HasNext() const
+               {
+                       return fElement;
+               }
+
+               Key Next()
+               {
+                       if (!fElement)
+                               return Key();
+                       Key result(fElement->fKey);
+                       _FindNext();
+                       return result;
+               }
+
+               bool Remove()
+               {
+                       if (!fLastElement)
+                               return false;
+                       fSet->fTable.Remove(fLastElement);
+                       fLastElement = NULL;
+                       return true;
+               }
+
+               Iterator& operator=(const Iterator& other)
+               {
+                       fSet = other.fSet;
+                       fIndex = other.fIndex;
+                       fElement = other.fElement;
+                       fLastElement = other.fLastElement;
+                       return *this;
+               }
+
+       private:
+               Iterator(HashSet<Key>* map)
+                       : fSet(map),
+                         fIndex(0),
+                         fElement(NULL),
+                         fLastElement(NULL)
+               {
+                       // find first
+                       _FindNext();
+               }
+
+               void _FindNext()
+               {
+                       fLastElement = fElement;
+                       if (fElement && fElement->fNext >= 0) {
+                               fElement = 
fSet->fTable.ElementAt(fElement->fNext);
+                               return;
+                       }
+                       fElement = NULL;
+                       int32 arraySize = fSet->fTable.ArraySize();
+                       for (; !fElement && fIndex < arraySize; fIndex++)
+                               fElement = fSet->fTable.FindFirst(fIndex);
+               }
+
+       private:
+               friend class HashSet<Key>;
+
+               HashSet<Key>*   fSet;
+               int32                   fIndex;
+               Element*                fElement;
+               Element*                fLastElement;
+       };
+
+       HashSet();
+       ~HashSet();
+
+       status_t InitCheck() const;
+
+       status_t Add(const Key& key);
+       bool Remove(const Key& key);
+       void Clear();
+       bool Contains(const Key& key) const;
+
+       int32 Size() const;
+       bool IsEmpty() const    { return Size() == 0; }
+
+       Iterator GetIterator();
+
+protected:
+       typedef HashSetElement<Key>     Element;
+       friend class Iterator;
+
+private:
+       Element *_FindElement(const Key& key) const;
+
+protected:
+       OpenHashElementArray<Element>                                           
        fElementArray;
+       OpenHashTable<Element, OpenHashElementArray<Element> >  fTable;
+};
+
+// SynchronizedHashSet
+template<typename Key>
+class SynchronizedHashSet : public BLocker {
+public:
+       typedef struct HashSet<Key>::Iterator Iterator;
+
+       SynchronizedHashSet() : BLocker("synchronized hash set")        {}
+       ~SynchronizedHashSet()  { Lock(); }
+
+       status_t InitCheck() const
+       {
+               return fSet.InitCheck();
+       }
+
+       status_t Add(const Key& key)
+       {
+               MapLocker locker(this);
+               if (!locker.IsLocked())
+                       return B_ERROR;
+               return fSet.Add(key);
+       }
+
+       bool Remove(const Key& key)
+       {
+               MapLocker locker(this);
+               if (!locker.IsLocked())
+                       return false;
+               return fSet.Remove(key);
+       }
+
+       bool Contains(const Key& key) const
+       {
+               const BLocker* lock = this;
+               MapLocker locker(const_cast<BLocker*>(lock));
+               if (!locker.IsLocked())
+                       return false;
+               return fSet.Contains(key);
+       }
+
+       int32 Size() const
+       {
+               const BLocker* lock = this;
+               MapLocker locker(const_cast<BLocker*>(lock));
+               return fSet.Size();
+       }
+
+       Iterator GetIterator()
+       {
+               return fSet.GetIterator();
+       }
+
+       // for debugging only
+       const HashSet<Key>& GetUnsynchronizedSet() const        { return fSet; }
+       HashSet<Key>& GetUnsynchronizedSet()                            { 
return fSet; }
+
+protected:
+       typedef AutoLocker<BLocker> MapLocker;
+
+       HashSet<Key>    fSet;
+};
+
+// HashSet
+
+// constructor
+template<typename Key>
+HashSet<Key>::HashSet()
+       : fElementArray(1000),
+         fTable(1000, &fElementArray)
+{
+}
+
+// destructor
+template<typename Key>
+HashSet<Key>::~HashSet()
+{
+}
+
+// InitCheck
+template<typename Key>
+status_t
+HashSet<Key>::InitCheck() const
+{
+       return (fTable.InitCheck() && fElementArray.InitCheck()
+                       ? B_OK : B_NO_MEMORY);
+}
+
+// Add
+template<typename Key>
+status_t
+HashSet<Key>::Add(const Key& key)
+{
+       if (Contains(key))
+               return B_OK;
+       Element* element = fTable.Add(key.GetHashCode());
+       if (!element)
+               return B_NO_MEMORY;
+       element->fKey = key;
+       return B_OK;
+}
+
+// Remove
+template<typename Key>
+bool
+HashSet<Key>::Remove(const Key& key)
+{
+       if (Element* element = _FindElement(key)) {
+               fTable.Remove(element);
+               return true;
+       }
+       return false;
+}
+
+// Clear
+template<typename Key>
+void
+HashSet<Key>::Clear()
+{
+       fTable.RemoveAll();
+}
+
+// Contains
+template<typename Key>
+bool
+HashSet<Key>::Contains(const Key& key) const
+{
+       return _FindElement(key);
+}
+
+// Size
+template<typename Key>
+int32
+HashSet<Key>::Size() const
+{
+       return fTable.CountElements();
+}
+
+// GetIterator
+template<typename Key>
+struct HashSet<Key>::Iterator
+HashSet<Key>::GetIterator()
+{
+       return Iterator(this);
+}
+
+// _FindElement
+template<typename Key>
+struct HashSet<Key>::Element *
+HashSet<Key>::_FindElement(const Key& key) const
+{
+       Element* element = fTable.FindFirst(key.GetHashCode());
+       while (element && element->fKey != key) {
+               if (element->fNext >= 0)
+                       element = fTable.ElementAt(element->fNext);
+               else
+                       element = NULL;
+       }
+       return element;
+}
+
+}      // namespace BPrivate
+
+using BPrivate::HashSet;
+using BPrivate::SynchronizedHashSet;
+
+#endif // HASH_SET_H

Added: webkit/trunk/WebKit/haiku/WebPositive/support/OpenHashTable.h
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ webkit/trunk/WebKit/haiku/WebPositive/support/OpenHashTable.h       Mon May 
 3 16:52:02 2010        (r477)
@@ -0,0 +1,514 @@
+/*
+Open Tracker License
+
+Terms and Conditions
+
+Copyright (c) 1991-2000, Be Incorporated. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice applies to all licensees
+and shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF TITLE, MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+BE INCORPORATED BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF, OR IN 
CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of Be Incorporated shall not be
+used in advertising or otherwise to promote the sale, use or other dealings in
+this Software without prior written authorization from Be Incorporated.
+
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered 
trademarks
+of Be Incorporated in the United States and other countries. Other brand 
product
+names are registered trademarks or trademarks of their respective holders.
+All rights reserved.
+*/
+
+// bonefish:
+// * removed need for exceptions
+// * fixed warnings
+// * implemented rehashing
+// * added RemoveAll()
+// TODO:
+// * shrinking of element vectors
+
+// Hash table with open addresssing
+
+#ifndef __OPEN_HASH_TABLE__
+#define __OPEN_HASH_TABLE__
+
+#include <stdlib.h>
+#include <new>
+
+// don't include <Debug.h>
+#ifndef ASSERT
+#      define ASSERT(E)               (void)0
+#endif
+#ifndef TRESPASS
+#      define TRESPASS()              (void)0
+#endif
+
+namespace BPrivate {
+
+template <class Element>
+class ElementVector {
+       // element vector for OpenHashTable needs to implement this
+       // interface
+public:
+       Element &At(int32 index);
+       Element *Add();
+       int32 IndexOf(const Element &) const;
+       void Remove(int32 index);
+};
+
+class OpenHashElement {
+public:
+       uint32 Hash() const;
+       bool operator==(const OpenHashElement &) const;
+       void Adopt(OpenHashElement &);
+               // low overhead copy, original element is in undefined state
+               // after call (calls Adopt on BString members, etc.)
+       int32 fNext;
+};
+
+const uint32 kPrimes [] = {
+       509, 1021, 2039, 4093, 8191, 16381, 32749, 65521, 131071, 262139,
+       524287, 1048573, 2097143, 4194301, 8388593, 16777213, 33554393, 
67108859,
+       134217689, 268435399, 536870909, 1073741789, 2147483647, 0
+};
+
+template <class Element, class ElementVec = ElementVector<Element> >
+class OpenHashTable {
+public:
+       OpenHashTable(int32 minSize, ElementVec *elementVector = 0,
+                                 float maxLoadFactor = 0.8);
+               // it is up to the subclass of OpenHashTable to supply
+               // elementVector
+       ~OpenHashTable();
+
+       bool InitCheck() const;
+
+       void SetElementVector(ElementVec *elementVector);
+
+       Element *FindFirst(uint32 elementHash) const;
+       Element *Add(uint32 elementHash);
+
+       void Remove(Element *element, bool dontRehash = false);
+       void RemoveAll();
+
+       // when calling Add, any outstanding element pointer may become
+       // invalid; to deal with this, get the element index and restore
+       // it after the add
+       int32 ElementIndex(const Element *) const;
+       Element *ElementAt(int32 index) const;
+
+       int32 ArraySize() const;
+       int32 VectorSize() const;
+       int32 CountElements() const;
+
+protected:
+       static int32 OptimalSize(int32 minSize);
+
+private:
+       bool _RehashIfNeeded();
+       bool _Rehash();
+
+       int32 fArraySize;
+       int32 fInitialSize;
+       int32 fElementCount;
+       int32 *fHashArray;
+       ElementVec *fElementVector;
+       float fMaxLoadFactor;
+};
+
+template <class Element>
+class OpenHashElementArray : public ElementVector<Element> {
+       // this is a straightforward implementation of an element vector
+       // deleting is handled by linking deleted elements into a free list
+       // the vector never shrinks
+public:
+       OpenHashElementArray(int32 initialSize);
+       ~OpenHashElementArray();
+
+       bool InitCheck() const;
+
+       Element &At(int32 index);
+       const Element &At(int32 index) const;
+       Element *Add(const Element &);
+       Element *Add();
+       void Remove(int32 index);
+       int32 IndexOf(const Element &) const;
+       int32 Size() const;
+
+private:
+       Element *fData;
+       int32 fSize;
+       int32 fNextFree;
+       int32 fNextDeleted;
+};
+
+
+//-----------------------------------
+
+template<class Element, class ElementVec>
+OpenHashTable<Element, ElementVec>::OpenHashTable(int32 minSize,
+       ElementVec *elementVector, float maxLoadFactor)
+       :       fArraySize(OptimalSize(minSize)),
+               fInitialSize(fArraySize),
+               fElementCount(0),
+               fElementVector(elementVector),
+               fMaxLoadFactor(maxLoadFactor)
+{
+       // sanity check the maximal load factor
+       if (fMaxLoadFactor < 0.5)
+               fMaxLoadFactor = 0.5;
+       // allocate and init the array
+       fHashArray = (int32*)calloc(fArraySize, sizeof(int32));
+       if (fHashArray) {
+               for (int32 index = 0; index < fArraySize; index++)
+                       fHashArray[index] = -1;
+       }
+}
+
+template<class Element, class ElementVec>
+OpenHashTable<Element, ElementVec>::~OpenHashTable()
+{
+       RemoveAll();
+       free(fHashArray);
+}
+
+template<class Element, class ElementVec>
+bool
+OpenHashTable<Element, ElementVec>::InitCheck() const
+{
+       return (fHashArray && fElementVector);
+}
+
+template<class Element, class ElementVec>
+int32
+OpenHashTable<Element, ElementVec>::OptimalSize(int32 minSize)
+{
+       for (int32 index = 0; ; index++)
+               if (!kPrimes[index] || kPrimes[index] >= (uint32)minSize)
+                       return (int32)kPrimes[index];
+
+       return 0;
+}
+
+template<class Element, class ElementVec>
+Element *
+OpenHashTable<Element, ElementVec>::FindFirst(uint32 hash) const
+{
+       ASSERT(fElementVector);
+       hash %= fArraySize;
+       if (fHashArray[hash] < 0)
+               return 0;
+
+       return &fElementVector->At(fHashArray[hash]);
+}
+
+template<class Element, class ElementVec>
+int32
+OpenHashTable<Element, ElementVec>::ElementIndex(const Element *element) const
+{
+       return fElementVector->IndexOf(*element);
+}
+
+template<class Element, class ElementVec>
+Element *
+OpenHashTable<Element, ElementVec>::ElementAt(int32 index) const
+{
+       return &fElementVector->At(index);
+}
+
+template<class Element, class ElementVec>
+int32
+OpenHashTable<Element, ElementVec>::ArraySize() const
+{
+        return fArraySize;
+}
+
+template<class Element, class ElementVec>
+int32
+OpenHashTable<Element, ElementVec>::VectorSize() const
+{
+        return fElementVector->Size();
+}
+
+template<class Element, class ElementVec>
+int32
+OpenHashTable<Element, ElementVec>::CountElements() const
+{
+        return fElementCount;
+}
+
+
+template<class Element, class ElementVec>
+Element *
+OpenHashTable<Element, ElementVec>::Add(uint32 hash)
+{
+       ASSERT(fElementVector);
+       _RehashIfNeeded();
+       hash %= fArraySize;
+       Element *result = fElementVector->Add();
+       if (result) {
+               result->fNext = fHashArray[hash];
+               fHashArray[hash] = fElementVector->IndexOf(*result);
+               fElementCount++;
+       }
+       return result;
+}
+
+template<class Element, class ElementVec>
+void
+OpenHashTable<Element, ElementVec>::Remove(Element *element, bool dontRehash)
+{
+       if (!dontRehash)
+               _RehashIfNeeded();
+       uint32 hash = element->Hash() % fArraySize;
+       int32 next = fHashArray[hash];
+       ASSERT(next >= 0);
+
+       if (&fElementVector->At(next) == element) {
+               fHashArray[hash] = element->fNext;
+               fElementVector->Remove(next);
+               fElementCount--;
+               return;
+       }
+
+       for (int32 index = next; index >= 0; ) {
+               // look for an existing match in table
+               next = fElementVector->At(index).fNext;
+               if (next < 0) {
+                       TRESPASS();
+                       return;
+               }
+
+               if (&fElementVector->At(next) == element) {
+                       fElementVector->At(index).fNext = element->fNext;
+                       fElementVector->Remove(next);
+                       fElementCount--;
+                       return;
+               }
+               index = next;
+       }
+}
+
+template<class Element, class ElementVec>
+void
+OpenHashTable<Element, ElementVec>::RemoveAll()
+{
+       for (int32 i = 0; fElementCount > 0 && i < fArraySize; i++) {
+               int32 index = fHashArray[i];
+               while (index >= 0) {
+                       Element* element = &fElementVector->At(index);
+                       int32 next = element->fNext;
+                       fElementVector->Remove(index);
+                       fElementCount--;
+                       index = next;
+               }
+               fHashArray[i] = -1;
+       }
+       _RehashIfNeeded();
+}
+
+template<class Element, class ElementVec>
+void
+OpenHashTable<Element, ElementVec>::SetElementVector(ElementVec *elementVector)
+{
+       fElementVector = elementVector;
+}
+
+// _RehashIfNeeded
+template<class Element, class ElementVec>
+bool
+OpenHashTable<Element, ElementVec>::_RehashIfNeeded()
+{
+       // The load factor range [fMaxLoadFactor / 3, fMaxLoadFactor] is fine,
+       // I think. After rehashing the load factor will be about
+       // fMaxLoadFactor * 2 / 3, respectively fMaxLoadFactor / 2.
+       float loadFactor = (float)fElementCount / (float)fArraySize;
+       if (loadFactor > fMaxLoadFactor
+               || (fArraySize > fInitialSize && loadFactor < fMaxLoadFactor / 
3)) {
+               return _Rehash();
+       }
+       return true;
+}
+
+// _Rehash
+template<class Element, class ElementVec>
+bool
+OpenHashTable<Element, ElementVec>::_Rehash()
+{
+       bool result = true;
+       int32 newSize = int32(fElementCount * 1.73 * fMaxLoadFactor);
+       newSize = (fInitialSize > newSize ? fInitialSize : newSize);
+       if (newSize != fArraySize) {
+               // allocate a new array
+               int32 *newHashArray = (int32*)calloc(newSize, sizeof(int32));
+               if (newHashArray) {
+                       // init the new hash array
+                       for (int32 index = 0; index < newSize; index++)
+                               newHashArray[index] = -1;
+                       // iterate through all elements and put them into the 
new
+                       // hash array
+                       for (int i = 0; i < fArraySize; i++) {
+                               int32 index = fHashArray[i];
+                               while (index >= 0) {
+                                       // insert the element in the new array
+                                       Element &element = 
fElementVector->At(index);
+                                       int32 next = element.fNext;
+                                       uint32 hash = (element.Hash() % 
newSize);
+                                       element.fNext = newHashArray[hash];
+                                       newHashArray[hash] = index;
+                                       // next element in old list
+                                       index = next;
+                               }
+                       }
+                       // delete the old array and set the new one
+                       free(fHashArray);
+                       fHashArray = newHashArray;
+                       fArraySize = newSize;
+               } else
+                       result = false;
+       }
+       return result;
+}
+
+
+template<class Element>
+OpenHashElementArray<Element>::OpenHashElementArray(int32 initialSize)
+       :       fSize(initialSize),
+               fNextFree(0),
+               fNextDeleted(-1)
+{
+       fData = (Element*)calloc((size_t)initialSize, sizeof(Element));
+}
+
+template<class Element>
+OpenHashElementArray<Element>::~OpenHashElementArray()
+{
+       free(fData);
+}
+
+template<class Element>
+bool
+OpenHashElementArray<Element>::InitCheck() const
+{
+       return fData;
+}
+
+template<class Element>
+Element &
+OpenHashElementArray<Element>::At(int32 index)
+{
+       ASSERT(index < fSize);
+       return fData[index];
+}
+
+template<class Element>
+const Element &
+OpenHashElementArray<Element>::At(int32 index) const
+{
+       ASSERT(index < fSize);
+       return fData[index];
+}
+
+template<class Element>
+int32
+OpenHashElementArray<Element>::IndexOf(const Element &element) const
+{
+       int32 result = &element - fData;
+       if (result < 0 || result > fSize)
+               return -1;
+
+       return result;
+}
+
+template<class Element>
+int32
+OpenHashElementArray<Element>::Size() const
+{
+       return fSize;
+}
+
+
+template<class Element>
+Element *
+OpenHashElementArray<Element>::Add(const Element &newElement)
+{
+       Element *element = Add();
+       if (element)
+               element.Adopt(newElement);
+       return element;
+}
+
+#if DEBUG
+const int32 kGrowChunk = 10;
+#else
+const int32 kGrowChunk = 1024;
+#endif
+
+template<class Element>
+Element *
+OpenHashElementArray<Element>::Add()
+{
+       int32 index = fNextFree;
+       if (fNextDeleted >= 0) {
+               index = fNextDeleted;
+               fNextDeleted = At(index).fNext;
+       } else if (fNextFree >= fSize - 1) {
+               int32 newSize = fSize + kGrowChunk;
+/*
+               Element *newData = (Element *)calloc((size_t)newSize , 
sizeof(Element));
+               if (!newData)
+                       return NULL;
+               memcpy(newData, fData, fSize * sizeof(Element));
+               free(fData);
+*/
+               Element *newData = (Element*)realloc(fData,
+                       (size_t)newSize * sizeof(Element));
+               if (!newData)
+                       return NULL;
+
+               fData = newData;
+               fSize = newSize;
+               index = fNextFree;
+               fNextFree++;
+       } else
+               fNextFree++;
+
+       new (&At(index)) Element;
+               // call placement new to initialize the element properly
+       ASSERT(At(index).fNext == -1);
+
+       return &At(index);
+}
+
+template<class Element>
+void
+OpenHashElementArray<Element>::Remove(int32 index)
+{
+       // delete by chaining empty elements in a single linked
+       // list, reusing the next field
+       ASSERT(index < fSize);
+       At(index).~Element();
+               // call the destructor explicitly to destroy the element
+               // properly
+       At(index).fNext = fNextDeleted;
+       fNextDeleted = index;
+}
+
+} // namespace BPrivate
+
+using BPrivate::OpenHashTable;
+
+#endif // __OPEN_HASH_TABLE__

Other related posts:

  • » [haiku-webkit-commits] r477 - webkit/trunk/WebKit/haiku/WebPositive/support - webkit