--- libaitrpc/example/tsrv.c 2010/07/08 12:29:38 1.1.1.1.2.8 +++ libaitrpc/example/tsrv.c 2011/08/31 17:11:57 1.3.2.3 @@ -1,8 +1,10 @@ #include +#include #include -int aaa(rpc_func_t *f, int in, rpc_val_t *iv) + +int aaa(rpc_func_t *f, int in, array_t *iv) { rpc_blob_t *b; @@ -27,39 +29,44 @@ int aaa(rpc_func_t *f, int in, rpc_val_t *iv) return 0; } -int BBB(rpc_func_t *f, int in, rpc_val_t *iv) +int BBB(rpc_func_t *f, int in, array_t *iv) { - rpc_val_t *v; + ait_val_t *v; rpc_blob_t *b; + array_t *arr; RPC_CALLBACK_CHECK_INPUT(f); printf("%s(%d): Piuk! %s %d %s %X\n", __func__, __LINE__, f->func_name, - RPC_GET_I32(&iv[0]), RPC_GET_STR(&iv[1]), RPC_GET_BLOB(&iv[2])); + 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*))); // input blob object - if (!(b = rpc_srv_getBLOB(f->func_parent, RPC_GET_BLOB(&iv[2])))) + 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, RPC_GET_BLOB(&iv[2])); + rpc_srv_unregisterBLOB(f->func_parent, AIT_GET_BLOB(io_array(iv, 2, ait_val_t*))); - rpc_srv_declValsCall(f, 4); - rpc_srv_getValsCall(f, &v); - RPC_SET_BUF(&v[0], "00!oo", 6); - RPC_SET_I8(&v[1], 65); - RPC_SET_STR(&v[2], "Oho boho i cheburashka"); + rpc_srv_allocVars(f, 4); + rpc_srv_getVars(f, &arr); + v = io_array(arr, 0, ait_val_t*); + AIT_SET_BUF(v, "00!oo", 6); + v = io_array(arr, 1, ait_val_t*); + AIT_SET_I8(v, 65); + v = io_array(arr, 2, ait_val_t*); + AIT_SET_STR(v, "Oho boho i cheburashka"); // return blob object b = rpc_srv_registerBLOB(f->func_parent, 128); if (!b) return -1; else - RPC_SET_BLOB2(&v[3], b); + AIT_SET_BLOB2(io_array(arr, 3, ait_val_t*), b); if (rpc_srv_blobMap(f->func_parent, b) == -1) { rpc_srv_blobFree(f->func_parent, b); @@ -81,7 +88,8 @@ int main() pthread_t tid[2]; int ret; - srv = rpc_srv_initServer(100, 2, 1, 2, "0.0.0.0", 11111); + srv = rpc_srv_initServer(100, 2, 1, 1024 * 10, AF_INET, "0.0.0.0", 11111); +// srv = rpc_srv_initServer(100, 2, 1, AF_LOCAL, "0.0.0.0", 11111); if (!srv) { printf("error:: errno=%d %s\n", rpc_GetErrno(), rpc_GetError()); return 1; @@ -107,10 +115,11 @@ int main() rpc_srv_unregisterCall(srv, NULL, "dummy"); - pthread_create(&tid[1], NULL, rpc_srv_execBLOBServer, srv); + pthread_create(&tid[1], NULL, (void*(*)(void*)) rpc_srv_execBLOBServer, srv); rpc_srv_execServer(srv); } + rpc_srv_endBLOBServer(srv); rpc_srv_endServer(srv); return 0; }