--- libaitrpc/src/lists.c 2011/08/18 15:08:03 1.3 +++ libaitrpc/src/lists.c 2012/05/14 08:39:06 1.9 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: lists.c,v 1.3 2011/08/18 15:08:03 misho Exp $ +* $Id: lists.c,v 1.9 2012/05/14 08:39:06 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,139 +47,54 @@ 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 + * * @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 return already allocated variables number + * return: -1 error, !=-1 return varnum value */ -inline rpc_val_t * -rpc_srv_retValsCall(rpc_func_t * __restrict call, int return_vals) +static inline int +rpc_srv_allocVars(rpc_func_t * __restrict call, int varnum) { - rpc_val_t *v = NULL; - - if (rpc_srv_declValsCall(call, return_vals) == -1) - return NULL; - else - rpc_srv_zeroValsCall(call); - if (rpc_srv_getValsCall(call, &v) == -1) - return NULL; - - return v; -} - -/* - * 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); -} - -/* - * 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) -{ - void *ptr; - - if (!call || return_vals < 0) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t declare return variables for RPC call...\n"); + if (!call || varnum < 0) { + rpc_SetErr(EINVAL, "Invalid parameter can`t allocate variables for RPC call"); 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; + if (varnum) { + call->func_vars = io_allocVars(varnum); + if (!call->func_vars) return -1; - } else - call->func_vals = ptr; } - return return_vals; + return io_arraySize(call->func_vars); } /* - * rpc_srv_zeroValsCall() Clean values from return 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_zeroValsCall(rpc_func_t * __restrict call) -{ - if (!call) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t delete return variables ...\n"); - return -1; - } - - memset(call->func_vals, 0, call->func_args * sizeof(rpc_val_t)); - return call->func_args; -} - -/* - * rpc_srv_copyValsCall() Copy return variables for RPC call to new variable - * @call = RPC function call - * @newvals = 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) -{ - if (!call || !newvals) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t copy return variables to new array\n"); - return -1; - } - - *newvals = calloc(call->func_args, sizeof(rpc_val_t)); - if (!*newvals) { - LOGERR; - return -1; - } else - memcpy(*newvals, call->func_vals, call->func_args * sizeof(rpc_val_t)); - - return call->func_args; -} - -/* - * rpc_srv_getValsCall() Get return variables 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, "Invalid parameter can`t get variables"); return -1; } - if (vals) - *vals = call->func_vals; - return call->func_args; + if (vars) + *vars = call->func_vars; + 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 @@ -187,49 +102,48 @@ 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); 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, UCHAR_MAX + 1); + + /* 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, MAXPATHLEN); - strlcpy((char*) str, csModule, MAXPATHLEN + UCHAR_MAX + 1); - } - strlcat((char*) str, "__", MAXPATHLEN + UCHAR_MAX + 1); - strlcat((char*) str, csFunc, MAXPATHLEN + UCHAR_MAX + 1); - 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_parent = srv; - if (args > 0 && rpc_srv_declValsCall(func, args) == -1) { + /* 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; } - pthread_mutex_lock(&srv->srv_mtx); + /* add to list of functions */ func->func_next = srv->srv_funcs; srv->srv_funcs = func; - pthread_mutex_unlock(&srv->srv_mtx); return 0; } /* - * 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 @@ -239,51 +153,41 @@ 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, MAXPATHLEN + UCHAR_MAX + 1); 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, UCHAR_MAX + 1); - if (csModule) { - strlcpy((char*) func.func_file, csModule, MAXPATHLEN); - strlcpy((char*) str, csModule, MAXPATHLEN + UCHAR_MAX + 1); - } - strlcat((char*) str, "__", MAXPATHLEN + UCHAR_MAX + 1); - strlcat((char*) str, csFunc, MAXPATHLEN + UCHAR_MAX + 1); + memset(&func, 0, sizeof func); - func.func_tag = crcFletcher16((u_short*) str, (MAXPATHLEN + UCHAR_MAX + 1) / 2); - func.func_hash = hash_fnv((char*) str, MAXPATHLEN + UCHAR_MAX + 1); + /* calculate hashes */ + if (rpc_calcHashes(&func, csModule, csFunc) == -1) + return -1; 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 */ 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_vals) - free(f->func_vals); - 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_vals) - free(f->func_vals); - free(f); } - pthread_mutex_unlock(&srv->srv_mtx); + io_freeVars(&f->func_vars); + AIT_FREE_VAL(&f->func_name); + AIT_FREE_VAL(&f->func_file); + free(f); 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 @@ -295,7 +199,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; } @@ -307,7 +211,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 @@ -316,33 +221,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, MAXPATHLEN + UCHAR_MAX + 1); 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, UCHAR_MAX + 1); - if (csModule) { - strlcpy((char*) func.func_file, csModule, MAXPATHLEN); - strlcpy((char*) str, csModule, MAXPATHLEN + UCHAR_MAX + 1); - } - strlcat((char*) str, "__", MAXPATHLEN + UCHAR_MAX + 1); - strlcat((char*) str, csFunc, MAXPATHLEN + UCHAR_MAX + 1); + memset(&func, 0, sizeof(rpc_func_t)); - func.func_tag = crcFletcher16((u_short*) str, (MAXPATHLEN + UCHAR_MAX + 1) / 2); - func.func_hash = hash_fnv((char*) str, MAXPATHLEN + UCHAR_MAX + 1); + /* 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 @@ -353,22 +255,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 @@ -379,23 +280,22 @@ 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; } blob = rpc_srv_blobCreate(srv, len); if (blob) { - pthread_mutex_lock(&srv->srv_blob.mtx); blob->blob_next = srv->srv_blob.blobs; srv->srv_blob.blobs = blob; - pthread_mutex_unlock(&srv->srv_blob.mtx); } return blob; } /* - * 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 @@ -406,15 +306,17 @@ 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 */ srv->srv_blob.blobs = srv->srv_blob.blobs->blob_next; } else { @@ -423,7 +325,54 @@ rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uin } 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; +} +