--- libaitrpc/inc/aitrpc.h 2010/06/23 16:44:24 1.1.1.1.2.8 +++ libaitrpc/inc/aitrpc.h 2010/06/24 15:01:19 1.1.1.1.2.11 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitrpc.h,v 1.1.1.1.2.8 2010/06/23 16:44:24 misho Exp $ +* $Id: aitrpc.h,v 1.1.1.1.2.11 2010/06/24 15:01:19 misho Exp $ * *************************************************************************/ #ifndef __AITRPC_H @@ -108,11 +108,8 @@ typedef struct { if (val->val.string) { \ val->val_type = string; val->val_len = strlen(v) + 1; \ } } while (0) -#define RPC_SET_BLOB(vl, v, l) do { rpc_val_t *val = (vl); assert(val); val->val.blob = realloc(val->val.blob, l); \ - if (val->val.blob) { \ - val->val_type = blob; val->val_len = l; \ - memcpy(val->val.blob, v, l); \ - } } while (0) +#define RPC_SET_BLOB(vl, v, l) do { rpc_val_t *val = (vl); assert(val); val->val_type = blob; \ + val->val.blob = (void*) v; val->val_len = l; } while (0) #define RPC_SET_SIZE(vl, v) do { rpc_val_t *val = (vl); assert(val); val->val_type = size; val->val.size = v; \ val->val_len = sizeof(size_t); } while (0) #define RPC_SET_OFF(vl, v) do { rpc_val_t *val = (vl); assert(val); val->val_type = offset; val->val.offset = v; \ @@ -149,10 +146,6 @@ typedef struct { free(val->val.string); \ val->val.string = NULL; \ } \ - if (val->val_type == blob && val->val.blob) { \ - free(val->val.blob); \ - val->val.blob = NULL; \ - } \ val->val_type = val->val_len = 0; \ } while (0) @@ -163,8 +156,8 @@ typedef struct { return -1; \ } \ } while (0) -#define RPC_CALLBACK_CHECK_INPUT(s, f) do { \ - if (!s || !f) { \ +#define RPC_CALLBACK_CHECK_INPUT(f) do { \ + if (!f) { \ rpc_SetErr(22, "Error:: invalid callback parameters ...\n"); \ return -1; \ } \ @@ -192,6 +185,7 @@ typedef struct tagRPCFunc { int8_t func_args; rpc_val_t *func_vals; + void *func_parent; struct tagRPCFunc *func_next; } rpc_func_t; @@ -272,7 +266,14 @@ typedef struct { } rpc_srv_t; -typedef int (*rpc_callback_t)(void * const, rpc_func_t *, int, rpc_val_t *); +/* + * (*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 + * @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, rpc_val_t *); // ----------------------------------------------------------------------- @@ -376,20 +377,29 @@ rpc_func_t *rpc_srv_getFunc(rpc_srv_t * __restrict srv inline rpc_func_t *rpc_srv_getCall(rpc_srv_t * __restrict srv, uint16_t tag, uint32_t hash); /* * rpc_srv_execCall() Execute registered call from RPC server - * @data = RPC const data * @call = Register RPC call * @rpc = IN RPC call structure * @args = IN RPC call array of rpc values * return: -1 error, !=-1 ok */ -int rpc_srv_execCall(void * const data, rpc_func_t * __restrict call, - struct tagRPCCall * __restrict rpc, rpc_val_t * __restrict args); +int rpc_srv_execCall(rpc_func_t * __restrict call, struct tagRPCCall * __restrict rpc, + rpc_val_t * __restrict args); /* - * rpc_srv_declValsCall() Declare return variables for RPC call + * rpc_srv_retValsCall() Declare return variables for RPC call and zeroed values + (for safe handling return values, use this!) * @call = RPC function call * @return_vals = Number of return variables + * return: NULL error, !=NULL array with return values for RPC call with return_vals items + */ +inline rpc_val_t *rpc_srv_retValsCall(rpc_func_t * __restrict call, int return_vals); +/* + * rpc_srv_declValsCall() Declare return variables for RPC call, + if already allocated memory for RPC call return values + function reallocate used space with return_vals count elements + * @call = RPC function call + * @return_vals = Number of return variables * return: -1 error, !=-1 ok */ inline int rpc_srv_declValsCall(rpc_func_t * __restrict call, int return_vals); @@ -407,11 +417,11 @@ inline void rpc_srv_freeValsCall(rpc_func_t * __restri */ inline int rpc_srv_copyValsCall(rpc_func_t * __restrict call, rpc_val_t ** __restrict newvals); /* - * rpc_srv_delValsCall() Clean values from return variables of RPC call + * rpc_srv_zeroValsCall() Clean values from return variables of RPC call * @call = RPC function call * return: -1 error, !=-1 Returned number of cleaned RPC variables */ -inline int rpc_srv_delValsCall(rpc_func_t * __restrict call); +inline int rpc_srv_zeroValsCall(rpc_func_t * __restrict call); /* * rpc_srv_getValsCall() Get return variables for RPC call * @call = RPC function call @@ -422,6 +432,13 @@ inline int rpc_srv_getValsCall(rpc_func_t * __restrict /* + * 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 + */ +inline rpc_blob_t *rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len); +/* * rpc_srv_blobMap() Map blob to memory region * @srv = RPC Server instance * @blob = Map to this BLOB element @@ -441,6 +458,36 @@ inline void rpc_srv_blobUnmap(rpc_blob_t * __restrict * return: -1 error or 0 ok */ inline int rpc_srv_blobFree(rpc_srv_t * __restrict srv, rpc_blob_t * __restrict blob); + +/* + * rpc_srv_registerBLOB() Register new BLOB to server + * @srv = RPC Server instance + * @len = BLOB length + * return: -1 error or 0 register ok + */ +rpc_blob_t *rpc_srv_registerBLOB(rpc_srv_t * __restrict srv, size_t len); +/* + * rpc_srv_unregisterBLOB() Unregister BLOB from server + * @srv = RPC Server instance + * @var = BLOB Variable for unregister + * return: -1 error, 0 not found call, 1 unregister ok + */ +int rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uint32_t var); + +/* + * rpc_srv_sendBLOB() Send mapped BLOB to client + * @cli = Client instance + * @blob = Mapped BLOB element + * return: -1 error, 0 ok + */ +int rpc_srv_sendBLOB(rpc_cli_t * __restrict cli, rpc_blob_t * __restrict blob); +/* + * rpc_srv_recvBLOB() Receive BLOB from client + * @cli = Client instance + * @blob = Mapped BLOB element + * return: -1 error, 0 ok, >0 unreceived data from client, may be error? + */ +int rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_t * __restrict blob); /* RPC Client side functions */