--- libaitrpc/src/lists.c 2011/07/14 01:31:00 1.2.2.1 +++ libaitrpc/src/lists.c 2011/09/01 11:39:26 1.4.2.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: lists.c,v 1.2.2.1 2011/07/14 01:31:00 misho Exp $ +* $Id: lists.c,v 1.4.2.3 2011/09/01 11:39:26 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -47,133 +47,129 @@ SUCH DAMAGE. /* - * rpc_srv_retValsCall() Declare return variables for RPC call and zeroed values - (for safe handling return values, use this!) + * rpc_srv_allocVars() Allocate array for call variables, + if already allocated memory for RPC call reallocate used space * @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 + * @varnum = Number of variables, if ==0 free previous allocated variables + * return: -1 error, !=-1 return varnum value */ -inline rpc_val_t * -rpc_srv_retValsCall(rpc_func_t * __restrict call, int return_vals) +inline int +rpc_srv_allocVars(rpc_func_t * __restrict call, int varnum) { - rpc_val_t *v = NULL; + register int i; + ait_val_t *v; - if (rpc_srv_declValsCall(call, return_vals) == -1) - return NULL; - else - rpc_srv_zeroValsCall(call); - if (rpc_srv_getValsCall(call, &v) == -1) - return NULL; + if (!call || varnum < 0) { + rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t allocate variables for RPC call...\n"); + return -1; + } - return v; -} + if (varnum) { + call->func_vars = io_arrayInit(varnum); + if (!call->func_vars) + return -1; -/* - * rpc_srv_freeValsCall() Free return variables for RPC call - * @call = RPC function call - * return: none - */ -inline void -rpc_srv_freeValsCall(rpc_func_t * __restrict call) -{ - rpc_srv_declValsCall(call, 0); + /* allocate ait_val_t elements & add to array */ + for (i = 0; i < io_arraySize(call->func_vars); i++) { + v = malloc(sizeof(ait_val_t)); + if (!v) { + LOGERR; + rpc_srv_destroyVars(call); + return -1; + } else { + memset(v, 0, sizeof(ait_val_t)); + io_arraySet(call->func_vars, i, v); + } + } + } + + return io_arraySize(call->func_vars); } /* - * 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 + * rpc_srv_destroyVars() Destroy variables of array & array * @call = RPC function call - * @return_vals = Number of return variables - * return: -1 error, !=-1 ok + * return: -1 error, !=-1 Returne remained variables */ inline int -rpc_srv_declValsCall(rpc_func_t * __restrict call, int return_vals) +rpc_srv_destroyVars(rpc_func_t * __restrict call) { - void *ptr; - - if (!call || return_vals < 0) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t declare return variables for RPC call...\n"); + if (!call) { + rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t delete variables ...\n"); return -1; - } else - call->func_args = return_vals; + } - if (!return_vals) { - if (call->func_vals) { - free(call->func_vals); - call->func_vals = NULL; - } - } else { - ptr = realloc(call->func_vals, return_vals * sizeof(rpc_val_t)); - if (!ptr) { - LOGERR; - call->func_args = 0; - return -1; - } else - call->func_vals = ptr; + if (call->func_vars) { + rpc_srv_freeVals(call); + + io_arrayFree(call->func_vars); + io_arrayDestroy(&call->func_vars); } - return return_vals; + return io_arraySize(call->func_vars); } /* - * rpc_srv_zeroValsCall() Clean values from return variables of RPC call + * rpc_srv_freeVals() Clean values from variables of array * @call = RPC function call - * return: -1 error, !=-1 Returned number of cleaned RPC variables + * return: -1 error, !=-1 Returned number of cleaned variables */ inline int -rpc_srv_zeroValsCall(rpc_func_t * __restrict call) +rpc_srv_freeVals(rpc_func_t * __restrict call) { + register int i; + if (!call) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t delete return variables ...\n"); + rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t delete variables ...\n"); return -1; } - memset(call->func_vals, 0, call->func_args * sizeof(rpc_val_t)); - return call->func_args; + if (call->func_vars) { + for (i = 0; i < io_arraySize(call->func_vars); i++) + if (io_arrayGet(call->func_vars, i)) + AIT_FREE_VAL(io_array(call->func_vars, i, ait_val_t*)); + } + + return io_arraySize(call->func_vars); } /* - * rpc_srv_copyValsCall() Copy return variables for RPC call to new variable + * rpc_srv_copyVars() Copy variables for RPC call to new variable array * @call = RPC function call - * @newvals = New allocated variables array, must be free after use + * @newvars = New allocated variables array, must be free after use * return: -1 error, !=-1 Returned number of copied RPC variables */ inline int -rpc_srv_copyValsCall(rpc_func_t * __restrict call, rpc_val_t ** __restrict newvals) +rpc_srv_copyVars(rpc_func_t * __restrict call, array_t ** __restrict newvars) { - if (!call || !newvals) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t copy return variables to new array\n"); + if (!call || !newvars) { + rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t copy variables to new array\n"); return -1; } - *newvals = calloc(call->func_args, sizeof(rpc_val_t)); - if (!*newvals) { - LOGERR; + if (io_arrayCopy(newvars, call->func_vars) == -1) return -1; - } else - memcpy(*newvals, call->func_vals, call->func_args * sizeof(rpc_val_t)); - return call->func_args; + return io_arraySize(*newvars); } /* - * rpc_srv_getValsCall() Get return variables for RPC call + * rpc_srv_getVars() Get variables array for RPC call * @call = RPC function call - * @vals = Returned variables, may be NULL + * @vars = Returned variables array, may be NULL * return: -1 error, !=-1 Number of returned variables */ inline int -rpc_srv_getValsCall(rpc_func_t * __restrict call, rpc_val_t ** __restrict vals) +rpc_srv_getVars(rpc_func_t * __restrict call, array_t ** __restrict vars) { if (!call) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t get return variables ...\n"); + rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t get variables ...\n"); return -1; } - if (vals) - *vals = call->func_vals; - return call->func_args; + if (vars) + *vars = call->func_vars; + return io_arraySize(call->func_vars); } // --------------------------------------------------------- @@ -187,12 +183,12 @@ rpc_srv_getValsCall(rpc_func_t * __restrict call, rpc_ * return: -1 error or 0 register ok */ int -rpc_srv_registerCall(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc, u_char args) +rpc_srv_registerCall(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc, u_short args) { rpc_func_t *func; u_char str[MAXPATHLEN + UCHAR_MAX + 1]; - memset(str, 0, MAXPATHLEN + UCHAR_MAX + 1); + memset(str, 0, sizeof str); if (!srv || !csFunc) { rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t register function to RPC server ...\n"); return -1; @@ -202,21 +198,21 @@ rpc_srv_registerCall(rpc_srv_t * __restrict srv, const return -1; } else { memset(func, 0, sizeof(rpc_func_t)); - strlcpy((char*) func->func_name, csFunc, UCHAR_MAX + 1); + strlcpy((char*) func->func_name, csFunc, sizeof func->func_name); } if (csModule) { - strlcpy((char*) func->func_file, csModule, MAXPATHLEN); - strlcpy((char*) str, csModule, MAXPATHLEN + UCHAR_MAX + 1); + strlcpy((char*) func->func_file, csModule, sizeof func->func_file); + strlcpy((char*) str, csModule, sizeof str); } - strlcat((char*) str, "__", MAXPATHLEN + UCHAR_MAX + 1); - strlcat((char*) str, csFunc, MAXPATHLEN + UCHAR_MAX + 1); + strlcat((char*) str, "__", sizeof str); + strlcat((char*) str, csFunc, sizeof str); - func->func_tag = crcFletcher16((u_short*) str, (MAXPATHLEN + UCHAR_MAX + 1) / 2); - func->func_hash = hash_fnv((char*) str, MAXPATHLEN + UCHAR_MAX + 1); + func->func_tag = crcFletcher16((u_short*) str, sizeof str / 2); + func->func_hash = hash_fnv((char*) str, sizeof str); func->func_parent = srv; - if (args > 0 && rpc_srv_declValsCall(func, args) == -1) { + if (args > 0 && rpc_srv_allocVars(func, args) == -1) { free(func); return -1; } @@ -242,21 +238,21 @@ rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, con u_char str[MAXPATHLEN + UCHAR_MAX + 1]; memset(&func, 0, sizeof(rpc_func_t)); - memset(str, 0, MAXPATHLEN + UCHAR_MAX + 1); + memset(str, 0, sizeof str); if (!srv || !csFunc) { rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t unregister function from RPC server ...\n"); return -1; } else - strlcpy((char*) func.func_name, csFunc, UCHAR_MAX + 1); + strlcpy((char*) func.func_name, csFunc, sizeof func.func_name); if (csModule) { - strlcpy((char*) func.func_file, csModule, MAXPATHLEN); - strlcpy((char*) str, csModule, MAXPATHLEN + UCHAR_MAX + 1); + strlcpy((char*) func.func_file, csModule, sizeof func.func_file); + strlcpy((char*) str, csModule, sizeof str); } - strlcat((char*) str, "__", MAXPATHLEN + UCHAR_MAX + 1); - strlcat((char*) str, csFunc, MAXPATHLEN + UCHAR_MAX + 1); + strlcat((char*) str, "__", sizeof str); + strlcat((char*) str, csFunc, sizeof str); - func.func_tag = crcFletcher16((u_short*) str, (MAXPATHLEN + UCHAR_MAX + 1) / 2); - func.func_hash = hash_fnv((char*) str, MAXPATHLEN + UCHAR_MAX + 1); + func.func_tag = crcFletcher16((u_short*) str, sizeof str / 2); + func.func_hash = hash_fnv((char*) str, sizeof str); f = rpc_srv_getCall(srv, func.func_tag, func.func_hash); if (!f) /* not found element for unregister */ @@ -266,15 +262,15 @@ rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, con if (srv->srv_funcs == f) { /* if is 1st element */ srv->srv_funcs = srv->srv_funcs->func_next; - if (f->func_args && f->func_vals) - free(f->func_vals); + if (f->func_vars) + rpc_srv_destroyVars(f); free(f); } else { for (curr = srv->srv_funcs; curr->func_next != f; curr = curr->func_next); curr->func_next = curr->func_next->func_next; - if (f->func_args && f->func_vals) - free(f->func_vals); + if (f->func_vars) + rpc_srv_destroyVars(f); free(f); } pthread_mutex_unlock(&srv->srv_mtx); @@ -320,21 +316,21 @@ rpc_srv_getFunc(rpc_srv_t * __restrict srv, const char u_char str[MAXPATHLEN + UCHAR_MAX + 1]; memset(&func, 0, sizeof(rpc_func_t)); - memset(str, 0, MAXPATHLEN + UCHAR_MAX + 1); + memset(str, 0, sizeof str); if (!srv || !csFunc) { rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t get function from RPC server ...\n"); return NULL; } else - strlcpy((char*) func.func_name, csFunc, UCHAR_MAX + 1); + strlcpy((char*) func.func_name, csFunc, sizeof func.func_name); if (csModule) { - strlcpy((char*) func.func_file, csModule, MAXPATHLEN); - strlcpy((char*) str, csModule, MAXPATHLEN + UCHAR_MAX + 1); + strlcpy((char*) func.func_file, csModule, sizeof func.func_file); + strlcpy((char*) str, csModule, sizeof str); } - strlcat((char*) str, "__", MAXPATHLEN + UCHAR_MAX + 1); - strlcat((char*) str, csFunc, MAXPATHLEN + UCHAR_MAX + 1); + strlcat((char*) str, "__", sizeof str); + strlcat((char*) str, csFunc, sizeof str); - func.func_tag = crcFletcher16((u_short*) str, (MAXPATHLEN + UCHAR_MAX + 1) / 2); - func.func_hash = hash_fnv((char*) str, MAXPATHLEN + UCHAR_MAX + 1); + func.func_tag = crcFletcher16((u_short*) str, sizeof str / 2); + func.func_hash = hash_fnv((char*) str, sizeof str); return rpc_srv_getCall(srv, func.func_tag, func.func_hash); }