libaitrpc/src/builtin.c - diff

Return to builtin.c CVS log

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

Diff for /libaitrpc/src/builtin.c between versions 1.4.2.2 and 1.7

version 1.4.2.2, 2011/11/03 12:52:36	version 1.7, 2012/05/14 08:39:05
Line 12 terms:	Line 12 terms:
All of the documentation and software included in the ELWIX and AITNET	All of the documentation and software included in the ELWIX and AITNET
Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>	Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>

Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011	Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
by Michael Pounov <misho@elwix.org>. All rights reserved.	by Michael Pounov <misho@elwix.org>. All rights reserved.

Redistribution and use in source and binary forms, with or without	Redistribution and use in source and binary forms, with or without
Line 129 rpcServerCalls(rpc_func_t call, int ic, array_t iv)	Line 129 rpcServerCalls(rpc_func_t call, int ic, array_t iv)
memset(val, 0, len);	memset(val, 0, len);

for (f = srv->srv_funcs, i = 0; f; f = f->func_next) {	for (f = srv->srv_funcs, i = 0; f; f = f->func_next) {
if (*f->func_name) {	if (*AIT_GET_STR(&f->func_name)) {
memset(str, 0, sizeof str);	memset(str, 0, sizeof str);
snprintf(str, sizeof str, "/%s/%s(%d); ",	if (AIT_ISEMPTY(&f->func_file))
f->func_file ? f->func_file : "",	snprintf(str, sizeof str, "/*/%s(%d); ",
f->func_name, io_arraySize(f->func_vars));	AIT_GET_STR(&f->func_name), io_arraySize(f->func_vars));
	else
	snprintf(str, sizeof str, "/%s/%s(%d); ", AIT_GET_STR(&f->func_file),
	AIT_GET_STR(&f->func_name), io_arraySize(f->func_vars));
strlcat(val, str, len);	strlcat(val, str, len);
}	}
}	}
Line 181 rpcServerShutdown(rpc_func_t call, int ic, array_t i	Line 184 rpcServerShutdown(rpc_func_t call, int ic, array_t i
else	else
srv = call->func_parent;	srv = call->func_parent;

pthread_mutex_lock(&srv->srv_mtx);
srv->srv_kill = kill;	srv->srv_kill = kill;
pthread_mutex_unlock(&srv->srv_mtx);

return 0;	return 0;
}	}
Line 201 rpcBLOBServerShutdown(rpc_func_t *call, int ic, array_	Line 202 rpcBLOBServerShutdown(rpc_func_t *call, int ic, array_
else	else
srv = call->func_parent;	srv = call->func_parent;

pthread_mutex_lock(&srv->srv_blob.mtx);
srv->srv_blob.state = kill;	srv->srv_blob.state = kill;
pthread_mutex_unlock(&srv->srv_blob.mtx);

return 0;	return 0;
}	}
Line 235 rpcBLOBServerVars(rpc_func_t call, int ic, array_t i	Line 234 rpcBLOBServerVars(rpc_func_t call, int ic, array_t i
return 1;	return 1;
}	}

pthread_mutex_lock(&srv->srv_blob.mtx);
for (i = 0, b = srv->srv_blob.blobs; b; i++, b = b->blob_next);	for (i = 0, b = srv->srv_blob.blobs; b; i++, b = b->blob_next);
len = i * sizeof str;	len = i * sizeof str;

if (!len) {	if (!len) {
AIT_SET_STR(io_array(vals, 0, ait_val_t*), "");	AIT_SET_STR(io_array(vals, 0, ait_val_t*), "");
pthread_mutex_unlock(&srv->srv_blob.mtx);
return 0;	return 0;
}	}

if (!(val = malloc(len))) {	if (!(val = malloc(len))) {
LOGERR;	LOGERR;
pthread_mutex_unlock(&srv->srv_blob.mtx);
return -1;	return -1;
} else	} else
memset(val, 0, len);	memset(val, 0, len);
Line 260 rpcBLOBServerVars(rpc_func_t call, int ic, array_t i	Line 256 rpcBLOBServerVars(rpc_func_t call, int ic, array_t i

AIT_SET_STR(io_array(vals, 0, ait_val_t*), val);	AIT_SET_STR(io_array(vals, 0, ait_val_t*), val);
free(val);	free(val);
pthread_mutex_unlock(&srv->srv_blob.mtx);
return 0;	return 0;
}	}

Line 278 rpcBLOBServerState(rpc_func_t call, int ic, array_t	Line 273 rpcBLOBServerState(rpc_func_t call, int ic, array_t
if (AIT_TYPE(io_array(iv, 0, ait_val_t*)) != i32)	if (AIT_TYPE(io_array(iv, 0, ait_val_t*)) != i32)
return -1;	return -1;

pthread_mutex_lock(&srv->srv_mtx);
srv->srv_blob.state = AIT_GET_I32(io_array(iv, 0, ait_val_t*));	srv->srv_blob.state = AIT_GET_I32(io_array(iv, 0, ait_val_t*));
pthread_mutex_unlock(&srv->srv_mtx);
return 0;	return 0;
}	}

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

Removed from v.1.4.2.2
changed lines
	Added in v.1.7