Changeset 5838 for trunk/src

Timestamp:

May 30, 2001, 3:02:55 PM (24 years ago)

Author:

phaller

Message:

.

File:

• trunk/src/kernel32/ccollection.cpp (modified) (4 diffs)

trunk/src/kernel32/ccollection.cpp

@@ -1 @@
-/* $Id: ccollection.cpp,v 1.3 2001-05-30 03:28:02 phaller Exp $ */
+/* $Id: ccollection.cpp,v 1.4 2001-05-30 13:02:55 phaller Exp $ */
 
 /*
@@ -652 +652 @@
     {
         PHASHTABLEENTRY pHTE = (PHASHTABLEENTRY)pLLE->pObject;
-        if (strcmp(pHTE->pszName, pszName) == 0)
-        {
-            // save old object pointer
-            void* pTemp = pHTE->pObject;
-            free(pHTE);
-
-            // found the correct entry
-            parrLists[ulHash]->removeElement(pLLE);
-
-            // count allocated elements
-            iElements--;
-
-            // return old object pointer to signal success
-            return pTemp;
-        }
+
+        // quickly compare 1st character for equality
+        // before doing the strcmp call
+        if (*pHTE->pszName == *pszName)
+            if (strcmp(pHTE->pszName, pszName) == 0)
+            {
+                // save old object pointer
+                void* pTemp = pHTE->pObject;
+                free(pHTE);
+
+                // found the correct entry
+                parrLists[ulHash]->removeElement(pLLE);
+
+                // count allocated elements
+                iElements--;
+
+                // return old object pointer to signal success
+                return pTemp;
+            }
 
         pLLE = pLLE->pNext;
@@ -702 +706 @@
     {
         PHASHTABLEENTRY pHTE = (PHASHTABLEENTRY)pLLE->pObject;
-        if (strcmp(pHTE->pszName, pszName) == 0)
-        {
-            // return result
-            return pHTE->pObject;
-        }
+
+        // quickly compare 1st character for equality
+        // before doing the strcmp call
+        if (*pHTE->pszName == *pszName)
+            if (strcmp(pHTE->pszName, pszName) == 0)
+            {
+                // return result
+                return pHTE->pObject;
+            }
 
         pLLE = pLLE->pNext;
@@ -735 +743 @@
 void  CHashtableLookup::rehash()
 {
+    // if there are less slots than elements,
+    // the blocking factor is expected to be high
+    setSize(iElements);
+}
+
+
+void  CHashtableLookup::setSize(int iNewSize)
+{
     // determine number of allocated elements
     // actually, we need the prime next to
     // the given number.
-    int iNewSize = nextPrime(iElements);
-
-    setSize(iNewSize);
-}
-
-
-void  CHashtableLookup::setSize(int iNewSize)
+    if (iSize < iNewSize)
+        setSize0(nextPrime(iNewSize));
+}
+
+
+void  CHashtableLookup::setSize0(int iNewSize)
 {
     // check if rehashing is necessary at all