--- libaitrpc/src/lists.c 2011/11/03 15:28:36 1.5.2.3 +++ libaitrpc/src/lists.c 2012/05/15 22:47:10 1.9.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: lists.c,v 1.5.2.3 2011/11/03 15:28:36 misho Exp $ +* $Id: lists.c,v 1.9.2.1 2012/05/15 22:47:10 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,228 +47,110 @@ SUCH DAMAGE. /* - * rpc_srv_allocVars() Allocate array for call variables - * @call = RPC function call - * @varnum = Number of variables, if ==0 return already allocated variables number - * return: -1 error, !=-1 return varnum value - */ -static inline int -rpc_srv_allocVars(rpc_func_t * __restrict call, int varnum) -{ - if (!call || varnum < 0) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t allocate variables for RPC call...\n"); - return -1; - } - - if (varnum) { - call->func_vars = io_allocVars(varnum); - if (!call->func_vars) - return -1; - } - - return io_arraySize(call->func_vars); -} - -/* - * 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, array_t ** __restrict newvars) -{ - if (!call || !newvars) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t copy variables to new array\n"); - return -1; - } - - if (io_arrayCopy(newvars, call->func_vars) == -1) - return -1; - - return io_arraySize(*newvars); -} - -/* - * 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, array_t ** __restrict vars) -{ - if (!call) { - rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t get variables ...\n"); - return -1; - } - - 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 - * @args = Number of return function arguments, use for restriction case! - * return: -1 error or 0 register ok + * @tag = Function tag + * @funcaddr = Function address + * @args = Number of return function arguments + * return: -1 error, 0 already registered tag or 1 register ok */ int -rpc_srv_registerCall(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc, u_short args) +rpc_srv_registerCall(rpc_srv_t * __restrict srv, u_short tag, void *funcaddr, 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"); + if (!srv || !funcaddr) { + rpc_SetErr(EINVAL, "Invalid parameter can`t register function"); return -1; + } else { + /* search for duplicate */ + TAILQ_FOREACH(func, &srv->srv_funcs, func_node) + if (AIT_KEY(&func->func_name) == tag) + return 0; } + if (!(func = malloc(sizeof(rpc_func_t)))) { LOGERR; return -1; } else { memset(func, 0, sizeof(rpc_func_t)); - strlcpy((char*) func->func_name, csFunc, sizeof func->func_name); + func->func_parent = srv; } - 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); + AIT_KEY(&func->func_name) = tag; + AIT_SET_PTR(&func->func_name, funcaddr, 0); - func->func_parent = srv; - - if (args > 0 && rpc_srv_allocVars(func, args) == -1) { + /* allocate return variables */ + if (args > 0 && !(func->func_vars = io_allocVars(args))) { + AIT_FREE_VAL(&func->func_name); free(func); return -1; } - pthread_mutex_lock(&srv->srv_mtx); - func->func_next = srv->srv_funcs; - srv->srv_funcs = func; - pthread_mutex_unlock(&srv->srv_mtx); - return 0; + /* add to list of functions */ + TAILQ_INSERT_TAIL(&srv->srv_funcs, func, func_node); + return 1; } /* - * 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 + * @tag = Function tag * return: -1 error, 0 not found call, 1 unregister ok */ int -rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc) +rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, u_short tag) { - rpc_func_t func, *f, *curr; - u_char str[MAXPATHLEN + UCHAR_MAX + 1]; + rpc_func_t *f; - 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"); + if (!srv) { + 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); - 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 */ + f = rpc_srv_getCall(srv, tag); + if (!f) /* not found element for unregister */ return 0; - if (srv->srv_funcs == f) /* if is 1st element */ - srv->srv_funcs = srv->srv_funcs->func_next; - else { - for (curr = srv->srv_funcs; curr->func_next != f; curr = curr->func_next); - curr->func_next = curr->func_next->func_next; - } + TAILQ_REMOVE(&srv->srv_funcs, f, func_node); + io_freeVars(&f->func_vars); + AIT_FREE_VAL(&f->func_name); 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 * return: NULL not found call, !=NULL return call */ inline rpc_func_t * -rpc_srv_getCall(rpc_srv_t * __restrict srv, uint16_t tag, uint32_t hash) +rpc_srv_getCall(rpc_srv_t * __restrict srv, uint16_t tag) { - rpc_func_t *f; + rpc_func_t *f, *tmp; 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; } - for (f = srv->srv_funcs; f; f = f->func_next) - if (f->func_tag == tag && f->func_hash == hash) + TAILQ_FOREACH_SAFE(f, &srv->srv_funcs, func_node, tmp) + if (AIT_KEY(&f->func_name) == tag) break; return f; } -/* - * 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 - * return: NULL not found call, !=NULL return call - */ -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]; +/* --------------------------------------------------------- */ - 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"); - 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); - - 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); -} - -// --------------------------------------------------------- - /* - * 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 @@ -279,7 +161,7 @@ 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; } @@ -292,7 +174,8 @@ rpc_srv_getBLOB(rpc_srv_t * __restrict srv, uint32_t v } /* - * 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 @@ -303,23 +186,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 @@ -330,7 +212,7 @@ 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; } @@ -341,14 +223,12 @@ rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uin 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 { 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);