X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=utils.c;h=e5f3d89b3df39dfbcbcdb90a68ad5430de9f3098;hp=15f0525941b9b31792dc3a467f720cea7e1f9df2;hb=449b8758a0a9741a663cdd98503560eeecd28a6a;hpb=69b2dcb92b8402b9c6df4d6a041a890fe6468e18

diff --git a/utils.c b/utils.c
index 15f0525..e5f3d89 100644
--- a/utils.c
+++ b/utils.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <stdlib.h>
 #include "utils.h"
 
 int
@@ -7,47 +8,46 @@ avl_strcmp(const void *k1, const void *k2, void *ptr)
 	return strcmp(k1, k2);
 }
 
-static int
-vlist_cmp(const void *k1, const void *k2, void *ptr)
-{
-	struct vlist_tree *vl = ptr;
-	return memcmp(k1, k2, vl->data_len);
-}
-
 void
-__vlist_init(struct vlist_tree *tree, vlist_update_cb update, int offset, int len)
+vlist_init(struct vlist_tree *tree, avl_tree_comp cmp, vlist_update_cb update)
 {
-	tree->data_offset = offset;
-	tree->data_len = len;
 	tree->update = update;
 	tree->version = 1;
 
-	avl_init(&tree->avl, vlist_cmp, 0, tree);
+	avl_init(&tree->avl, cmp, 0, tree);
 }
 
 void
 vlist_delete(struct vlist_tree *tree, struct vlist_node *node)
 {
-	avl_delete(&tree->avl, &node->avl);
+	if (!tree->no_delete)
+		avl_delete(&tree->avl, &node->avl);
 	tree->update(tree, NULL, node);
 }
 
 void
-vlist_add(struct vlist_tree *tree, struct vlist_node *node)
+vlist_add(struct vlist_tree *tree, struct vlist_node *node, void *key)
 {
 	struct vlist_node *old_node = NULL;
 	struct avl_node *anode;
 
-	node->avl.key = (char *) node + tree->data_offset;
+	node->avl.key = key;
 	node->version = tree->version;
 
-	anode = avl_find(&tree->avl, (char *) node + tree->data_offset);
+	anode = avl_find(&tree->avl, key);
 	if (anode) {
 		old_node = container_of(anode, struct vlist_node, avl);
+		if (tree->keep_old || tree->no_delete) {
+			old_node->version = tree->version;
+			goto update_only;
+		}
+
 		avl_delete(&tree->avl, anode);
 	}
 
 	avl_insert(&tree->avl, &node->avl);
+
+update_only:
 	tree->update(tree, node, old_node);
 }
 
@@ -57,7 +57,8 @@ vlist_flush(struct vlist_tree *tree)
 	struct vlist_node *node, *tmp;
 
 	avl_for_each_element_safe(&tree->avl, node, avl, tmp) {
-		if (node->version == tree->version)
+		if ((node->version == tree->version || node->version == -1) &&
+		    tree->version != -1)
 			continue;
 
 		vlist_delete(tree, node);
@@ -67,6 +68,46 @@ vlist_flush(struct vlist_tree *tree)
 void
 vlist_flush_all(struct vlist_tree *tree)
 {
-	tree->version++;
+	tree->version = -1;
 	vlist_flush(tree);
 }
+
+
+void
+__vlist_simple_init(struct vlist_simple_tree *tree, int offset)
+{
+	INIT_LIST_HEAD(&tree->list);
+	tree->version = 1;
+	tree->head_offset = offset;
+}
+
+void
+vlist_simple_delete(struct vlist_simple_tree *tree, struct vlist_simple_node *node)
+{
+	char *ptr;
+
+	list_del(&node->list);
+	ptr = (char *) node - tree->head_offset;
+	free(ptr);
+}
+
+void
+vlist_simple_flush(struct vlist_simple_tree *tree)
+{
+	struct vlist_simple_node *n, *tmp;
+
+	list_for_each_entry_safe(n, tmp, &tree->list, list) {
+		if ((n->version == tree->version || n->version == -1) &&
+		    tree->version != -1)
+			continue;
+
+		vlist_simple_delete(tree, n);
+	}
+}
+
+void
+vlist_simple_flush_all(struct vlist_simple_tree *tree)
+{
+	tree->version = -1;
+	vlist_simple_flush(tree);
+}