--- libaitrpc/src/srv.c	2012/03/29 01:34:16	1.8
+++ libaitrpc/src/srv.c	2012/05/11 09:11:01	1.8.2.4
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.8 2012/03/29 01:34:16 misho Exp $
+* $Id: srv.c,v 1.8.2.4 2012/05/11 09:11:01 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -579,8 +579,6 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 	} else
 		memset(srv->srv_blob.clients, 0, srv->srv_numcli * sizeof(rpc_cli_t));
 
-	pthread_mutex_init(&srv->srv_blob.mtx, NULL);
-
 	rpc_srv_registerCall(srv, NULL, CALL_BLOBSHUTDOWN, 0);
 	rpc_srv_registerCall(srv, NULL, CALL_BLOBCLIENTS, 1);
 	rpc_srv_registerCall(srv, NULL, CALL_BLOBVARS, 1);
@@ -621,7 +619,6 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 			shutdown(c->cli_sock, SHUT_RDWR);
 	close(srv->srv_blob.server.cli_sock);
 
-	pthread_mutex_lock(&srv->srv_blob.mtx);
 	if (srv->srv_blob.clients) {
 		free(srv->srv_blob.clients);
 		srv->srv_blob.clients = NULL;
@@ -633,13 +630,9 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 		rpc_srv_blobFree(srv, f);
 		free(f);
 	}
-	pthread_mutex_unlock(&srv->srv_blob.mtx);
 
 	AIT_FREE_VAL(&srv->srv_blob.dir);
 
-	while (pthread_mutex_trylock(&srv->srv_blob.mtx) == EBUSY);
-	pthread_mutex_destroy(&srv->srv_blob.mtx);
-
 	/* at final, save disable BLOB service state */
 	srv->srv_blob.state = disable;
 }
@@ -656,10 +649,9 @@ rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
 	socklen_t salen = sizeof(io_sockaddr_t);
 	register int i;
 	rpc_cli_t *c;
-	fd_set fds;
 	int ret;
-	struct timeval tv = { DEF_RPC_TIMEOUT, 0 };
 	pthread_attr_t attr;
+	struct pollfd pfd;
 
 	ioTRACE(RPC_TRACE_LEVEL);
 
@@ -668,16 +660,18 @@ rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
 		return -1;
 	}
 
-	tv.tv_sec = srv->srv_session.sess_timeout;
-
 	if (listen(srv->srv_blob.server.cli_sock, SOMAXCONN) == -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);
 
+	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) {
 		for (c = srv->srv_blob.clients, i = 0; i < srv->srv_numcli && c; i++, c++)
@@ -692,15 +686,12 @@ rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
 			continue;
 		}
 
-		FD_ZERO(&fds);
-		FD_SET(srv->srv_blob.server.cli_sock, &fds);
-		ret = select(srv->srv_blob.server.cli_sock + 1, &fds, NULL, NULL, &tv);
-		if (ret == -1) {
+		if ((ret = poll(&pfd, 1, srv->srv_session.sess_timeout * 1000)) == -1 || 
+				pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
 			LOGERR;
 			ret = 1;
 			break;
-		}
-		if (!ret)
+		} else if (!ret)
 			continue;
 
 		c->cli_sock = accept(srv->srv_blob.server.cli_sock, &c->cli_sa.sa, &salen);
@@ -853,8 +844,6 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i
 	} else
 		memset(srv->srv_clients, 0, srv->srv_numcli * sizeof(rpc_cli_t));
 
-	pthread_mutex_init(&srv->srv_mtx, NULL);
-
 	rpc_srv_registerCall(srv, NULL, CALL_SRVSHUTDOWN, 0);
 	rpc_srv_registerCall(srv, NULL, CALL_SRVCLIENTS, 1);
 	rpc_srv_registerCall(srv, NULL, CALL_SRVSESSIONS, 4);
@@ -900,7 +889,6 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
 	}
 
 	/* detach exported calls */
-	pthread_mutex_lock(&(*psrv)->srv_mtx);
 	while ((f = (*psrv)->srv_funcs)) {
 		(*psrv)->srv_funcs = f->func_next;
 		io_freeVars(&f->func_vars);
@@ -908,11 +896,7 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
 		AIT_FREE_VAL(&f->func_file);
 		free(f);
 	}
-	pthread_mutex_unlock(&(*psrv)->srv_mtx);
 
-	while (pthread_mutex_trylock(&(*psrv)->srv_mtx) == EBUSY);
-	pthread_mutex_destroy(&(*psrv)->srv_mtx);
-
 	free(*psrv);
 	*psrv = NULL;
 }
@@ -929,10 +913,9 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv)
 	socklen_t salen = sizeof(io_sockaddr_t);
 	register int i;
 	rpc_cli_t *c;
-	fd_set fds;
 	int ret;
-	struct timeval tv = { DEF_RPC_TIMEOUT, 0 };
 	pthread_attr_t attr;
+	struct pollfd pfd;
 
 	ioTRACE(RPC_TRACE_LEVEL);
 
@@ -941,19 +924,20 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv)
 		return -1;
 	}
 
-	tv.tv_sec = srv->srv_session.sess_timeout;
-
 	/* activate BLOB server worker if srv->srv_blob.state == enable */
 	rpc_srv_execBLOBServer(srv);
 
 	if (listen(srv->srv_server.cli_sock, SOMAXCONN) == -1) {
 		LOGERR;
 		return -1;
-	}
+	} else
+		fcntl(srv->srv_server.cli_sock, F_SETFL, fcntl(srv->srv_server.cli_sock, F_GETFL) | O_NONBLOCK);
 
 	pthread_attr_init(&attr);
 	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
 
+	pfd.fd = srv->srv_server.cli_sock;
+	pfd.events = POLLIN | POLLPRI;
 	/* main rpc loop */
 	while (srv->srv_kill != kill) {
 		for (c = srv->srv_clients, i = 0; i < srv->srv_numcli && c; i++, c++)
@@ -968,15 +952,12 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv)
 			continue;
 		}
 
-		FD_ZERO(&fds);
-		FD_SET(srv->srv_server.cli_sock, &fds);
-		ret = select(srv->srv_server.cli_sock + 1, &fds, NULL, NULL, &tv);
-		if (ret == -1) {
+		if ((ret = poll(&pfd, 1, srv->srv_session.sess_timeout * 1000)) == -1 || 
+				pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
 			LOGERR;
 			ret = 1;
 			break;
-		}
-		if (!ret)
+		} else if (!ret)
 			continue;
 
 		c->cli_sock = accept(srv->srv_server.cli_sock, &c->cli_sa.sa, &salen);
@@ -1022,7 +1003,7 @@ rpc_srv_execCall(rpc_func_t * __restrict call, struct 
 		return -1;
 	}
 
-	dl = dlopen(AIT_VOID(&call->func_file), RTLD_NOW);
+	dl = dlopen(AIT_ADDR(&call->func_file), RTLD_NOW);
 	if (!dl) {
 		rpc_SetErr(ENOENT, "Can`t attach module %s!", dlerror());
 		return -1;