diff options
author | Geir Storli <geirst@yahoo-inc.com> | 2017-06-08 07:45:24 +0000 |
---|---|---|
committer | Geir Storli <geirst@yahoo-inc.com> | 2017-06-08 11:03:43 +0000 |
commit | 23ce7262beb629a3cf057d798a9e5bfd77dc5560 (patch) | |
tree | b18c7c0de3788c0b64e818caf82f5e6d80cbc21e /fnet | |
parent | de29971b5d926470e95356770dd744745129dfc3 (diff) |
Rename binaries in fnet to use vespa- prefix.
Diffstat (limited to 'fnet')
-rw-r--r-- | fnet/src/examples/frt/rpc/.gitignore | 6 | ||||
-rw-r--r-- | fnet/src/examples/frt/rpc/CMakeLists.txt | 7 | ||||
-rw-r--r-- | fnet/src/examples/frt/rpc/rpc_info.cpp | 4 | ||||
-rw-r--r-- | fnet/src/examples/frt/rpc/rpc_invoke.cpp | 4 | ||||
-rw-r--r-- | fnet/src/tests/examples/examples_test.cpp | 14 |
5 files changed, 18 insertions, 17 deletions
diff --git a/fnet/src/examples/frt/rpc/.gitignore b/fnet/src/examples/frt/rpc/.gitignore index 91218a0868b..907b6c8a249 100644 --- a/fnet/src/examples/frt/rpc/.gitignore +++ b/fnet/src/examples/frt/rpc/.gitignore @@ -5,12 +5,12 @@ echo_server rpc_callback_client rpc_callback_server rpc_client -rpc_info -rpc_invoke -rpc_proxy rpc_server fnet_echo_client_app fnet_rpc_callback_client_app fnet_rpc_callback_server_app fnet_rpc_client_app fnet_rpc_server_app +vespa-rpc-info +vespa-rpc-invoke +vespa-rpc-proxy diff --git a/fnet/src/examples/frt/rpc/CMakeLists.txt b/fnet/src/examples/frt/rpc/CMakeLists.txt index 338fe761b97..0d71ba4f91e 100644 --- a/fnet/src/examples/frt/rpc/CMakeLists.txt +++ b/fnet/src/examples/frt/rpc/CMakeLists.txt @@ -20,14 +20,15 @@ vespa_add_executable(fnet_echo_client_app vespa_add_executable(fnet_rpc_info_app SOURCES rpc_info.cpp - OUTPUT_NAME rpc_info + OUTPUT_NAME vespa-rpc-info + INSTALL bin DEPENDS fnet ) vespa_add_executable(fnet_rpc_proxy_app SOURCES rpc_proxy.cpp - OUTPUT_NAME rpc_proxy + OUTPUT_NAME vespa-rpc-proxy INSTALL bin DEPENDS fnet @@ -47,7 +48,7 @@ vespa_add_executable(fnet_rpc_callback_client_app vespa_add_executable(fnet_rpc_invoke_app SOURCES rpc_invoke.cpp - OUTPUT_NAME rpc_invoke + OUTPUT_NAME vespa-rpc-invoke INSTALL bin DEPENDS fnet diff --git a/fnet/src/examples/frt/rpc/rpc_info.cpp b/fnet/src/examples/frt/rpc/rpc_info.cpp index 841bc9228f7..78313a46baa 100644 --- a/fnet/src/examples/frt/rpc/rpc_info.cpp +++ b/fnet/src/examples/frt/rpc/rpc_info.cpp @@ -4,7 +4,7 @@ #include <vespa/fastos/app.h> #include <vespa/log/log.h> -LOG_SETUP("rpc_info"); +LOG_SETUP("vespa-rpc-info"); class RPCInfo : public FastOS_Application { @@ -74,7 +74,7 @@ int RPCInfo::Main() { if (_argc < 2) { - printf("usage : rpc_info <connectspec> [verbose]\n"); + printf("usage : vespa-rpc-info <connectspec> [verbose]\n"); return 1; } diff --git a/fnet/src/examples/frt/rpc/rpc_invoke.cpp b/fnet/src/examples/frt/rpc/rpc_invoke.cpp index d5ade794a73..f1e93f3b2dc 100644 --- a/fnet/src/examples/frt/rpc/rpc_invoke.cpp +++ b/fnet/src/examples/frt/rpc/rpc_invoke.cpp @@ -4,7 +4,7 @@ #include <vespa/fastos/app.h> #include <vespa/log/log.h> -LOG_SETUP("rpc_invoke"); +LOG_SETUP("vespa-rpc-invoke"); class RPCClient : public FastOS_Application { @@ -52,7 +52,7 @@ int RPCClient::Main() { if (_argc < 3) { - fprintf(stderr, "usage: rpc_invoke [-t timeout] <connectspec> <method> [args]\n"); + fprintf(stderr, "usage: vespa-rpc-invoke [-t timeout] <connectspec> <method> [args]\n"); fprintf(stderr, " -t timeout in seconds\n"); fprintf(stderr, " Each arg must be on the form <type>:<value>\n"); fprintf(stderr, " supported types: {'b','h','i','l','f','d','s'}\n"); diff --git a/fnet/src/tests/examples/examples_test.cpp b/fnet/src/tests/examples/examples_test.cpp index b3a21a7bc42..434c1ffa426 100644 --- a/fnet/src/tests/examples/examples_test.cpp +++ b/fnet/src/tests/examples/examples_test.cpp @@ -78,11 +78,11 @@ TEST("usage") { EXPECT_FALSE(runProc(proc, done)); } { - SlaveProc proc("exec ../../examples/frt/rpc/rpc_info"); + SlaveProc proc("exec ../../examples/frt/rpc/vespa-rpc-info"); EXPECT_FALSE(runProc(proc, done)); } { - SlaveProc proc("exec ../../examples/frt/rpc/rpc_invoke"); + SlaveProc proc("exec ../../examples/frt/rpc/vespa-rpc-invoke"); EXPECT_FALSE(runProc(proc, done)); } { @@ -94,7 +94,7 @@ TEST("usage") { EXPECT_FALSE(runProc(proc, done)); } { - SlaveProc proc("exec ../../examples/frt/rpc/rpc_proxy"); + SlaveProc proc("exec ../../examples/frt/rpc/vespa-rpc-proxy"); EXPECT_FALSE(runProc(proc, done)); } } @@ -188,9 +188,9 @@ TEST_MT_F("rpc info", 2, std::atomic<bool>()) { EXPECT_TRUE(runProc(proc, f1)); } else { TEST_BARRIER(); - EXPECT_TRUE(runProc(vespalib::make_string("exec ../../examples/frt/rpc/rpc_info tcp/localhost:%d", + EXPECT_TRUE(runProc(vespalib::make_string("exec ../../examples/frt/rpc/vespa-rpc-info tcp/localhost:%d", PORT0).c_str())); - EXPECT_TRUE(runProc(vespalib::make_string("exec ../../examples/frt/rpc/rpc_info tcp/localhost:%d verbose", + EXPECT_TRUE(runProc(vespalib::make_string("exec ../../examples/frt/rpc/vespa-rpc-info tcp/localhost:%d verbose", PORT0).c_str())); f1 = true; } @@ -204,7 +204,7 @@ TEST_MT_F("rpc invoke", 2, std::atomic<bool>()) { EXPECT_TRUE(runProc(proc, f1)); } else { TEST_BARRIER(); - EXPECT_TRUE(runProc(vespalib::make_string("exec ../../examples/frt/rpc/rpc_invoke tcp/localhost:%d frt.rpc.echo " + EXPECT_TRUE(runProc(vespalib::make_string("exec ../../examples/frt/rpc/vespa-rpc-invoke tcp/localhost:%d frt.rpc.echo " "b:1 h:2 i:4 l:8 f:0.5 d:0.25 s:foo", PORT0).c_str())); f1 = true; @@ -232,7 +232,7 @@ TEST_MT_F("rpc callback client server with proxy", 3, std::atomic<bool>()) { TEST_BARRIER(); EXPECT_TRUE(runProc(proc, f1)); } else if (thread_id == 1) { - SlaveProc proc(vespalib::make_string("exec ../../examples/frt/rpc/rpc_proxy tcp/%d tcp/localhost:%d", + SlaveProc proc(vespalib::make_string("exec ../../examples/frt/rpc/vespa-rpc-proxy tcp/%d tcp/localhost:%d", PORT1, PORT0).c_str()); TEST_BARRIER(); EXPECT_TRUE(runProc(proc, f1)); |