X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=utils.h;h=5ea9c6f092915138fbff666e4e09c17ea789a56a;hp=e872dc55fff872080035fe550c798f280ca9ac78;hb=e64619267d7b4e5f5fec57718c0e11e7844dc9ee;hpb=69b2dcb92b8402b9c6df4d6a041a890fe6468e18

diff --git a/utils.h b/utils.h
index e872dc5..5ea9c6f 100644
--- a/utils.h
+++ b/utils.h
@@ -3,15 +3,25 @@
 
 #include <libubox/list.h>
 #include <libubox/avl.h>
+#include <libubox/blobmsg.h>
 
-#ifdef DEBUG
-#define DPRINTF(format, ...) fprintf(stderr, "%s(%d): " format, __func__, __LINE__, ## __VA_ARGS__)
+#ifndef __OPTIMIZE__
+#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
 #else
-#define DPRINTF(format, ...) no_debug(format, ## __VA_ARGS__)
+extern int __build_bug_on_failed;
+#define BUILD_BUG_ON(condition)				 \
+	do {							\
+		((void)sizeof(char[1 - 2*!!(condition)]));  \
+		if (condition) __build_bug_on_failed = 1;   \
+	} while(0)
 #endif
 
-static inline void no_debug(const char *fmt, ...)
+static inline bool blobmsg_get_bool_default(struct blob_attr *attr, bool val)
 {
+	if (!attr)
+		return val;
+
+	return blobmsg_get_bool(attr);
 }
 
 #define __init __attribute__((constructor))
@@ -27,9 +37,8 @@ struct vlist_tree {
 	struct avl_tree avl;
 
 	vlist_update_cb update;
-
-	int data_offset;
-	int data_len;
+	bool keep_old;
+	bool no_delete;
 
 	int version;
 };
@@ -39,17 +48,62 @@ struct vlist_node {
 	int version;
 };
 
-void __vlist_init(struct vlist_tree *tree, vlist_update_cb update, int offset, int len);
+void vlist_init(struct vlist_tree *tree, avl_tree_comp cmp, vlist_update_cb update);
+
+#define vlist_find(tree, name, element, node_member) \
+	avl_find_element(&(tree)->avl, name, element, node_member.avl)
 
-#define vlist_init(tree, update, type, vlist, first, last) \
-	__vlist_init(tree, update, offsetof(type, first) - offsetof(type, vlist), \
-		     offsetof(type, last) - offsetof(type, first) + sizeof(((type *) 0)->last))
+static inline void vlist_update(struct vlist_tree *tree)
+{
+	tree->version++;
+}
 
-void vlist_add(struct vlist_tree *tree, struct vlist_node *node);
+void vlist_add(struct vlist_tree *tree, struct vlist_node *node, void *key);
 void vlist_delete(struct vlist_tree *tree, struct vlist_node *node);
 void vlist_flush(struct vlist_tree *tree);
 void vlist_flush_all(struct vlist_tree *tree);
 
+#define vlist_for_each_element(tree, element, node_member) \
+	avl_for_each_element(&(tree)->avl, element, node_member.avl)
+
+
+struct vlist_simple_tree {
+	struct list_head list;
+	int head_offset;
+	int version;
+};
+
+struct vlist_simple_node {
+	struct list_head list;
+	int version;
+};
+
+#define vlist_simple_init(tree, node, member) \
+	__vlist_simple_init(tree, offsetof(node, member))
+
+void __vlist_simple_init(struct vlist_simple_tree *tree, int offset);
+void vlist_simple_delete(struct vlist_simple_tree *tree, struct vlist_simple_node *node);
+void vlist_simple_flush(struct vlist_simple_tree *tree);
+void vlist_simple_flush_all(struct vlist_simple_tree *tree);
+
+static inline void vlist_simple_update(struct vlist_simple_tree *tree)
+{
+	tree->version++;
+}
+
+static inline void vlist_simple_add(struct vlist_simple_tree *tree, struct vlist_simple_node *node)
+{
+	node->version = tree->version;
+	list_add(&node->list, &tree->list);
+}
+
+#define vlist_simple_for_each_element(tree, element, node_member) \
+	list_for_each_entry(element, &(tree)->list, node_member.list)
+
+#define vlist_simple_empty(tree) \
+	list_empty(&(tree)->list)
+
+
 #ifdef __linux__
 static inline int fls(int x)
 {