--- libaitrpc/inc/aitrpc.h 2011/08/30 09:07:55 1.3.2.2 +++ libaitrpc/inc/aitrpc.h 2011/09/03 12:39:27 1.3.2.6 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitrpc.h,v 1.3.2.2 2011/08/30 09:07:55 misho Exp $ +* $Id: aitrpc.h,v 1.3.2.6 2011/09/03 12:39:27 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -79,9 +79,9 @@ SUCH DAMAGE. /* RPC types */ typedef enum { - disable, enable, kill, /* for blob.state */ - ok, error, /* for blob reply */ - get, set, unset /* for blob request */ + disable, enable, running, kill, /* for blob.state */ + ok, error, /* for blob reply */ + get, set, unset /* for blob request */ } cmd_type_t; @@ -94,7 +94,7 @@ typedef enum { } while (0) #define RPC_CALLBACK_CHK_ARGS(_f, _n) do { \ RPC_CALLBACK_CHECK_INPUT((_f)); \ - if ((_f) && (_f)->func_args != _n) { \ + if ((_f) && io_arraySize((_f)->func_vars) != _n) { \ rpc_SetErr(22, "Error:: different number of arguments!\n"); \ return -1; \ } \ @@ -119,8 +119,7 @@ typedef struct tagRPCFunc { int8_t func_file[MAXPATHLEN]; int8_t func_name[UCHAR_MAX + 1]; - int8_t func_args; - ait_val_t *func_vars; + array_t *func_vars; void *func_parent; struct tagRPCFunc *func_next; @@ -133,7 +132,7 @@ struct tagRPCCall { rpc_sess_t call_session; uint16_t call_tag; uint32_t call_hash; - uint8_t call_argc; + uint16_t call_argc; } __packed; /* Network RPC packet - Server response */ @@ -144,7 +143,7 @@ struct tagRPCRet { uint32_t ret_hash; int32_t ret_retcode; int32_t ret_errno; - uint8_t ret_argc; + uint16_t ret_argc; } __packed; /* Network BLOB packet - Header */ @@ -165,6 +164,7 @@ typedef struct { pthread_t cli_tid; // TID of thread void *cli_parent; // pointer to parent rpc_srv_t for server or to rpc_sess_t for client + int cli_netbuf; // size of network buffer size } rpc_cli_t; @@ -212,7 +212,7 @@ typedef struct { * @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, ait_val_t *); +typedef int (*rpc_callback_t)(rpc_func_t *, int, array_t *); // ----------------------------------------------------------------------- @@ -232,7 +232,7 @@ inline const char *rpc_GetError(); * @regProgID = ProgramID for authentication & recognition * @regProcID = ProcessID for authentication & recognition * @concurentClients = Concurent clients at same time to this server - * @netBuf = Network buffer length, if =0 == BUFSIZ + * @netBuf = Network buffer length, if =0 == BUFSIZ (also meaning max RPC packet) * @family = Family type, AF_INET, AF_INET6 or AF_LOCAL * @csHost = Host name or address for bind server, if NULL any address * @Port = Port for bind server, if Port == 0 default port is selected @@ -247,11 +247,19 @@ rpc_srv_t *rpc_srv_initServer(u_int regProgID, u_int r */ void 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); +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) /* * rpc_srv_initBLOBServer() Init & create BLOB Server @@ -268,11 +276,19 @@ int rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, */ void 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); +int rpc_srv_loopBLOB(rpc_srv_t * __restrict srv); +#define rpc_srv_execBLOBServer(_srv) do { assert((_srv)); pthread_t __tid; \ + if ((_srv)->srv_blob.state == enable) { \ + pthread_create(&__tid, NULL, (void*(*)(void*)) \ + rpc_srv_loopBLOB, (_srv)); \ + pthread_detach(__tid); \ + (_srv)->srv_blob.state = running; \ + } \ + } while (0) /* * rpc_srv_registerCall() Register call to RPC server @@ -283,7 +299,7 @@ int rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv) * return: -1 error or 0 register ok */ int rpc_srv_registerCall(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc, - unsigned char args); + unsigned short args); /* * rpc_srv_unregisterCall() Unregister call from RPC server * @srv = RPC Server instance @@ -312,22 +328,14 @@ inline rpc_func_t *rpc_srv_getCall(rpc_srv_t * __restr * rpc_srv_execCall() Execute registered call from RPC server * @call = Register RPC call * @rpc = IN RPC call structure - * @args = IN RPC call array of rpc values + * @args = IN RPC calling arguments from RPC client * return: -1 error, !=-1 ok */ int rpc_srv_execCall(rpc_func_t * __restrict call, struct tagRPCCall * __restrict rpc, - ait_val_t * __restrict args); + array_t * __restrict args); /* - * rpc_srv_returnVars() Init return variables for RPC call and zeroed values - (for safe handling return values, use this!) - * @call = RPC function call - * @varnum = Number of return variables - * return: NULL error, !=NULL array with return values for RPC call with varnum items - */ -inline ait_val_t *rpc_srv_returnVars(rpc_func_t * __restrict call, int varnum); -/* * rpc_srv_allocVars() Allocate array for call variables, if already allocated memory for RPC call reallocate used space * @call = RPC function call @@ -335,27 +343,32 @@ inline ait_val_t *rpc_srv_returnVars(rpc_func_t * __re * return: -1 error, !=-1 return varnum value */ inline int rpc_srv_allocVars(rpc_func_t * __restrict call, int varnum); -#define rpc_srv_freeVars(_call) (assert((_call)), rpc_srv_allocVars((_call), 0)) /* - * rpc_srv_zeroVars() Clean values from variables of RPC call + * rpc_srv_destroyVars() Destroy variables of array & array * @call = RPC function call - * return: -1 error, !=-1 Returned number of cleaned RPC variables + * return: -1 error, !=-1 Returne remained variables */ -inline int rpc_srv_zeroVars(rpc_func_t * __restrict call); +inline int rpc_srv_destroyVars(rpc_func_t * __restrict call); /* + * rpc_srv_freeVals() Clean values from variables of array + * @call = RPC function call + * return: -1 error, !=-1 Returned number of cleaned variables + */ +inline int rpc_srv_freeVals(rpc_func_t * __restrict call); +/* * rpc_srv_copyVars() Copy variables for RPC call to new variable array * @call = RPC function call * @newvars = New allocated variables array, must be free after use * return: -1 error, !=-1 Returned number of copied RPC variables */ -inline int rpc_srv_copyVars(rpc_func_t * __restrict call, ait_val_t ** __restrict newvars); +inline int rpc_srv_copyVars(rpc_func_t * __restrict call, array_t ** __restrict newvars); /* * rpc_srv_getVars() Get variables array for RPC call * @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, ait_val_t ** __restrict vars); +inline int rpc_srv_getVars(rpc_func_t * __restrict call, array_t ** __restrict vars); /* @@ -423,6 +436,8 @@ int rpc_srv_sendBLOB(rpc_cli_t * __restrict cli, rpc_b */ int rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_t * __restrict blob); +/* CLIENT part of functions */ + /* * rpc_cli_sendBLOB() Send BLOB to server * @cli = Client instance @@ -463,12 +478,13 @@ inline int rpc_cli_getBLOB(rpc_cli_t * __restrict cli, * rpc_cli_openClient() Connect to RPC Server * @ProgID = ProgramID for RPC session request * @ProcID = ProcessID for RPC session request + * @netBuf = Network buffer length, if =0 == BUFSIZ (also meaning max RPC packet) * @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(u_int ProgID, u_int ProcID, +rpc_cli_t *rpc_cli_openClient(u_int ProgID, u_int ProcID, int netBuf, u_short family, const char *csHost, u_short Port); /* * rpc_cli_closeClient() Close connection to RPC server and free resources @@ -481,21 +497,24 @@ void rpc_cli_closeClient(rpc_cli_t * __restrict cli); * @cli = RPC Client session * @csModule = Module name, if NULL self binary * @csFunc = Function name for execute - * @in_argc = IN count of arguments * @in_vars = IN RPC call array of rpc values - * @out_argc = OUT returned count of arguments - * @out_vars = OUT returned array of rpc values, must be free after use (see rpc_cli_freeVals()) + * @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, const char *csModule, const char *csFunc, int in_argc, - ait_val_t * __restrict in_vars, int *out_argc, ait_val_t ** __restrict out_vars); +int rpc_cli_execCall(rpc_cli_t *cli, const char *csModule, const char *csFunc, + array_t * __restrict in_vars, array_t ** __restrict out_vars); /* * rpc_cli_freeVals() Free ait_val_t array returned from RPC call - * @args = Number of arguments in array - * @vars = Value elements + * @vars = Variable array * return: none */ -inline void rpc_cli_freeVals(int args, ait_val_t * __restrict vars); +inline void rpc_cli_freeVals(array_t ** __restrict vars); +/* + * rpc_cli_allocVals() Allocate ait_val_t array for RPC call + * @args = Number of arguments + * return: =NULL error or !=NULL allocated array + */ +inline array_t *rpc_cli_allocVals(unsigned short args); /*