--- libaitrpc/src/srv.c 2011/09/01 11:39:27 1.4.2.5 +++ libaitrpc/src/srv.c 2011/09/07 08:56:32 1.5.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.4.2.5 2011/09/01 11:39:27 misho Exp $ +* $Id: srv.c,v 1.5.2.1 2011/09/07 08:56:32 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -97,14 +97,14 @@ rpc_srv_dispatchCall(void *arg) break; } if (ret < sizeof(struct tagRPCCall)) { - rpc_SetErr(EMSGSIZE, "Error:: too short RPC packet ...\n"); + rpc_SetErr(ERPCMISMATCH, "Error:: too short RPC packet ...\n"); ret = -4; break; } else rpc = (struct tagRPCCall*) buf; /* check RPC packet session info */ - if (memcmp(&rpc->call_session, &s->srv_session, sizeof rpc->call_session)) { - rpc_SetErr(EINVAL, "Error:: get invalid RPC session ...\n"); + if (rpc_chkPktSession(&rpc->call_session, &s->srv_session)) { + rpc_SetErr(ERPCMISMATCH, "Error:: get invalid RPC session ...\n"); ret = -5; goto makeReply; } else @@ -117,13 +117,14 @@ rpc_srv_dispatchCall(void *arg) ret = -5; goto makeReply; } - } + } else + arr = NULL; /* execute call */ argc = 0; memcpy(&ses, &rpc->call_session, sizeof ses); if (!(f = rpc_srv_getCall(s, rpc->call_tag, rpc->call_hash))) { - rpc_SetErr(EINVAL, "Error:: call not found into RPC server ...\n"); + rpc_SetErr(EPROGUNAVAIL, "Error:: call not found into RPC server ...\n"); ret = -6; } else if ((ret = rpc_srv_execCall(f, rpc, arr)) == -1) @@ -157,7 +158,7 @@ makeReply: rpc_srv_freeVals(f); argc = 0; ret = -7; - rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet values (-7) ...\n"); + rpc_SetErr(EBADRPC, "Error:: in prepare RPC packet values (-7) ...\n"); goto makeReply; } else { Limit += i; @@ -173,7 +174,7 @@ makeReply: break; } if (ret != Limit) { - rpc_SetErr(ECANCELED, "Error:: in send RPC request, should be send %d bytes, " + rpc_SetErr(EPROCUNAVAIL, "Error:: in send RPC request, should be send %d bytes, " "really is %d\n", Limit, ret); ret = -9; break; @@ -240,7 +241,7 @@ rpc_srv_dispatchVars(void *arg) break; } if (ret < sizeof(struct tagBLOBHdr)) { - rpc_SetErr(EMSGSIZE, "Error:: too short BLOB packet ...\n"); + rpc_SetErr(ERPCMISMATCH, "Error:: too short BLOB packet ...\n"); ret = -4; break; } else @@ -284,7 +285,7 @@ rpc_srv_dispatchVars(void *arg) ret = -7; break; default: - rpc_SetErr(EINVAL, "Error:: unsupported BLOB command (%d)...\n", + rpc_SetErr(EPROCUNAVAIL, "Error:: unsupported BLOB command (%d)...\n", blob->hdr_cmd); ret = -7; } @@ -300,7 +301,7 @@ makeReply: break; } if (ret != sizeof buf) { - rpc_SetErr(ECANCELED, "Error:: in send BLOB reply, should be send %d bytes, " + rpc_SetErr(EPROCUNAVAIL, "Error:: in send BLOB reply, should be send %d bytes, " "really is %d\n", sizeof buf, ret); ret = -9; break; @@ -310,7 +311,7 @@ makeReply: shutdown(c->cli_sock, SHUT_RDWR); close(c->cli_sock); memset(c, 0, sizeof(rpc_cli_t)); - return (void*) (long)ret; + return (void*) ((long)ret); } // ------------------------------------------------- @@ -410,12 +411,10 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s pthread_mutex_init(&srv->srv_blob.mtx, NULL); - pthread_mutex_lock(&srv->srv_mtx); 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, 1); - pthread_mutex_unlock(&srv->srv_mtx); + rpc_srv_registerCall(srv, NULL, CALL_BLOBSTATE, 0); srv->srv_blob.state = enable; /* enable BLOB */ return 0; @@ -450,13 +449,13 @@ 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; } /* detach blobs */ - pthread_mutex_lock(&srv->srv_blob.mtx); while ((f = srv->srv_blob.blobs)) { srv->srv_blob.blobs = f->blob_next; rpc_srv_blobFree(srv, f); @@ -469,12 +468,12 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) } /* - * rpc_srv_execBLOBServer() Execute Main BLOB server loop and wait for clients requests + * rpc_srv_loopBLOB() 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_execBLOBServer(rpc_srv_t * __restrict srv) +rpc_srv_loopBLOB(rpc_srv_t * __restrict srv) { socklen_t salen = sizeof(struct sockaddr); register int i; @@ -498,9 +497,10 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv) if (!c->cli_sa.sa_family) break; if (i >= srv->srv_numcli) { - usleep(1000000); #ifdef HAVE_PTHREAD_YIELD pthread_yield(); +#else + usleep(1000000); #endif continue; } @@ -530,7 +530,7 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv) pthread_detach(c->cli_tid); } - srv->srv_blob.state = disable; + srv->srv_blob.state = kill; return 0; } @@ -729,12 +729,12 @@ rpc_srv_endServer(rpc_srv_t * __restrict srv) } /* - * rpc_srv_execServer() Execute Main server loop and wait for clients requests + * rpc_srv_loopServer() Execute Main server loop and wait for clients requests * @srv = RPC Server instance * return: -1 error or 0 ok, infinite loop ... */ int -rpc_srv_execServer(rpc_srv_t * __restrict srv) +rpc_srv_loopServer(rpc_srv_t * __restrict srv) { socklen_t salen = sizeof(struct sockaddr); register int i; @@ -748,6 +748,9 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv) return -1; } + /* 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; @@ -758,9 +761,10 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv) if (!c->cli_sa.sa_family) break; if (i >= srv->srv_numcli) { - usleep(1000000); #ifdef HAVE_PTHREAD_YIELD pthread_yield(); +#else + usleep(1000000); #endif continue; }