--- libaitrpc/inc/aitrpc.h 2012/05/16 07:24:08 1.8.2.6 +++ libaitrpc/inc/aitrpc.h 2012/05/17 08:42:32 1.8.2.17 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitrpc.h,v 1.8.2.6 2012/05/16 07:24:08 misho Exp $ +* $Id: aitrpc.h,v 1.8.2.17 2012/05/17 08:42:32 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -72,31 +72,23 @@ SUCH DAMAGE. /* RPC builtin registed calls */ -#define CALL_MAX_ID 65535 +#define CALL_TAG_MAX 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_SRVPING 65534 -#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 +#define CALL_SRVSHUTDOWN 65533 +#define CALL_SRVCLIENTS 65532 +#define CALL_SRVCALLS 65531 +#define CALL_SRVSESSIONS 65530 +#define CALL_BLOBSHUTDOWN 65529 +#define CALL_BLOBCLIENTS 65528 +#define CALL_BLOBVARS 65527 + /* RPC types */ typedef enum { - disable, enable, running, kill, /* for blob.state */ ok, error, no, /* for blob reply */ get, set, unset /* for blob request */ } cmd_type_t; @@ -165,7 +157,7 @@ struct tagBLOBHdr { uint32_t hdr_ret; uint16_t hdr_crc; uint8_t hdr_pad; -} __packed; +} __packed; /* size == 22 bytes */ /* Network RPC client & server elements */ @@ -178,8 +170,21 @@ typedef struct tagRPCFunc { void *func_parent; TAILQ_ENTRY(tagRPCFunc) func_node; } rpc_func_t; +#define RPC_FUNC_RETVARS(x) ((x)->func_vars) +#define RPC_FUNC_SERVER(x) ((rpc_srv_t*) (x)->func_parent) +/* 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 */ @@ -189,17 +194,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 */ @@ -213,13 +207,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; @@ -228,11 +224,11 @@ typedef struct { * (*rpc_callback_t)() - Callback type definition for RPC call in server process * * @arg1 = current execution RPC call function - * @arg2 = number of items in input array from call request + * @arg2 = RPC packet header * @arg3 = input array with values from RPC call execution request * return: -1 error or >-1 success execution */ -typedef int (*rpc_callback_t)(rpc_func_t *, int, array_t *); +typedef int (*rpc_callback_t)(rpc_func_t *, struct tagRPCCall *, array_t *); // ----------------------------------------------------------------------- @@ -262,6 +258,13 @@ inline int rpc_chkPktSession(rpc_sess_t *p, rpc_sess_t */ inline int rpc_addPktSession(rpc_sess_t *p, rpc_sess_t *s); /* + * rpc_register_srvPing() - Register ping service function + * + * @srv = RPC server instance + * return: -1 error or 0 ok + */ +inline int rpc_register_srvPing(rpc_srv_t * __restrict srv); +/* * rpc_register_srvServices() - Register internal service functions * * @srv = RPC server instance @@ -308,13 +311,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 @@ -338,13 +342,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) @@ -388,7 +391,7 @@ int rpc_srv_execCall(rpc_func_t * __restrict call, str /* - * rpc_srv_blobCreate() - Create map blob to memory region and return object + * rpc_srv_blobCreate() - Create and map blob to memory region and return object * * @srv = RPC Server instance * @len = BLOB length object @@ -509,14 +512,11 @@ inline int rpc_cli_getBLOB(rpc_cli_t * __restrict cli, * @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, +rpc_cli_t *rpc_cli_openClient(unsigned int ProgID, unsigned char ProcID, int netBuf, const char *csHost, unsigned short Port); /* * rpc_cli_closeClient() - Close connection to RPC server and free resources @@ -524,19 +524,18 @@ rpc_cli_t *rpc_cli_openClient(unsigned int ProgID, uns * @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); @@ -554,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