--- libaitrpc/inc/aitrpc.h	2012/05/16 08:10:39	1.8.2.9
+++ libaitrpc/inc/aitrpc.h	2012/05/16 13:32:47	1.8.2.12
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.8.2.9 2012/05/16 08:10:39 misho Exp $
+* $Id: aitrpc.h,v 1.8.2.12 2012/05/16 13:32:47 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -96,7 +96,6 @@ SUCH DAMAGE.
 /* RPC types */
 
 typedef enum {
-	disable, enable, running, kill, 	/* for blob.state */
 	ok, error, no, 				/* for blob reply */
 	get, set, unset				/* for blob request */
 } cmd_type_t;
@@ -213,7 +212,9 @@ typedef struct {
 	TAILQ_HEAD(, tagRPCFunc)	srv_funcs;	/* RPC functions list */
 
 	struct {
-		cmd_type_t			state;		/* BLOB server state: ==0 disable | !=0 enable */
+		sched_root_task_t		*root;		/* BLOB server scheduler */
+		intptr_t			kill;		/* BLOB server state: ==0 disable | !=0 enable */
+
 		ait_val_t			dir;		/* BLOB states directory */
 
 		rpc_cli_t			server;		/* BLOB server socket */
@@ -308,13 +309,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 +340,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)
 
@@ -509,34 +510,31 @@ inline int rpc_cli_getBLOB(rpc_cli_t * __restrict cli,
  * @ProgID = ProgramID for RPC session request
  * @ProcID = ProcessID for RPC session request
  * @netBuf = Network buffer length, if =0 == BUFSIZ (also meaning max RPC packet)
- * @Timeout = RPC timeout in seconds, if =0 set default RPC timeout
  * @family = Family socket type, AF_INET or AF_INET6
  * @csHost = Host name or IP address for bind server
  * @Port = Port for bind server, if Port == 0 default port is selected
  * return: NULL == error or !=NULL connection to RPC server established
  */
-rpc_cli_t *rpc_cli_openClient(unsigned int ProgID, unsigned int ProcID, int netBuf, 
-		unsigned char Timeout, unsigned short family, 
-		const char *csHost, unsigned short Port);
+rpc_cli_t *rpc_cli_openClient(unsigned int ProgID, unsigned char ProcID, int netBuf, 
+		unsigned short family, const char *csHost, unsigned short Port);
 /*
  * rpc_cli_closeClient() - Close connection to RPC server and free resources
  *
  * @cli = RPC Client session
  * return: none
  */
-void rpc_cli_closeClient(rpc_cli_t * __restrict cli);
+void rpc_cli_closeClient(rpc_cli_t ** __restrict cli);
 /*
  * rpc_cli_execCall() - Execute RPC call
  *
  * @cli = RPC Client session
  * @noreply = We not want RPC reply
- * @csModule = Module name, if NULL self binary
- * @csFunc = Function name for execute
+ * @tag = Function tag for execution
  * @in_vars = IN RPC call array of rpc values
  * @out_vars = OUT returned array of rpc values, must be free after use with rpc_cli_freeVals()
  * return: -1 error or != -1 ok result
  */
-int rpc_cli_execCall(rpc_cli_t *cli, int noreply, const char *csModule, const char *csFunc, 
+int rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short tag, 
 		array_t * __restrict in_vars, array_t ** __restrict out_vars);
 
 
@@ -554,7 +552,7 @@ rpc_cli_t *rpc_cli_openBLOBClient(rpc_cli_t * __restri
  * @cli = BLOB Client session
  * return: none
  */
-void rpc_cli_closeBLOBClient(rpc_cli_t * __restrict cli);
+void rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli);
 
 
 #endif