X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=utils.h;h=5ea9c6f092915138fbff666e4e09c17ea789a56a;hp=85d7dc6bdb0d23c6fd97641ac254eaa230558795;hb=c7a52ed70eaae0207d7f7e6c4a31035f5ec3757e;hpb=64c271ed3bd50ce5ffbf69108d75bb79d279e8d9

diff --git a/utils.h b/utils.h
index 85d7dc6..5ea9c6f 100644
--- a/utils.h
+++ b/utils.h
@@ -3,6 +3,26 @@
 
 #include <libubox/list.h>
 #include <libubox/avl.h>
+#include <libubox/blobmsg.h>
+
+#ifndef __OPTIMIZE__
+#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
+#else
+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 bool blobmsg_get_bool_default(struct blob_attr *attr, bool val)
+{
+	if (!attr)
+		return val;
+
+	return blobmsg_get_bool(attr);
+}
 
 #define __init __attribute__((constructor))
 
@@ -17,7 +37,6 @@ struct vlist_tree {
 	struct avl_tree avl;
 
 	vlist_update_cb update;
-	int key_offset;
 	bool keep_old;
 	bool no_delete;
 
@@ -29,12 +48,17 @@ struct vlist_node {
 	int version;
 };
 
-void __vlist_init(struct vlist_tree *tree, avl_tree_comp cmp, vlist_update_cb update, int offset);
+void vlist_init(struct vlist_tree *tree, avl_tree_comp cmp, vlist_update_cb update);
 
-#define vlist_init(tree, cmp, update, type, node, key) \
-	__vlist_init(tree, cmp, update, offsetof(type, key) - offsetof(type, node))
+#define vlist_find(tree, name, element, node_member) \
+	avl_find_element(&(tree)->avl, name, element, node_member.avl)
 
-void vlist_add(struct vlist_tree *tree, struct vlist_node *node);
+static inline void vlist_update(struct vlist_tree *tree)
+{
+	tree->version++;
+}
+
+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);
@@ -42,6 +66,44 @@ 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)
 {