--- libaitrpc/inc/aitrpc.h 2012/05/17 07:53:03 1.8.2.16 +++ libaitrpc/inc/aitrpc.h 2012/05/17 14:22:24 1.8.2.19 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitrpc.h,v 1.8.2.16 2012/05/17 07:53:03 misho Exp $ +* $Id: aitrpc.h,v 1.8.2.19 2012/05/17 14:22:24 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -74,8 +74,7 @@ SUCH DAMAGE. #define CALL_TAG_MAX 65535 -#define CALL_SRVPING 65535 -#define CALL_BLOBPING 65534 +#define CALL_SRVPING 65534 #define CALL_SRVSHUTDOWN 65533 #define CALL_SRVCLIENTS 65532 @@ -199,6 +198,7 @@ typedef struct { rpc_sess_t srv_session; /* RPC session registration info */ int srv_netbuf; /* size of network buffer */ + pthread_t srv_tid; /* RPC exec pthread */ sched_root_task_t *srv_root; /* RPC server scheduler */ intptr_t srv_kill; /* Scheduler condition variable */ @@ -208,6 +208,7 @@ typedef struct { TAILQ_HEAD(, tagRPCFunc) srv_funcs; /* RPC functions list */ struct { + pthread_t tid; /* BLOB exec pthread */ sched_root_task_t *root; /* BLOB server scheduler */ intptr_t kill; /* BLOB server state: ==0 disable | !=0 enable */ @@ -225,14 +226,14 @@ 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 *); -// ----------------------------------------------------------------------- +/* ----------------------------------------------------------------------- */ /* Error support functions */ @@ -259,6 +260,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 @@ -304,14 +312,14 @@ void rpc_srv_endServer(rpc_srv_t ** __restrict psrv); * return: -1 error or 0 ok, infinite loop ... */ int rpc_srv_loopServer(rpc_srv_t * __restrict srv); -#define rpc_srv_execServer(_srv, _sync) do { assert((_srv)); pthread_t __tid; \ +#define rpc_srv_execServer(_srv, _sync) do { assert((_srv)); \ if (!(_srv)->srv_kill) { \ - pthread_create(&__tid, NULL, (void*(*)(void*)) \ + pthread_create(&(_srv)->srv_tid, NULL, (void*(*)(void*)) \ rpc_srv_loopServer, (_srv)); \ if ((_sync)) \ - pthread_join(__tid, (void**) (_sync)); \ + pthread_join((_srv)->srv_tid, (void**) (_sync)); \ else \ - pthread_detach(__tid); \ + pthread_detach((_srv)->srv_tid); \ } } while (0) /* @@ -322,7 +330,7 @@ int rpc_srv_loopServer(rpc_srv_t * __restrict srv); * @diskDir = Disk place for BLOB file objects * return: -1 == error or 0 bind and created BLOB server instance */ -int rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_short Port, const char *diskDir); +int rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, unsigned short Port, const char *diskDir); /* * rpc_srv_endBLOBServer() - Destroy BLOB server, close all opened sockets and free resources * @@ -337,11 +345,12 @@ void rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) * return: -1 error or 0 ok, infinite loop ... */ int rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv); -#define rpc_srv_execBLOBServer(_srv) do { assert((_srv)); pthread_t __tid; \ +#define rpc_srv_execBLOBServer(_srv) do { assert((_srv)); \ if (!(_srv)->srv_kill && !(_srv)->srv_blob.kill) { \ - pthread_create(&__tid, NULL, (void*(*)(void*)) \ + pthread_create(&(_srv)->srv_blob.tid, NULL, \ + (void*(*)(void*)) \ rpc_srv_loopBLOBServer, (_srv)); \ - pthread_detach(__tid); \ + pthread_detach((_srv)->srv_blob.tid); \ } \ } while (0) @@ -525,12 +534,19 @@ void rpc_cli_closeClient(rpc_cli_t ** __restrict cli); * @cli = RPC Client session * @noreply = We not want RPC reply * @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() + * @in_vars = IN RPC call array of rpc values, may be NULL + * @out_vars = OUT returned array of rpc values, if !=NULL must be free after use with io_freeVars() * return: -1 error or != -1 ok result */ -int rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short tag, +int rpc_cli_execCall(rpc_cli_t *cli, int noreply, unsigned short tag, array_t * __restrict in_vars, array_t ** __restrict out_vars); +/* + * rpc_cli_ping() - Ping RPC server + * + * @cli = connected client + * return: -1 error or !=-1 ping seq id + */ +inline int rpc_cli_ping(rpc_cli_t *cli); /* @@ -540,7 +556,7 @@ int rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_sh * @Port = Port for bind server, if Port == 0 default port is selected * return: NULL == error or !=NULL connection to BLOB server established */ -rpc_cli_t *rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, u_short Port); +rpc_cli_t *rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, unsigned short Port); /* * rpc_cli_closeBLOBClient() - Close connection to BLOB server and free resources *