--- libaitrpc/example/tsrv.c 2012/05/16 14:08:52 1.7.4.2 +++ libaitrpc/example/tsrv.c 2012/05/16 14:46:29 1.7.4.3 @@ -1,16 +1,17 @@ #include #include #include +#include "rc.h" - int aaa(rpc_func_t *f, int in, array_t *iv) { rpc_blob_t *b; RPC_CALLBACK_CHECK_INPUT(f); - printf("%s(%d): Piuk! %s\n", __func__, __LINE__, AIT_GET_STR(&f->func_name)); + printf("%s(%d): Piuk! %p(0x%x)\n", __func__, __LINE__, + AIT_GET_PTR(&f->func_name), AIT_KEY(&f->func_name)); /* b = rpc_srv_registerBLOB(f->func_parent, BUFSIZ); @@ -33,14 +34,15 @@ int BBB(rpc_func_t *f, int in, array_t *iv) { 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__, AIT_GET_STR(&f->func_name), + printf("%s(%d): Piuk! %p(0x%x) %d %s %X\n", __func__, __LINE__, + AIT_GET_PTR(&f->func_name), AIT_KEY(&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), + printf("%s(%d): Piuk! %p(0x%x) %d %s %X\n", __func__, __LINE__, + AIT_GET_PTR(&f->func_name), AIT_KEY(&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 @@ -67,7 +69,7 @@ int BBB(rpc_func_t *f, int in, array_t *iv) if (!b) return -1; else { - v = io_array(arr, 3, ait_val_t*); + v = io_array(f->func_vars, 3, ait_val_t*); AIT_SET_BLOB2(v, b); } @@ -86,7 +88,8 @@ int xxx(rpc_func_t *f, int in, array_t *iv) 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), + printf("%s(%d): Piuk! %p(0x%x) --- %s\n", __func__, __LINE__, + AIT_GET_PTR(&f->func_name), AIT_KEY(&f->func_name), AIT_GET_BUF(io_array(iv, 0, ait_val_t*))); fflush(stdout); @@ -123,14 +126,15 @@ int main() return 1; } - rpc_srv_registerCall(srv, 1, aaa, 0); - rpc_srv_registerCall(srv, 2, BBB, 4); + rpc_srv_registerCall(srv, RC_aaa, aaa, 0); + rpc_srv_registerCall(srv, RC_BBB, BBB, 4); rpc_srv_registerCall(srv, 3, NULL, 1); - rpc_srv_registerCall(srv, 4, xYz, 2); - rpc_srv_registerCall(srv, 5, xxx, 2); + rpc_srv_registerCall(srv, RC_xYz, xYz, 2); + rpc_srv_registerCall(srv, RC_xxx, xxx, 2); rpc_srv_unregisterCall(srv, 4); + rpc_srv_execBLOBServer(srv); rpc_srv_loopServer(srv); rpc_srv_endBLOBServer(srv);