ipcpd: Use hash_mix64 for pft keys

Drops the per-table hash_key flag and the local MD5 hash() helper.
The calc_key function now folds the key with hash_mix64
unconditionally. Simplifies pft_create, which no longer takes a bool.

Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks>
Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>

6 files changed, 7 insertions, 32 deletions

diff --git a/src/ipcpd/unicast/pff/alternate.c b/src/ipcpd/unicast/pff/alternate.c
index be1c35c0..1c508c1b 100644
--- a/src/ipcpd/unicast/pff/alternate.c
+++ b/src/ipcpd/unicast/pff/alternate.c
@@ -211,7 +211,7 @@ struct pff_i * alternate_pff_create(void)
         if (pthread_rwlock_init(&tmp->lock, NULL))
                 goto fail_lock;
 
-        tmp->pft = pft_create(PFT_SIZE, false);
+        tmp->pft = pft_create(PFT_SIZE);
         if (tmp->pft == NULL)
                 goto fail_pft;
 
diff --git a/src/ipcpd/unicast/pff/multipath.c b/src/ipcpd/unicast/pff/multipath.c
index c636e789..9ba59592 100644
--- a/src/ipcpd/unicast/pff/multipath.c
+++ b/src/ipcpd/unicast/pff/multipath.c
@@ -63,7 +63,7 @@ struct pff_i * multipath_pff_create(void)
         if (pthread_rwlock_init(&tmp->lock, NULL))
                 goto fail_rwlock;
 
-        tmp->pft = pft_create(PFT_SIZE, false);
+        tmp->pft = pft_create(PFT_SIZE);
         if (tmp->pft == NULL)
                 goto fail_pft;
 
diff --git a/src/ipcpd/unicast/pff/pft.c b/src/ipcpd/unicast/pff/pft.c
index a0d70799..d0e562d6 100644
--- a/src/ipcpd/unicast/pff/pft.c
+++ b/src/ipcpd/unicast/pff/pft.c
@@ -43,12 +43,10 @@ struct pft_entry {
 
 struct pft {
         struct list_head * buckets;
-        bool               hash_key;
         uint64_t           buckets_size;
 };
 
-struct pft * pft_create(uint64_t buckets,
-                        bool     hash_key)
+struct pft * pft_create(uint64_t buckets)
 {
         struct pft * tmp;
         unsigned int i;
@@ -69,7 +67,6 @@ struct pft * pft_create(uint64_t buckets,
         if (tmp == NULL)
                 return NULL;
 
-        tmp->hash_key = hash_key;
         tmp->buckets_size = buckets;
 
         tmp->buckets = malloc(buckets * sizeof(*tmp->buckets));
@@ -113,22 +110,10 @@ void pft_flush(struct pft * pft)
         }
 }
 
-static uint64_t hash(uint64_t key)
-{
-        uint64_t res[2];
-
-        mem_hash(HASH_MD5, res, (uint8_t *) &key, sizeof(key));
-
-        return res[0];
-}
-
 static uint64_t calc_key(struct pft * pft,
                          uint64_t     dst)
 {
-        if (pft->hash_key)
-                dst = hash(dst);
-
-        return (dst & (pft->buckets_size - 1));
+        return hash_mix64(dst) & (pft->buckets_size - 1);
 }
 
 int pft_insert(struct pft * pft,
diff --git a/src/ipcpd/unicast/pff/pft.h b/src/ipcpd/unicast/pff/pft.h
index 3bb9cff7..15bbe451 100644
--- a/src/ipcpd/unicast/pff/pft.h
+++ b/src/ipcpd/unicast/pff/pft.h
@@ -24,14 +24,12 @@
 #define OUROBOROS_PFT_H
 
 #include <stdint.h>
-#include <stdbool.h>
 #include <stdlib.h>
 
 struct pft;
 
 /* Buckets is rounded up to the nearest power of 2 */
-struct pft * pft_create(uint64_t buckets,
-                        bool     hash_key);
+struct pft * pft_create(uint64_t buckets);
 
 void         pft_destroy(struct pft * table);
 
diff --git a/src/ipcpd/unicast/pff/simple.c b/src/ipcpd/unicast/pff/simple.c
index be542bdb..7befa42f 100644
--- a/src/ipcpd/unicast/pff/simple.c
+++ b/src/ipcpd/unicast/pff/simple.c
@@ -63,7 +63,7 @@ struct pff_i * simple_pff_create(void)
                 return NULL;
         }
 
-        tmp->pft = pft_create(PFT_SIZE, false);
+        tmp->pft = pft_create(PFT_SIZE);
         if (tmp->pft == NULL) {
                 pthread_rwlock_destroy(&tmp->lock);
                 free(tmp);
diff --git a/src/ipcpd/unicast/pff/tests/pft_test.c b/src/ipcpd/unicast/pff/tests/pft_test.c
index 4962c241..20e73a94 100644
--- a/src/ipcpd/unicast/pff/tests/pft_test.c
+++ b/src/ipcpd/unicast/pff/tests/pft_test.c
@@ -38,15 +38,7 @@ int pft_test(int     argc,
         (void) argc;
         (void) argv;
 
-        pft = pft_create(TBL_SIZE, true);
-        if (pft == NULL) {
-                printf("Failed to create.\n");
-                return -1;
-        }
-
-        pft_destroy(pft);
-
-        pft = pft_create(TBL_SIZE, false);
+        pft = pft_create(TBL_SIZE);
         if (pft == NULL) {
                 printf("Failed to create.\n");
                 return -1;