version 1.4.2.4, 2011/09/01 14:28:41
|
version 1.5.2.3, 2011/11/03 15:28:36
|
Line 47 SUCH DAMAGE.
|
Line 47 SUCH DAMAGE.
|
|
|
|
|
/* |
/* |
* rpc_srv_allocVars() Allocate array for call variables, | * rpc_srv_allocVars() Allocate array for call variables |
if already allocated memory for RPC call reallocate used space | |
* @call = RPC function call |
* @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 |
* 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 (varnum) { |
if (varnum) { |
call->func_vars = io_arrayInit(varnum); | call->func_vars = io_allocVars(varnum); |
if (!call->func_vars) |
if (!call->func_vars) |
return -1; |
return -1; |
|
|
/* allocate ait_val_t elements & add to array */ |
|
for (i = 0; i < io_arraySize(call->func_vars); i++) { |
|
v = malloc(sizeof(ait_val_t)); |
|
if (!v) { |
|
LOGERR; |
|
rpc_srv_destroyVars(call); |
|
return -1; |
|
} else { |
|
memset(v, 0, sizeof(ait_val_t)); |
|
io_arraySet(call->func_vars, i, v); |
|
} |
|
} |
|
} |
} |
|
|
return io_arraySize(call->func_vars); |
return io_arraySize(call->func_vars); |
} |
} |
|
|
/* |
/* |
* rpc_srv_destroyVars() Destroy variables of array & array |
|
* @call = RPC function call |
|
* return: -1 error, !=-1 Returne remained variables |
|
*/ |
|
inline int |
|
rpc_srv_destroyVars(rpc_func_t * __restrict call) |
|
{ |
|
if (!call) { |
|
rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t delete variables ...\n"); |
|
return -1; |
|
} |
|
|
|
if (call->func_vars) { |
|
rpc_srv_freeVals(call); |
|
|
|
io_arrayFree(call->func_vars); |
|
io_arrayDestroy(&call->func_vars); |
|
} |
|
|
|
return io_arraySize(call->func_vars); |
|
} |
|
|
|
/* |
|
* rpc_srv_freeVals() Clean values from variables of array |
|
* @call = RPC function call |
|
* return: -1 error, !=-1 Returned number of cleaned variables |
|
*/ |
|
inline int |
|
rpc_srv_freeVals(rpc_func_t * __restrict call) |
|
{ |
|
register int i; |
|
|
|
if (!call) { |
|
rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t delete variables ...\n"); |
|
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*)); |
|
} |
|
|
|
return io_arraySize(call->func_vars); |
|
} |
|
|
|
/* |
|
* rpc_srv_copyVars() Copy variables for RPC call to new variable array |
* rpc_srv_copyVars() Copy variables for RPC call to new variable array |
* @call = RPC function call |
* @call = RPC function call |
* @newvars = New allocated variables array, must be free after use |
* @newvars = New allocated variables array, must be free after use |
Line 221 rpc_srv_registerCall(rpc_srv_t * __restrict srv, const
|
Line 157 rpc_srv_registerCall(rpc_srv_t * __restrict srv, const
|
func->func_next = srv->srv_funcs; |
func->func_next = srv->srv_funcs; |
srv->srv_funcs = func; |
srv->srv_funcs = func; |
pthread_mutex_unlock(&srv->srv_mtx); |
pthread_mutex_unlock(&srv->srv_mtx); |
printf("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<func(%s)=%p\n", func->func_name, func); |
|
return 0; |
return 0; |
} |
} |
|
|
Line 260 rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, con
|
Line 195 rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, con
|
if (!f) /* not found element for unregister */ |
if (!f) /* not found element for unregister */ |
return 0; |
return 0; |
|
|
printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>func(%s)=%p\n", f->func_name, f); | 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 { |
rpc_srv_destroyVars(f); | |
free(f); | |
f = NULL; | |
} 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; |
|
|
rpc_srv_destroyVars(f); |
|
free(f); |
|
f = NULL; |
|
} |
} |
|
io_freeVars(&f->func_vars); |
|
free(f); |
pthread_mutex_unlock(&srv->srv_mtx); |
pthread_mutex_unlock(&srv->srv_mtx); |
|
|
return 1; |
return 1; |
Line 355 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 411 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 419 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; |
} |
} |