Rename fbench programs to have vespa- prefix.

Temporarily add symlinks from old name to new name.

12 files changed, 13 insertions, 13 deletions

diff --git a/fbench/src/fbench/.gitignore b/fbench/src/fbench/.gitignore
index 91da6fc795c..6d049d33747 100644
--- a/fbench/src/fbench/.gitignore
+++ b/fbench/src/fbench/.gitignore
@@ -1,5 +1,5 @@
 .depend
 Makefile
-fbench
+vespa-fbench
 fbench.ilk
 fbench.pdb
diff --git a/fbench/src/fbench/CMakeLists.txt b/fbench/src/fbench/CMakeLists.txt
index 987d128f66b..85318a69c07 100644
--- a/fbench/src/fbench/CMakeLists.txt
+++ b/fbench/src/fbench/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(fbench_app
     SOURCES
     client.cpp
     fbench.cpp
-    OUTPUT_NAME fbench
+    OUTPUT_NAME vespa-fbench
     INSTALL bin
     DEPENDS
     fbench_util
diff --git a/fbench/src/fbench/fbench.cpp b/fbench/src/fbench/fbench.cpp
index 20195d9d234..599ac87233d 100644
--- a/fbench/src/fbench/fbench.cpp
+++ b/fbench/src/fbench/fbench.cpp
@@ -207,7 +207,7 @@ FBench::PrintSummary()
 void
 FBench::Usage()
 {
-    printf("usage: fbench [-H extraHeader] [-a queryStringToAppend ] [-n numClients] [-c cycleTime] [-l limit] [-i ignoreCount]\n");
+    printf("usage: vespa-fbench [-H extraHeader] [-a queryStringToAppend ] [-n numClients] [-c cycleTime] [-l limit] [-i ignoreCount]\n");
     printf("              [-s seconds] [-q queryFilePattern] [-o outputFilePattern]\n");
     printf("              [-r restartLimit] [-m maxLineSize] [-k] <hostname> <port>\n\n");
     printf(" -H <str> : append extra header to each get request.\n");
@@ -454,7 +454,7 @@ FBench::Main(int argc, char *argv[])
             sleepTimer.Start();
 
             if (seconds % 60 == 0) {
-                printf("[dummydate]: PROGRESS: fbench: Seconds left %d\n", seconds);
+                printf("[dummydate]: PROGRESS: vespa-fbench: Seconds left %d\n", seconds);
             }
 
             if (printInterval != 0 && seconds % printInterval == 0) {
diff --git a/fbench/src/filterfile/.gitignore b/fbench/src/filterfile/.gitignore
index 097e544e83d..c6ef8978cb6 100644
--- a/fbench/src/filterfile/.gitignore
+++ b/fbench/src/filterfile/.gitignore
@@ -1,5 +1,5 @@
 .depend
 Makefile
-filterfile
+vespa-fbench-filterfile
 filterfile.ilk
 filterfile.pdb
diff --git a/fbench/src/filterfile/CMakeLists.txt b/fbench/src/filterfile/CMakeLists.txt
index 42984155cc0..8334cff50e0 100644
--- a/fbench/src/filterfile/CMakeLists.txt
+++ b/fbench/src/filterfile/CMakeLists.txt
@@ -2,7 +2,7 @@
 vespa_add_executable(fbench_filterfile_app
     SOURCES
     filterfile.cpp
-    OUTPUT_NAME filterfile
+    OUTPUT_NAME vespa-fbench-filterfile
     INSTALL bin
     DEPENDS
     fbench_util
diff --git a/fbench/src/filterfile/filterfile.cpp b/fbench/src/filterfile/filterfile.cpp
index e72b5b5c02d..3a0a842446e 100644
--- a/fbench/src/filterfile/filterfile.cpp
+++ b/fbench/src/filterfile/filterfile.cpp
@@ -48,7 +48,7 @@ main(int argc, char** argv)
     }
 
     if (optError || showUsage) {
-        printf("usage: filterfile [-a] [-h] [-m maxLineSize]\n\n");
+        printf("usage: vespa-fbench-filterfile [-a] [-h] [-m maxLineSize]\n\n");
         printf("Read concatenated fastserver logs from stdin and write\n");
         printf("extracted query urls to stdout.\n\n");
         printf(" -a : all parameters to the original query urls are preserved.\n");
diff --git a/fbench/src/geturl/.gitignore b/fbench/src/geturl/.gitignore
index b615c53e087..ad21b60cbde 100644
--- a/fbench/src/geturl/.gitignore
+++ b/fbench/src/geturl/.gitignore
@@ -1,5 +1,5 @@
 .depend
 Makefile
-geturl
+vespa-geturl
 geturl.ilk
 geturl.pdb
diff --git a/fbench/src/geturl/CMakeLists.txt b/fbench/src/geturl/CMakeLists.txt
index d9163146dc1..85ae66bc0e3 100644
--- a/fbench/src/geturl/CMakeLists.txt
+++ b/fbench/src/geturl/CMakeLists.txt
@@ -2,7 +2,7 @@
 vespa_add_executable(fbench_geturl_app
     SOURCES
     geturl.cpp
-    OUTPUT_NAME geturl
+    OUTPUT_NAME vespa-geturl
     INSTALL bin
     DEPENDS
     fbench_util
diff --git a/fbench/src/geturl/geturl.cpp b/fbench/src/geturl/geturl.cpp
index 5a8b25ec7f5..d6bcdc6dd3b 100644
--- a/fbench/src/geturl/geturl.cpp
+++ b/fbench/src/geturl/geturl.cpp
@@ -6,7 +6,7 @@ int
 main(int argc, char** argv)
 {
     if (argc != 4) {
-        printf("usage: geturl <host> <port> <url>\n");
+        printf("usage: vespa-geturl <host> <port> <url>\n");
         return -1;
     }
 
diff --git a/fbench/src/splitfile/.gitignore b/fbench/src/splitfile/.gitignore
index 681674c8928..0caff830da7 100644
--- a/fbench/src/splitfile/.gitignore
+++ b/fbench/src/splitfile/.gitignore
@@ -1,5 +1,5 @@
 .depend
 Makefile
-splitfile
+vespa-fbench-split-file
 splitfile.ilk
 splitfile.pdb
diff --git a/fbench/src/splitfile/CMakeLists.txt b/fbench/src/splitfile/CMakeLists.txt
index 94c8c5681ff..e7be0d79033 100644
--- a/fbench/src/splitfile/CMakeLists.txt
+++ b/fbench/src/splitfile/CMakeLists.txt
@@ -2,7 +2,7 @@
 vespa_add_executable(fbench_splitfile_app
     SOURCES
     splitfile.cpp
-    OUTPUT_NAME splitfile
+    OUTPUT_NAME vespa-fbench-split-file
     INSTALL bin
     DEPENDS
     fbench_util
diff --git a/fbench/src/splitfile/splitfile.cpp b/fbench/src/splitfile/splitfile.cpp
index 001e6c4ed5c..8bd2ddc5c29 100644
--- a/fbench/src/splitfile/splitfile.cpp
+++ b/fbench/src/splitfile/splitfile.cpp
@@ -44,7 +44,7 @@ main(int argc, char** argv)
     }
 
     if (argc < (idx + 1) || argc > (idx + 2) || optError) {
-        printf("usage: splitfile [-p pattern] [-m maxLineSize] <numparts> [<file>]\n\n");
+        printf("usage: vespa-fbench-split-file [-p pattern] [-m maxLineSize] <numparts> [<file>]\n\n");
         printf(" -p pattern : output name pattern ['query%%03d.txt']\n");
         printf(" -m <num>   : max line size for input/output lines.\n");
         printf("              Can not be less than the default [10240]\n");