--- libaitrpc/src/lists.c 2011/08/19 14:23:05 1.3.2.2 +++ libaitrpc/src/lists.c 2011/11/03 15:28:36 1.5.2.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: lists.c,v 1.3.2.2 2011/08/19 14:23:05 misho Exp $ +* $Id: lists.c,v 1.5.2.3 2011/11/03 15:28:36 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -47,102 +47,46 @@ SUCH DAMAGE. /* - * rpc_srv_returnVars() Init return variables for RPC call and zeroed values - (for safe handling return values, use this!) + * rpc_srv_allocVars() Allocate array for call variables * @call = RPC function call - * @varnum = Number of return variables - * return: NULL error, !=NULL array with return values for RPC call with varnum items - */ -inline rpc_val_t * -rpc_srv_returnVars(rpc_func_t * __restrict call, int varnum) -{ - rpc_val_t *v = NULL; - - if (rpc_srv_allocVars(call, varnum) == -1) - return NULL; - else - rpc_srv_zeroVars(call); - if (rpc_srv_getVars(call, &v) == -1) - return NULL; - - return v; -} - -/* - * rpc_srv_allocVars() Allocate array for call variables, - if already allocated memory for RPC call reallocate used space - * @call = RPC function call - * @varnum = Number of variables, if ==0 free previous allocated variables + * @varnum = Number of variables, if ==0 return already allocated variables number * return: -1 error, !=-1 return varnum value */ -inline int +static inline int rpc_srv_allocVars(rpc_func_t * __restrict call, int varnum) { - void *ptr; - if (!call || varnum < 0) { rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t allocate variables for RPC call...\n"); return -1; - } else - call->func_args = varnum; + } - if (!varnum) { - if (call->func_vars) { - free(call->func_vars); - call->func_vars = NULL; - } - } else { - ptr = realloc(call->func_vars, varnum * sizeof(rpc_val_t)); - if (!ptr) { - LOGERR; - call->func_args = 0; + if (varnum) { + call->func_vars = io_allocVars(varnum); + if (!call->func_vars) return -1; - } else - call->func_vars = ptr; } - return varnum; + return io_arraySize(call->func_vars); } /* - * rpc_srv_zeroVars() Clean values from variables of RPC call - * @call = RPC function call - * return: -1 error, !=-1 Returned number of cleaned RPC variables - */ -inline int -rpc_srv_zeroVars(rpc_func_t * __restrict call) -{ - if (!call) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t delete variables ...\n"); - return -1; - } - - memset(call->func_vars, 0, call->func_args * sizeof(rpc_val_t)); - return call->func_args; -} - -/* * 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, rpc_val_t ** __restrict newvars) +rpc_srv_copyVars(rpc_func_t * __restrict call, array_t ** __restrict newvars) { if (!call || !newvars) { rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t copy variables to new array\n"); return -1; } - *newvars = calloc(call->func_args, sizeof(rpc_val_t)); - if (!*newvars) { - LOGERR; + if (io_arrayCopy(newvars, call->func_vars) == -1) return -1; - } else - memcpy(*newvars, call->func_vars, call->func_args * sizeof(rpc_val_t)); - return call->func_args; + return io_arraySize(*newvars); } /* @@ -152,7 +96,7 @@ rpc_srv_copyVars(rpc_func_t * __restrict call, rpc_val * return: -1 error, !=-1 Number of returned variables */ inline int -rpc_srv_getVars(rpc_func_t * __restrict call, rpc_val_t ** __restrict vars) +rpc_srv_getVars(rpc_func_t * __restrict call, array_t ** __restrict vars) { if (!call) { rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t get variables ...\n"); @@ -161,7 +105,7 @@ rpc_srv_getVars(rpc_func_t * __restrict call, rpc_val_ if (vars) *vars = call->func_vars; - return call->func_args; + return io_arraySize(call->func_vars); } // --------------------------------------------------------- @@ -175,7 +119,7 @@ rpc_srv_getVars(rpc_func_t * __restrict call, rpc_val_ * 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]; @@ -246,25 +190,19 @@ rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, con func.func_tag = crcFletcher16((u_short*) str, sizeof str / 2); func.func_hash = hash_fnv((char*) str, sizeof str); + pthread_mutex_lock(&srv->srv_mtx); f = rpc_srv_getCall(srv, func.func_tag, func.func_hash); if (!f) /* not found element for unregister */ return 0; - pthread_mutex_lock(&srv->srv_mtx); - if (srv->srv_funcs == f) { /* if is 1st element */ + if (srv->srv_funcs == f) /* if is 1st element */ srv->srv_funcs = srv->srv_funcs->func_next; - - if (f->func_args && f->func_vars) - free(f->func_vars); - free(f); - } else { + 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_vars) - free(f->func_vars); - free(f); } + io_freeVars(&f->func_vars); + free(f); pthread_mutex_unlock(&srv->srv_mtx); return 1; @@ -345,12 +283,10 @@ rpc_srv_getBLOB(rpc_srv_t * __restrict srv, uint32_t v return NULL; } - pthread_mutex_lock(&srv->srv_blob.mtx); for (b = srv->srv_blob.blobs; b; b = b->blob_next) { if (b->blob_var == var) break; } - pthread_mutex_unlock(&srv->srv_blob.mtx); return b; } @@ -401,6 +337,9 @@ rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uin b = rpc_srv_getBLOB(srv, var); if (!b) /* not found element for unregister */ return 0; + /* if BLOB is unmapped force to unmap object */ + if (b->blob_data) + rpc_srv_blobUnmap(b); pthread_mutex_lock(&srv->srv_blob.mtx); if (srv->srv_blob.blobs == b) { /* if is 1st element */ @@ -409,9 +348,9 @@ rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uin for (curr = srv->srv_blob.blobs; curr->blob_next != b; curr = curr->blob_next); curr->blob_next = curr->blob_next->blob_next; } + pthread_mutex_unlock(&srv->srv_blob.mtx); rpc_srv_blobFree(srv, b); free(b); - pthread_mutex_unlock(&srv->srv_blob.mtx); return 1; }