version 1.4.2.2, 2011/08/31 17:11:58
|
version 1.5.2.3, 2011/11/03 15:28:36
|
Line 47 SUCH DAMAGE.
|
Line 47 SUCH DAMAGE.
|
|
|
|
|
/* |
/* |
* rpc_srv_returnVars() Init return variables for RPC call and zeroed values | * rpc_srv_allocVars() Allocate array for call variables |
(for safe handling return values, use this!) | |
* @call = RPC function call |
* @call = RPC function call |
* @varnum = Number of return variables | * @varnum = Number of variables, if ==0 return already allocated variables number |
* return: NULL error, !=NULL array with return values for RPC call with varnum items | |
*/ | |
inline array_t * | |
rpc_srv_returnVars(rpc_func_t * __restrict call, int varnum) | |
{ | |
array_t *v = NULL; | |
| |
if (rpc_srv_allocVars(call, varnum) == -1) | |
return NULL; | |
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 | |
* return: -1 error, !=-1 return varnum value |
* return: -1 error, !=-1 return varnum value |
*/ |
*/ |
inline int | static inline int |
rpc_srv_allocVars(rpc_func_t * __restrict call, int varnum) |
rpc_srv_allocVars(rpc_func_t * __restrict call, int varnum) |
{ |
{ |
register int i; |
|
ait_val_t *v; |
|
|
|
if (!call || varnum < 0) { |
if (!call || varnum < 0) { |
rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t allocate variables for RPC call...\n"); |
rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t allocate variables for RPC call...\n"); |
return -1; |
return -1; |
} |
} |
|
|
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*)); |
|
io_arrayFree(call->func_vars); |
|
io_arrayDestroy(&call->func_vars); |
|
|
|
if (varnum) { |
if (varnum) { |
if (!(call->func_vars = io_arrayInit(varnum))) | call->func_vars = io_allocVars(varnum); |
| if (!call->func_vars) |
return -1; |
return -1; |
|
|
for (i = 0; i < io_arraySize(call->func_vars); i++) { |
|
v = malloc(sizeof(ait_val_t)); |
|
if (!v) { |
|
LOGERR; |
|
rpc_srv_freeVars(call); |
|
return -1; |
|
} else { |
|
memset(v, 0, sizeof(ait_val_t)); |
|
io_arraySet(call->func_vars, i, v); |
|
} |
|
} |
|
|
|
varnum = io_arraySize(call->func_vars); |
|
} |
} |
|
|
return varnum; |
|
} |
|
|
|
/* |
|
* 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; |
|
} |
|
|
|
io_arrayFree(call->func_vars); |
|
io_arrayZero(call->func_vars); |
|
return io_arraySize(call->func_vars); |
return io_arraySize(call->func_vars); |
} |
} |
|
|
Line 167 rpc_srv_getVars(rpc_func_t * __restrict call, array_t
|
Line 105 rpc_srv_getVars(rpc_func_t * __restrict call, array_t
|
|
|
if (vars) |
if (vars) |
*vars = call->func_vars; |
*vars = call->func_vars; |
return (call->func_vars ? io_arraySize(call->func_vars) : 0); | return io_arraySize(call->func_vars); |
} |
} |
|
|
// --------------------------------------------------------- |
// --------------------------------------------------------- |
Line 252 rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, con
|
Line 190 rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, con
|
func.func_tag = crcFletcher16((u_short*) str, sizeof str / 2); |
func.func_tag = crcFletcher16((u_short*) str, sizeof str / 2); |
func.func_hash = hash_fnv((char*) str, sizeof str); |
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); |
f = rpc_srv_getCall(srv, func.func_tag, func.func_hash); |
if (!f) /* not found element for unregister */ |
if (!f) /* not found element for unregister */ |
return 0; |
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; |
srv->srv_funcs = srv->srv_funcs->func_next; |
| else { |
if (f->func_args && f->func_vars) | |
free(f->func_vars); | |
free(f); | |
} else { | |
for (curr = srv->srv_funcs; curr->func_next != f; curr = curr->func_next); |
for (curr = srv->srv_funcs; curr->func_next != f; curr = curr->func_next); |
curr->func_next = curr->func_next->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); |
pthread_mutex_unlock(&srv->srv_mtx); |
|
|
return 1; |
return 1; |
Line 351 rpc_srv_getBLOB(rpc_srv_t * __restrict srv, uint32_t v
|
Line 283 rpc_srv_getBLOB(rpc_srv_t * __restrict srv, uint32_t v
|
return NULL; |
return NULL; |
} |
} |
|
|
pthread_mutex_lock(&srv->srv_blob.mtx); |
|
for (b = srv->srv_blob.blobs; b; b = b->blob_next) { |
for (b = srv->srv_blob.blobs; b; b = b->blob_next) { |
if (b->blob_var == var) |
if (b->blob_var == var) |
break; |
break; |
} |
} |
pthread_mutex_unlock(&srv->srv_blob.mtx); |
|
|
|
return b; |
return b; |
} |
} |
Line 407 rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uin
|
Line 337 rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uin
|
b = rpc_srv_getBLOB(srv, var); |
b = rpc_srv_getBLOB(srv, var); |
if (!b) /* not found element for unregister */ |
if (!b) /* not found element for unregister */ |
return 0; |
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); |
pthread_mutex_lock(&srv->srv_blob.mtx); |
if (srv->srv_blob.blobs == b) { /* if is 1st element */ |
if (srv->srv_blob.blobs == b) { /* if is 1st element */ |
Line 415 rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uin
|
Line 348 rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uin
|
for (curr = srv->srv_blob.blobs; curr->blob_next != b; curr = curr->blob_next); |
for (curr = srv->srv_blob.blobs; curr->blob_next != b; curr = curr->blob_next); |
curr->blob_next = curr->blob_next->blob_next; |
curr->blob_next = curr->blob_next->blob_next; |
} |
} |
|
pthread_mutex_unlock(&srv->srv_blob.mtx); |
rpc_srv_blobFree(srv, b); |
rpc_srv_blobFree(srv, b); |
free(b); |
free(b); |
pthread_mutex_unlock(&srv->srv_blob.mtx); |
|
|
|
return 1; |
return 1; |
} |
} |