Changeset 82cbf8c6 in mainline for kernel/generic/include/adt/hash.h

Timestamp:

2017-10-08T19:37:24Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2fd26bb

Parents:

81b9d3e

Message:

Replace the old hash table implementation in the kernel with the newer one

This replaces the original hash table implementation with the resizable one
already used in uspace. Along the way, the IRQ hash table code was streamlined
and cleaned up.

File:

• kernel/generic/include/adt/hash.h (modified) (3 diffs)

kernel/generic/include/adt/hash.h

@@ -45 +45 @@
          * Public domain.
          */
-        hash = ~hash + (hash << 15); 
+        hash = ~hash + (hash << 15);
         hash = hash ^ (hash >> 12);
         hash = hash + (hash << 2);
         hash = hash ^ (hash >> 4);
-        hash = hash * 2057; 
+        hash = hash * 2057;
         hash = hash ^ (hash >> 16);
-        return hash;    
+        return hash;
 }
 
@@ -65 +65 @@
         hash = hash ^ (hash >> 4);
         hash = hash * 0x27d4eb2d;
-        hash = hash ^ (hash >> 15);     
-        /* 
+        hash = hash ^ (hash >> 15);
+        /*
          * Lower order bits are mixed more thoroughly. Swap them with
          * the higher order bits and make the resulting higher order bits
@@ -105 +105 @@
          * http://burtleburtle.net/bob/c/lookup3.c
          */
-        seed ^= hash + 0x9e3779b9 
+        seed ^= hash + 0x9e3779b9
                 + ((seed << 5) | (seed >> (sizeof(size_t) * 8 - 5)));
-        return seed;    
+        return seed;
 }