From: Howard Chu <hyc@openldap.org>
Date: Wed, 21 Sep 2005 11:26:56 +0000 (+0000)
Subject: Rearrange avlnode / padding, add threaded AVL functions
X-Git-Tag: OPENLDAP_REL_ENG_2_2_MP~405
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b6e38a12bf686bb439376f5ede4fe2e8558c0ba4;p=openldap

Rearrange avlnode / padding, add threaded AVL functions
---

diff --git a/include/avl.h b/include/avl.h
index 458f99fd48..0b6ed41298 100644
--- a/include/avl.h
+++ b/include/avl.h
@@ -40,11 +40,16 @@ typedef struct avlnode Avlnode;
 
 struct avlnode {
 	void*		avl_data;
-	signed int		avl_bf;
-	struct avlnode	*avl_left;
-	struct avlnode	*avl_right;
+	struct avlnode	*avl_link[2];
+	char		avl_bits[2];
+	signed char		avl_bf;
 };
 
+#define avl_left	avl_link[0]
+#define avl_right	avl_link[1]
+#define avl_lbit	avl_bits[0]
+#define avl_rbit	avl_bits[1]
+
 #ifdef AVL_INTERNAL
 
 #define NULLAVL	((Avlnode *) NULL)
@@ -54,12 +59,21 @@ struct avlnode {
 #define EH 	0
 #define RH 	1
 
+/* thread bits */
+#define	AVL_THREAD	0
+#define	AVL_CHILD	1
+
 /* avl routines */
 #define avl_getone(x)	((x) == 0 ? 0 : (x)->avl_data)
 #define avl_onenode(x)	((x) == 0 || ((x)->avl_left == 0 && (x)->avl_right == 0))
 
 #endif /* AVL_INTERNALS */
 
+#define	avl_child(x,dir)	((x)->avl_bits[dir]) == AVL_CHILD ? \
+	(x)->avl_link[dir] : NULL
+#define	avl_lchild(x)	avl_child(x,0)
+#define	avl_rchild(x)	avl_child(x,1)
+
 typedef int		(*AVL_APPLY) LDAP_P((void *, void*));
 typedef int		(*AVL_CMP) LDAP_P((const void*, const void*));
 typedef int		(*AVL_DUP) LDAP_P((void*, void*));
@@ -103,6 +117,21 @@ avl_apply LDAP_P((Avlnode *, AVL_APPLY, void*, int, int));
 LDAP_AVL_F( int )
 avl_prefixapply LDAP_P((Avlnode *, void*, AVL_CMP, void*, AVL_CMP, void*, int));
 
+LDAP_AVL_F( int )
+tavl_free LDAP_P(( Avlnode *root, AVL_FREE dfree ));
+
+LDAP_AVL_F( int )
+tavl_insert LDAP_P((Avlnode **, void*, AVL_CMP, AVL_DUP));
+
+LDAP_AVL_F( void* )
+tavl_delete LDAP_P((Avlnode **, void*, AVL_CMP));
+
+LDAP_AVL_F( void* )
+tavl_find LDAP_P((Avlnode *, const void*, AVL_CMP));
+
+LDAP_AVL_F( Avlnode* )
+tavl_find2 LDAP_P((Avlnode *, const void*, AVL_CMP));
+
 /* apply traversal types */
 #define AVL_PREORDER	1
 #define AVL_INORDER	2