--- libaitrpc/src/srv.c 2012/05/16 07:54:49 1.9.2.11 +++ libaitrpc/src/srv.c 2012/05/16 09:02:48 1.9.2.12 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.9.2.11 2012/05/16 07:54:49 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 @@ -285,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) @@ -469,6 +515,7 @@ rpc_srv_dispatchVars(void *arg) } #endif +/* ------------------------------------------------------ */ /* * rpc_srv_initBLOBServer() - Init & create BLOB Server @@ -484,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) { @@ -564,7 +607,16 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s return -1; } - srv->srv_blob.state = enable; /* enable BLOB */ + /* 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; + } + return 0; } @@ -581,10 +633,8 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) register int i; rpc_blob_t *b, *tmp; - if (!srv || srv->srv_blob.state == disable) + if (!srv) return; - else - srv->srv_blob.state = kill; /* close all clients connections & server socket */ for (i = 0; i < io_arraySize(srv->srv_blob.clients); i++) { @@ -608,48 +658,41 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) 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; } -#if 0 /* - * 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; @@ -661,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 /* @@ -813,6 +840,9 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv) rpc_SetErr(EINVAL, "Can`t destroy server because parameter is null!"); 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++) {