libaitrpc/example/tsrv.c - diff

Return to tsrv.c CVS log

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

Diff for /libaitrpc/example/tsrv.c between versions 1.3.2.3 and 1.5

version 1.3.2.3, 2011/08/31 17:11:57	version 1.5, 2011/11/03 15:32:21
Line 40 int BBB(rpc_func_t f, int in, array_t iv)	Line 40 int BBB(rpc_func_t f, int in, array_t iv)
printf("%s(%d): Piuk! %s %d %s %X\n", __func__, __LINE__, f->func_name,	printf("%s(%d): Piuk! %s %d %s %X\n", __func__, __LINE__, f->func_name,
AIT_GET_I32(io_array(iv, 0, ait_val_t)), AIT_GET_STR(io_array(iv, 1, ait_val_t)),	AIT_GET_I32(io_array(iv, 0, ait_val_t)), AIT_GET_STR(io_array(iv, 1, ait_val_t)),
AIT_GET_BLOB(io_array(iv, 2, ait_val_t*)));	AIT_GET_BLOB(io_array(iv, 2, ait_val_t*)));
	printf("%s(%d): Piuk! %s %d %s %X\n", __func__, __LINE__, f->func_name,
	AIT_GET_I32(io_array(iv, 0, ait_val_t)), AIT_GET_STR(io_array(iv, 1, ait_val_t)));

// input blob object	// input blob object
if (!(b = rpc_srv_getBLOB(f->func_parent, AIT_GET_BLOB(io_array(iv, 2, ait_val_t*)))))	if (!(b = rpc_srv_getBLOB(f->func_parent, AIT_GET_BLOB(io_array(iv, 2, ait_val_t*)))))
Line 49 int BBB(rpc_func_t f, int in, array_t iv)	Line 51 int BBB(rpc_func_t f, int in, array_t iv)
return -1;	return -1;
}	}
printf("VAR=%X(%d):: %s\n", b->blob_var, b->blob_len, b->blob_data);	printf("VAR=%X(%d):: %s\n", b->blob_var, b->blob_len, b->blob_data);
	rpc_srv_blobUnmap(b);
rpc_srv_unregisterBLOB(f->func_parent, AIT_GET_BLOB(io_array(iv, 2, ait_val_t*)));	rpc_srv_unregisterBLOB(f->func_parent, AIT_GET_BLOB(io_array(iv, 2, ait_val_t*)));


rpc_srv_allocVars(f, 4);
rpc_srv_getVars(f, &arr);	rpc_srv_getVars(f, &arr);
v = io_array(arr, 0, ait_val_t*);	v = io_array(arr, 0, ait_val_t*);
AIT_SET_BUF(v, "00!oo", 6);	AIT_SET_BUF(v, "00!oo", 6);
Line 65 int BBB(rpc_func_t f, int in, array_t iv)	Line 67 int BBB(rpc_func_t f, int in, array_t iv)
b = rpc_srv_registerBLOB(f->func_parent, 128);	b = rpc_srv_registerBLOB(f->func_parent, 128);
if (!b)	if (!b)
return -1;	return -1;
else	else {
AIT_SET_BLOB2(io_array(arr, 3, ait_val_t*), b);	v = io_array(arr, 3, ait_val_t*);
	AIT_SET_BLOB2(v, b);
if (rpc_srv_blobMap(f->func_parent, b) == -1) {
rpc_srv_blobFree(f->func_parent, b);
return -1;
}	}

printf("data=%p blen=%d\n", b->blob_data, b->blob_len);	printf("data=%p blen=%d\n", b->blob_data, b->blob_len);
Line 85 int main()	Line 84 int main()
{	{
rpc_srv_t *srv;	rpc_srv_t *srv;
rpc_func_t *f;	rpc_func_t *f;
pthread_t tid[2];
int ret;	int ret;

srv = rpc_srv_initServer(100, 2, 1, 1024 * 10, AF_INET, "0.0.0.0", 11111);	srv = rpc_srv_initServer(100, 2, 1, 1024 * 10, AF_INET, "0.0.0.0", 11111);
Line 100 int main()	Line 98 int main()
return 1;	return 1;
}	}

/* dump register functions	rpc_srv_registerCall(srv, NULL, "aaa", 0);
	rpc_srv_registerCall(srv, NULL, "BBB", 4);
	rpc_srv_registerCall(srv, NULL, "dummy", 1);
	rpc_srv_registerCall(srv, NULL, "xYz", 2);

	/* dump register functions */
	/*
for (f = srv->srv_funcs; f; f = f->func_next)	for (f = srv->srv_funcs; f; f = f->func_next)
printf("func::name=%s args=%d\n", f->func_name, f->func_args);	printf("0.func::name=%s args=%d\n", f->func_name, io_arraySize(f->func_vars));
*/	*/

if (!fork()) {	rpc_srv_unregisterCall(srv, NULL, "dummy");
setsid();

rpc_srv_registerCall(srv, NULL, "aaa", 0);	/* dump register functions */
rpc_srv_registerCall(srv, NULL, "BBB", 4);	/*
rpc_srv_registerCall(srv, NULL, "dummy", 1);	for (f = srv->srv_funcs; f; f = f->func_next)
rpc_srv_registerCall(srv, NULL, "xYz", 2);	printf("1.func::name=%s args=%d\n", f->func_name, io_arraySize(f->func_vars));
	*/

rpc_srv_unregisterCall(srv, NULL, "dummy");	// if (!fork()) {
	setsid();

pthread_create(&tid[1], NULL, (void()(void*)) rpc_srv_execBLOBServer, srv);	//// rpc_srv_loopServer(srv);
rpc_srv_execServer(srv);	rpc_srv_execServer(srv, &ret);
}	// }

rpc_srv_endBLOBServer(srv);	rpc_srv_endBLOBServer(srv);
rpc_srv_endServer(srv);	rpc_srv_endServer(&srv);

return 0;	return 0;
}	}

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

Removed from v.1.3.2.3
changed lines
	Added in v.1.5