--- libaitrpc/inc/aitrpc.h	2012/11/05 15:57:35	1.10.2.1
+++ libaitrpc/inc/aitrpc.h	2012/11/13 09:21:27	1.10.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.10.2.1 2012/11/05 15:57:35 misho Exp $
+* $Id: aitrpc.h,v 1.10.2.2 2012/11/13 09:21:27 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -159,11 +159,24 @@ typedef struct tagRPCFunc {
 	ait_val_t		func_name;
 
 	void			*func_parent;
-	TAILQ_ENTRY(tagRPCFunc)	func_node;
+
+	SLIST_ENTRY(tagRPCFunc)	func_next;
+	AVL_ENTRY(tagRPCFunc)	func_node;
 } rpc_func_t;
 #define RPC_FUNC_SERVER(x)	((rpc_srv_t*) (x)->func_parent)
 
+/* Tree root node */
+typedef struct tagRPCFuncs {
+	pthread_mutex_t		mtx;
 
+	struct tagRPCFunc	*slh_first;
+	struct tagRPCFunc	*avlh_root;
+} rpc_funcs_t;
+#define RPC_FUNCS_LOCK(x)	pthread_mutex_lock(&(x)->mtx)
+#define RPC_FUNCS_UNLOCK(x)	pthread_mutex_unlock(&(x)->mtx)
+#define RPC_FUNCS_ISEMPTY(x)	AVL_EMPTY((x))
+
+
 /* BLOB register element */
 typedef struct tagBLOB {
 	uint32_t		blob_var;	/* BLOB id */
@@ -200,7 +213,7 @@ typedef struct {
 	rpc_cli_t			srv_server;	/* RPC server socket */
 	array_t				*srv_clients;	/* connected rpc client sockets */
 
-	TAILQ_HEAD(, tagRPCFunc)	srv_funcs;	/* RPC functions list */
+	rpc_funcs_t			srv_funcs;	/* RPC functions */
 
 	struct {
 		pthread_t			tid;		/* BLOB exec pthread */