--- libaitrpc/src/lists.c 2011/08/29 22:37:06 1.4 +++ libaitrpc/src/lists.c 2012/03/29 01:34:16 1.8 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: lists.c,v 1.4 2011/08/29 22:37:06 misho Exp $ +* $Id: lists.c,v 1.8 2012/03/29 01:34:16 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -47,127 +47,54 @@ 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"); + rpc_SetErr(EINVAL, "Invalid parameter can`t allocate variables for RPC call"); 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 + * rpc_srv_getVars() - Get variables array for 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) -{ - 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; - return -1; - } else - memcpy(*newvars, call->func_vars, call->func_args * sizeof(rpc_val_t)); - - return call->func_args; -} - -/* - * 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, 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"); + rpc_SetErr(EINVAL, "Invalid parameter can`t get variables"); return -1; } if (vars) *vars = call->func_vars; - return call->func_args; + return io_arraySize(call->func_vars); } -// --------------------------------------------------------- +/* --------------------------------------------------------- */ /* - * rpc_srv_registerCall() Register call to RPC server + * rpc_srv_registerCall() - Register call to RPC server + * * @srv = RPC Server instance * @csModule = Module name, if NULL self binary * @csFunc = Function name @@ -175,40 +102,40 @@ 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]; - memset(str, 0, sizeof str); if (!srv || !csFunc) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t register function to RPC server ...\n"); + rpc_SetErr(EINVAL, "Invalid parameter can`t register function"); return -1; } if (!(func = malloc(sizeof(rpc_func_t)))) { LOGERR; return -1; - } else { + } else memset(func, 0, sizeof(rpc_func_t)); - strlcpy((char*) func->func_name, csFunc, sizeof func->func_name); + + /* calculate hashes */ + if (rpc_calcHashes(func, csModule, csFunc) == -1) { + AIT_FREE_VAL(&func->func_name); + AIT_FREE_VAL(&func->func_file); + free(func); + return -1; } - if (csModule) { - strlcpy((char*) func->func_file, csModule, sizeof func->func_file); - strlcpy((char*) str, csModule, sizeof str); - } - strlcat((char*) str, "__", sizeof str); - strlcat((char*) str, csFunc, sizeof str); - func->func_tag = crcFletcher16((u_short*) str, sizeof str / 2); - func->func_hash = hash_fnv((char*) str, sizeof str); - func->func_parent = srv; + /* allocate return variables */ if (args > 0 && rpc_srv_allocVars(func, args) == -1) { + AIT_FREE_VAL(&func->func_name); + AIT_FREE_VAL(&func->func_file); free(func); return -1; } + /* add to list of functions */ pthread_mutex_lock(&srv->srv_mtx); func->func_next = srv->srv_funcs; srv->srv_funcs = func; @@ -217,7 +144,8 @@ rpc_srv_registerCall(rpc_srv_t * __restrict srv, const } /* - * rpc_srv_unregisterCall() Unregister call from RPC server + * rpc_srv_unregisterCall() - Unregister call from RPC server + * * @srv = RPC Server instance * @csModule = Module name, if NULL self binary * @csFunc = Function name @@ -227,51 +155,45 @@ int rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc) { rpc_func_t func, *f, *curr; - u_char str[MAXPATHLEN + UCHAR_MAX + 1]; - memset(&func, 0, sizeof(rpc_func_t)); - memset(str, 0, sizeof str); if (!srv || !csFunc) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t unregister function from RPC server ...\n"); + rpc_SetErr(EINVAL, "Invalid parameter can`t unregister function"); return -1; } else - strlcpy((char*) func.func_name, csFunc, sizeof func.func_name); - if (csModule) { - strlcpy((char*) func.func_file, csModule, sizeof func.func_file); - strlcpy((char*) str, csModule, sizeof str); - } - strlcat((char*) str, "__", sizeof str); - strlcat((char*) str, csFunc, sizeof str); + memset(&func, 0, sizeof func); - func.func_tag = crcFletcher16((u_short*) str, sizeof str / 2); - func.func_hash = hash_fnv((char*) str, sizeof str); + /* calculate hashes */ + if (rpc_calcHashes(&func, csModule, csFunc) == -1) + return -1; + pthread_mutex_lock(&srv->srv_mtx); f = rpc_srv_getCall(srv, func.func_tag, func.func_hash); - if (!f) /* not found element for unregister */ + AIT_FREE_VAL(&func.func_name); + AIT_FREE_VAL(&func.func_file); + if (!f) { /* not found element for unregister */ + pthread_mutex_unlock(&srv->srv_mtx); return 0; + } - pthread_mutex_lock(&srv->srv_mtx); - if (srv->srv_funcs == f) { /* if is 1st element */ + /* remove from list of functions */ + 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); + AIT_FREE_VAL(&f->func_name); + AIT_FREE_VAL(&f->func_file); + free(f); pthread_mutex_unlock(&srv->srv_mtx); return 1; } /* - * rpc_srv_getCall() Get registered call from RPC server + * rpc_srv_getCall() - Get registered call from RPC server + * * @srv = RPC Server instance * @tag = tag for function * @hash = hash for function @@ -283,7 +205,7 @@ rpc_srv_getCall(rpc_srv_t * __restrict srv, uint16_t t rpc_func_t *f; if (!srv) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t get function from RPC server ...\n"); + rpc_SetErr(EINVAL, "Invalid parameter can`t get function"); return NULL; } @@ -295,7 +217,8 @@ rpc_srv_getCall(rpc_srv_t * __restrict srv, uint16_t t } /* - * rpc_srv_getFunc() Get registered call from RPC server by Name + * rpc_srv_getFunc() - Get registered call from RPC server by Name + * * @srv = RPC Server instance * @csModule = Module name, if NULL self binary * @csFunc = Function name @@ -304,33 +227,30 @@ rpc_srv_getCall(rpc_srv_t * __restrict srv, uint16_t t rpc_func_t * rpc_srv_getFunc(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc) { - rpc_func_t func; - u_char str[MAXPATHLEN + UCHAR_MAX + 1]; + rpc_func_t func, *f = NULL; - memset(&func, 0, sizeof(rpc_func_t)); - memset(str, 0, sizeof str); if (!srv || !csFunc) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t get function from RPC server ...\n"); + rpc_SetErr(EINVAL, "Invalid parameter can`t get function"); return NULL; } else - strlcpy((char*) func.func_name, csFunc, sizeof func.func_name); - if (csModule) { - strlcpy((char*) func.func_file, csModule, sizeof func.func_file); - strlcpy((char*) str, csModule, sizeof str); - } - strlcat((char*) str, "__", sizeof str); - strlcat((char*) str, csFunc, sizeof str); + memset(&func, 0, sizeof(rpc_func_t)); - func.func_tag = crcFletcher16((u_short*) str, sizeof str / 2); - func.func_hash = hash_fnv((char*) str, sizeof str); + /* calculate hashes */ + if (rpc_calcHashes(&func, csModule, csFunc) == -1) + return NULL; - return rpc_srv_getCall(srv, func.func_tag, func.func_hash); + f = rpc_srv_getCall(srv, func.func_tag, func.func_hash); + + AIT_FREE_VAL(&func.func_name); + AIT_FREE_VAL(&func.func_file); + return f; } // --------------------------------------------------------- /* - * rpc_srv_getBLOB() Get registered BLOB + * rpc_srv_getBLOB() - Get registered BLOB + * * @srv = RPC Server instance * @var = hash for variable * return: NULL not found, !=NULL return blob var @@ -341,22 +261,21 @@ rpc_srv_getBLOB(rpc_srv_t * __restrict srv, uint32_t v rpc_blob_t *b; if (!srv) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t get variable from BLOB server ...\n"); + rpc_SetErr(EINVAL, "Invalid parameter can`t get BLOB variable"); 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; } /* - * rpc_srv_registerBLOB() Register new BLOB to server + * rpc_srv_registerBLOB() - Register new BLOB to server + * * @srv = RPC Server instance * @len = BLOB length * return: NULL error or new registered BLOB @@ -367,7 +286,7 @@ rpc_srv_registerBLOB(rpc_srv_t * __restrict srv, size_ rpc_blob_t *blob = NULL; if (!srv || !len) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t register BLOB to server ...\n"); + rpc_SetErr(EINVAL, "Invalid parameter can`t register BLOB variable"); return blob; } @@ -383,7 +302,8 @@ rpc_srv_registerBLOB(rpc_srv_t * __restrict srv, size_ } /* - * rpc_srv_unregisterBLOB() Unregister BLOB from server + * 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 @@ -394,13 +314,16 @@ rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uin rpc_blob_t *b, *curr; if (!srv) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t unregister BLOB from server ...\n"); + rpc_SetErr(EINVAL, "Invalid parameter can`t unregister BLOB variable"); return -1; } 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 +332,57 @@ 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; } + +/* + * rpc_calcHashes() - Calculate hashes for RPC call + * + * @func = function + * @csModule = Module name, if NULL self binary + * @csFunc = Function name + * return: -1 error or 0 ok + */ +int +rpc_calcHashes(rpc_func_t * __restrict func, const char *csModule, const char *csFunc) +{ + char *str = NULL; + int len = 0; + + assert(func && csFunc); + + /* set function name */ + AIT_SET_STR(&func->func_name, csFunc); + len = strlen(csFunc) + 3; /* extra 3 bytes, because add string "__" and 0 */ + /* set module name if exists */ + if (csModule) { + AIT_SET_STR(&func->func_file, csModule); + len += strlen(csModule); + } + /* align len to 2 */ + len = io_align(len, 1); + + /* prepare hash source string */ + str = malloc(len); + if (!str) { + LOGERR; + return -1; + } else { + memset(str, 0, len); + if (csModule) + strlcpy((char*) str, csModule, len); + strlcat((char*) str, "__", len); + strlcat((char*) str, csFunc, len); + } + + func->func_tag = crcFletcher16((u_short*) str, len / 2); + func->func_hash = hash_fnv((char*) str, len); + + free(str); + return len; +} +