--- libaitrpc/inc/aitrpc.h 2012/05/15 20:49:24 1.8.2.2 +++ libaitrpc/inc/aitrpc.h 2012/05/16 13:17:51 1.8.2.11 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitrpc.h,v 1.8.2.2 2012/05/15 20:49:24 misho Exp $ +* $Id: aitrpc.h,v 1.8.2.11 2012/05/16 13:17:51 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -58,7 +58,6 @@ SUCH DAMAGE. #endif #include #include -#include #include #include @@ -73,15 +72,25 @@ SUCH DAMAGE. /* RPC builtin registed calls */ +#define CALL_MAX_ID 65535 + #define CALL_BLOBSHUTDOWN "rpcBLOBServerShutdown" +#define CALL_BLOBSHUTDOWN_ID 65530 #define CALL_BLOBCLIENTS "rpcBLOBServerClients" +#define CALL_BLOBCLIENTS_ID 65529 #define CALL_BLOBVARS "rpcBLOBServerVars" +#define CALL_BLOBVARS_ID 65528 #define CALL_BLOBSTATE "rpcBLOBServerState" +#define CALL_BLOBSTATE_ID 65527 #define CALL_SRVSHUTDOWN "rpcServerShutdown" +#define CALL_SRVSHUTDOWN_ID 65534 #define CALL_SRVCLIENTS "rpcServerClients" +#define CALL_SRVCLIENTS_ID 65533 #define CALL_SRVCALLS "rpcServerCalls" +#define CALL_SRVCALLS_ID 65532 #define CALL_SRVSESSIONS "rpcServerSessions" +#define CALL_SRVSESSIONS_ID 65531 /* RPC types */ @@ -144,7 +153,7 @@ struct tagRPCCall { uint16_t call_tag; uint16_t call_argc; ait_val_t call_argv[0]; -} __packed; /* size == 24 bytes */ +} __packed; /* size == 24 bytes */ /* Network BLOB packet - Header */ @@ -171,6 +180,17 @@ typedef struct tagRPCFunc { } rpc_func_t; +/* BLOB register element */ +typedef struct tagBLOB { + uint32_t blob_var; /* BLOB id */ + + size_t blob_len; /* size of allocated BLOB data */ + void *blob_data; /* mapped BLOB data */ + + TAILQ_ENTRY(tagBLOB) blob_node; +} rpc_blob_t; + + typedef struct { int cli_id; /* slot id */ int cli_sock; /* socket fd */ @@ -180,17 +200,6 @@ typedef struct { void *cli_parent; /* pointer to parent rpc_srv_t for server or to rpc_sess_t for client */ } rpc_cli_t; - -/* BLOB registration element! */ -typedef struct tagBLOB { - uint32_t blob_var; - - size_t blob_len; // size of allocated BLOB data - void *blob_data; // BLOB data - - struct tagBLOB *blob_next; -} rpc_blob_t; - typedef struct { rpc_sess_t srv_session; /* RPC session registration info */ int srv_netbuf; /* size of network buffer */ @@ -204,13 +213,15 @@ typedef struct { TAILQ_HEAD(, tagRPCFunc) srv_funcs; /* RPC functions list */ struct { - cmd_type_t state; // BLOB server state: ==0 disable | !=0 enable - ait_val_t dir; + sched_root_task_t *root; /* BLOB server scheduler */ + intptr_t kill; /* BLOB server state: ==0 disable | !=0 enable */ - rpc_cli_t server; // BLOB server socket - rpc_cli_t *clients; // connected blob client sockets + ait_val_t dir; /* BLOB states directory */ - rpc_blob_t *blobs; // registered blob variables list + rpc_cli_t server; /* BLOB server socket */ + array_t *clients; /* connected blob client sockets */ + + TAILQ_HEAD(, tagBLOB) blobs; /* registered blob variables list */ } srv_blob; } rpc_srv_t; @@ -259,6 +270,13 @@ inline int rpc_addPktSession(rpc_sess_t *p, rpc_sess_t * return: -1 error or 0 ok */ int rpc_register_srvServices(rpc_srv_t * __restrict srv); +/* + * rpc_register_blobServices() - Register internal service functions + * + * @srv = RPC server instance + * return: -1 error or 0 ok + */ +int rpc_register_blobServices(rpc_srv_t * __restrict srv); /* RPC Server side functions */ @@ -292,13 +310,14 @@ void rpc_srv_endServer(rpc_srv_t ** __restrict psrv); */ int rpc_srv_loopServer(rpc_srv_t * __restrict srv); #define rpc_srv_execServer(_srv, _sync) do { assert((_srv)); pthread_t __tid; \ - pthread_create(&__tid, NULL, (void*(*)(void*)) \ - rpc_srv_loopServer, (_srv)); \ - if ((_sync)) \ - pthread_join(__tid, (void**) (_sync)); \ - else \ - pthread_detach(__tid); \ - } while (0) + if (!(_srv)->srv_kill) { \ + pthread_create(&__tid, NULL, (void*(*)(void*)) \ + rpc_srv_loopServer, (_srv)); \ + if ((_sync)) \ + pthread_join(__tid, (void**) (_sync)); \ + else \ + pthread_detach(__tid); \ + } } while (0) /* * rpc_srv_initBLOBServer() - Init & create BLOB Server @@ -322,13 +341,12 @@ void rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) * @srv = RPC Server instance * return: -1 error or 0 ok, infinite loop ... */ -int rpc_srv_loopBLOB(rpc_srv_t * __restrict srv); +int rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv); #define rpc_srv_execBLOBServer(_srv) do { assert((_srv)); pthread_t __tid; \ - if ((_srv)->srv_blob.state == enable) { \ + if (!(_srv)->srv_kill && !(_srv)->srv_blob.kill) { \ pthread_create(&__tid, NULL, (void*(*)(void*)) \ - rpc_srv_loopBLOB, (_srv)); \ + rpc_srv_loopBLOBServer, (_srv)); \ pthread_detach(__tid); \ - (_srv)->srv_blob.state = running; \ } \ } while (0) @@ -336,35 +354,25 @@ int rpc_srv_loopBLOB(rpc_srv_t * __restrict srv); * rpc_srv_registerCall() - Register call to RPC server * * @srv = RPC Server instance - * @csModule = Module name, if NULL self binary - * @csFunc = Function name - * @args = Number of return function arguments, use for restriction case! - * return: -1 error or 0 register ok + * @tag = Function tag + * @funcaddr = Function address + * @args = Number of return function arguments + * return: -1 error, 0 already registered tag or 1 register ok */ -int rpc_srv_registerCall(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc, - unsigned short args); +int rpc_srv_registerCall(rpc_srv_t * __restrict srv, unsigned short tag, + void *funcaddr, unsigned short args); /* * rpc_srv_unregisterCall() - Unregister call from RPC server * * @srv = RPC Server instance - * @csModule = Module name, if NULL self binary - * @csFunc = Function name + * @tag = Function tag * return: -1 error, 0 not found call, 1 unregister ok */ -int rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc); +int rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, unsigned short tag); /* - * rpc_srv_getFunc() - Get registered call from RPC server by Name + * rpc_srv_getCall() - Get registered call from RPC server * * @srv = RPC Server instance - * @csModule = Module name, if NULL self binary - * @csFunc = Function name - * return: NULL not found call, !=NULL return call - */ -rpc_func_t *rpc_srv_getFunc(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc); -/* - * rpc_srv_getCall() - Get registered call from RPC server - * - * @srv = RPC Server instance * @tag = tag for function * return: NULL not found call, !=NULL return call */ @@ -382,18 +390,8 @@ int rpc_srv_execCall(rpc_func_t * __restrict call, str /* - * rpc_srv_getVars() - Get variables array for RPC call + * rpc_srv_blobCreate() - Create and map blob to memory region and return object * - * @call = RPC function call - * @vars = Returned variables array, may be NULL - * return: -1 error, !=-1 Number of returned variables - */ -inline int rpc_srv_getVars(rpc_func_t * __restrict call, array_t ** __restrict vars); - - -/* - * rpc_srv_blobCreate() - Create map blob to memory region and return object - * * @srv = RPC Server instance * @len = BLOB length object * return: NULL error or !=NULL allocated BLOB object @@ -505,17 +503,6 @@ inline int rpc_cli_getBLOB(rpc_cli_t * __restrict cli, void ** __restrict data); -/* - * rpc_calcHashes() - Calculate hashes for RPC call - * - * @func = function - * @csModule = Module name, if NULL self binary - * @csFunc = Function name - * return: -1 error or 0 ok - */ -int rpc_calcHashes(rpc_func_t * __restrict func, const char *csModule, const char *csFunc); - - /* RPC Client side functions */ /* @@ -524,34 +511,31 @@ int rpc_calcHashes(rpc_func_t * __restrict func, const * @ProgID = ProgramID for RPC session request * @ProcID = ProcessID for RPC session request * @netBuf = Network buffer length, if =0 == BUFSIZ (also meaning max RPC packet) - * @Timeout = RPC timeout in seconds, if =0 set default RPC timeout * @family = Family socket type, AF_INET or AF_INET6 * @csHost = Host name or IP address for bind server * @Port = Port for bind server, if Port == 0 default port is selected * return: NULL == error or !=NULL connection to RPC server established */ -rpc_cli_t *rpc_cli_openClient(unsigned int ProgID, unsigned int ProcID, int netBuf, - unsigned char Timeout, unsigned short family, - const char *csHost, unsigned short Port); +rpc_cli_t *rpc_cli_openClient(unsigned int ProgID, unsigned char ProcID, int netBuf, + unsigned short family, const char *csHost, unsigned short Port); /* * rpc_cli_closeClient() - Close connection to RPC server and free resources * * @cli = RPC Client session * return: none */ -void rpc_cli_closeClient(rpc_cli_t * __restrict cli); +void rpc_cli_closeClient(rpc_cli_t ** __restrict cli); /* * rpc_cli_execCall() - Execute RPC call * * @cli = RPC Client session * @noreply = We not want RPC reply - * @csModule = Module name, if NULL self binary - * @csFunc = Function name for execute + * @tag = Function tag for execution * @in_vars = IN RPC call array of rpc values * @out_vars = OUT returned array of rpc values, must be free after use with rpc_cli_freeVals() * return: -1 error or != -1 ok result */ -int rpc_cli_execCall(rpc_cli_t *cli, int noreply, const char *csModule, const char *csFunc, +int rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short tag, array_t * __restrict in_vars, array_t ** __restrict out_vars); @@ -569,7 +553,7 @@ rpc_cli_t *rpc_cli_openBLOBClient(rpc_cli_t * __restri * @cli = BLOB Client session * return: none */ -void rpc_cli_closeBLOBClient(rpc_cli_t * __restrict cli); +void rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli); #endif