--- libaitrpc/example/tsrv.c 2011/09/01 15:29:39 1.3.2.7 +++ libaitrpc/example/tsrv.c 2012/05/15 16:06:13 1.7.4.1 @@ -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,10 +37,10 @@ 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, + 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__, 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*))); // input blob object @@ -51,6 +51,7 @@ int BBB(rpc_func_t *f, int in, array_t *iv) 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*))); @@ -71,11 +72,6 @@ int BBB(rpc_func_t *f, int in, array_t *iv) 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"); @@ -84,11 +80,34 @@ int BBB(rpc_func_t *f, int in, array_t *iv) return 33; } +int xxx(rpc_func_t *f, int in, array_t *iv) +{ + array_t *arr; + ait_val_t *v; + + RPC_CALLBACK_CHECK_INPUT(f); + + printf("iv_s=%d\n", io_arraySize(iv)); + printf("%s(%d): Piuk! %s --- %s\n", __func__, __LINE__, AIT_GET_STR(&f->func_name), + AIT_GET_BUF(io_array(iv, 0, ait_val_t*))); + fflush(stdout); + + rpc_srv_getVars(f, &arr); + v = io_array(arr, 0, ait_val_t*); + AIT_SET_DATA(v, "00!oo", 6); + io_arraySet(arr, 0, v); + v = io_array(arr, 1, ait_val_t*); + AIT_SET_I8(v, 65); + io_arraySet(arr, 1, v); + return 111; +} + +io_enableDEBUG = 7; + 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); @@ -103,30 +122,35 @@ int main() 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, "xxx", 2); - 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) + 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_endServer(&srv); + return 0; }