--- libaitrpc/src/srv.c 2012/05/11 08:49:43 1.8.2.3 +++ libaitrpc/src/srv.c 2012/05/11 13:35:22 1.8.2.7 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.8.2.3 2012/05/11 08:49:43 misho Exp $ +* $Id: srv.c,v 1.8.2.7 2012/05/11 13:35:22 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -60,8 +60,6 @@ txPacket(sched_task_t *task) int ret, wlen = sizeof(struct tagRPCCall); array_t *arr = NULL; - ioTRACE(RPC_TRACE_LEVEL); - if (rpc->call_argc) { f = rpc_srv_getCall(s, ntohs(rpc->call_tag), ntohl(rpc->call_hash)); if (!f) { @@ -96,8 +94,6 @@ txPacket(sched_task_t *task) else if (ret != wlen) rpc_SetErr(EPROCUNAVAIL, "RPC reply, should be send %d bytes, " "really sended %d bytes", wlen, ret); - else - ioDEBUG(RPC_DEBUG_LEVEL, "Sended %d bytes", ret); return NULL; } @@ -113,8 +109,6 @@ execCall(sched_task_t *task) struct tagRPCCall *rpc = (struct tagRPCCall*) buf; int argc = ntohs(rpc->call_argc); - ioTRACE(RPC_TRACE_LEVEL); - /* Go decapsulate variables ... */ if (argc) { arr = io_buffer2vars(buf + sizeof(struct tagRPCCall), @@ -135,9 +129,6 @@ execCall(sched_task_t *task) rpc->call_rep.ret = RPC_ERROR(-1); rpc->call_rep.eno = RPC_ERROR(rpc_Errno); } else { - ioDEBUG(RPC_DEBUG_LEVEL, "RPC function %s from module %s", - AIT_GET_STR(&f->func_name), AIT_GET_LIKE(&f->func_file, char*)); - /* if client doesn't want reply */ argc = rpc->call_req.flags & RPC_NOREPLY; rpc->call_rep.ret = RPC_ERROR(rpc_srv_execCall(f, rpc, arr)); @@ -171,8 +162,6 @@ rxPacket(sched_task_t *task) struct tagRPCCall *rpc; struct timespec ts; - ioTRACE(RPC_TRACE_LEVEL); - memset(buf, 0, TASK_DATLEN(task)); rlen = recv(TASK_FD(task), buf, TASK_DATLEN(task), 0); if (rlen == -1) { @@ -182,8 +171,7 @@ rxPacket(sched_task_t *task) } else if (!rlen) { /* receive EOF */ s->srv_kill = s->srv_blob.state = kill; return NULL; - } else - ioDEBUG(RPC_DEBUG_LEVEL, "Readed %d bytes", rlen); + } do { if (rlen < sizeof(struct tagRPCCall)) { @@ -252,8 +240,6 @@ rpc_srv_dispatchCall(void *arg) sched_root_task_t *root; struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; - ioTRACE(RPC_TRACE_LEVEL); - if (!arg) { rpc_SetErr(EINVAL, "Invalid parameter can`t procced RPC client"); return NULL; @@ -297,8 +283,6 @@ txBLOB(sched_task_t *task) struct tagBLOBHdr *blob = (struct tagBLOBHdr *) buf; int wlen = sizeof(struct tagBLOBHdr); - ioTRACE(RPC_TRACE_LEVEL); - /* calculate CRC */ blob->hdr_crc ^= blob->hdr_crc; blob->hdr_crc = htons(crcFletcher16((u_short*) buf, wlen / 2)); @@ -310,8 +294,6 @@ txBLOB(sched_task_t *task) else if (wlen != sizeof(struct tagBLOBHdr)) rpc_SetErr(EPROCUNAVAIL, "RPC reply, should be send %d bytes, " "really sended %d bytes", sizeof(struct tagBLOBHdr), wlen); - else - ioDEBUG(RPC_DEBUG_LEVEL, "Sended %d bytes", wlen); return NULL; } @@ -328,8 +310,6 @@ rxBLOB(sched_task_t *task) u_short crc; struct timespec ts; - ioTRACE(RPC_TRACE_LEVEL); - /* check for disable service at this moment? */ if (!s || s->srv_blob.state == disable) { usleep(100000); @@ -350,8 +330,7 @@ rxBLOB(sched_task_t *task) } else if (!rlen || s->srv_kill == kill) { /* receive EOF */ s->srv_blob.state = kill; return NULL; - } else - ioDEBUG(RPC_DEBUG_LEVEL, "Readed %d bytes", rlen); + } if (rlen < sizeof(struct tagBLOBHdr)) { rpc_SetErr(ERPCMISMATCH, "Too short BLOB packet"); @@ -444,8 +423,6 @@ rpc_srv_dispatchVars(void *arg) u_char *buf; struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; - ioTRACE(RPC_TRACE_LEVEL); - if (!arg) { rpc_SetErr(EINVAL, "Invalid parameter can`t procced BLOB"); return NULL; @@ -497,8 +474,6 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s int n = 1; io_sockaddr_t sa; - ioTRACE(RPC_TRACE_LEVEL); - if (!srv) { rpc_SetErr(EINVAL, "Invalid parameters can`t init BLOB server"); return -1; @@ -601,8 +576,6 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) register int i; rpc_blob_t *f; - ioTRACE(RPC_TRACE_LEVEL); - if (!srv || srv->srv_blob.state == disable) return; else @@ -653,8 +626,6 @@ rpc_srv_loopBLOB(rpc_srv_t * __restrict srv) pthread_attr_t attr; struct pollfd pfd; - ioTRACE(RPC_TRACE_LEVEL); - if (!srv || srv->srv_blob.state == kill) { rpc_SetErr(EINVAL, "Invalid parameter can`t start BLOB server"); return -1; @@ -664,12 +635,13 @@ rpc_srv_loopBLOB(rpc_srv_t * __restrict srv) LOGERR; return -1; } else - fcntl(srv->srv_server.cli_sock, F_SETFL, fcntl(srv->srv_server.cli_sock, F_GETFL) | O_NONBLOCK); + 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_server.cli_sock; + 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) { @@ -735,8 +707,6 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i struct hostent *host = NULL; io_sockaddr_t sa; - ioTRACE(RPC_TRACE_LEVEL); - if (!concurentClients || !regProgID || (family != AF_INET && family != AF_INET6 && family != AF_LOCAL)) { rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t init RPC server ...\n"); @@ -864,8 +834,6 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv) register int i; rpc_func_t *f; - ioTRACE(RPC_TRACE_LEVEL); - if (!psrv || !*psrv) { rpc_SetErr(EINVAL, "Error:: Can`t destroy server because parameter is null!\n"); return; @@ -916,8 +884,6 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv) pthread_attr_t attr; struct pollfd pfd; - ioTRACE(RPC_TRACE_LEVEL); - if (!srv) { rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t start RPC server ...\n"); return -1; @@ -929,8 +895,9 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv) if (listen(srv->srv_server.cli_sock, SOMAXCONN) == -1) { LOGERR; return -1; - } else + } /*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); @@ -994,8 +961,6 @@ rpc_srv_execCall(rpc_func_t * __restrict call, struct void *dl; rpc_callback_t func; int ret; - - ioTRACE(RPC_TRACE_LEVEL); if (!call || !rpc || !call->func_parent) { rpc_SetErr(EINVAL, "Invalid parameter can`t exec function");