Avoid using vespamalloc for small utility programs as it has a too high initial cost and memory footprint.

12 files changed, 10 insertions, 17 deletions

diff --git a/config/src/apps/vespa-get-config/.gitignore b/config/src/apps/vespa-get-config/.gitignore
index 141e1e034fd..a6c00fa4508 100644
--- a/config/src/apps/vespa-get-config/.gitignore
+++ b/config/src/apps/vespa-get-config/.gitignore
@@ -1,4 +1,4 @@
 /.depend
 /Makefile
 /getvespaconfig
-vespa-get-config-bin
+vespa-get-config
diff --git a/config/src/apps/vespa-get-config/CMakeLists.txt b/config/src/apps/vespa-get-config/CMakeLists.txt
index eb6b49ff824..b6dea3e1508 100644
--- a/config/src/apps/vespa-get-config/CMakeLists.txt
+++ b/config/src/apps/vespa-get-config/CMakeLists.txt
@@ -2,7 +2,7 @@
 vespa_add_executable(config_getvespaconfig_app
     SOURCES
     getconfig.cpp
-    OUTPUT_NAME vespa-get-config-bin
+    OUTPUT_NAME vespa-get-config
     INSTALL bin
     DEPENDS
     config_cloudconfig
diff --git a/configd/src/apps/cmd/.gitignore b/configd/src/apps/cmd/.gitignore
index c79a9a7a643..5c0a1e06041 100644
--- a/configd/src/apps/cmd/.gitignore
+++ b/configd/src/apps/cmd/.gitignore
@@ -1 +1 @@
-/vespa-sentinel-cmd-bin
+/vespa-sentinel-cmd
diff --git a/configd/src/apps/cmd/CMakeLists.txt b/configd/src/apps/cmd/CMakeLists.txt
index f02865cf9a9..7b670ad9abe 100644
--- a/configd/src/apps/cmd/CMakeLists.txt
+++ b/configd/src/apps/cmd/CMakeLists.txt
@@ -2,7 +2,7 @@
 vespa_add_executable(configd_vespa-sentinel-cmd_app
     SOURCES
     main.cpp
-    OUTPUT_NAME vespa-sentinel-cmd-bin
+    OUTPUT_NAME vespa-sentinel-cmd
     INSTALL bin
     DEPENDS
     fnet
diff --git a/fnet/src/examples/frt/rpc/.gitignore b/fnet/src/examples/frt/rpc/.gitignore
index 76876fa7cda..a4a999dc119 100644
--- a/fnet/src/examples/frt/rpc/.gitignore
+++ b/fnet/src/examples/frt/rpc/.gitignore
@@ -12,5 +12,4 @@ fnet_rpc_callback_server_app
 fnet_rpc_client_app
 fnet_rpc_server_app
 vespa-rpc-info
-vespa-rpc-invoke-bin
 vespa-rpc-proxy
diff --git a/fnet/src/examples/frt/rpc/CMakeLists.txt b/fnet/src/examples/frt/rpc/CMakeLists.txt
index 7cad990b090..de4f9e89864 100644
--- a/fnet/src/examples/frt/rpc/CMakeLists.txt
+++ b/fnet/src/examples/frt/rpc/CMakeLists.txt
@@ -48,7 +48,7 @@ vespa_add_executable(fnet_rpc_callback_client_app
 vespa_add_executable(fnet_rpc_invoke_app
     SOURCES
     rpc_invoke.cpp
-    OUTPUT_NAME vespa-rpc-invoke-bin
+    OUTPUT_NAME vespa-rpc-invoke
     INSTALL bin
     DEPENDS
     fnet
diff --git a/fnet/src/tests/examples/examples_test.cpp b/fnet/src/tests/examples/examples_test.cpp
index 74271a7ef5c..2b05ec57081 100644
--- a/fnet/src/tests/examples/examples_test.cpp
+++ b/fnet/src/tests/examples/examples_test.cpp
@@ -76,7 +76,7 @@ TEST("usage") {
         EXPECT_FALSE(runProc(proc, done));
     }
     {
-        ChildProcess proc("exec ../../examples/frt/rpc/vespa-rpc-invoke-bin");
+        ChildProcess proc("exec ../../examples/frt/rpc/vespa-rpc-invoke");
         EXPECT_FALSE(runProc(proc, done));
     }
     {
@@ -199,7 +199,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/vespa-rpc-invoke-bin 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;
diff --git a/searchcore/src/apps/vespa-proton-cmd/.gitignore b/searchcore/src/apps/vespa-proton-cmd/.gitignore
index 5d106f9b232..7b1042f8086 100644
--- a/searchcore/src/apps/vespa-proton-cmd/.gitignore
+++ b/searchcore/src/apps/vespa-proton-cmd/.gitignore
@@ -1,2 +1,2 @@
 /vespa-proton-cmd
-vespa-proton-cmd-bin
+vespa-proton-cmd
diff --git a/searchcore/src/apps/vespa-proton-cmd/CMakeLists.txt b/searchcore/src/apps/vespa-proton-cmd/CMakeLists.txt
index fd2a78bae9d..d2084aab37b 100644
--- a/searchcore/src/apps/vespa-proton-cmd/CMakeLists.txt
+++ b/searchcore/src/apps/vespa-proton-cmd/CMakeLists.txt
@@ -2,7 +2,7 @@
 vespa_add_executable(searchcore_vespa-proton-cmd_app
     SOURCES
     vespa-proton-cmd.cpp
-    OUTPUT_NAME vespa-proton-cmd-bin
+    OUTPUT_NAME vespa-proton-cmd
     INSTALL bin
     DEPENDS
 )
diff --git a/vespabase/CMakeLists.txt b/vespabase/CMakeLists.txt
index d709a4b90d2..2e4dd756da1 100644
--- a/vespabase/CMakeLists.txt
+++ b/vespabase/CMakeLists.txt
@@ -1,14 +1,9 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_install_script(src/start-cbinaries.sh vespa-get-config bin)
 vespa_install_script(src/start-cbinaries.sh vespa-verify-ranksetup bin)
 vespa_install_script(src/start-cbinaries.sh vespa-config-status bin)
 vespa_install_script(src/start-cbinaries.sh vespa-configproxy-cmd bin)
 vespa_install_script(src/start-cbinaries.sh vespa-doclocator bin)
 vespa_install_script(src/start-cbinaries.sh vespa-model-inspect bin)
-vespa_install_script(src/start-cbinaries.sh vespa-proton-cmd bin)
-vespa_install_script(src/start-cbinaries.sh vespa-rpc-invoke bin)
-vespa_install_script(src/start-cbinaries.sh vespa-sentinel-cmd bin)
-vespa_install_script(src/start-cbinaries.sh vespa-route bin)
 vespa_install_script(src/start-cbinaries.sh vespa-transactionlog-inspect bin)
 vespa_install_script(src/start-cbinaries.sh vespa-distributord sbin)
 vespa_install_script(src/start-cbinaries.sh vespa-proton sbin)
diff --git a/vespaclient/src/vespa/vespaclient/vesparoute/.gitignore b/vespaclient/src/vespa/vespaclient/vesparoute/.gitignore
index 573df74b762..7c1657e5caa 100644
--- a/vespaclient/src/vespa/vespaclient/vesparoute/.gitignore
+++ b/vespaclient/src/vespa/vespaclient/vesparoute/.gitignore
@@ -1,4 +1,3 @@
 .depend
 Makefile
 vespa-route
-vespa-route-bin
diff --git a/vespaclient/src/vespa/vespaclient/vesparoute/CMakeLists.txt b/vespaclient/src/vespa/vespaclient/vesparoute/CMakeLists.txt
index 3b342387d01..ddf500560c7 100644
--- a/vespaclient/src/vespa/vespaclient/vesparoute/CMakeLists.txt
+++ b/vespaclient/src/vespa/vespaclient/vesparoute/CMakeLists.txt
@@ -5,7 +5,7 @@ vespa_add_executable(vespaclient_vesparoute_app
     main.cpp
     mynetwork.cpp
     params.cpp
-    OUTPUT_NAME vespa-route-bin
+    OUTPUT_NAME vespa-route
     INSTALL bin
     DEPENDS
 )