--- libaitrpc/example/tsrv.c 2011/09/01 14:33:00 1.3.2.5 +++ libaitrpc/example/tsrv.c 2012/03/15 01:32:56 1.5.2.6 @@ -10,7 +10,7 @@ int aaa(rpc_func_t *f, int in, array_t *iv) RPC_CALLBACK_CHECK_INPUT(f); - printf("%s(%d): Piuk! %s\n", __func__, __LINE__, f->func_name); + printf("%s(%d): Piuk! %s\n", __func__, __LINE__, AIT_GET_STR(&f->func_name)); /* b = rpc_srv_registerBLOB(f->func_parent, BUFSIZ); @@ -37,21 +37,22 @@ int BBB(rpc_func_t *f, int in, array_t *iv) RPC_CALLBACK_CHECK_INPUT(f); -// 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_BLOB(io_array(iv, 2, ait_val_t*))); - 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__, AIT_GET_STR(&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_BLOB(io_array(iv, 2, ait_val_t*))); + printf("%s(%d): Piuk! %s %d %s %X\n", __func__, __LINE__, AIT_GET_STR(&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 -// if (!(b = rpc_srv_getBLOB(f->func_parent, AIT_GET_BLOB(io_array(iv, 2, ait_val_t*))))) -// return -1; -// if (rpc_srv_blobMap(f->func_parent, b) == -1) { -// rpc_srv_blobFree(f->func_parent, b); -// return -1; -// } -// printf("VAR=%X(%d):: %s\n", b->blob_var, b->blob_len, b->blob_data); -// rpc_srv_unregisterBLOB(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*))))) + return -1; + if (rpc_srv_blobMap(f->func_parent, b) == -1) { + rpc_srv_blobFree(f->func_parent, b); + return -1; + } + 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_getVars(f, &arr); @@ -63,22 +64,19 @@ int BBB(rpc_func_t *f, int in, array_t *iv) AIT_SET_STR(v, "Oho boho i cheburashka"); // return blob object -// b = rpc_srv_registerBLOB(f->func_parent, 128); -// if (!b) -// return -1; -// else -// AIT_SET_BLOB2(io_array(arr, 3, ait_val_t*), b); + b = rpc_srv_registerBLOB(f->func_parent, 128); + if (!b) + return -1; + else { + 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); + memset(b->blob_data, 0, b->blob_len); + strcpy(b->blob_data, "Hello Worldzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz mzdnfdskf\naddfs\n"); -// printf("data=%p blen=%d\n", b->blob_data, b->blob_len); -// memset(b->blob_data, 0, b->blob_len); -// strcpy(b->blob_data, "Hello Worldzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz mzdnfdskf\naddfs\n"); - -// rpc_srv_blobUnmap(b); + rpc_srv_blobUnmap(b); return 33; } @@ -86,7 +84,6 @@ int main() { rpc_srv_t *srv; rpc_func_t *f; - pthread_t tid[2]; int ret; srv = rpc_srv_initServer(100, 2, 1, 1024 * 10, AF_INET, "0.0.0.0", 11111); @@ -96,37 +93,39 @@ int main() return 1; } - /* if (rpc_srv_initBLOBServer(srv, 0, "/tmp")) { printf("error:: errno=%d %s\n", rpc_GetErrno(), rpc_GetError()); return 1; } - */ - if (!fork()) { - setsid(); + 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); - rpc_srv_registerCall(srv, NULL, "aaa", 0); - rpc_srv_registerCall(srv, NULL, "BBB", /*4*/ 3); - 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) + printf("0.func::name=%s args=%d\n", AIT_GET_STR(&f->func_name), io_arraySize(f->func_vars)); + */ - /* dump register functions */ - for (f = srv->srv_funcs; f; f = f->func_next) - printf("0.func::name=%s args=%d\n", f->func_name, io_arraySize(f->func_vars)); + rpc_srv_unregisterCall(srv, NULL, "dummy"); - rpc_srv_unregisterCall(srv, NULL, "dummy"); + /* dump register functions */ + /* + for (f = srv->srv_funcs; f; f = f->func_next) + printf("1.func::name=%s args=%d\n", AIT_GET_STR(&f->func_name), io_arraySize(f->func_vars)); + */ - /* dump register functions */ - for (f = srv->srv_funcs; f; f = f->func_next) - printf("1.func::name=%s args=%d\n", f->func_name, io_arraySize(f->func_vars)); +// if (!fork()) { +///////// setsid(); -// pthread_create(&tid[1], NULL, (void*(*)(void*)) rpc_srv_execBLOBServer, srv); -// pthread_detach(tid[1]); - rpc_srv_execServer(srv); - } + rpc_srv_loopServer(srv); +//// rpc_srv_execServer(srv, &ret); +// } -// rpc_srv_endBLOBServer(srv); - rpc_srv_endServer(srv); + rpc_srv_endBLOBServer(srv); + rpc_srv_endServer(&srv); + return 0; }