diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-11-02 10:56:32 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-11-02 10:56:32 +0000 |
commit | c054290535f0ddb816606fa45efb1262264bd411 (patch) | |
tree | 8eb2d666cadbb25584eaa26ffbdc4eccd3592b6d /fbench | |
parent | 8160443e8b62895c64bcf1e34380c609461e8ea9 (diff) |
Only require fastos where you actually use it and link statically
Diffstat (limited to 'fbench')
-rw-r--r-- | fbench/CMakeLists.txt | 4 | ||||
-rw-r--r-- | fbench/INSTALL | 35 | ||||
-rw-r--r-- | fbench/build/buildspec.xml | 41 | ||||
-rw-r--r-- | fbench/src/fbench/CMakeLists.txt | 2 | ||||
-rw-r--r-- | fbench/src/fbench/client.cpp | 2 | ||||
-rw-r--r-- | fbench/src/fbench/fbench.cpp | 2 | ||||
-rw-r--r-- | fbench/src/fbench/fbench.h | 4 | ||||
-rw-r--r-- | fbench/src/geturl/CMakeLists.txt | 2 | ||||
-rw-r--r-- | fbench/src/geturl/geturl.cpp | 2 | ||||
-rw-r--r-- | fbench/src/httpclient/CMakeLists.txt | 7 | ||||
-rw-r--r-- | fbench/src/httpclient/httpclient.cpp (renamed from fbench/src/util/httpclient.cpp) | 0 | ||||
-rw-r--r-- | fbench/src/httpclient/httpclient.h (renamed from fbench/src/util/httpclient.h) | 0 | ||||
-rw-r--r-- | fbench/src/test/CMakeLists.txt | 3 | ||||
-rw-r--r-- | fbench/src/test/httpclient.cpp | 2 | ||||
-rw-r--r-- | fbench/src/util/CMakeLists.txt | 1 |
15 files changed, 15 insertions, 92 deletions
diff --git a/fbench/CMakeLists.txt b/fbench/CMakeLists.txt index d079ce70406..f243c8bb51b 100644 --- a/fbench/CMakeLists.txt +++ b/fbench/CMakeLists.txt @@ -1,14 +1,12 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_define_module( - DEPENDS - fastos - APPS src/fbench src/filterfile src/geturl src/splitfile src/util + src/httpclient TESTS src/test diff --git a/fbench/INSTALL b/fbench/INSTALL deleted file mode 100644 index 2bbd9fb9fc2..00000000000 --- a/fbench/INSTALL +++ /dev/null @@ -1,35 +0,0 @@ -****************** -* fbench INSTALL * -****************** - -fbench uses 'FastOS'. In the following instructions, let %FASTOS_DIR% -denote the install directory for FastOS, also let %FBENCH_DIR% denote -the install directory for fbench. A resonable selection of install -directories would be: - %FASTOS_DIR% = '/usr/fastsearch/fastos' - %FBENCH_DIR% = '/usr/fastsearch/fbench' - -Install FastOS: -- checkout the fastos CVS module -- go to fastos/src/fastos -- ./configure --install-dir %FASTOS_DIR% [<config parameters>] - (run ./configure --help for help) -- make install - -Install fbench: -- checkout the fbench CVS module -- go to fbench/src -- ./configure --fastos-dir %FASTOS_DIR% \ - --install-dir %FBENCH_DIR% [<config parameters>] - (run ./configure --fastos-dir %FASTOS_DIR% --help for help) -- make install - -This will install all needed binaries and scripts into -%FBENCH_DIR%/bin. It will also copy the README file into -%FBENCH_DIR%. The README file contains a step by step description of -how to perform benchmarking. - -NOTE: When building on Win32, FastOS may have trouble resolving paths -to directories that do not exist; If you want to use a relative path -as install directory, Win32 users must create the install directory -before running the configure script in the fbench directory. diff --git a/fbench/build/buildspec.xml b/fbench/build/buildspec.xml deleted file mode 100644 index eb33ba8416e..00000000000 --- a/fbench/build/buildspec.xml +++ /dev/null @@ -1,41 +0,0 @@ -<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<BuildSpecification> - <Owner> - <OwnerName>Haavard Pettersen</OwnerName> - <OwnerEmail>Havard.Pettersen@fast.no</OwnerEmail> - </Owner> - - <Dependencies> - <dep package="common/fastos" version="1.5.5.1" /> - </Dependencies> - - <PreBuild> - <configure path="src"> - <parameter value="--fastos-dir ${fbuild_install_dir}/fastos" /> - <parameter value="--install-dir ${fbuild_install_dir}/fbench" /> - </configure> - </PreBuild> - - <Build> - <make path="src" target="bootstrap"/> - </Build> - - <PostBuild> - </PostBuild> - - <Test> - </Test> - - <Install> - <make path="src" target="install" /> - </Install> - - <Dist> - <tar target="${fbuild_dist_dir}/${fbuild_build_title}-${fbuild_arch}-${fbuild_os}-${fbuild_os_version}" - basepath="${fbuild_install_dir}" compress="yes"> - <addfile path="fbench" /> - </tar> - - </Dist> - -</BuildSpecification> diff --git a/fbench/src/fbench/CMakeLists.txt b/fbench/src/fbench/CMakeLists.txt index f9f2ad7e1d9..987d128f66b 100644 --- a/fbench/src/fbench/CMakeLists.txt +++ b/fbench/src/fbench/CMakeLists.txt @@ -7,5 +7,5 @@ vespa_add_executable(fbench_app INSTALL bin DEPENDS fbench_util - fastos + fbench_httpclient ) diff --git a/fbench/src/fbench/client.cpp b/fbench/src/fbench/client.cpp index efaafab6e87..912589a1fed 100644 --- a/fbench/src/fbench/client.cpp +++ b/fbench/src/fbench/client.cpp @@ -1,6 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <util/timer.h> -#include <util/httpclient.h> +#include <httpclient/httpclient.h> #include <util/filereader.h> #include "client.h" diff --git a/fbench/src/fbench/fbench.cpp b/fbench/src/fbench/fbench.cpp index 5e53573b1b3..14a0fd4106d 100644 --- a/fbench/src/fbench/fbench.cpp +++ b/fbench/src/fbench/fbench.cpp @@ -1,6 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <util/timer.h> -#include <util/httpclient.h> +#include <httpclient/httpclient.h> #include <util/filereader.h> #include "client.h" #include "fbench.h" diff --git a/fbench/src/fbench/fbench.h b/fbench/src/fbench/fbench.h index cf0782f9e36..636d2b7e8b7 100644 --- a/fbench/src/fbench/fbench.h +++ b/fbench/src/fbench/fbench.h @@ -67,8 +67,4 @@ public: int Main(int argc, char *argv[]); }; -/** - * Run fbench as a FastOS application. - **/ int main(int argc, char** argv); - diff --git a/fbench/src/geturl/CMakeLists.txt b/fbench/src/geturl/CMakeLists.txt index c5e69018e5d..d9163146dc1 100644 --- a/fbench/src/geturl/CMakeLists.txt +++ b/fbench/src/geturl/CMakeLists.txt @@ -6,5 +6,5 @@ vespa_add_executable(fbench_geturl_app INSTALL bin DEPENDS fbench_util - fastos + fbench_httpclient ) diff --git a/fbench/src/geturl/geturl.cpp b/fbench/src/geturl/geturl.cpp index 667db264156..5a8b25ec7f5 100644 --- a/fbench/src/geturl/geturl.cpp +++ b/fbench/src/geturl/geturl.cpp @@ -1,5 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <util/httpclient.h> +#include <httpclient/httpclient.h> #include <iostream> int diff --git a/fbench/src/httpclient/CMakeLists.txt b/fbench/src/httpclient/CMakeLists.txt new file mode 100644 index 00000000000..25140e02b57 --- /dev/null +++ b/fbench/src/httpclient/CMakeLists.txt @@ -0,0 +1,7 @@ +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_library(fbench_httpclient STATIC + SOURCES + httpclient.cpp + DEPENDS + fastos_static +) diff --git a/fbench/src/util/httpclient.cpp b/fbench/src/httpclient/httpclient.cpp index ce2157335e4..ce2157335e4 100644 --- a/fbench/src/util/httpclient.cpp +++ b/fbench/src/httpclient/httpclient.cpp diff --git a/fbench/src/util/httpclient.h b/fbench/src/httpclient/httpclient.h index e69a10346cd..e69a10346cd 100644 --- a/fbench/src/util/httpclient.h +++ b/fbench/src/httpclient/httpclient.h diff --git a/fbench/src/test/CMakeLists.txt b/fbench/src/test/CMakeLists.txt index 23a95df9dff..69214361825 100644 --- a/fbench/src/test/CMakeLists.txt +++ b/fbench/src/test/CMakeLists.txt @@ -4,7 +4,6 @@ vespa_add_executable(fbench_httpclient_splitstring_app TEST httpclient_splitstring.cpp DEPENDS fbench_util - fastos ) vespa_add_test(NAME fbench_httpclient_splitstring_app COMMAND fbench_httpclient_splitstring_app) vespa_add_executable(fbench_httpclient_app @@ -12,7 +11,7 @@ vespa_add_executable(fbench_httpclient_app httpclient.cpp DEPENDS fbench_util - fastos + fbench_httpclient ) vespa_add_executable(fbench_filereader_app TEST SOURCES diff --git a/fbench/src/test/httpclient.cpp b/fbench/src/test/httpclient.cpp index 9c1800d0003..afa1419a018 100644 --- a/fbench/src/test/httpclient.cpp +++ b/fbench/src/test/httpclient.cpp @@ -1,5 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <util/httpclient.h> +#include <httpclient/httpclient.h> #include <iostream> #include <thread> diff --git a/fbench/src/util/CMakeLists.txt b/fbench/src/util/CMakeLists.txt index 9efca452cea..74c6666bee1 100644 --- a/fbench/src/util/CMakeLists.txt +++ b/fbench/src/util/CMakeLists.txt @@ -2,7 +2,6 @@ vespa_add_library(fbench_util STATIC SOURCES filereader.cpp - httpclient.cpp timer.cpp clientstatus.cpp DEPENDS |