libaitrpc/src/lists.c - diff

Return to lists.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / libaitrpc / src

Diff for /libaitrpc/src/lists.c between versions 1.4.2.5 and 1.5.2.1

version 1.4.2.5, 2011/09/01 15:29:39	version 1.5.2.1, 2011/11/03 13:35:39
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	inline int
Line 100 rpc_srv_destroyVars(rpc_func_t * __restrict call)	Line 99 rpc_srv_destroyVars(rpc_func_t * __restrict call)
}	}

if (call->func_vars) {	if (call->func_vars) {
rpc_srv_freeVals(call);	rpc_srv_freeVars(call);

io_arrayFree(call->func_vars);	io_arrayFree(call->func_vars);
io_arrayDestroy(&call->func_vars);	io_arrayDestroy(&call->func_vars);
Line 110 rpc_srv_destroyVars(rpc_func_t * __restrict call)	Line 109 rpc_srv_destroyVars(rpc_func_t * __restrict call)
}	}

/*	/*
* rpc_srv_freeVals() Clean values from variables of array	* rpc_srv_freeVars() Clean values from variables of array
* @call = RPC function call	* @call = RPC function call
* return: -1 error, !=-1 Returned number of cleaned variables	* return: -1 error, !=-1 Returned number of cleaned variables
*/	*/
inline int	inline int
rpc_srv_freeVals(rpc_func_t * __restrict call)	rpc_srv_freeVars(rpc_func_t * __restrict call)
{	{
register int i;	register int i;

Line 221 rpc_srv_registerCall(rpc_srv_t * __restrict srv, const	Line 220 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 258 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;
}	}
	rpc_srv_destroyVars(f);
	free(f);
pthread_mutex_unlock(&srv->srv_mtx);	pthread_mutex_unlock(&srv->srv_mtx);

return 1;	return 1;
Line 409 rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uin	Line 400 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 417 rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uin	Line 411 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;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.4.2.5
changed lines
	Added in v.1.5.2.1