--- libaitrpc/src/srv.c	2012/05/15 20:49:25	1.9.2.6
+++ libaitrpc/src/srv.c	2012/05/16 09:02:48	1.9.2.12
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.9.2.6 2012/05/15 20:49:25 misho Exp $
+* $Id: srv.c,v 1.9.2.12 2012/05/16 09:02:48 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -75,7 +75,6 @@ txPacket(sched_task_t *task)
 	u_char buf[USHRT_MAX] = { 0 };
 	struct tagRPCCall *rpc = (struct tagRPCCall*) buf;
 	int ret, wlen = sizeof(struct tagRPCCall);
-	array_t *arr = NULL;
 
 	/* copy RPC header */
 	memcpy(buf, TASK_DATA(task), wlen);
@@ -87,9 +86,9 @@ txPacket(sched_task_t *task)
 			rpc->call_rep.ret = RPC_ERROR(-1);
 			rpc->call_rep.eno = RPC_ERROR(rpc_Errno);
 		} else {
-			rpc->call_argc = htons(rpc_srv_getVars(f, &arr));
+			rpc->call_argc = htons(io_arraySize(f->func_vars));
 			/* Go Encapsulate variables */
-			ret = io_vars2buffer(buf + wlen, sizeof buf - wlen, arr);
+			ret = io_vars2buffer(buf + wlen, sizeof buf - wlen, f->func_vars);
 			/* Free return values */
 			io_clrVars(f->func_vars);
 			if (ret == -1) {
@@ -141,7 +140,8 @@ execCall(sched_task_t *task)
 			rpc->call_rep.eno = RPC_ERROR(rpc_Errno);
 			return NULL;
 		}
-	}
+	} else
+		arr = NULL;
 
 	if (!(f = rpc_srv_getCall(s, ntohs(rpc->call_tag)))) {
 		rpc_SetErr(EPROGUNAVAIL, "Function not found at RPC server");
@@ -161,13 +161,14 @@ execCall(sched_task_t *task)
 				/* without reply */
 				io_clrVars(f->func_vars);
 				rpc->call_argc ^= rpc->call_argc;
-			} else
-				rpc->call_argc = htons(rpc_srv_getVars(f, NULL));
+			} else {
+				/* reply */
+				rpc->call_argc = htons(io_arraySize(f->func_vars));
+			}
 		}
 	}
 
-	if (arr)
-		io_arrayDestroy(&arr);
+	io_arrayDestroy(&arr);
 	return NULL;
 }
 
@@ -284,6 +285,52 @@ end:
 	return NULL;
 }
 
+/* ------------------------------------------------------ */
+
+static void *
+acceptBLOBClients(sched_task_t *task)
+{
+	rpc_srv_t *srv = TASK_ARG(task);
+	rpc_cli_t *c = NULL;
+	register int i;
+	socklen_t salen = sizeof(io_sockaddr_t);
+
+	/* check free slots for connect */
+	for (i = 0; i < io_arraySize(srv->srv_clients) && 
+			(c = io_array(srv->srv_clients, i, rpc_cli_t*)); i++);
+	if (c)	/* no more free slots! */
+		goto end;
+	c = malloc(sizeof(rpc_cli_t));
+	if (!c) {
+		LOGERR;
+		srv->srv_kill = kill;
+		return NULL;
+	} else {
+		memset(c, 0, sizeof(rpc_cli_t));
+		io_arraySet(srv->srv_clients, i, c);
+		c->cli_id = i;
+		c->cli_parent = srv;
+	}
+
+	/* alloc empty buffer */
+	AIT_SET_BUF2(&c->cli_buf, 0, srv->srv_netbuf);
+
+	/* accept client */
+	c->cli_sock = accept(srv->srv_server.cli_sock, &c->cli_sa.sa, &salen);
+	if (c->cli_sock == -1) {
+		LOGERR;
+		AIT_FREE_VAL(&c->cli_buf);
+		io_arrayDel(srv->srv_clients, i, 42);
+		goto end;
+	} else
+		fcntl(c->cli_sock, F_SETFL, fcntl(c->cli_sock, F_GETFL) | O_NONBLOCK);
+
+	schedRead(TASK_ROOT(task), rxPacket, c, c->cli_sock, NULL, 0);
+end:
+	schedReadSelf(task);
+	return NULL;
+}
+
 #if 0
 static void *
 txBLOB(sched_task_t *task)
@@ -466,8 +513,9 @@ rpc_srv_dispatchVars(void *arg)
 	free(buf);
 	return NULL;
 }
+#endif
 
-// -------------------------------------------------
+/* ------------------------------------------------------ */
 
 /*
  * rpc_srv_initBLOBServer() - Init & create BLOB Server
@@ -483,14 +531,10 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 	int n = 1;
 	io_sockaddr_t sa;
 
-	if (!srv) {
+	if (!srv || srv->srv_kill) {
 		rpc_SetErr(EINVAL, "Invalid parameters can`t init BLOB server");
 		return -1;
 	}
-	if (srv->srv_blob.state) {
-		rpc_SetErr(EPERM, "Already started BLOB server!");
-		return 0;
-	}
 
 	memset(&srv->srv_blob, 0, sizeof srv->srv_blob);
 	if (access(diskDir, R_OK | W_OK) == -1) {
@@ -499,10 +543,12 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 	} else
 		AIT_SET_STR(&srv->srv_blob.dir, diskDir);
 
-	srv->srv_blob.server.cli_tid = pthread_self();
+	/* init blob list */
+	TAILQ_INIT(&srv->srv_blob.blobs);
+
 	srv->srv_blob.server.cli_parent = srv;
 
-	memcpy(&sa, &srv->srv_server.cli_sa, sizeof sa);
+	memcpy(&srv->srv_blob.server.cli_sa, &srv->srv_server.cli_sa, sizeof(io_sockaddr_t));
 	switch (sa.sa.sa_family) {
 		case AF_INET:
 			sa.sin.sin_port = htons(Port ? Port : ntohs(sa.sin.sin_port) + 1);
@@ -517,7 +563,6 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 			AIT_FREE_VAL(&srv->srv_blob.dir);
 			return -1;
 	}
-	memcpy(&srv->srv_blob.server.cli_sa, &sa, sizeof sa);
 
 	/* create BLOB server socket */
 	srv->srv_blob.server.cli_sock = socket(srv->srv_server.cli_sa.sa.sa_family, SOCK_STREAM, 0);
@@ -553,22 +598,25 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 		return -1;
 	}
 
-	/* allocate pool for concurent clients */
-	srv->srv_blob.clients = calloc(srv->srv_numcli, sizeof(rpc_cli_t));
+	/* allocate pool for concurent blob clients */
+	srv->srv_blob.clients = io_arrayInit(io_arraySize(srv->srv_clients));
 	if (!srv->srv_blob.clients) {
-		LOGERR;
+		rpc_SetErr(io_GetErrno(), "%s", io_GetError());
 		close(srv->srv_blob.server.cli_sock);
 		AIT_FREE_VAL(&srv->srv_blob.dir);
 		return -1;
-	} else
-		memset(srv->srv_blob.clients, 0, srv->srv_numcli * sizeof(rpc_cli_t));
+	}
 
-	rpc_srv_registerCall(srv, NULL, CALL_BLOBSHUTDOWN, 0);
-	rpc_srv_registerCall(srv, NULL, CALL_BLOBCLIENTS, 1);
-	rpc_srv_registerCall(srv, NULL, CALL_BLOBVARS, 1);
-	rpc_srv_registerCall(srv, NULL, CALL_BLOBSTATE, 0);
+	/* init blob scheduler */
+	srv->srv_blob.root = schedBegin();
+	if (!srv->srv_blob.root) {
+		rpc_SetErr(sched_GetErrno(), "%s", sched_GetError());
+		io_arrayDestroy(&srv->srv_blob.clients);
+		close(srv->srv_blob.server.cli_sock);
+		AIT_FREE_VAL(&srv->srv_blob.dir);
+		return -1;
+	}
 
-	srv->srv_blob.state = enable;	/* enable BLOB */
 	return 0;
 }
 
@@ -583,77 +631,68 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 {
 	rpc_cli_t *c;
 	register int i;
-	rpc_blob_t *f;
+	rpc_blob_t *b, *tmp;
 
-	if (!srv || srv->srv_blob.state == disable)
+	if (!srv)
 		return;
-	else
-		srv->srv_blob.state = kill;
 
-	rpc_srv_unregisterCall(srv, NULL, CALL_BLOBSHUTDOWN);
-	rpc_srv_unregisterCall(srv, NULL, CALL_BLOBCLIENTS);
-	rpc_srv_unregisterCall(srv, NULL, CALL_BLOBVARS);
-	rpc_srv_unregisterCall(srv, NULL, CALL_BLOBSTATE);
-
 	/* close all clients connections & server socket */
-	for (i = 0, c = srv->srv_blob.clients; i < srv->srv_numcli && c; i++, c++)
-		if (c->cli_sa.sa.sa_family)
+	for (i = 0; i < io_arraySize(srv->srv_blob.clients); i++) {
+		c = io_array(srv->srv_blob.clients, i, rpc_cli_t*);
+		if (c) {
 			shutdown(c->cli_sock, SHUT_RDWR);
-	close(srv->srv_blob.server.cli_sock);
+			close(c->cli_sock);
 
-	if (srv->srv_blob.clients) {
-		free(srv->srv_blob.clients);
-		srv->srv_blob.clients = NULL;
+			io_arrayDel(srv->srv_blob.clients, i, 42);
+		}
 	}
+	io_arrayDestroy(&srv->srv_blob.clients);
 
+	close(srv->srv_blob.server.cli_sock);
+
 	/* detach blobs */
-	while ((f = srv->srv_blob.blobs)) {
-		srv->srv_blob.blobs = f->blob_next;
-		rpc_srv_blobFree(srv, f);
-		free(f);
+	TAILQ_FOREACH_SAFE(b, &srv->srv_blob.blobs, blob_node, tmp) {
+		TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node);
+
+		rpc_srv_blobFree(srv, b);
+		free(b);
 	}
 
+	schedEnd(&srv->srv_blob.root);
 	AIT_FREE_VAL(&srv->srv_blob.dir);
 
-	/* at final, save disable BLOB service state */
-	srv->srv_blob.state = disable;
+	srv->srv_blob.kill = 1;
 }
 
 /*
- * rpc_srv_loopBLOB() - Execute Main BLOB server loop and wait for clients requests
+ * rpc_srv_loopBLOBServer() - Execute Main BLOB server loop and wait for clients requests
  *
  * @srv = RPC Server instance
  * return: -1 error or 0 ok, infinite loop ...
  */
 int
-rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
+rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
 {
-	socklen_t salen = sizeof(io_sockaddr_t);
-	register int i;
-	rpc_cli_t *c;
-	int ret;
-	pthread_attr_t attr;
-	struct pollfd pfd;
-
-	if (!srv || srv->srv_blob.state == kill) {
+	if (!srv || srv->srv_kill) {
 		rpc_SetErr(EINVAL, "Invalid parameter can`t start BLOB server");
 		return -1;
 	}
 
-	if (listen(srv->srv_blob.server.cli_sock, SOMAXCONN) == -1) {
+	fcntl(srv->srv_blob.server.cli_sock, F_SETFL, 
+			fcntl(srv->srv_blob.server.cli_sock, F_GETFL) | O_NONBLOCK);
+
+	if (listen(srv->srv_blob.server.cli_sock, io_arraySize(srv->srv_blob.clients)) == -1) {
 		LOGERR;
 		return -1;
-	} else
-		fcntl(srv->srv_blob.server.cli_sock, F_SETFL, 
-				fcntl(srv->srv_blob.server.cli_sock, F_GETFL) | O_NONBLOCK);
+	}
 
-	pthread_attr_init(&attr);
-	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+	if (!schedRead(srv->srv_blob.root, acceptBLOBClients, srv, 
+				srv->srv_blob.server.cli_sock, NULL, 0)) {
+		rpc_SetErr(sched_GetErrno(), "%s", sched_GetError());
+		return -1;
+	}
 
-	pfd.fd = srv->srv_blob.server.cli_sock;
-	pfd.events = POLLIN | POLLPRI;
-	/* main BLOB loop */
-	while (srv->srv_blob.state != kill && srv->srv_kill != kill) {
+#if 0
 		for (c = srv->srv_blob.clients, i = 0; i < srv->srv_numcli && c; i++, c++)
 			if (!c->cli_sa.sa.sa_family)
 				break;
@@ -665,35 +704,19 @@ rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
 			continue;
 		}
 
-		if ((ret = poll(&pfd, 1, srv->srv_session.sess_timeout * 1000)) == -1 || 
-				pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
-			LOGERR;
-			ret = 1;
-			break;
-		} else if (!ret)
-			continue;
-
 		c->cli_sock = accept(srv->srv_blob.server.cli_sock, &c->cli_sa.sa, &salen);
 		if (c->cli_sock == -1) {
 			LOGERR;
 			continue;
 		} else
 			c->cli_parent = srv;
-
-		/* spawn dispatch thread for BLOB client */
-		c->cli_kill = enable;
-		if (pthread_create(&c->cli_tid, &attr, rpc_srv_dispatchVars, c)) {
-			LOGERR;
-			continue;
-		}
 	}
+#endif
 
-	srv->srv_blob.state = kill;
-
-	pthread_attr_destroy(&attr);
+	/* main rpc loop */
+	schedRun(srv->srv_blob.root, &srv->srv_blob.kill);
 	return 0;
 }
-#endif
 
 
 /*
@@ -818,6 +841,9 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
 		return;
 	}
 
+	if (!(*psrv)->srv_blob.kill)
+		rpc_srv_endBLOBServer(*psrv);
+
 	/* close all clients connections & server socket */
 	for (i = 0; i < io_arraySize((*psrv)->srv_clients); i++) {
 		c = io_array((*psrv)->srv_clients, i, rpc_cli_t*);
@@ -825,8 +851,7 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
 			shutdown(c->cli_sock, SHUT_RDWR);
 			close(c->cli_sock);
 
-			free(c);
-			io_arrayDel((*psrv)->srv_clients, i, 0);
+			io_arrayDel((*psrv)->srv_clients, i, 42);
 		}
 	}
 	io_arrayDestroy(&(*psrv)->srv_clients);
@@ -835,6 +860,8 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
 
 	/* detach exported calls */
 	TAILQ_FOREACH_SAFE(f, &(*psrv)->srv_funcs, func_node, tmp) {
+		TAILQ_REMOVE(&(*psrv)->srv_funcs, f, func_node);
+
 		io_freeVars(&f->func_vars);
 		AIT_FREE_VAL(&f->func_name);
 		free(f);