--- libaitrpc/inc/aitrpc.h	2012/05/16 07:37:37	1.8.2.7
+++ libaitrpc/inc/aitrpc.h	2012/05/16 09:02:47	1.8.2.10
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.8.2.7 2012/05/16 07:37:37 misho Exp $
+* $Id: aitrpc.h,v 1.8.2.10 2012/05/16 09:02:47 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -180,6 +180,17 @@ typedef struct tagRPCFunc {
 } rpc_func_t;
 
 
+/* BLOB register element */
+typedef struct tagBLOB {
+	uint32_t		blob_var;	/* BLOB id */
+
+	size_t			blob_len;	/* size of allocated BLOB data */
+	void			*blob_data;	/* mapped BLOB data */
+
+	TAILQ_ENTRY(tagBLOB)	blob_node;
+} rpc_blob_t;
+
+
 typedef struct {
 	int		cli_id;		/* slot id */
 	int		cli_sock;	/* socket fd */
@@ -189,17 +200,6 @@ typedef struct {
 	void		*cli_parent;	/* pointer to parent rpc_srv_t for server or to rpc_sess_t for client */
 } rpc_cli_t;
 
-
-/* BLOB registration element! */
-typedef struct tagBLOB {
-	uint32_t	blob_var;
-
-	size_t		blob_len;	// size of allocated BLOB data
-	void		*blob_data;	// BLOB data
-
-	struct tagBLOB	*blob_next;
-} rpc_blob_t;
-
 typedef struct {
 	rpc_sess_t			srv_session;	/* RPC session registration info */
 	int				srv_netbuf;	/* size of network buffer */
@@ -213,13 +213,15 @@ typedef struct {
 	TAILQ_HEAD(, tagRPCFunc)	srv_funcs;	/* RPC functions list */
 
 	struct {
-		cmd_type_t	state;		/* BLOB server state: ==0 disable | !=0 enable */
-		ait_val_t	dir;		/* BLOB states directory */
+		sched_root_task_t		*root;		/* BLOB server scheduler */
+		intptr_t			kill;		/* BLOB server state: ==0 disable | !=0 enable */
 
-		rpc_cli_t	server;		/* BLOB server socket */
-		array_t		*clients;	/* connected blob client sockets */
+		ait_val_t			dir;		/* BLOB states directory */
 
-		rpc_blob_t	*blobs;		/* registered blob variables list */
+		rpc_cli_t			server;		/* BLOB server socket */
+		array_t				*clients;	/* connected blob client sockets */
+
+		TAILQ_HEAD(, tagBLOB)		blobs;		/* registered blob variables list */
 	} 				srv_blob;
 } rpc_srv_t;
 
@@ -308,13 +310,14 @@ void rpc_srv_endServer(rpc_srv_t ** __restrict psrv);
  */
 int rpc_srv_loopServer(rpc_srv_t * __restrict srv);
 #define rpc_srv_execServer(_srv, _sync)	do { assert((_srv)); pthread_t __tid; \
-						pthread_create(&__tid, NULL, (void*(*)(void*)) \
-								rpc_srv_loopServer, (_srv)); \
-						if ((_sync)) \
-							pthread_join(__tid, (void**) (_sync)); \
-						else \
-							pthread_detach(__tid); \
-					} while (0)
+						if (!(_srv)->srv_kill) { \
+							pthread_create(&__tid, NULL, (void*(*)(void*)) \
+									rpc_srv_loopServer, (_srv)); \
+							if ((_sync)) \
+								pthread_join(__tid, (void**) (_sync)); \
+							else \
+								pthread_detach(__tid); \
+						} } while (0)
 
 /*
  * rpc_srv_initBLOBServer() - Init & create BLOB Server
@@ -338,13 +341,12 @@ void rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
  * @srv = RPC Server instance
  * return: -1 error or 0 ok, infinite loop ...
  */
-int rpc_srv_loopBLOB(rpc_srv_t * __restrict srv);
+int rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv);
 #define rpc_srv_execBLOBServer(_srv)	do { assert((_srv)); pthread_t __tid; \
-						if ((_srv)->srv_blob.state == enable) { \
+						if (!(_srv)->srv_kill && !(_srv)->srv_blob.kill) { \
 							pthread_create(&__tid, NULL, (void*(*)(void*)) \
-									rpc_srv_loopBLOB, (_srv)); \
+									rpc_srv_loopBLOBServer, (_srv)); \
 							pthread_detach(__tid); \
-							(_srv)->srv_blob.state = running; \
 						} \
 					} while (0)
 
@@ -388,7 +390,7 @@ int rpc_srv_execCall(rpc_func_t * __restrict call, str
 
 
 /*
- * rpc_srv_blobCreate() - Create map blob to memory region and return object
+ * rpc_srv_blobCreate() - Create and map blob to memory region and return object
  *
  * @srv = RPC Server instance
  * @len = BLOB length object