--- libaitrpc/inc/aitrpc.h 2012/05/15 16:06:13 1.8.2.1 +++ libaitrpc/inc/aitrpc.h 2012/05/16 09:02:47 1.8.2.10 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitrpc.h,v 1.8.2.1 2012/05/15 16:06:13 misho Exp $ +* $Id: aitrpc.h,v 1.8.2.10 2012/05/16 09:02:47 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -72,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 */ @@ -114,39 +124,22 @@ typedef enum { typedef struct { uint8_t sess_version; - uint8_t sess_timeout; uint32_t sess_program; - uint16_t sess_process; -} __packed rpc_sess_t; /* size == 8 bytes */ + uint8_t sess_process; +} __packed rpc_sess_t; /* size == 6 bytes */ /* Server managment RPC functions ... */ -/* RPC function registration element! */ -typedef struct tagRPCFunc { - uint16_t func_tag; - uint32_t func_hash; - ait_val_t func_file; - ait_val_t func_name; - - array_t *func_vars; - - void *func_parent; - TAILQ_ENTRY(tagRPCFunc) func_node; -} rpc_func_t; - - /* Network RPC packet - Client request */ struct tagRPCCall { rpc_sess_t call_session; + uint16_t call_seq; uint16_t call_len; + uint16_t call_crc; - uint16_t call_tag; - uint32_t call_hash; - uint16_t call_argc; - union { struct { uint64_t flags; @@ -157,8 +150,10 @@ struct tagRPCCall { } call_rep; }; - uint16_t call_crc; -} __packed; /* size == 28 bytes */ + uint16_t call_tag; + uint16_t call_argc; + ait_val_t call_argv[0]; +} __packed; /* size == 24 bytes */ /* Network BLOB packet - Header */ @@ -174,6 +169,28 @@ struct tagBLOBHdr { /* Network RPC client & server elements */ +/* RPC function registration element! */ +typedef struct tagRPCFunc { + ait_val_t func_name; + + array_t *func_vars; + + void *func_parent; + TAILQ_ENTRY(tagRPCFunc) func_node; +} 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 */ @@ -183,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 */ @@ -207,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; @@ -262,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 */ @@ -277,8 +292,9 @@ int rpc_register_srvServices(rpc_srv_t * __restrict sr * @Port = Port for bind server, if Port == 0 default port is selected * return: NULL == error or !=NULL bind and created RPC server instance */ -rpc_srv_t *rpc_srv_initServer(u_int regProgID, u_int regProcID, int concurentClients, - int netBuf, const char *csHost, u_short Port); +rpc_srv_t *rpc_srv_initServer(unsigned int regProgID, unsigned char regProcID, + int concurentClients, int netBuf, + const char *csHost, unsigned short Port); /* * rpc_srv_endServer() - Destroy RPC server, close all opened sockets and free resources * @@ -294,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 @@ -324,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) @@ -338,40 +354,29 @@ 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 - * @hash = hash for function * return: NULL not found call, !=NULL return call */ -inline rpc_func_t *rpc_srv_getCall(rpc_srv_t * __restrict srv, uint16_t tag, uint32_t hash); +inline rpc_func_t *rpc_srv_getCall(rpc_srv_t * __restrict srv, uint16_t tag); /* * rpc_srv_execCall() - Execute registered call from RPC server * @@ -385,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 @@ -506,17 +501,6 @@ int rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_va */ inline int rpc_cli_getBLOB(rpc_cli_t * __restrict cli, ait_val_t * __restrict var, 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 */