lib: merge branch 'cpaasch-oai:t/resizeable-hashtable'

#434

Author: thom311

Makefile.am

@@ -335,6 +335,7 @@ noinst_HEADERS = \
 	include/nl-aux-xfrm/nl-xfrm.h \
 	include/nl-default.h \
 	include/nl-priv-dynamic-core/cache-api.h \
+	lib/hashtable-api.h \
 	include/nl-priv-dynamic-core/nl-core.h \
 	include/nl-priv-dynamic-core/object-api.h \
 	include/nl-priv-dynamic-route/nl-priv-dynamic-route.h \

include/netlink/hashtable.h

@@ -14,33 +14,30 @@ extern "C" {
 #endif
 
 typedef struct nl_hash_node {
-    uint32_t			key;
-    uint32_t			key_size;
-    struct nl_object *		obj;
-    struct nl_hash_node *	next;
+	uint32_t key;
+	uint32_t key_size;
+	struct nl_object *obj;
+	struct nl_hash_node *next;
 } nl_hash_node_t;
 
 typedef struct nl_hash_table {
-    int 			size;
-    nl_hash_node_t **		nodes;
+	int size;
+	nl_hash_node_t **nodes;
 } nl_hash_table_t;
 
 /* Default hash table size */
 #define NL_MAX_HASH_ENTRIES 1024
 
 /* Access Functions */
-extern nl_hash_table_t *	nl_hash_table_alloc(int size);
-extern void 			nl_hash_table_free(nl_hash_table_t *ht);
-
-extern int			nl_hash_table_add(nl_hash_table_t *ht,
-						  struct nl_object *obj);
-extern int			nl_hash_table_del(nl_hash_table_t *ht,
-						  struct nl_object *obj);
-
-extern struct nl_object *	nl_hash_table_lookup(nl_hash_table_t *ht,
-						     struct nl_object *obj);
-extern uint32_t 		nl_hash(void *k, size_t length,
-					uint32_t initval);
+extern nl_hash_table_t *nl_hash_table_alloc(int size);
+extern void nl_hash_table_free(nl_hash_table_t *ht);
+
+extern int nl_hash_table_add(nl_hash_table_t *ht, struct nl_object *obj);
+extern int nl_hash_table_del(nl_hash_table_t *ht, struct nl_object *obj);
+
+extern struct nl_object *nl_hash_table_lookup(nl_hash_table_t *ht,
+					      struct nl_object *obj);
+extern uint32_t nl_hash(void *k, size_t length, uint32_t initval);
 
 #ifdef __cplusplus
 }

include/nl-priv-dynamic-core/cache-api.h

@@ -163,9 +163,6 @@ struct nl_cache_ops
 	/** Netlink protocol */
 	int			co_protocol;
 
-	/** cache object hash size **/
-	int			co_hash_size;
-
 	/** cache flags */
 	unsigned int		co_flags;
 
@@ -261,7 +258,7 @@ struct nl_cache {
 	int c_iarg2;
 	int c_refcnt;
 	unsigned int c_flags;
-	struct nl_hash_table *hashtable;
+	struct nl_rhash_table *hashtable;
 	struct nl_cache_ops *c_ops;
 };
 

lib/cache.c

@@ -55,6 +55,7 @@
 #include "nl-priv-dynamic-core/nl-core.h"
 #include "nl-priv-dynamic-core/object-api.h"
 #include "nl-priv-dynamic-core/cache-api.h"
+#include "hashtable-api.h"
 #include "nl-aux-core/nl-core.h"
 
 /**
@@ -200,14 +201,7 @@ struct nl_cache *nl_cache_alloc(struct nl_cache_ops *ops)
 	 * cache objects for faster lookups
 	 */
 	if (ops->co_obj_ops->oo_keygen) {
-		int hashtable_size;
-
-		if (ops->co_hash_size)
-			hashtable_size = ops->co_hash_size;
-		else
-			hashtable_size = NL_MAX_HASH_ENTRIES;
-
-		cache->hashtable = nl_hash_table_alloc(hashtable_size);
+		cache->hashtable = nl_rhash_table_alloc();
 	}
 
 	NL_DBG(2, "Allocated cache %p <%s>.\n", cache, nl_cache_name(cache));
@@ -379,7 +373,7 @@ static void __nl_cache_free(struct nl_cache *cache)
 	nl_cache_clear(cache);
 
 	if (cache->hashtable)
-		nl_hash_table_free(cache->hashtable);
+		nl_rhash_table_free(cache->hashtable);
 
 	NL_DBG(2, "Freeing cache %p <%s>...\n", cache, nl_cache_name(cache));
 	free(cache);
@@ -439,7 +433,7 @@ static int __cache_add(struct nl_cache *cache, struct nl_object *obj)
 	obj->ce_cache = cache;
 
 	if (cache->hashtable) {
-		ret = nl_hash_table_add(cache->hashtable, obj);
+		ret = nl_rhash_table_add(cache->hashtable, obj);
 		if (ret < 0) {
 			obj->ce_cache = NULL;
 			return ret;
@@ -558,7 +552,7 @@ void nl_cache_remove(struct nl_object *obj)
 		return;
 
 	if (cache->hashtable) {
-		ret = nl_hash_table_del(cache->hashtable, obj);
+		ret = nl_rhash_table_del(cache->hashtable, obj);
 		if (ret < 0)
 			NL_DBG(2, "Failed to delete %p from cache %p <%s>.\n",
 			       obj, cache, nl_cache_name(cache));
@@ -1095,7 +1089,7 @@ static struct nl_object *__cache_fast_lookup(struct nl_cache *cache,
 {
 	struct nl_object *obj;
 
-	obj = nl_hash_table_lookup(cache->hashtable, needle);
+	obj = nl_rhash_table_lookup(cache->hashtable, needle);
 	if (obj) {
 		nl_object_get(obj);
 		return obj;

lib/hashtable-api.h

@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: LGPL-2.1-only */
+/*
+ * Private resizable hash table API for libnl.
+ */
+
+#ifndef NETLINK_HASHTABLE_API_H_
+#define NETLINK_HASHTABLE_API_H_
+
+#include "nl-priv-dynamic-core/object-api.h"
+
+/* Opaque resizable hash table handle. */
+typedef struct nl_rhash_table nl_rhash_table_t;
+
+/* Allocation / Deletion */
+nl_rhash_table_t *nl_rhash_table_alloc(void);
+void nl_rhash_table_free(nl_rhash_table_t *ht);
+
+/* Access helpers */
+struct nl_object *nl_rhash_table_lookup(nl_rhash_table_t *ht,
+					struct nl_object *obj);
+int nl_rhash_table_add(nl_rhash_table_t *ht, struct nl_object *obj);
+int nl_rhash_table_del(nl_rhash_table_t *ht, struct nl_object *obj);
+
+#endif /* NETLINK_HASHTABLE_API_H_ */