--- libaitrpc/src/srv.c 2013/08/21 15:28:16 1.17.4.8 +++ libaitrpc/src/srv.c 2014/01/28 13:56:25 1.22.6.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.17.4.8 2013/08/21 15:28:16 misho Exp $ +* $Id: srv.c,v 1.22.6.1 2014/01/28 13:56:25 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -66,37 +66,11 @@ static sched_task_func_t cbProto[SOCK_RAW + 1][4] = { { NULL, NULL, NULL, NULL } /* SOCK_RAW */ }; +/* Global Signal Argument when kqueue support disabled */ -ait_val_t * -rpc_getBufVar(rpc_cli_t * __restrict c) -{ - return array(c->cli_buf, RPC_ISNEXTBUF(c), ait_val_t*); -} +static volatile uintptr_t _glSigArg = 0; -u_char * -rpc_getBuffer(rpc_cli_t * __restrict c) -{ - u_char *b = NULL; - assert(c); - - if (RPC_ISNEXTBUF(c)) - b = AIT_GET_BUF(array(c->cli_buf, 1, ait_val_t*)); - else - b = AIT_GET_BUF(array(c->cli_buf, 0, ait_val_t*)) + - sizeof(struct tagRPCCall); - - return b; -} - -struct tagRPCCall * -rpc_getHeader(rpc_cli_t * __restrict c) -{ - assert(c); - - return (struct tagRPCCall*) AIT_GET_BUF(array(c->cli_buf, 0, ait_val_t*)); -} - void rpc_freeCli(rpc_cli_t * __restrict c) { @@ -104,8 +78,8 @@ rpc_freeCli(rpc_cli_t * __restrict c) schedCancelby(s->srv_root, taskMAX, CRITERIA_ARG, c, NULL); - /* free buffer(s) */ - ait_freeVars(&c->cli_buf); + /* free buffer */ + AIT_FREE_VAL(&c->cli_buf); array_Del(s->srv_clients, c->cli_id, 0); if (c) @@ -156,14 +130,8 @@ _allocClient(rpc_srv_t * __restrict srv, sockaddr_t * c->cli_parent = srv; } - /* init buffer(s) */ - c->cli_buf = ait_allocVars(2); - if (!c->cli_buf) { - rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); - array_Del(srv->srv_clients, n, 42); - return NULL; - } else - AIT_SET_BUFSIZ(array(c->cli_buf, 0, ait_val_t*), 0, srv->srv_netbuf); + /* alloc empty buffer */ + AIT_SET_BUFSIZ(&c->cli_buf, 0, srv->srv_netbuf); } return c; @@ -197,23 +165,17 @@ txPacket(sched_task_t *task) rpc_cli_t *c = TASK_ARG(task); rpc_srv_t *s = c->cli_parent; rpc_func_t *f = NULL; - u_char *buf; - struct tagRPCCall *rpc = (struct tagRPCCall*) TASK_DATA(task); - int ret, wlen = sizeof(struct tagRPCCall); - int len = sizeof(struct tagRPCCall) + ntohl(rpc->call_len); + u_char *buf = AIT_GET_BUF(&c->cli_buf); + struct tagRPCCall *rpc = (struct tagRPCCall*) buf; + int ret, estlen, wlen = sizeof(struct tagRPCCall); + struct pollfd pfd; +#ifdef TCP_SESSION_TIMEOUT + struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; - buf = e_malloc(len); - if (!buf) { - rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); - /* close connection */ - schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], - TASK_ARG(task), 0, NULL, 0); - return NULL; - } else { - /* copy RPC header */ - memcpy(buf, rpc, wlen); - rpc = (struct tagRPCCall*) buf; - } + schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, TASK_ARG(task), NULL); + schedTimer(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], + TASK_ARG(task), ts, TASK_ARG(task), 0); +#endif if (rpc->call_argc) { f = rpc_srv_getCall(s, ntohs(rpc->call_tag)); @@ -224,9 +186,17 @@ txPacket(sched_task_t *task) rpc->call_rep.ret = RPC_ERROR(-1); rpc->call_rep.eno = RPC_ERROR(rpc_Errno); } else { + /* calc estimated length */ + estlen = ait_resideVars(RPC_RETVARS(c)) + wlen; + if (estlen > AIT_LEN(&c->cli_buf)) + AIT_RE_BUF(&c->cli_buf, estlen); + buf = AIT_GET_BUF(&c->cli_buf); + rpc = (struct tagRPCCall*) buf; + rpc->call_argc = htons(array_Size(RPC_RETVARS(c))); /* Go Encapsulate variables */ - ret = ait_vars2buffer(buf + wlen, len - wlen, RPC_RETVARS(c)); + ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_buf) - wlen, + RPC_RETVARS(c)); /* Free return values */ ait_freeVars(&c->cli_vars); if (ret == -1) { @@ -242,15 +212,36 @@ txPacket(sched_task_t *task) rpc->call_len = htonl(wlen); +#if 0 + /* calculate CRC */ + rpc->call_crc ^= rpc->call_crc; + rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2)); +#endif + /* send reply */ - ret = send(TASK_FD(task), buf, wlen, MSG_NOSIGNAL); - if (ret == -1 || ret != wlen) { - /* close connection */ - schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], - TASK_ARG(task), 0, NULL, 0); + pfd.fd = TASK_FD(task); + pfd.events = POLLOUT; + for (; wlen > 0; wlen -= ret, buf += ret) { + if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || + pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { + if (ret) + LOGERR; + else + rpc_SetErr(ETIMEDOUT, "Timeout reached! Client not respond"); + /* close connection */ + schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], + TASK_ARG(task), 0, NULL, 0); + return NULL; + } + ret = send(TASK_FD(task), buf, MIN(wlen, s->srv_netbuf), MSG_NOSIGNAL); + if (ret == -1) { + /* close connection */ + schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], + TASK_ARG(task), 0, NULL, 0); + return NULL; + } } - e_free(buf); return NULL; } @@ -261,13 +252,14 @@ execCall(sched_task_t *task) rpc_srv_t *s = c->cli_parent; rpc_func_t *f = NULL; array_t *arr = NULL; - u_char *buf = rpc_getBuffer(c); - struct tagRPCCall *rpc = rpc_getHeader(c); + u_char *buf = AIT_GET_BUF(&c->cli_buf); + struct tagRPCCall *rpc = (struct tagRPCCall*) buf; int argc = ntohs(rpc->call_argc); /* Go decapsulate variables ... */ if (argc) { - arr = ait_buffer2vars(buf, ntohl(rpc->call_len), argc, 42); + arr = ait_buffer2vars(buf + sizeof(struct tagRPCCall), + AIT_LEN(&c->cli_buf) - sizeof(struct tagRPCCall), argc, 42); if (!arr) { rpc_SetErr(ERPCMISMATCH, "#%d - %s", elwix_GetErrno(), elwix_GetError()); @@ -290,7 +282,10 @@ execCall(sched_task_t *task) argc = RPC_CHK_NOREPLY(rpc); rpc->call_rep.ret = RPC_ERROR(rpc_srv_execCall(c, rpc, f->func_name, arr)); if (rpc->call_rep.ret == htonl(-1)) { - rpc->call_rep.eno = RPC_ERROR(errno); + if (!rpc->call_rep.eno) { + LOGERR; + rpc->call_rep.eno = RPC_ERROR(rpc_Errno); + } rpc->call_argc ^= rpc->call_argc; } else { rpc->call_rep.eno ^= rpc->call_rep.eno; @@ -314,52 +309,71 @@ rxPacket(sched_task_t *task) { rpc_cli_t *c = TASK_ARG(task); rpc_srv_t *s = c->cli_parent; - int len, rlen, noreply; - ait_val_t *bufz = array(c->cli_buf, 0, ait_val_t*); - u_char *buf = (u_char*) AIT_GET_BUF(bufz); + int len, rlen, noreply, estlen; +#if 0 + u_short crc; +#endif + u_char *buf = AIT_GET_BUF(&c->cli_buf); struct tagRPCCall *rpc = (struct tagRPCCall*) buf; + struct pollfd pfd; +#ifdef TCP_SESSION_TIMEOUT + struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; - memset(buf, 0, AIT_LEN(bufz)); - /* 1st buffer is last */ - RPC_CLR_NEXTBUF(c); + schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, TASK_ARG(task), NULL); + schedTimer(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], + TASK_ARG(task), ts, TASK_ARG(task), 0); +#endif - /* read rpc header */ - rlen = recv(TASK_FD(task), rpc, MIN(sizeof(struct tagRPCCall), AIT_LEN(bufz)), 0); - if (rlen < sizeof(struct tagRPCCall) || - ntohl(rpc->call_len) < sizeof(struct tagRPCCall)) { + memset(buf, 0, sizeof(struct tagRPCCall)); + rlen = recv(TASK_FD(task), rpc, sizeof(struct tagRPCCall), MSG_PEEK); + if (rlen < sizeof(struct tagRPCCall)) { /* close connection */ schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], TASK_ARG(task), 0, NULL, 0); return NULL; } else { - buf += sizeof(struct tagRPCCall); - len = ntohl(rpc->call_len); + estlen = ntohl(rpc->call_len); + if (estlen > AIT_LEN(&c->cli_buf)) + AIT_RE_BUF(&c->cli_buf, estlen); + rpc = (struct tagRPCCall*) AIT_GET_BUF(&c->cli_buf); + buf = AIT_GET_BUF(&c->cli_buf); + len = estlen; } - if (len > (AIT_LEN(bufz) - sizeof(struct tagRPCCall))) { - /* add extra buffer */ - if (!(bufz = ait_getVars(&c->cli_buf, 1))) { + /* get next part of packet */ + memset(buf, 0, len); + pfd.fd = TASK_FD(task); + pfd.events = POLLIN | POLLPRI; + for (; len > 0; len -= rlen, buf += rlen) { + if ((rlen = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || + pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { + if (rlen) + LOGERR; + else + rpc_SetErr(ETIMEDOUT, "Timeout reached! Client not respond"); + schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], + TASK_ARG(task), 0, NULL, 0); + return NULL; + } + rlen = recv(TASK_FD(task), buf, len, 0); + if (rlen == -1) { /* close connection */ schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], TASK_ARG(task), 0, NULL, 0); return NULL; - } else { - AIT_FREE_VAL(bufz); - AIT_SET_BUFSIZ(bufz, 0, len); - buf = AIT_GET_BUF(bufz); } - /* buffer isnt last */ - RPC_SET_NEXTBUF(c); } + len = estlen; - /* read payload */ - rlen = recv(TASK_FD(task), buf, len, 0); - if (rlen < len) { - /* close connection */ - schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], - TASK_ARG(task), 0, NULL, 0); +#if 0 + /* check integrity of packet */ + crc = ntohs(rpc->call_crc); + rpc->call_crc ^= rpc->call_crc; + if (crc != crcFletcher16((u_short*) rpc, len / 2)) { + rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); return NULL; } +#endif noreply = RPC_CHK_NOREPLY(rpc); @@ -372,7 +386,7 @@ rxPacket(sched_task_t *task) rpc->call_rep.eno = RPC_ERROR(errno); } else { /* execute RPC call */ - schedEvent(TASK_ROOT(task), execCall, TASK_ARG(task), noreply, rpc, len); + schedEvent(TASK_ROOT(task), execCall, TASK_ARG(task), (int) noreply, rpc, len); } /* send RPC reply */ @@ -391,21 +405,37 @@ acceptClients(sched_task_t *task) rpc_srv_t *srv = TASK_ARG(task); rpc_cli_t *c = NULL; socklen_t salen = sizeof(sockaddr_t); + int sock; +#ifdef TCP_SESSION_TIMEOUT + struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; +#endif c = _allocClient(srv, NULL); - if (!c) + if (!c) { + EVERBOSE(1, "RPC client quota exceeded! Connection will be shutdown!\n"); + if ((sock = accept(TASK_FD(task), NULL, NULL)) != -1) { + shutdown(sock, SHUT_RDWR); + close(sock); + } goto end; + } /* accept client */ c->cli_sock = accept(TASK_FD(task), &c->cli_sa.sa, &salen); if (c->cli_sock == -1) { LOGERR; - ait_freeVars(&c->cli_buf); + AIT_FREE_VAL(&c->cli_buf); array_Del(srv->srv_clients, c->cli_id, 42); goto end; } else fcntl(c->cli_sock, F_SETFL, fcntl(c->cli_sock, F_GETFL) | O_NONBLOCK); +#ifdef TCP_SESSION_TIMEOUT + /* armed timer for close stateless connection */ + schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, c, NULL); + schedTimer(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], c, + ts, c, 0); +#endif schedRead(TASK_ROOT(task), cbProto[srv->srv_proto][CB_RXPACKET], c, c->cli_sock, NULL, 0); end: @@ -420,46 +450,39 @@ txUDPPacket(sched_task_t *task) rpc_cli_t *c = TASK_ARG(task); rpc_srv_t *s = c->cli_parent; rpc_func_t *f = NULL; - u_char *buf; - struct tagRPCCall *rpc = (struct tagRPCCall*) TASK_DATA(task); - int ret, wlen = sizeof(struct tagRPCCall); - int len = sizeof(struct tagRPCCall) + ntohl(rpc->call_len); + u_char *buf = AIT_GET_BUF(&c->cli_buf); + struct tagRPCCall *rpc = (struct tagRPCCall*) buf; + int ret, estlen, wlen = sizeof(struct tagRPCCall); struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; + struct pollfd pfd; schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, TASK_ARG(task), NULL); schedTimer(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], TASK_ARG(task), ts, TASK_ARG(task), 0); - buf = e_malloc(len); - if (!buf) { - rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); - /* close connection */ - schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], - TASK_ARG(task), 0, NULL, 0); - return NULL; - } else { - /* copy RPC header */ - memcpy(buf, rpc, wlen); - rpc = (struct tagRPCCall*) buf; - } - if (rpc->call_argc) { f = rpc_srv_getCall(s, ntohs(rpc->call_tag)); if (!f) { rpc_SetErr(EPROGUNAVAIL, "Function not found at RPC server"); - rpc->call_argc ^= rpc->call_argc; rpc->call_rep.ret = RPC_ERROR(-1); rpc->call_rep.eno = RPC_ERROR(rpc_Errno); } else { + /* calc estimated length */ + estlen = ait_resideVars(RPC_RETVARS(c)) + wlen; + if (estlen > AIT_LEN(&c->cli_buf)) + AIT_RE_BUF(&c->cli_buf, estlen); + buf = AIT_GET_BUF(&c->cli_buf); + rpc = (struct tagRPCCall*) buf; + rpc->call_argc = htons(array_Size(RPC_RETVARS(c))); /* Go Encapsulate variables */ - ret = ait_vars2buffer(buf + wlen, len - wlen, RPC_RETVARS(c)); + ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_buf) - wlen, + RPC_RETVARS(c)); /* Free return values */ ait_freeVars(&c->cli_vars); if (ret == -1) { rpc_SetErr(EBADRPC, "Prepare RPC packet failed"); - rpc->call_argc ^= rpc->call_argc; rpc->call_rep.ret = RPC_ERROR(-1); rpc->call_rep.eno = RPC_ERROR(rpc_Errno); @@ -475,15 +498,30 @@ txUDPPacket(sched_task_t *task) rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2)); /* send reply */ - ret = sendto(TASK_FD(task), buf, wlen, MSG_NOSIGNAL, - &c->cli_sa.sa, c->cli_sa.sa.sa_len); - if (ret == -1 || ret != wlen) { - /* close connection */ - schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], - TASK_ARG(task), 0, NULL, 0); + pfd.fd = TASK_FD(task); + pfd.events = POLLOUT; + for (; wlen > 0; wlen -= ret, buf += ret) { + if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || + pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { + if (ret) + LOGERR; + else + rpc_SetErr(ETIMEDOUT, "Timeout reached! Client not respond"); + /* close connection */ + schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], + TASK_ARG(task), 0, NULL, 0); + return NULL; + } + ret = sendto(TASK_FD(task), buf, MIN(wlen, s->srv_netbuf), MSG_NOSIGNAL, + &c->cli_sa.sa, c->cli_sa.sa.sa_len); + if (ret == -1) { + /* close connection */ + schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], + TASK_ARG(task), 0, NULL, 0); + return NULL; + } } - e_free(buf); return NULL; } @@ -492,66 +530,79 @@ rxUDPPacket(sched_task_t *task) { rpc_srv_t *srv = TASK_ARG(task); rpc_cli_t *c = NULL; - int len, rlen, noreply; - ait_val_t *bufz; - u_char *buf = NULL; - struct tagRPCCall rpcbuf, *rpc; - sockaddr_t sa[2]; + int len, rlen, noreply, estlen; + u_short crc; + u_char *buf, b[sizeof(struct tagRPCCall)]; + struct tagRPCCall *rpc = (struct tagRPCCall*) b; + sockaddr_t sa; socklen_t salen; struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; + struct pollfd pfd; - memset(&rpcbuf, 0, sizeof rpcbuf); - /* receive connect packet */ - salen = sa[0].ss.ss_len = sizeof(sockaddr_t); - rlen = recvfrom(TASK_FD(task), &rpcbuf, sizeof rpcbuf, 0, &sa[0].sa, &salen); - if (rlen < sizeof(struct tagRPCCall) || ntohl(rpcbuf.call_len) < sizeof(struct tagRPCCall)) + salen = sa.ss.ss_len = sizeof(sockaddr_t); + rlen = recvfrom(TASK_FD(task), b, sizeof b, MSG_PEEK, &sa.sa, &salen); + if (rlen < sizeof(struct tagRPCCall)) { + rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); goto end; - else - len = ntohl(rpcbuf.call_len); + } - buf = e_malloc(len); - if (!buf) + c = _allocClient(srv, &sa); + if (!c) { + EVERBOSE(1, "RPC client quota exceeded! Connection will be shutdown!\n"); + usleep(2000); /* blocked client delay */ goto end; - else - memset(buf, 0, len); + } else { + estlen = ntohl(rpc->call_len); + if (estlen > AIT_LEN(&c->cli_buf)) + AIT_RE_BUF(&c->cli_buf, estlen); + rpc = (struct tagRPCCall*) AIT_GET_BUF(&c->cli_buf); + buf = AIT_GET_BUF(&c->cli_buf); + len = estlen; - /* read payload */ - salen = sa[1].ss.ss_len = sizeof(sockaddr_t); - rlen = recvfrom(TASK_FD(task), buf, len, 0, &sa[1].sa, &salen); - if (rlen < len || memcmp(&sa[0], &sa[1], sizeof sa[0])) - goto end; - - c = _allocClient(srv, sa); - if (!c) - goto end; - else { - /* add extra buffer */ - if (!(bufz = ait_getVars(&c->cli_buf, 1))) - goto end; - else { - AIT_FREE_VAL(bufz); - AIT_SET_BUFSIZ(bufz, 0, len); - /* buffer isnt last */ - RPC_SET_NEXTBUF(c); - } - - rpc = rpc_getHeader(c); - memcpy(rpc, &rpcbuf, sizeof(struct tagRPCCall)); - memcpy(rpc_getBuffer(c), buf, len); - c->cli_sock = TASK_FD(task); - memcpy(&c->cli_sa, sa, sizeof c->cli_sa); + memcpy(&c->cli_sa, &sa, sizeof c->cli_sa); + /* armed timer for close stateless connection */ schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, c, NULL); schedTimer(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], c, ts, c, 0); } + /* get next part of packet */ + memset(buf, 0, len); + pfd.fd = TASK_FD(task); + pfd.events = POLLIN | POLLPRI; + for (; len > 0; len -= rlen, buf += rlen) { + if ((rlen = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || + pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { + if (rlen) + LOGERR; + else + rpc_SetErr(ETIMEDOUT, "Timeout reached! Client not respond"); + schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], + c, 0, NULL, 0); + return NULL; + } + salen = sa.ss.ss_len = sizeof(sockaddr_t); + rlen = recvfrom(TASK_FD(task), buf, len, 0, &sa.sa, &salen); + if (rlen == -1) { + /* close connection */ + schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], + c, 0, NULL, 0); + return NULL; + } + if (e_addrcmp(&c->cli_sa, &sa, 42)) + rlen ^= rlen; /* skip if arrive from different address */ + } + len = estlen; + /* check integrity of packet */ - if (ntohs(rpc->call_crc) != crcFletcher16((u_short*) buf, len / 2)) { + crc = ntohs(rpc->call_crc); + rpc->call_crc ^= rpc->call_crc; + if (crc != crcFletcher16((u_short*) rpc, len / 2)) { rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); - goto end; + return NULL; } noreply = RPC_CHK_NOREPLY(rpc); @@ -565,7 +616,7 @@ rxUDPPacket(sched_task_t *task) rpc->call_rep.eno = RPC_ERROR(errno); } else { /* execute RPC call */ - schedEvent(TASK_ROOT(task), execCall, c, noreply, rpc, len); + schedEvent(TASK_ROOT(task), execCall, c, (int) noreply, rpc, len); } /* send RPC reply */ @@ -573,8 +624,6 @@ rxUDPPacket(sched_task_t *task) schedWrite(TASK_ROOT(task), cbProto[srv->srv_proto][CB_TXPACKET], c, TASK_FD(task), rpc, len); end: - if (buf) - e_free(buf); schedReadSelf(task); return NULL; } @@ -588,8 +637,8 @@ rpc_freeBLOBCli(rpc_cli_t * __restrict c) schedCancelby(s->srv_blob.root, taskMAX, CRITERIA_ARG, c, NULL); - /* free buffer(s) */ - ait_freeVars(&c->cli_buf); + /* free buffer */ + AIT_FREE_VAL(&c->cli_buf); array_Del(s->srv_blob.clients, c->cli_id, 0); if (c) @@ -614,7 +663,7 @@ static void * txBLOB(sched_task_t *task) { rpc_cli_t *c = TASK_ARG(task); - u_char *buf = AIT_GET_BUF(array(c->cli_buf, 0, ait_val_t*)); + u_char *buf = AIT_GET_BUF(&c->cli_buf); int wlen = sizeof(struct tagBLOBHdr); /* send reply */ @@ -706,7 +755,7 @@ rxBLOB(sched_task_t *task) } end: - memcpy(AIT_ADDR(array(c->cli_buf, 0, ait_val_t*)), &blob, sizeof blob); + memcpy(AIT_ADDR(&c->cli_buf), &blob, sizeof blob); schedWrite(TASK_ROOT(task), txBLOB, TASK_ARG(task), TASK_FD(task), NULL, 0); schedReadSelf(task); return NULL; @@ -715,7 +764,8 @@ end: static void * flushBLOB(sched_task_t *task) { - rpc_srv_t *srv = TASK_ARG(task); + uintptr_t sigArg = atomic_load_acq_ptr(&_glSigArg); + rpc_srv_t *srv = sigArg ? (void*) sigArg : TASK_ARG(task); rpc_blob_t *b, *tmp; TAILQ_FOREACH_SAFE(b, &srv->srv_blob.blobs, blob_node, tmp) { @@ -725,7 +775,17 @@ flushBLOB(sched_task_t *task) e_free(b); } - schedSignalSelf(task); + if (!schedSignalSelf(task)) { + /* disabled kqueue support in libaitsched */ + struct sigaction sa; + + memset(&sa, 0, sizeof sa); + sigemptyset(&sa.sa_mask); + sa.sa_handler = (void (*)(int)) flushBLOB; + sa.sa_flags = SA_RESTART | SA_RESETHAND; + sigaction(SIGFBLOB, &sa, NULL); + } + return NULL; } @@ -736,6 +796,7 @@ acceptBLOBClients(sched_task_t *task) rpc_cli_t *c = NULL; register int i; socklen_t salen = sizeof(sockaddr_t); + int sock; #ifdef TCP_NOPUSH int n = 1; #endif @@ -743,8 +804,15 @@ acceptBLOBClients(sched_task_t *task) /* check free slots for connect */ for (i = 0; i < array_Size(srv->srv_blob.clients) && (c = array(srv->srv_blob.clients, i, rpc_cli_t*)); i++); - if (c) /* no more free slots! */ + if (c) { /* no more free slots! */ + EVERBOSE(1, "BLOB client quota exceeded! Connection will be shutdown!\n"); + if ((sock = accept(TASK_FD(task), NULL, NULL)) != -1) { + shutdown(sock, SHUT_RDWR); + close(sock); + } goto end; + } + c = e_malloc(sizeof(rpc_cli_t)); if (!c) { LOGERR; @@ -757,20 +825,14 @@ acceptBLOBClients(sched_task_t *task) c->cli_parent = srv; } - /* init buffer(s) */ - c->cli_buf = ait_allocVars(1); - if (!c->cli_buf) { - rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); - array_Del(srv->srv_blob.clients, i, 42); - goto end; - } else - AIT_SET_BUFSIZ(array(c->cli_buf, 0, ait_val_t*), 0, srv->srv_netbuf); + /* alloc empty buffer */ + AIT_SET_BUFSIZ(&c->cli_buf, 0, srv->srv_netbuf); /* accept client */ c->cli_sock = accept(TASK_FD(task), &c->cli_sa.sa, &salen); if (c->cli_sock == -1) { LOGERR; - ait_freeVars(&c->cli_buf); + AIT_FREE_VAL(&c->cli_buf); array_Del(srv->srv_blob.clients, i, 42); goto end; } else { @@ -937,7 +999,19 @@ rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv) return -1; } - schedSignal(srv->srv_blob.root, flushBLOB, srv, SIGFBLOB, NULL, 0); + if (!schedSignal(srv->srv_blob.root, flushBLOB, srv, SIGFBLOB, NULL, 0)) { + /* disabled kqueue support in libaitsched */ + struct sigaction sa; + + atomic_store_rel_ptr(&_glSigArg, (uintptr_t) srv); + + memset(&sa, 0, sizeof sa); + sigemptyset(&sa.sa_mask); + sa.sa_handler = (void (*)(int)) flushBLOB; + sa.sa_flags = SA_RESTART | SA_RESETHAND; + sigaction(SIGFBLOB, &sa, NULL); + } + if (!schedRead(srv->srv_blob.root, acceptBLOBClients, srv, srv->srv_blob.server.cli_sock, NULL, 0)) { rpc_SetErr(sched_GetErrno(), "%s", sched_GetError()); @@ -964,7 +1038,7 @@ rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv) close(c->cli_sock); schedCancelby(srv->srv_blob.root, taskMAX, CRITERIA_ARG, c, NULL); - ait_freeVars(&c->cli_buf); + AIT_FREE_VAL(&c->cli_buf); } array_Del(srv->srv_blob.clients, i, 42); } @@ -1170,7 +1244,7 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv) schedCancelby(srv->srv_root, taskMAX, CRITERIA_ARG, c, NULL); ait_freeVars(&RPC_RETVARS(c)); - ait_freeVars(&c->cli_buf); + AIT_FREE_VAL(&c->cli_buf); } array_Del(srv->srv_clients, i, 42); }