diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-05-19 21:57:59 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-05-20 12:38:48 +0000 |
| commit | 64500ab17deb86b394edc81f4ad42b5a2c43fe30 (patch) | |
| tree | 64334ba1513b697dacd5068981a8ee5b7ad92f3b | |
| parent | cfa6ec5cdbd1cf39558d3f85101de05230d6c225 (diff) | |
Fold staging_vespalib into vespalib
228 files changed, 320 insertions, 1179 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b1f2e81d54c..1b0c2fbf8f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -120,7 +120,6 @@ add_subdirectory(security-tools) add_subdirectory(security-utils) add_subdirectory(service-monitor) add_subdirectory(slobrok) -add_subdirectory(staging_vespalib) add_subdirectory(standalone-container) add_subdirectory(storage) add_subdirectory(storageserver) diff --git a/Code-map.md b/Code-map.md index 247828f4e77..40307ef7e30 100644 --- a/Code-map.md +++ b/Code-map.md @@ -93,7 +93,6 @@ It is implemented in Java. Libraries used throughput the code. - [vespalib](https://github.com/vespa-engine/vespa/tree/master/vespalib) - general utility library for C++ -- [staging_vespalib](https://github.com/vespa-engine/vespa/tree/master/staging_vespalib) - general (less stable) utility library for C++ - [vespajlib](https://github.com/vespa-engine/vespa/tree/master/vespajlib) - general utility library for Java. Includes the Java implementation of the tensor library. - [yolean](https://github.com/vespa-engine/vespa/tree/master/yolean) - another (more stable) general Java utility library diff --git a/configd/src/apps/sentinel/CMakeLists.txt b/configd/src/apps/sentinel/CMakeLists.txt index de384e8a3cd..79d4af7b3a4 100644 --- a/configd/src/apps/sentinel/CMakeLists.txt +++ b/configd/src/apps/sentinel/CMakeLists.txt @@ -25,5 +25,5 @@ vespa_add_executable(configd_config-sentinel_app DEPENDS fnet configdefinitions - staging_vespalib + vespalib ) diff --git a/dist/vespa.spec b/dist/vespa.spec index 8fed193214a..a4ede9bac67 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -822,7 +822,6 @@ fi %dir %{_prefix}/lib64 %{_prefix}/lib64/libfastos.so %{_prefix}/lib64/libfnet.so -%{_prefix}/lib64/libstaging_vespalib.so %{_prefix}/lib64/libvespadefaults.so %{_prefix}/lib64/libvespalib.so %{_prefix}/lib64/libvespalog.so @@ -835,7 +834,6 @@ fi %{_prefix}/lib64 %exclude %{_prefix}/lib64/libfastos.so %exclude %{_prefix}/lib64/libfnet.so -%exclude %{_prefix}/lib64/libstaging_vespalib.so %exclude %{_prefix}/lib64/libvespadefaults.so %exclude %{_prefix}/lib64/libvespalib.so %exclude %{_prefix}/lib64/libvespalog.so diff --git a/document/CMakeLists.txt b/document/CMakeLists.txt index 6505de79d39..327194ea9da 100644 --- a/document/CMakeLists.txt +++ b/document/CMakeLists.txt @@ -4,7 +4,6 @@ vespa_define_module( fastos vespalog vespalib - staging_vespalib config_cloudconfig vespaeval diff --git a/eval/CMakeLists.txt b/eval/CMakeLists.txt index ff731158b21..56db263fed4 100644 --- a/eval/CMakeLists.txt +++ b/eval/CMakeLists.txt @@ -2,7 +2,6 @@ vespa_define_module( DEPENDS vespalib - staging_vespalib APPS src/apps/analyze_onnx_model diff --git a/fbench/CMakeLists.txt b/fbench/CMakeLists.txt index 77d0a5e9080..851d6706247 100644 --- a/fbench/CMakeLists.txt +++ b/fbench/CMakeLists.txt @@ -3,7 +3,6 @@ vespa_define_module( DEPENDS fastos vespalib - staging_vespalib APPS src/fbench diff --git a/logd/CMakeLists.txt b/logd/CMakeLists.txt index 498efc36cf2..d02b99a393a 100644 --- a/logd/CMakeLists.txt +++ b/logd/CMakeLists.txt @@ -4,7 +4,6 @@ vespa_define_module( fastos vespalog vespalib - staging_vespalib config_cloudconfig APPS diff --git a/messagebus/CMakeLists.txt b/messagebus/CMakeLists.txt index 87cbcaa7f01..526a5a32880 100644 --- a/messagebus/CMakeLists.txt +++ b/messagebus/CMakeLists.txt @@ -5,7 +5,6 @@ vespa_define_module( vespalog config_cloudconfig vespalib - staging_vespalib fnet slobrok_slobrokserver diff --git a/metrics/CMakeLists.txt b/metrics/CMakeLists.txt index c5dcf89c02f..d75c17d4a00 100644 --- a/metrics/CMakeLists.txt +++ b/metrics/CMakeLists.txt @@ -4,7 +4,6 @@ vespa_define_module( fastos vespalog vespalib - staging_vespalib config_cloudconfig LIBS diff --git a/searchcore/src/tests/proton/common/timer/.gitignore b/searchcore/src/tests/proton/common/timer/.gitignore index 9031e40152a..f0f08dcd650 100644 --- a/searchcore/src/tests/proton/common/timer/.gitignore +++ b/searchcore/src/tests/proton/common/timer/.gitignore @@ -1 +1 @@ -staging_vespalib_timer_test_app +searchcore_common_timer_test_app diff --git a/searchcore/src/tests/proton/common/timer/CMakeLists.txt b/searchcore/src/tests/proton/common/timer/CMakeLists.txt index 7afd366ed89..89b9ecc688a 100644 --- a/searchcore/src/tests/proton/common/timer/CMakeLists.txt +++ b/searchcore/src/tests/proton/common/timer/CMakeLists.txt @@ -1,8 +1,8 @@ # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(staging_vespalib_timer_test_app TEST +vespa_add_executable(searchcore_common_timer_test_app TEST SOURCES timer_test.cpp DEPENDS searchcore_pcommon ) -vespa_add_test(NAME staging_vespalib_timer_test_app COMMAND staging_vespalib_timer_test_app) +vespa_add_test(NAME searchcore_common_timer_test_app COMMAND searchcore_common_timer_test_app) diff --git a/searchlib/CMakeLists.txt b/searchlib/CMakeLists.txt index 54892bbea3d..1d478f4f328 100644 --- a/searchlib/CMakeLists.txt +++ b/searchlib/CMakeLists.txt @@ -4,7 +4,6 @@ vespa_define_module( fastos vespalog vespalib - staging_vespalib vespaeval fnet configdefinitions diff --git a/searchlib/src/vespa/searchlib/CMakeLists.txt b/searchlib/src/vespa/searchlib/CMakeLists.txt index dac40e0ab5f..83dc08091e5 100644 --- a/searchlib/src/vespa/searchlib/CMakeLists.txt +++ b/searchlib/src/vespa/searchlib/CMakeLists.txt @@ -32,7 +32,7 @@ vespa_add_library(searchlib INSTALL lib64 DEPENDS - staging_vespalib + vespalib ${VESPA_ATOMIC_LIB} ) diff --git a/slobrok/CMakeLists.txt b/slobrok/CMakeLists.txt index 9a8f73c6e86..332e1e90282 100644 --- a/slobrok/CMakeLists.txt +++ b/slobrok/CMakeLists.txt @@ -5,7 +5,6 @@ vespa_define_module( vespalib fnet configdefinitions - staging_vespalib LIBS src/vespa/slobrok diff --git a/staging_vespalib/.gitignore b/staging_vespalib/.gitignore deleted file mode 100644 index 65e000de4f0..00000000000 --- a/staging_vespalib/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -bin -doc -lib -Makefile diff --git a/staging_vespalib/CMakeLists.txt b/staging_vespalib/CMakeLists.txt deleted file mode 100644 index 6d65c5046df..00000000000 --- a/staging_vespalib/CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -if(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") -set(STAGING_VESPALIB_DIRECTIO_TESTDIR src/tests/directio) -set(STAGING_VESPALIB_PROCESS_MEMORY_STATS_TESTDIR src/tests/util/process_memory_stats) -endif() - -vespa_define_module( - DEPENDS - fastos - vespalog - vespalib - - TESTS - src/tests/array - src/tests/benchmark - src/tests/bits - src/tests/clock - src/tests/crc - ${STAGING_VESPALIB_DIRECTIO_TESTDIR} - src/tests/floatingpointtype - src/tests/growablebytebuffer - src/tests/json - src/tests/memorydatastore - src/tests/objectdump - src/tests/objects - src/tests/objectselection - src/tests/polymorphicarray - src/tests/programoptions - src/tests/rusage - src/tests/shutdownguard - src/tests/stllike - ${STAGING_VESPALIB_PROCESS_MEMORY_STATS_TESTDIR} - src/tests/xmlserializable - - LIBS - src/vespa/vespalib - src/vespa/vespalib/objects - src/vespa/vespalib/stllike - src/vespa/vespalib/util -) diff --git a/staging_vespalib/OWNERS b/staging_vespalib/OWNERS deleted file mode 100644 index 3853ae0ffae..00000000000 --- a/staging_vespalib/OWNERS +++ /dev/null @@ -1,3 +0,0 @@ -arnej27959 -havardpe -baldersheim diff --git a/staging_vespalib/README b/staging_vespalib/README deleted file mode 100644 index 4cb562d8b79..00000000000 --- a/staging_vespalib/README +++ /dev/null @@ -1,3 +0,0 @@ -Vespalib is the location for common and generic vespa utility classes. -This is the staging location for classes that are intended to be added -to vespalib, but aren't finished enough yet.
\ No newline at end of file diff --git a/staging_vespalib/src/.gitignore b/staging_vespalib/src/.gitignore deleted file mode 100644 index 7871665637b..00000000000 --- a/staging_vespalib/src/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -*.dsp -Makefile.ini -config_command.sh -project.dsw -/module.conf diff --git a/staging_vespalib/src/Doxyfile b/staging_vespalib/src/Doxyfile deleted file mode 100644 index 6ad88d3127b..00000000000 --- a/staging_vespalib/src/Doxyfile +++ /dev/null @@ -1,225 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -# Doxyfile 1.4.6 - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- -PROJECT_NAME = vespalib -PROJECT_NUMBER = -OUTPUT_DIRECTORY = ../doc/doxygen -CREATE_SUBDIRS = NO -OUTPUT_LANGUAGE = English -USE_WINDOWS_ENCODING = NO -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = YES -ABBREVIATE_BRIEF = -ALWAYS_DETAILED_SEC = NO -INLINE_INHERITED_MEMB = NO -FULL_PATH_NAMES = YES -STRIP_FROM_PATH = -STRIP_FROM_INC_PATH = ./ -SHORT_NAMES = NO -JAVADOC_AUTOBRIEF = NO -MULTILINE_CPP_IS_BRIEF = NO -DETAILS_AT_TOP = NO -INHERIT_DOCS = YES -SEPARATE_MEMBER_PAGES = NO -TAB_SIZE = 8 -ALIASES = -OPTIMIZE_OUTPUT_FOR_C = NO -OPTIMIZE_OUTPUT_JAVA = NO -BUILTIN_STL_SUPPORT = NO -DISTRIBUTE_GROUP_DOC = NO -SUBGROUPING = YES -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- -EXTRACT_ALL = YES -EXTRACT_PRIVATE = NO -EXTRACT_STATIC = NO -EXTRACT_LOCAL_CLASSES = YES -EXTRACT_LOCAL_METHODS = NO -HIDE_UNDOC_MEMBERS = YES -HIDE_UNDOC_CLASSES = YES -HIDE_FRIEND_COMPOUNDS = NO -HIDE_IN_BODY_DOCS = NO -INTERNAL_DOCS = NO -CASE_SENSE_NAMES = YES -HIDE_SCOPE_NAMES = NO -SHOW_INCLUDE_FILES = YES -INLINE_INFO = YES -SORT_MEMBER_DOCS = YES -SORT_BRIEF_DOCS = NO -SORT_BY_SCOPE_NAME = NO -GENERATE_TODOLIST = YES -GENERATE_TESTLIST = YES -GENERATE_BUGLIST = YES -GENERATE_DEPRECATEDLIST= YES -ENABLED_SECTIONS = -MAX_INITIALIZER_LINES = 30 -SHOW_USED_FILES = YES -SHOW_DIRECTORIES = NO -FILE_VERSION_FILTER = -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- -QUIET = NO -WARNINGS = YES -WARN_IF_UNDOCUMENTED = YES -WARN_IF_DOC_ERROR = YES -WARN_NO_PARAMDOC = NO -WARN_FORMAT = "$file:$line: $text" -WARN_LOGFILE = -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- -INPUT = vespalib/util \ - vespalib/testkit -FILE_PATTERNS = -RECURSIVE = NO -EXCLUDE = -EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = -EXAMPLE_PATH = -EXAMPLE_PATTERNS = -EXAMPLE_RECURSIVE = NO -IMAGE_PATH = -INPUT_FILTER = -FILTER_PATTERNS = -FILTER_SOURCE_FILES = NO -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- -SOURCE_BROWSER = YES -INLINE_SOURCES = NO -STRIP_CODE_COMMENTS = YES -REFERENCED_BY_RELATION = NO -REFERENCES_RELATION = NO -USE_HTAGS = NO -VERBATIM_HEADERS = YES -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- -ALPHABETICAL_INDEX = YES -COLS_IN_ALPHA_INDEX = 5 -IGNORE_PREFIX = -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- -GENERATE_HTML = YES -HTML_OUTPUT = html -HTML_FILE_EXTENSION = .html -HTML_HEADER = -HTML_FOOTER = -HTML_STYLESHEET = -HTML_ALIGN_MEMBERS = YES -GENERATE_HTMLHELP = NO -CHM_FILE = -HHC_LOCATION = -GENERATE_CHI = NO -BINARY_TOC = NO -TOC_EXPAND = NO -DISABLE_INDEX = NO -ENUM_VALUES_PER_LINE = 4 -GENERATE_TREEVIEW = NO -TREEVIEW_WIDTH = 250 -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- -GENERATE_LATEX = NO -LATEX_OUTPUT = latex -LATEX_CMD_NAME = latex -MAKEINDEX_CMD_NAME = makeindex -COMPACT_LATEX = NO -PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = -PDF_HYPERLINKS = NO -USE_PDFLATEX = NO -LATEX_BATCHMODE = NO -LATEX_HIDE_INDICES = NO -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- -GENERATE_RTF = NO -RTF_OUTPUT = rtf -COMPACT_RTF = NO -RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- -GENERATE_MAN = NO -MAN_OUTPUT = man -MAN_EXTENSION = .3 -MAN_LINKS = NO -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- -GENERATE_XML = NO -XML_OUTPUT = xml -XML_SCHEMA = -XML_DTD = -XML_PROGRAMLISTING = YES -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- -GENERATE_AUTOGEN_DEF = NO -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- -GENERATE_PERLMOD = NO -PERLMOD_LATEX = NO -PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- -ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = NO -EXPAND_ONLY_PREDEF = NO -SEARCH_INCLUDES = YES -INCLUDE_PATH = -INCLUDE_FILE_PATTERNS = -PREDEFINED = IAM_DOXYGEN -EXPAND_AS_DEFINED = -SKIP_FUNCTION_MACROS = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- -TAGFILES = -GENERATE_TAGFILE = ../doc/doxygen/vespalib.tag -ALLEXTERNALS = NO -EXTERNAL_GROUPS = YES -PERL_PATH = /usr/bin/perl -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- -CLASS_DIAGRAMS = YES -HIDE_UNDOC_RELATIONS = YES -HAVE_DOT = YES -CLASS_GRAPH = YES -COLLABORATION_GRAPH = YES -GROUP_GRAPHS = YES -UML_LOOK = NO -TEMPLATE_RELATIONS = NO -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = YES -CALL_GRAPH = NO -GRAPHICAL_HIERARCHY = YES -DIRECTORY_GRAPH = YES -DOT_IMAGE_FORMAT = png -DOT_PATH = -DOTFILE_DIRS = -MAX_DOT_GRAPH_WIDTH = 1024 -MAX_DOT_GRAPH_HEIGHT = 1024 -MAX_DOT_GRAPH_DEPTH = 0 -DOT_TRANSPARENT = NO -DOT_MULTI_TARGETS = NO -GENERATE_LEGEND = YES -DOT_CLEANUP = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to the search engine -#--------------------------------------------------------------------------- -SEARCHENGINE = NO diff --git a/staging_vespalib/src/tests/.gitignore b/staging_vespalib/src/tests/.gitignore deleted file mode 100644 index c473b24b98a..00000000000 --- a/staging_vespalib/src/tests/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.depend -Makefile -testrunner -*_test diff --git a/staging_vespalib/src/tests/array/.gitignore b/staging_vespalib/src/tests/array/.gitignore deleted file mode 100644 index 154e6464c50..00000000000 --- a/staging_vespalib/src/tests/array/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/sort_benchmark -/allocinarray_benchmark -staging_vespalib_allocinarray_test_app -staging_vespalib_allocinarray_benchmark_app -staging_vespalib_sort_benchmark_app diff --git a/staging_vespalib/src/tests/array/CMakeLists.txt b/staging_vespalib/src/tests/array/CMakeLists.txt deleted file mode 100644 index 74ed249c099..00000000000 --- a/staging_vespalib/src/tests/array/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(staging_vespalib_allocinarray_test_app TEST - SOURCES - allocinarray_test.cpp - DEPENDS - staging_vespalib -) -vespa_add_test(NAME staging_vespalib_allocinarray_test_app COMMAND staging_vespalib_allocinarray_test_app) -vespa_add_executable(staging_vespalib_sort_benchmark_app - SOURCES - sort_benchmark.cpp - DEPENDS - staging_vespalib -) -vespa_add_test(NAME staging_vespalib_sort_benchmark_app COMMAND staging_vespalib_sort_benchmark_app BENCHMARK) -vespa_add_executable(staging_vespalib_allocinarray_benchmark_app - SOURCES - allocinarray_benchmark.cpp - DEPENDS - staging_vespalib -) -vespa_add_test(NAME staging_vespalib_allocinarray_benchmark_app COMMAND staging_vespalib_allocinarray_benchmark_app BENCHMARK) diff --git a/staging_vespalib/src/tests/array/allocinarray_benchmark.cpp b/staging_vespalib/src/tests/array/allocinarray_benchmark.cpp deleted file mode 100644 index 801f946687c..00000000000 --- a/staging_vespalib/src/tests/array/allocinarray_benchmark.cpp +++ /dev/null @@ -1,126 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/vespalib/testkit/testapp.h> -#include <vespa/vespalib/util/rusage.h> -#include <vespa/vespalib/util/optimized.h> -#include <vespa/vespalib/util/allocinarray.h> -#include <vespa/vespalib/util/array.hpp> -#include <csignal> - -#include <vespa/log/log.h> -LOG_SETUP("allocinarray_benchmark"); - -using namespace vespalib; - -class Test : public TestApp -{ -public: -private: - void benchmarkTree(size_t count); - void benchmarkTreeInArray(size_t count); - int Main() override; -}; - -template <typename T> -class TreeNode -{ -public: - typedef TreeNode * P; - TreeNode(const T & p) :_left(NULL), _right(NULL), _payLoad(p) { } - ~TreeNode() { - if (_left) { - delete _left; - } - if (_right) { - delete _right; - } - } - P left() { return _left; } - P right() { return _right; } - void left(P l) { _left = l; } - void right(P l) { _right = l; } -private: - P _left; - P _right; - T _payLoad; -}; - -template <typename T> -class RefTreeNode -{ -public: - typedef uint32_t P; - RefTreeNode(const T & p) :_left(-1), _right(-1), _payLoad(p) { } - P left() { return _left; } - P right() { return _right; } - void left(P l) { _left = l; } - void right(P l) { _right = l; } -private: - P _left; - P _right; - T _payLoad; -}; - -typedef TreeNode<long> N; -typedef RefTreeNode<long> R; -typedef AllocInArray<R, vespalib::Array<R> > Store; - -void populate(Store & store, uint32_t parent, size_t depth) -{ - if (depth > 0) { - store[parent].left(store.alloc(R(0))); - populate(store, store[parent].left(), depth-1); - store[parent].right(store.alloc(R(1))); - populate(store, store[parent].right(), depth-1); - } -} - -void populate(N * parent, size_t depth) -{ - if (depth > 0) { - parent->left(new N(0)); - populate(parent->left(), depth-1); - parent->right(new N(1)); - populate(parent->right(), depth-1); - } -} - -void Test::benchmarkTree(size_t count) -{ - N root(0); - size_t depth = Optimized::msbIdx(count); - populate(&root, depth); -} - -void Test::benchmarkTreeInArray(size_t count) -{ - Store store; - store.alloc(R(0)); - size_t depth = Optimized::msbIdx(count); - populate(store, 0, depth); -} - -int -Test::Main() -{ - std::string type("direct"); - size_t count = 1000000; - if (_argc > 1) { - type = _argv[1]; - } - if (_argc > 2) { - count = strtol(_argv[2], NULL, 0); - } - TEST_INIT("allocinarray_benchmark"); - steady_time start(steady_clock::now()); - if (type == "direct") { - benchmarkTree(count); - } else { - benchmarkTreeInArray(count); - } - LOG(info, "rusage = {\n%s\n}", vespalib::RUsage::createSelf(start).toString().c_str()); - ASSERT_EQUAL(0, kill(0, SIGPROF)); - TEST_DONE(); -} - -TEST_APPHOOK(Test); - diff --git a/staging_vespalib/src/tests/array/allocinarray_test.cpp b/staging_vespalib/src/tests/array/allocinarray_test.cpp deleted file mode 100644 index b6acd9e7e78..00000000000 --- a/staging_vespalib/src/tests/array/allocinarray_test.cpp +++ /dev/null @@ -1,71 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/vespalib/util/array.h> -#include <vespa/vespalib/util/allocinarray.h> -#include <vespa/vespalib/stllike/string.h> -#include <vespa/vespalib/testkit/testapp.h> -#include <deque> - -using namespace vespalib; - -class Test : public TestApp -{ -public: - int Main() override; -private: - template <typename T, typename V> - void testAllocInArray(); -}; - -int -Test::Main() -{ - TEST_INIT("allocinarray_test"); - - testAllocInArray<int64_t, vespalib::Array<int64_t> >(); - testAllocInArray<int64_t, vespalib::Array<int64_t> >(); - testAllocInArray<int64_t, std::vector<int64_t> >(); - testAllocInArray<int64_t, std::deque<int64_t> >(); - - TEST_DONE(); -} - -template <typename T, typename V> -void Test::testAllocInArray() -{ - typedef AllocInArray<T, V> AA; - AA alloc; - EXPECT_EQUAL(0ul, alloc.size()); - EXPECT_EQUAL(0ul, alloc.alloc(1)); - EXPECT_EQUAL(1ul, alloc.size()); - EXPECT_EQUAL(1, alloc[0]); - alloc.free(0); - EXPECT_EQUAL(0ul, alloc.size()); - alloc.free(0); - EXPECT_EQUAL(0ul, alloc.size()); - alloc.free(1); - EXPECT_EQUAL(0ul, alloc.size()); - - alloc.alloc(7); - alloc.alloc(17); - alloc.alloc(-17); - EXPECT_EQUAL(3ul, alloc.size()); - EXPECT_EQUAL(7, alloc[0]); - EXPECT_EQUAL(17, alloc[1]); - EXPECT_EQUAL(-17, alloc[2]); - alloc[1] = 99; - EXPECT_EQUAL(99, alloc[1]); - alloc.free(1); - EXPECT_EQUAL(2ul, alloc.size()); - EXPECT_EQUAL(7, alloc[0]); - EXPECT_EQUAL(-17, alloc[2]); - EXPECT_EQUAL(1ul, alloc.alloc(103)); - EXPECT_EQUAL(3ul, alloc.size()); - EXPECT_EQUAL(7, alloc[0]); - EXPECT_EQUAL(103, alloc[1]); - EXPECT_EQUAL(-17, alloc[2]); - - alloc.clear(); - EXPECT_EQUAL(0ul, alloc.size()); -} - -TEST_APPHOOK(Test) diff --git a/staging_vespalib/src/tests/benchmark/.gitignore b/staging_vespalib/src/tests/benchmark/.gitignore deleted file mode 100644 index 789e52c1370..00000000000 --- a/staging_vespalib/src/tests/benchmark/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.depend -Makefile -benchmark_test -staging_vespalib_benchmark_test_app diff --git a/staging_vespalib/src/tests/benchmark/CMakeLists.txt b/staging_vespalib/src/tests/benchmark/CMakeLists.txt deleted file mode 100644 index 95d61495047..00000000000 --- a/staging_vespalib/src/tests/benchmark/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(staging_vespalib_benchmark_test_app - SOURCES - benchmark.cpp - testbase.cpp - DEPENDS - staging_vespalib - EXTERNAL_DEPENDS - ${VESPA_GLIBC_RT_LIB} -) -vespa_add_test(NAME staging_vespalib_benchmark_test NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/benchmark_test.sh BENCHMARK - DEPENDS staging_vespalib_benchmark_test_app) diff --git a/staging_vespalib/src/tests/benchmark/benchmark_test.sh b/staging_vespalib/src/tests/benchmark/benchmark_test.sh deleted file mode 100755 index 172a8a1379b..00000000000 --- a/staging_vespalib/src/tests/benchmark/benchmark_test.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -set -e -TIME=time - -$TIME ./staging_vespalib_benchmark_test_app vespalib::ParamByReferenceVectorInt 200000 1 -$TIME ./staging_vespalib_benchmark_test_app vespalib::ParamByValueVectorInt 4000 1 -$TIME ./staging_vespalib_benchmark_test_app vespalib::ParamByReferenceVectorString 30000 1 -$TIME ./staging_vespalib_benchmark_test_app vespalib::ParamByValueVectorString 40 1 -$TIME ./staging_vespalib_benchmark_test_app vespalib::ReturnByReferenceVectorString 10 1 -$TIME ./staging_vespalib_benchmark_test_app vespalib::ReturnByValueVectorString 10 1 -$TIME ./staging_vespalib_benchmark_test_app vespalib::ReturnByValueMultiVectorString 10 1 -$TIME ./staging_vespalib_benchmark_test_app vespalib::ClockSystem 1000 1 -$TIME ./staging_vespalib_benchmark_test_app vespalib::ClockGToD 1000 1 -$TIME ./staging_vespalib_benchmark_test_app vespalib::ClockGToD 20000 1 -$TIME ./staging_vespalib_benchmark_test_app vespalib::ClockREALTIME 1000 1 -$TIME ./staging_vespalib_benchmark_test_app vespalib::ClockMONOTONIC 1000 1 -$TIME ./staging_vespalib_benchmark_test_app vespalib::ClockMONOTONIC_RAW 1000 1 -$TIME ./staging_vespalib_benchmark_test_app vespalib::ClockPROCESS_CPUTIME_ID 2500 1 -$TIME ./staging_vespalib_benchmark_test_app vespalib::ClockTHREAD_CPUTIME_ID 2500 1 -$TIME ./staging_vespalib_benchmark_test_app vespalib::CreateVespalibString 20000 1 diff --git a/staging_vespalib/src/tests/bits/.gitignore b/staging_vespalib/src/tests/bits/.gitignore deleted file mode 100644 index 82481fe3c30..00000000000 --- a/staging_vespalib/src/tests/bits/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.depend -Makefile -bits_test -staging_vespalib_bits_test_app diff --git a/staging_vespalib/src/tests/bits/CMakeLists.txt b/staging_vespalib/src/tests/bits/CMakeLists.txt deleted file mode 100644 index 36edcf3bb8f..00000000000 --- a/staging_vespalib/src/tests/bits/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(staging_vespalib_bits_test_app TEST - SOURCES - bits_test.cpp - DEPENDS - staging_vespalib -) -vespa_add_test(NAME staging_vespalib_bits_test_app COMMAND staging_vespalib_bits_test_app) diff --git a/staging_vespalib/src/tests/clock/.gitignore b/staging_vespalib/src/tests/clock/.gitignore deleted file mode 100644 index b0fcd343176..00000000000 --- a/staging_vespalib/src/tests/clock/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -.depend -Makefile -clock_test -staging_vespalib_clock_test_app -staging_vespalib_clock_benchmark_app diff --git a/staging_vespalib/src/tests/clock/CMakeLists.txt b/staging_vespalib/src/tests/clock/CMakeLists.txt deleted file mode 100644 index 240ad8d0a55..00000000000 --- a/staging_vespalib/src/tests/clock/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(staging_vespalib_clock_benchmark_app TEST - SOURCES - clock_benchmark.cpp - DEPENDS - staging_vespalib -) -vespa_add_executable(staging_vespalib_clock_test_app TEST - SOURCES - clock_test.cpp - DEPENDS - staging_vespalib -) -vespa_add_test(NAME staging_vespalib_clock_test_app COMMAND staging_vespalib_clock_test_app) diff --git a/staging_vespalib/src/tests/crc/.gitignore b/staging_vespalib/src/tests/crc/.gitignore deleted file mode 100644 index 448fa141b03..00000000000 --- a/staging_vespalib/src/tests/crc/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.depend -Makefile -crc_test -staging_vespalib_crc_test_app diff --git a/staging_vespalib/src/tests/crc/CMakeLists.txt b/staging_vespalib/src/tests/crc/CMakeLists.txt deleted file mode 100644 index b6c89d00c54..00000000000 --- a/staging_vespalib/src/tests/crc/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(staging_vespalib_crc_test_app TEST - SOURCES - crc_test.cpp - DEPENDS - staging_vespalib -) -vespa_add_test(NAME staging_vespalib_crc_test_app COMMAND staging_vespalib_crc_test_app boost) diff --git a/staging_vespalib/src/tests/directio/.gitignore b/staging_vespalib/src/tests/directio/.gitignore deleted file mode 100644 index 6e6dbe13324..00000000000 --- a/staging_vespalib/src/tests/directio/.gitignore +++ /dev/null @@ -1 +0,0 @@ -staging_vespalib_directio_test_app diff --git a/staging_vespalib/src/tests/directio/CMakeLists.txt b/staging_vespalib/src/tests/directio/CMakeLists.txt deleted file mode 100644 index 64da387d950..00000000000 --- a/staging_vespalib/src/tests/directio/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(staging_vespalib_directio_test_app TEST - SOURCES - directio.cpp - DEPENDS - staging_vespalib -) -vespa_add_test(NAME staging_vespalib_directio_test_app COMMAND staging_vespalib_directio_test_app) diff --git a/staging_vespalib/src/tests/floatingpointtype/.gitignore b/staging_vespalib/src/tests/floatingpointtype/.gitignore deleted file mode 100644 index f99dd0fd707..00000000000 --- a/staging_vespalib/src/tests/floatingpointtype/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.depend -Makefile -floatingpointtype_test -staging_vespalib_floatingpointtype_test_app diff --git a/staging_vespalib/src/tests/floatingpointtype/CMakeLists.txt b/staging_vespalib/src/tests/floatingpointtype/CMakeLists.txt deleted file mode 100644 index eca27430e0b..00000000000 --- a/staging_vespalib/src/tests/floatingpointtype/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(staging_vespalib_floatingpointtype_test_app TEST - SOURCES - floatingpointtypetest.cpp - DEPENDS - staging_vespalib -) -vespa_add_test(NAME staging_vespalib_floatingpointtype_test_app COMMAND staging_vespalib_floatingpointtype_test_app) diff --git a/staging_vespalib/src/tests/growablebytebuffer/.gitignore b/staging_vespalib/src/tests/growablebytebuffer/.gitignore deleted file mode 100644 index 8df98f682b8..00000000000 --- a/staging_vespalib/src/tests/growablebytebuffer/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.depend -Makefile -growablebytebuffer_test -staging_vespalib_growablebytebuffer_test_app diff --git a/staging_vespalib/src/tests/growablebytebuffer/CMakeLists.txt b/staging_vespalib/src/tests/growablebytebuffer/CMakeLists.txt deleted file mode 100644 index 9126bd1cd07..00000000000 --- a/staging_vespalib/src/tests/growablebytebuffer/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(staging_vespalib_growablebytebuffer_test_app TEST - SOURCES - growablebytebuffer_test.cpp - DEPENDS - staging_vespalib -) -vespa_add_test(NAME staging_vespalib_growablebytebuffer_test_app COMMAND staging_vespalib_growablebytebuffer_test_app) diff --git a/staging_vespalib/src/tests/json/.gitignore b/staging_vespalib/src/tests/json/.gitignore deleted file mode 100644 index 963bafed038..00000000000 --- a/staging_vespalib/src/tests/json/.gitignore +++ /dev/null @@ -1 +0,0 @@ -staging_vespalib_json_test_app diff --git a/staging_vespalib/src/tests/json/CMakeLists.txt b/staging_vespalib/src/tests/json/CMakeLists.txt deleted file mode 100644 index 2ca20be9258..00000000000 --- a/staging_vespalib/src/tests/json/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(staging_vespalib_json_test_app TEST - SOURCES - json.cpp - DEPENDS - staging_vespalib -) -vespa_add_test(NAME staging_vespalib_json_test_app COMMAND staging_vespalib_json_test_app boost) diff --git a/staging_vespalib/src/tests/memorydatastore/.gitignore b/staging_vespalib/src/tests/memorydatastore/.gitignore deleted file mode 100644 index 634cea1ae88..00000000000 --- a/staging_vespalib/src/tests/memorydatastore/.gitignore +++ /dev/null @@ -1 +0,0 @@ -staging_vespalib_memorydatastore_test_app diff --git a/staging_vespalib/src/tests/memorydatastore/CMakeLists.txt b/staging_vespalib/src/tests/memorydatastore/CMakeLists.txt deleted file mode 100644 index f3709aeea65..00000000000 --- a/staging_vespalib/src/tests/memorydatastore/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(staging_vespalib_memorydatastore_test_app TEST - SOURCES - memorydatastore.cpp - DEPENDS - staging_vespalib -) -vespa_add_test(NAME staging_vespalib_memorydatastore_test_app COMMAND staging_vespalib_memorydatastore_test_app) diff --git a/staging_vespalib/src/tests/objectdump/.gitignore b/staging_vespalib/src/tests/objectdump/.gitignore deleted file mode 100644 index d243567aea6..00000000000 --- a/staging_vespalib/src/tests/objectdump/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.depend -Makefile -objectdump_test -staging_vespalib_objectdump_test_app diff --git a/staging_vespalib/src/tests/objectdump/CMakeLists.txt b/staging_vespalib/src/tests/objectdump/CMakeLists.txt deleted file mode 100644 index 29fc8a748ee..00000000000 --- a/staging_vespalib/src/tests/objectdump/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(staging_vespalib_objectdump_test_app TEST - SOURCES - objectdump.cpp - DEPENDS - staging_vespalib -) -vespa_add_test(NAME staging_vespalib_objectdump_test_app COMMAND staging_vespalib_objectdump_test_app) diff --git a/staging_vespalib/src/tests/objects/CMakeLists.txt b/staging_vespalib/src/tests/objects/CMakeLists.txt deleted file mode 100644 index f1313da4bae..00000000000 --- a/staging_vespalib/src/tests/objects/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(staging_vespalib_identifiable_test_app TEST - SOURCES - identifiable_test.cpp - DEPENDS - staging_vespalib -) -vespa_add_test(NAME staging_vespalib_identifiable_test_app COMMAND staging_vespalib_identifiable_test_app) diff --git a/staging_vespalib/src/tests/objectselection/.gitignore b/staging_vespalib/src/tests/objectselection/.gitignore deleted file mode 100644 index 3dece3fbbfe..00000000000 --- a/staging_vespalib/src/tests/objectselection/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.depend -Makefile -objectselection_test -staging_vespalib_objectselection_test_app diff --git a/staging_vespalib/src/tests/objectselection/CMakeLists.txt b/staging_vespalib/src/tests/objectselection/CMakeLists.txt deleted file mode 100644 index 63f33d05e62..00000000000 --- a/staging_vespalib/src/tests/objectselection/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(staging_vespalib_objectselection_test_app TEST - SOURCES - objectselection.cpp - DEPENDS - staging_vespalib -) -vespa_add_test(NAME staging_vespalib_objectselection_test_app COMMAND staging_vespalib_objectselection_test_app) diff --git a/staging_vespalib/src/tests/polymorphicarray/.gitignore b/staging_vespalib/src/tests/polymorphicarray/.gitignore deleted file mode 100644 index b3a74390312..00000000000 --- a/staging_vespalib/src/tests/polymorphicarray/.gitignore +++ /dev/null @@ -1 +0,0 @@ -staging_vespalib_polymorphicarray_test_app diff --git a/staging_vespalib/src/tests/polymorphicarray/CMakeLists.txt b/staging_vespalib/src/tests/polymorphicarray/CMakeLists.txt deleted file mode 100644 index 3c7e6074b88..00000000000 --- a/staging_vespalib/src/tests/polymorphicarray/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(staging_vespalib_polymorphicarray_test_app TEST - SOURCES - polymorphicarray_test.cpp - DEPENDS - staging_vespalib -) -vespa_add_test(NAME staging_vespalib_polymorphicarray_test_app COMMAND staging_vespalib_polymorphicarray_test_app) diff --git a/staging_vespalib/src/tests/programoptions/.gitignore b/staging_vespalib/src/tests/programoptions/.gitignore deleted file mode 100644 index 31f3aa61556..00000000000 --- a/staging_vespalib/src/tests/programoptions/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.depend -Makefile -programoptions_test -staging_vespalib_programoptions_test_app diff --git a/staging_vespalib/src/tests/programoptions/CMakeLists.txt b/staging_vespalib/src/tests/programoptions/CMakeLists.txt deleted file mode 100644 index a4d71815621..00000000000 --- a/staging_vespalib/src/tests/programoptions/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(staging_vespalib_programoptions_test_app TEST - SOURCES - programoptions_test.cpp - DEPENDS - staging_vespalib -) -vespa_add_test(NAME staging_vespalib_programoptions_test_app COMMAND staging_vespalib_programoptions_test_app) diff --git a/staging_vespalib/src/tests/rusage/.gitignore b/staging_vespalib/src/tests/rusage/.gitignore deleted file mode 100644 index 195922a9ced..00000000000 --- a/staging_vespalib/src/tests/rusage/.gitignore +++ /dev/null @@ -1 +0,0 @@ -staging_vespalib_rusage_test_app diff --git a/staging_vespalib/src/tests/rusage/CMakeLists.txt b/staging_vespalib/src/tests/rusage/CMakeLists.txt deleted file mode 100644 index b52a47183b0..00000000000 --- a/staging_vespalib/src/tests/rusage/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(staging_vespalib_rusage_test_app TEST - SOURCES - rusage_test.cpp - DEPENDS - staging_vespalib -) -vespa_add_test(NAME staging_vespalib_rusage_test_app COMMAND staging_vespalib_rusage_test_app) diff --git a/staging_vespalib/src/tests/shutdownguard/.gitignore b/staging_vespalib/src/tests/shutdownguard/.gitignore deleted file mode 100644 index a596164ac7b..00000000000 --- a/staging_vespalib/src/tests/shutdownguard/.gitignore +++ /dev/null @@ -1 +0,0 @@ -staging_vespalib_shutdownguard_test_app diff --git a/staging_vespalib/src/tests/shutdownguard/CMakeLists.txt b/staging_vespalib/src/tests/shutdownguard/CMakeLists.txt deleted file mode 100644 index b1d43788957..00000000000 --- a/staging_vespalib/src/tests/shutdownguard/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(staging_vespalib_shutdownguard_test_app TEST - SOURCES - shutdownguard_test.cpp - DEPENDS - staging_vespalib -) -vespa_add_test(NAME staging_vespalib_shutdownguard_test_app NO_VALGRIND COMMAND staging_vespalib_shutdownguard_test_app) diff --git a/staging_vespalib/src/tests/stllike/.gitignore b/staging_vespalib/src/tests/stllike/.gitignore deleted file mode 100644 index 268b9e88393..00000000000 --- a/staging_vespalib/src/tests/stllike/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.depend -Makefile -lrucache_test -cache_test -staging_vespalib_cache_test_app -staging_vespalib_lrucache_test_app diff --git a/staging_vespalib/src/tests/stllike/CMakeLists.txt b/staging_vespalib/src/tests/stllike/CMakeLists.txt deleted file mode 100644 index 40dc7a8a438..00000000000 --- a/staging_vespalib/src/tests/stllike/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(staging_vespalib_lrucache_test_app TEST - SOURCES - lrucache.cpp - DEPENDS - staging_vespalib -) -vespa_add_test(NAME staging_vespalib_lrucache_test_app COMMAND staging_vespalib_lrucache_test_app) -vespa_add_executable(staging_vespalib_cache_test_app TEST - SOURCES - cache_test.cpp - DEPENDS - staging_vespalib -) -vespa_add_test(NAME staging_vespalib_cache_test_app COMMAND staging_vespalib_cache_test_app) diff --git a/staging_vespalib/src/tests/util/process_memory_stats/.gitignore b/staging_vespalib/src/tests/util/process_memory_stats/.gitignore deleted file mode 100644 index e32e9f22dd3..00000000000 --- a/staging_vespalib/src/tests/util/process_memory_stats/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -mapfile -staging_vespalib_process_memory_stats_test_app diff --git a/staging_vespalib/src/tests/util/process_memory_stats/CMakeLists.txt b/staging_vespalib/src/tests/util/process_memory_stats/CMakeLists.txt deleted file mode 100644 index 6709c7bac1b..00000000000 --- a/staging_vespalib/src/tests/util/process_memory_stats/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(staging_vespalib_process_memory_stats_test_app TEST - SOURCES - process_memory_stats_test.cpp - DEPENDS - staging_vespalib -) -vespa_add_test(NAME staging_vespalib_process_memory_stats_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/process_memory_stats_test.sh - DEPENDS staging_vespalib_process_memory_stats_test_app) diff --git a/staging_vespalib/src/tests/xmlserializable/.gitignore b/staging_vespalib/src/tests/xmlserializable/.gitignore deleted file mode 100644 index d2910cb7407..00000000000 --- a/staging_vespalib/src/tests/xmlserializable/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -*_test -.depend -Makefile -staging_vespalib_xmlserializable_test_app diff --git a/staging_vespalib/src/tests/xmlserializable/CMakeLists.txt b/staging_vespalib/src/tests/xmlserializable/CMakeLists.txt deleted file mode 100644 index 999bc45ad66..00000000000 --- a/staging_vespalib/src/tests/xmlserializable/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(staging_vespalib_xmlserializable_test_app TEST - SOURCES - xmlserializabletest.cpp - DEPENDS - staging_vespalib -) -vespa_add_test(NAME staging_vespalib_xmlserializable_test_app COMMAND staging_vespalib_xmlserializable_test_app) diff --git a/staging_vespalib/src/vespa/vespalib/.gitignore b/staging_vespalib/src/vespa/vespalib/.gitignore deleted file mode 100644 index fae8ae72fc9..00000000000 --- a/staging_vespalib/src/vespa/vespalib/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.so.* -.depend -Makefile diff --git a/staging_vespalib/src/vespa/vespalib/CMakeLists.txt b/staging_vespalib/src/vespa/vespalib/CMakeLists.txt deleted file mode 100644 index 053c04064ca..00000000000 --- a/staging_vespalib/src/vespa/vespalib/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(staging_vespalib - SOURCES - $<TARGET_OBJECTS:staging_vespalib_vespalib_util> - $<TARGET_OBJECTS:staging_vespalib_vespalib_objects> - $<TARGET_OBJECTS:staging_vespalib_vespalib_stllike> - INSTALL lib64 - DEPENDS -) diff --git a/staging_vespalib/src/vespa/vespalib/objects/.gitignore b/staging_vespalib/src/vespa/vespalib/objects/.gitignore deleted file mode 100644 index ee8938b6bf4..00000000000 --- a/staging_vespalib/src/vespa/vespalib/objects/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -*.So -*.exe -*.ilk -*.pdb -.depend* -Makefile diff --git a/staging_vespalib/src/vespa/vespalib/objects/CMakeLists.txt b/staging_vespalib/src/vespa/vespalib/objects/CMakeLists.txt deleted file mode 100644 index 6300cad0c72..00000000000 --- a/staging_vespalib/src/vespa/vespalib/objects/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(staging_vespalib_vespalib_objects OBJECT - SOURCES - identifiable.cpp - namedobject.cpp - objectvisitor.cpp - objectdumper.cpp - object2slime.cpp - visit.cpp - objectpredicate.cpp - objectoperation.cpp - nboserializer.cpp - serializer.cpp - deserializer.cpp - asciiserializer.cpp - floatingpointtype.cpp - DEPENDS -) diff --git a/staging_vespalib/src/vespa/vespalib/objects/memberinfo.h b/staging_vespalib/src/vespa/vespalib/objects/memberinfo.h deleted file mode 100644 index 4f2736cdbf3..00000000000 --- a/staging_vespalib/src/vespa/vespalib/objects/memberinfo.h +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#pragma once - -namespace vespalib { - -#define MI_TYPEID(t) MemberInfo::##t##_id -#define MI_M_OFFSET(c, m) static_cast<long>(&static_cast<const c *>(0)->m) -#define MI_M_SIZEOF(c, m) sizeof(static_cast<const c *>(0)->m) -#define MI_BASE_OFFSET(c,b) static_cast<long>(static_cast<const b *>(static_cast<const * c>(1)) - 1) - -#define MI_DECLARE \ - static const MemberInfo _memberInfo[]; \ - static const unsigned _memberCount; - -#define MI_IMPL_BEGIN(c) const MemberInfo c::_memberInfo[] = { \ -#define MI_IMPL_MEM(c, t, m) {#m, MI_TYPEID(t), MI_M_OFFSET(c, m), sizeof(m) } -#define MI_IMPL_END(c) }; const unsigned c::_memberCount = sizeof(cl::__memberDescription)/sizeof(cl::__memberDescription[0]) - - -class MemberInfo { - public: - enum TypeId { - bool_id = 1, - char_id, - int8_t_id, - uint8_t_id, - int16_t_id, - uint16_t_id, - int32_t_id, - uint32_t_id, - int64_t_id, - uint64_t_id, - float_id, - double_id, - std_string_id, - vespalib_Identifiable_id - }; - const char * _name; - TypeId _type; - size_t _offset - size_t _sizeof; -}; - -} - diff --git a/staging_vespalib/src/vespa/vespalib/objects/simpledynamicdata.h b/staging_vespalib/src/vespa/vespalib/objects/simpledynamicdata.h deleted file mode 100644 index f07832465e7..00000000000 --- a/staging_vespalib/src/vespa/vespalib/objects/simpledynamicdata.h +++ /dev/null @@ -1,113 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#pragma once - -#include <vector> -#include <algorithm> -#include <memory> -#include "dynamicdatavalue.h" - -namespace vespalib -{ - -class SimpleDynamicData : public DynamicDataValue -{ -private: - struct DataUnit { - uint32_t id; - Value *v; - DataUnit(uint32_t id_, Value *v_) : id(id_), v(v_) {} - }; - typedef std::vector<DataUnit> DataUnits; - DataUnits _values; - - virtual bool setValueIfExisting(uint32_t id, const Value& v) { - for (DataUnits::iterator it = _values.begin(); it != _values.end(); ++it) { - if (it->id == id) { - delete it->v; - it->v = v.clone(); - return true; - } - } - return false; - } - virtual void addNewValue(uint32_t id, const Value& v) { - _values.push_back(DataUnit(id, v.clone())); - } - - void swap(SimpleDynamicData& other) { - std::swap(_values, other._values); - } - -public: - virtual ~SimpleDynamicData() { - // we own contained data, must delete it - for (DataUnits::iterator it = _values.begin(); it != _values.end(); ++it) { - delete it->v; - } - } - virtual bool hasValue(uint32_t id) const { - for (DataUnits::const_iterator it = _values.begin(); it != _values.end(); ++it) { - if (it->id == id) return true; - } - return false; - } - virtual void deleteValue(uint32_t id) { - for (DataUnits::iterator it = _values.begin(); it != _values.end(); ++it) { - if (it->id == id) { - delete it->v; - _values.erase(it); - return; - } - } - } - virtual const Value& getValue(uint32_t id) const { - for (DataUnits::const_iterator it = _values.begin(); it != _values.end(); ++it) { - if (it->id == id) { - return *(it->v); - } - } - throw IllegalArgumentException("id not found"); - } - virtual Value *getValueRef(uint32_t id) const { - for (DataUnits::const_iterator it = _values.begin(); it != _values.end(); ++it) { - if (it->id == id) { - return it->v; - } - } - return NULL; - } - virtual void visitValues(ValueReceiverI& visitor) const { - for (DataUnits::const_iterator it = _values.begin(); it != _values.end(); ++it) { - visitor(it->id, *(it->v)); - } - } - - SimpleDynamicData() : _values() {} - SimpleDynamicData(const SimpleDynamicData& other) : - DynamicDataValue(), - _values() - { - for (DataUnits::const_iterator it = other._values.begin(); - it != other._values.end(); - ++it) - { - addNewValue(it->id, *(it->v)); - } - } - - SimpleDynamicData& operator= (const SimpleDynamicData& other) { - SimpleDynamicData tmp(other); - swap(tmp); - return *this; - } - - virtual SimpleDynamicData *clone() const { - SimpleDynamicData *ret = new SimpleDynamicData(*this); - return ret; - } -}; - - - -} // namespace vespalib - diff --git a/staging_vespalib/src/vespa/vespalib/objects/valuetype.cpp b/staging_vespalib/src/vespa/vespalib/objects/valuetype.cpp deleted file mode 100644 index 96cf3fa22e1..00000000000 --- a/staging_vespalib/src/vespa/vespalib/objects/valuetype.cpp +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include "valuetype.h" - -namespace vespalib { - -const StringValueType StringValueType::t; -const DynamicDataValueType DynamicDataValueType::t; -const Int16ValueType Int16ValueType::t; -const Int32ValueType Int32ValueType::t; -const Int64ValueType Int64ValueType::t; -const UnsignedByteValueType UnsignedByteValueType::t; -const Uint128ValueType Uint128ValueType::t; -const Uint256ValueType Uint256ValueType::t; -const Uint96ValueType Uint96ValueType::t; -const ArrayOfStringValueType ArrayOfStringValueType::t; -const ArrayOfDynamicDataValueType ArrayOfDynamicDataValueType::t; -const ArrayOfInt16ValueType ArrayOfInt16ValueType::t; -const ArrayOfInt32ValueType ArrayOfInt32ValueType::t; -const ArrayOfInt64ValueType ArrayOfInt64ValueType::t; -const ArrayOfUnsignedByteValueType ArrayOfUnsignedByteValueType::t; -const ArrayOfUint128ValueType ArrayOfUint128ValueType::t; -const ArrayOfUint256ValueType ArrayOfUint256ValueType::t; -const ArrayOfUint96ValueType ArrayOfUint96ValueType::t; - -} // namespace vespalib diff --git a/staging_vespalib/src/vespa/vespalib/stllike/.gitignore b/staging_vespalib/src/vespa/vespalib/stllike/.gitignore deleted file mode 100644 index ee8938b6bf4..00000000000 --- a/staging_vespalib/src/vespa/vespalib/stllike/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -*.So -*.exe -*.ilk -*.pdb -.depend* -Makefile diff --git a/staging_vespalib/src/vespa/vespalib/stllike/CMakeLists.txt b/staging_vespalib/src/vespa/vespalib/stllike/CMakeLists.txt deleted file mode 100644 index a76f2b82d4e..00000000000 --- a/staging_vespalib/src/vespa/vespalib/stllike/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(staging_vespalib_vespalib_stllike OBJECT - SOURCES - DEPENDS -) diff --git a/staging_vespalib/src/vespa/vespalib/util/.gitignore b/staging_vespalib/src/vespa/vespalib/util/.gitignore deleted file mode 100644 index ee8938b6bf4..00000000000 --- a/staging_vespalib/src/vespa/vespalib/util/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -*.So -*.exe -*.ilk -*.pdb -.depend* -Makefile diff --git a/staging_vespalib/src/vespa/vespalib/util/CMakeLists.txt b/staging_vespalib/src/vespa/vespalib/util/CMakeLists.txt deleted file mode 100644 index dec951f9ef2..00000000000 --- a/staging_vespalib/src/vespa/vespalib/util/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(staging_vespalib_vespalib_util OBJECT - SOURCES - bits.cpp - clock.cpp - crc.cpp - document_runnable.cpp - doom.cpp - growablebytebuffer.cpp - jsonexception.cpp - jsonstream.cpp - malloc_mmap_guard.cpp - process_memory_stats.cpp - programoptions.cpp - programoptions_testutils.cpp - rusage.cpp - shutdownguard.cpp - testclock.cpp - xmlserializable.cpp - xmlstream.cpp - DEPENDS -) diff --git a/staging_vespalib/src/vespa/vespalib/util/allocinarray.h b/staging_vespalib/src/vespa/vespalib/util/allocinarray.h deleted file mode 100644 index aa8951fe9ec..00000000000 --- a/staging_vespalib/src/vespa/vespalib/util/allocinarray.h +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#pragma once - -#include <vespa/vespalib/util/alloc.h> -#include <vespa/vespalib/util/array.h> - -namespace vespalib { - -/** - * This is a class that lets you allocate memory tightly. It uses an vector interface - * for storing objects of the same type efficiently. It also providex vector like access with []. - * New objects are just appended to the backing vector, or if there are holes they are inserted there. - * freed objects are not destructed upon free, but rather when the place is required again. - * That happens either - * - on free if it is the last element in the backing vector. - * - when the AllocInArray goes out of scope. - * - on an explicit clear. -**/ -template <typename T, typename V=vespalib::Array<T> > -class AllocInArray { -public: - typedef uint32_t Index; - void reserve(size_t sz) { _v.reserve(sz); } - Index alloc(const T & v); - void free(Index p); - const T & operator [] (Index p) const { return _v[p]; } - T & operator [] (Index p) { return _v[p]; } - void clear(); - size_t size() const { return _v.size() - _free.size(); } -private: - Index last() const { return _v.size() - 1; } - typedef vespalib::Array<Index> FreeList; - V _v; - FreeList _free; -}; - -template <typename T, typename V> -typename AllocInArray<T, V>::Index -AllocInArray<T, V>::alloc(const T & v) -{ - if (_free.empty()) { - _v.push_back(v); - return last(); - } else { - Index p(_free.back()); - _free.pop_back(); - _v[p] = v; - return p; - } -} - -template <typename T, typename V> -void -AllocInArray<T, V>::free(Index p) -{ - if (p == last()) { - _v.pop_back(); - } else if ( p < _v.size()) { - _free.push_back(p); - } -} - -template <typename T, typename V> -void -AllocInArray<T, V>::clear() -{ - _v.clear(); - _free.clear(); -} - -} - diff --git a/staging_vespalib/src/vespa/vespalib/util/overview.h b/staging_vespalib/src/vespa/vespalib/util/overview.h deleted file mode 100644 index b998356ba50..00000000000 --- a/staging_vespalib/src/vespa/vespalib/util/overview.h +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/*! \mainpage Vespalib - C++ utility library for Vespa components - * - * \section intro_sec Introduction - * - * vespalib is a collection of simple utility classes shared - * between most Vespa components that are written in C++. - * Most of these aren't Vespa specific in any way, except that - * they reflect the Vespa code standard and conventions. - * - * \section install_sec Installation - * - * install vespa_vespalib_dev - * - * \section overview_sec Overview - * - * Most of the classes in vespalib can be used by themselves, - * for a full list see the alphabetical class list. - * Here are the major groups of classes: - * - * Generation counter - * - * vespalib::GenCnt - * - * Reference counting and atomic operations - * - * <BR> vespalib::ReferenceCounter - * - * Simple hashmap - * - * \ref vespalib::HashMap<T> - * - * Scope guards for easier exception-safety - * - * vespalib::CounterGuard - * <BR> vespalib::DirPointer - * <BR> vespalib::FileDescriptor - * <BR> vespalib::FilePointer - * <BR> \ref vespalib::MaxValueGuard<T> - * <BR> \ref vespalib::ValueGuard<T> - * - * General utility macros - * <BR> \ref VESPA_STRLOC - * <BR> \ref VESPA_STRINGIZE(str) - * - * Standalone testing framework - * - * vespalib::TestApp - */ diff --git a/staging_vespalib/testrun/.gitignore b/staging_vespalib/testrun/.gitignore deleted file mode 100644 index faed45bc94a..00000000000 --- a/staging_vespalib/testrun/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -test-report.html -test-report.html.* -test.*.*.desc -test.*.*.file.* -test.*.*.files.html -test.*.*.log -tmp.* -xsync.log -/test.*.*.result -Makefile diff --git a/storage/src/vespa/storageapi/buckets/bucketinfo.cpp b/storage/src/vespa/storageapi/buckets/bucketinfo.cpp index ff2f40e736b..8305b999afc 100644 --- a/storage/src/vespa/storageapi/buckets/bucketinfo.cpp +++ b/storage/src/vespa/storageapi/buckets/bucketinfo.cpp @@ -2,7 +2,6 @@ #include "bucketinfo.h" #include <vespa/vespalib/stllike/asciistream.h> #include <vespa/vespalib/util/xmlstream.h> -#include <ostream> namespace storage::api { @@ -111,7 +110,7 @@ BucketInfo::toString() const } void -BucketInfo::printXml(vespalib::XmlOutputStream& xos) const +BucketInfo::printXml(vespalib::xml::XmlOutputStream& xos) const { using namespace vespalib::xml; xos << XmlAttribute("checksum", _checksum, XmlAttribute::HEX) diff --git a/storage/src/vespa/storageapi/buckets/bucketinfo.h b/storage/src/vespa/storageapi/buckets/bucketinfo.h index d7b407185f6..e535dee3152 100644 --- a/storage/src/vespa/storageapi/buckets/bucketinfo.h +++ b/storage/src/vespa/storageapi/buckets/bucketinfo.h @@ -14,9 +14,9 @@ #pragma once #include <vespa/storageapi/defs.h> -#include <vespa/vespalib/util/xmlserializable.h> #include <vespa/vespalib/stllike/string.h> +namespace vespalib::xml { class XmlOutputStream; } namespace storage::api { class BucketInfo @@ -76,7 +76,7 @@ public: return _metaCount == 0 && _usedFileSize == 0 && _checksum == 0; } vespalib::string toString() const; - void printXml(vespalib::XmlOutputStream&) const; + void printXml(vespalib::xml::XmlOutputStream&) const; }; std::ostream & operator << (std::ostream & os, const BucketInfo & bucketInfo); diff --git a/vbench/CMakeLists.txt b/vbench/CMakeLists.txt index 04a326cfb04..3fb5df8cd20 100644 --- a/vbench/CMakeLists.txt +++ b/vbench/CMakeLists.txt @@ -3,7 +3,6 @@ vespa_define_module( DEPENDS fastos vespalib - staging_vespalib LIBS src/vbench diff --git a/vdslib/CMakeLists.txt b/vdslib/CMakeLists.txt index 4f0e97ae07d..0f8144b99e9 100644 --- a/vdslib/CMakeLists.txt +++ b/vdslib/CMakeLists.txt @@ -4,7 +4,6 @@ vespa_define_module( fastos vespalog vespalib - staging_vespalib config_cloudconfig configdefinitions document diff --git a/vespaclient/CMakeLists.txt b/vespaclient/CMakeLists.txt index 2a43ea804a3..a427198a22c 100644 --- a/vespaclient/CMakeLists.txt +++ b/vespaclient/CMakeLists.txt @@ -9,7 +9,6 @@ vespa_define_module( document documentapi vespalib - staging_vespalib LIBS src/vespa/vespaclient/clusterlist diff --git a/vespajlib/src/main/java/com/yahoo/vespa/objects/Ids.java b/vespajlib/src/main/java/com/yahoo/vespa/objects/Ids.java index 93bfa3f0dde..62ec6efe3c1 100644 --- a/vespajlib/src/main/java/com/yahoo/vespa/objects/Ids.java +++ b/vespajlib/src/main/java/com/yahoo/vespa/objects/Ids.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.objects; /** * This is a class containing the global ids that are given out. - * Must be in sync with version for c++ in staging_vespalib/src/vespalib/objects/ids.h + * Must be in sync with version for c++ in vespalib/src/vespalib/objects/ids.h * * @author baldersheim */ diff --git a/vespalib/CMakeLists.txt b/vespalib/CMakeLists.txt index 79cc32d2a60..fd1c52a868a 100644 --- a/vespalib/CMakeLists.txt +++ b/vespalib/CMakeLists.txt @@ -1,4 +1,9 @@ # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +if(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") +set(VESPALIB_DIRECTIO_TESTDIR src/tests/directio) +set(VESPALIB_PROCESS_MEMORY_STATS_TESTDIR src/tests/util/process_memory_stats) +endif() + vespa_define_module( DEPENDS fastos @@ -25,16 +30,20 @@ vespa_define_module( src/tests/arrayref src/tests/assert src/tests/barrier + src/tests/benchmark src/tests/benchmark_timer + src/tests/bits src/tests/box src/tests/btree src/tests/btree/btree_store src/tests/btree/btree-scan-speed src/tests/btree/btree-stress + src/tests/clock src/tests/component src/tests/compress src/tests/compression src/tests/cpu_usage + src/tests/crc src/tests/crypto src/tests/data/databuffer src/tests/data/input_reader @@ -53,6 +62,7 @@ vespa_define_module( src/tests/datastore/unique_store src/tests/datastore/unique_store_dictionary src/tests/datastore/unique_store_string_allocator + ${VESPALIB_DIRECTIO_TESTDIR} src/tests/detect_type_benchmark src/tests/dotproduct src/tests/drop-file-from-cache @@ -63,21 +73,25 @@ vespa_define_module( src/tests/executor src/tests/executor_idle_tracking src/tests/explore_modern_cpp - src/tests/fileheader src/tests/false src/tests/fiddle + src/tests/fileheader + src/tests/floatingpointtype src/tests/fuzzy src/tests/gencnt + src/tests/growablebytebuffer src/tests/guard src/tests/host_name src/tests/hwaccelrated src/tests/io/fileutil src/tests/io/mapped_file_input src/tests/issue + src/tests/json src/tests/latch src/tests/left_right_heap src/tests/make_fixture_macros src/tests/memory + src/tests/memorydatastore src/tests/metrics src/tests/net/async_resolver src/tests/net/crypto_socket @@ -93,9 +107,13 @@ vespa_define_module( src/tests/net/tls/protocol_snooping src/tests/net/tls/transport_options src/tests/nice + src/tests/objects/identifiable src/tests/objects/nbostream + src/tests/objects/objectdump + src/tests/objects/objectselection src/tests/optimized src/tests/overload + src/tests/polymorphicarray src/tests/portal src/tests/portal/handle_manager src/tests/portal/http_request @@ -103,13 +121,17 @@ vespa_define_module( src/tests/printable src/tests/priority_queue src/tests/process + ${VESPALIB_PROCESS_MEMORY_STATS_TESTDIR} + src/tests/programoptions src/tests/random src/tests/referencecounter src/tests/regex src/tests/rendezvous src/tests/require src/tests/runnable_pair + src/tests/rusage src/tests/sequencedtaskexecutor + src/tests/shutdownguard src/tests/singleexecutor src/tests/sha1 src/tests/shared_operation_throttler @@ -169,6 +191,7 @@ vespa_define_module( src/tests/visit_ranges src/tests/invokeservice src/tests/wakeup + src/tests/xmlserializable src/tests/zcurve LIBS diff --git a/vespalib/src/tests/array/.gitignore b/vespalib/src/tests/array/.gitignore index 952bc0ecdf2..dd07c7d9777 100644 --- a/vespalib/src/tests/array/.gitignore +++ b/vespalib/src/tests/array/.gitignore @@ -1,3 +1,4 @@ /sort_benchmark /allocinarray_benchmark vespalib_array_test_app +vespalib_sort_benchmark_app diff --git a/vespalib/src/tests/array/CMakeLists.txt b/vespalib/src/tests/array/CMakeLists.txt index 18cb5c2b95e..fae7b32cd7e 100644 --- a/vespalib/src/tests/array/CMakeLists.txt +++ b/vespalib/src/tests/array/CMakeLists.txt @@ -6,3 +6,10 @@ vespa_add_executable(vespalib_array_test_app TEST vespalib ) vespa_add_test(NAME vespalib_array_test_app COMMAND vespalib_array_test_app) +vespa_add_executable(vespalib_sort_benchmark_app + SOURCES + sort_benchmark.cpp + DEPENDS + vespalib +) +vespa_add_test(NAME vespalib_sort_benchmark_app COMMAND vespalib_sort_benchmark_app BENCHMARK) diff --git a/staging_vespalib/src/tests/array/sort_benchmark.cpp b/vespalib/src/tests/array/sort_benchmark.cpp index 5d8a1efaa7a..5d8a1efaa7a 100644 --- a/staging_vespalib/src/tests/array/sort_benchmark.cpp +++ b/vespalib/src/tests/array/sort_benchmark.cpp diff --git a/vespalib/src/tests/benchmark/.gitignore b/vespalib/src/tests/benchmark/.gitignore new file mode 100644 index 00000000000..3280cb17888 --- /dev/null +++ b/vespalib/src/tests/benchmark/.gitignore @@ -0,0 +1,4 @@ +.depend +Makefile +benchmark_test +vespalib_benchmark_test_app diff --git a/vespalib/src/tests/benchmark/CMakeLists.txt b/vespalib/src/tests/benchmark/CMakeLists.txt new file mode 100644 index 00000000000..7003a5c4183 --- /dev/null +++ b/vespalib/src/tests/benchmark/CMakeLists.txt @@ -0,0 +1,12 @@ +# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(vespalib_benchmark_test_app + SOURCES + benchmark.cpp + testbase.cpp + DEPENDS + vespalib + EXTERNAL_DEPENDS + ${VESPA_GLIBC_RT_LIB} +) +vespa_add_test(NAME vespalib_benchmark_test NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/benchmark_test.sh BENCHMARK + DEPENDS vespalib_benchmark_test_app) diff --git a/staging_vespalib/src/tests/benchmark/benchmark.cpp b/vespalib/src/tests/benchmark/benchmark.cpp index f1e69758c8c..f1e69758c8c 100644 --- a/staging_vespalib/src/tests/benchmark/benchmark.cpp +++ b/vespalib/src/tests/benchmark/benchmark.cpp diff --git a/vespalib/src/tests/benchmark/benchmark_test.sh b/vespalib/src/tests/benchmark/benchmark_test.sh new file mode 100755 index 00000000000..28dc6b518be --- /dev/null +++ b/vespalib/src/tests/benchmark/benchmark_test.sh @@ -0,0 +1,21 @@ +#!/bin/bash +# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +set -e +TIME=time + +$TIME ./vespalib_benchmark_test_app vespalib::ParamByReferenceVectorInt 200000 1 +$TIME ./vespalib_benchmark_test_app vespalib::ParamByValueVectorInt 4000 1 +$TIME ./vespalib_benchmark_test_app vespalib::ParamByReferenceVectorString 30000 1 +$TIME ./vespalib_benchmark_test_app vespalib::ParamByValueVectorString 40 1 +$TIME ./vespalib_benchmark_test_app vespalib::ReturnByReferenceVectorString 10 1 +$TIME ./vespalib_benchmark_test_app vespalib::ReturnByValueVectorString 10 1 +$TIME ./vespalib_benchmark_test_app vespalib::ReturnByValueMultiVectorString 10 1 +$TIME ./vespalib_benchmark_test_app vespalib::ClockSystem 1000 1 +$TIME ./vespalib_benchmark_test_app vespalib::ClockGToD 1000 1 +$TIME ./vespalib_benchmark_test_app vespalib::ClockGToD 20000 1 +$TIME ./vespalib_benchmark_test_app vespalib::ClockREALTIME 1000 1 +$TIME ./vespalib_benchmark_test_app vespalib::ClockMONOTONIC 1000 1 +$TIME ./vespalib_benchmark_test_app vespalib::ClockMONOTONIC_RAW 1000 1 +$TIME ./vespalib_benchmark_test_app vespalib::ClockPROCESS_CPUTIME_ID 2500 1 +$TIME ./vespalib_benchmark_test_app vespalib::ClockTHREAD_CPUTIME_ID 2500 1 +$TIME ./vespalib_benchmark_test_app vespalib::CreateVespalibString 20000 1 diff --git a/staging_vespalib/src/tests/benchmark/testbase.cpp b/vespalib/src/tests/benchmark/testbase.cpp index 6b5f8d7d627..6b5f8d7d627 100644 --- a/staging_vespalib/src/tests/benchmark/testbase.cpp +++ b/vespalib/src/tests/benchmark/testbase.cpp diff --git a/staging_vespalib/src/tests/benchmark/testbase.h b/vespalib/src/tests/benchmark/testbase.h index 95621f52471..95621f52471 100644 --- a/staging_vespalib/src/tests/benchmark/testbase.h +++ b/vespalib/src/tests/benchmark/testbase.h diff --git a/vespalib/src/tests/bits/.gitignore b/vespalib/src/tests/bits/.gitignore new file mode 100644 index 00000000000..b5330fc2580 --- /dev/null +++ b/vespalib/src/tests/bits/.gitignore @@ -0,0 +1,4 @@ +.depend +Makefile +bits_test +vespalib_bits_test_app diff --git a/vespalib/src/tests/bits/CMakeLists.txt b/vespalib/src/tests/bits/CMakeLists.txt new file mode 100644 index 00000000000..f63196bc489 --- /dev/null +++ b/vespalib/src/tests/bits/CMakeLists.txt @@ -0,0 +1,8 @@ +# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(vespalib_bits_test_app TEST + SOURCES + bits_test.cpp + DEPENDS + vespalib +) +vespa_add_test(NAME vespalib_bits_test_app COMMAND vespalib_bits_test_app) diff --git a/staging_vespalib/src/tests/bits/bits_test.cpp b/vespalib/src/tests/bits/bits_test.cpp index 47d691c739d..47d691c739d 100644 --- a/staging_vespalib/src/tests/bits/bits_test.cpp +++ b/vespalib/src/tests/bits/bits_test.cpp diff --git a/vespalib/src/tests/clock/.gitignore b/vespalib/src/tests/clock/.gitignore new file mode 100644 index 00000000000..96861fcc5d3 --- /dev/null +++ b/vespalib/src/tests/clock/.gitignore @@ -0,0 +1,5 @@ +.depend +Makefile +clock_test +vespalib_clock_test_app +vespalib_clock_benchmark_app diff --git a/vespalib/src/tests/clock/CMakeLists.txt b/vespalib/src/tests/clock/CMakeLists.txt new file mode 100644 index 00000000000..d3ee3178163 --- /dev/null +++ b/vespalib/src/tests/clock/CMakeLists.txt @@ -0,0 +1,14 @@ +# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(vespalib_clock_benchmark_app TEST + SOURCES + clock_benchmark.cpp + DEPENDS + vespalib +) +vespa_add_executable(vespalib_clock_test_app TEST + SOURCES + clock_test.cpp + DEPENDS + vespalib +) +vespa_add_test(NAME vespalib_clock_test_app COMMAND vespalib_clock_test_app) diff --git a/staging_vespalib/src/tests/clock/clock_benchmark.cpp b/vespalib/src/tests/clock/clock_benchmark.cpp index 249add4bc1a..249add4bc1a 100644 --- a/staging_vespalib/src/tests/clock/clock_benchmark.cpp +++ b/vespalib/src/tests/clock/clock_benchmark.cpp diff --git a/staging_vespalib/src/tests/clock/clock_test.cpp b/vespalib/src/tests/clock/clock_test.cpp index f2de085da84..f2de085da84 100644 --- a/staging_vespalib/src/tests/clock/clock_test.cpp +++ b/vespalib/src/tests/clock/clock_test.cpp diff --git a/vespalib/src/tests/crc/.gitignore b/vespalib/src/tests/crc/.gitignore new file mode 100644 index 00000000000..cd64c20e0a4 --- /dev/null +++ b/vespalib/src/tests/crc/.gitignore @@ -0,0 +1,4 @@ +.depend +Makefile +crc_test +vespalib_crc_test_app diff --git a/vespalib/src/tests/crc/CMakeLists.txt b/vespalib/src/tests/crc/CMakeLists.txt new file mode 100644 index 00000000000..30adfd131f1 --- /dev/null +++ b/vespalib/src/tests/crc/CMakeLists.txt @@ -0,0 +1,8 @@ +# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(vespalib_crc_test_app TEST + SOURCES + crc_test.cpp + DEPENDS + vespalib +) +vespa_add_test(NAME vespalib_crc_test_app COMMAND vespalib_crc_test_app boost) diff --git a/staging_vespalib/src/tests/crc/crc_test.cpp b/vespalib/src/tests/crc/crc_test.cpp index 8afeed487ee..8afeed487ee 100644 --- a/staging_vespalib/src/tests/crc/crc_test.cpp +++ b/vespalib/src/tests/crc/crc_test.cpp diff --git a/vespalib/src/tests/directio/.gitignore b/vespalib/src/tests/directio/.gitignore new file mode 100644 index 00000000000..ad19022dfc3 --- /dev/null +++ b/vespalib/src/tests/directio/.gitignore @@ -0,0 +1 @@ +vespalib_directio_test_app diff --git a/vespalib/src/tests/directio/CMakeLists.txt b/vespalib/src/tests/directio/CMakeLists.txt new file mode 100644 index 00000000000..41a8dca85b9 --- /dev/null +++ b/vespalib/src/tests/directio/CMakeLists.txt @@ -0,0 +1,8 @@ +# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(vespalib_directio_test_app TEST + SOURCES + directio.cpp + DEPENDS + vespalib +) +vespa_add_test(NAME vespalib_directio_test_app COMMAND vespalib_directio_test_app) diff --git a/staging_vespalib/src/tests/directio/directio.cpp b/vespalib/src/tests/directio/directio.cpp index 9bc4f244711..77374f6f926 100644 --- a/staging_vespalib/src/tests/directio/directio.cpp +++ b/vespalib/src/tests/directio/directio.cpp @@ -19,7 +19,7 @@ TEST("that DirectIOException propagates the correct information.") { } TEST("that DirectIOException is thrown on unaligned buf.") { - FastOS_File f("staging_vespalib_directio_test_app"); + FastOS_File f("vespalib_directio_test_app"); f.EnableDirectIO(); EXPECT_TRUE(f.OpenReadOnly()); DataBuffer buf(10000, 4_Ki); @@ -37,7 +37,7 @@ TEST("that DirectIOException is thrown on unaligned buf.") { } TEST("that DirectIOException is thrown on unaligned offset.") { - FastOS_File f("staging_vespalib_directio_test_app"); + FastOS_File f("vespalib_directio_test_app"); f.EnableDirectIO(); EXPECT_TRUE(f.OpenReadOnly()); DataBuffer buf(10000, 4_Ki); diff --git a/vespalib/src/tests/floatingpointtype/.gitignore b/vespalib/src/tests/floatingpointtype/.gitignore new file mode 100644 index 00000000000..abe8249f33a --- /dev/null +++ b/vespalib/src/tests/floatingpointtype/.gitignore @@ -0,0 +1,4 @@ +.depend +Makefile +floatingpointtype_test +vespalib_floatingpointtype_test_app diff --git a/vespalib/src/tests/floatingpointtype/CMakeLists.txt b/vespalib/src/tests/floatingpointtype/CMakeLists.txt new file mode 100644 index 00000000000..3f0ec8eab69 --- /dev/null +++ b/vespalib/src/tests/floatingpointtype/CMakeLists.txt @@ -0,0 +1,8 @@ +# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(vespalib_floatingpointtype_test_app TEST + SOURCES + floatingpointtypetest.cpp + DEPENDS + vespalib +) +vespa_add_test(NAME vespalib_floatingpointtype_test_app COMMAND vespalib_floatingpointtype_test_app) diff --git a/staging_vespalib/src/tests/floatingpointtype/floatingpointtypetest.cpp b/vespalib/src/tests/floatingpointtype/floatingpointtypetest.cpp index d26385f23bf..d26385f23bf 100644 --- a/staging_vespalib/src/tests/floatingpointtype/floatingpointtypetest.cpp +++ b/vespalib/src/tests/floatingpointtype/floatingpointtypetest.cpp diff --git a/vespalib/src/tests/growablebytebuffer/.gitignore b/vespalib/src/tests/growablebytebuffer/.gitignore new file mode 100644 index 00000000000..76218df9168 --- /dev/null +++ b/vespalib/src/tests/growablebytebuffer/.gitignore @@ -0,0 +1,4 @@ +.depend +Makefile +growablebytebuffer_test +vespalib_growablebytebuffer_test_app diff --git a/vespalib/src/tests/growablebytebuffer/CMakeLists.txt b/vespalib/src/tests/growablebytebuffer/CMakeLists.txt new file mode 100644 index 00000000000..b518206ae56 --- /dev/null +++ b/vespalib/src/tests/growablebytebuffer/CMakeLists.txt @@ -0,0 +1,8 @@ +# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(vespalib_growablebytebuffer_test_app TEST + SOURCES + growablebytebuffer_test.cpp + DEPENDS + vespalib +) +vespa_add_test(NAME vespalib_growablebytebuffer_test_app COMMAND vespalib_growablebytebuffer_test_app) diff --git a/staging_vespalib/src/tests/growablebytebuffer/growablebytebuffer_test.cpp b/vespalib/src/tests/growablebytebuffer/growablebytebuffer_test.cpp index 0a616745023..0a616745023 100644 --- a/staging_vespalib/src/tests/growablebytebuffer/growablebytebuffer_test.cpp +++ b/vespalib/src/tests/growablebytebuffer/growablebytebuffer_test.cpp diff --git a/vespalib/src/tests/json/.gitignore b/vespalib/src/tests/json/.gitignore new file mode 100644 index 00000000000..9918fbce6e8 --- /dev/null +++ b/vespalib/src/tests/json/.gitignore @@ -0,0 +1 @@ +vespalib_json_test_app diff --git a/vespalib/src/tests/json/CMakeLists.txt b/vespalib/src/tests/json/CMakeLists.txt new file mode 100644 index 00000000000..0ea216b189b --- /dev/null +++ b/vespalib/src/tests/json/CMakeLists.txt @@ -0,0 +1,8 @@ +# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(vespalib_json_test_app TEST + SOURCES + json.cpp + DEPENDS + vespalib +) +vespa_add_test(NAME vespalib_json_test_app COMMAND vespalib_json_test_app boost) diff --git a/staging_vespalib/src/tests/json/json.cpp b/vespalib/src/tests/json/json.cpp index 1a707ae1776..1a707ae1776 100644 --- a/staging_vespalib/src/tests/json/json.cpp +++ b/vespalib/src/tests/json/json.cpp diff --git a/vespalib/src/tests/memorydatastore/.gitignore b/vespalib/src/tests/memorydatastore/.gitignore new file mode 100644 index 00000000000..6809bff5d3d --- /dev/null +++ b/vespalib/src/tests/memorydatastore/.gitignore @@ -0,0 +1 @@ +vespalib_memorydatastore_test_app diff --git a/vespalib/src/tests/memorydatastore/CMakeLists.txt b/vespalib/src/tests/memorydatastore/CMakeLists.txt new file mode 100644 index 00000000000..65d9231455a --- /dev/null +++ b/vespalib/src/tests/memorydatastore/CMakeLists.txt @@ -0,0 +1,8 @@ +# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(vespalib_memorydatastore_test_app TEST + SOURCES + memorydatastore.cpp + DEPENDS + vespalib +) +vespa_add_test(NAME vespalib_memorydatastore_test_app COMMAND vespalib_memorydatastore_test_app) diff --git a/staging_vespalib/src/tests/memorydatastore/memorydatastore.cpp b/vespalib/src/tests/memorydatastore/memorydatastore.cpp index 1d49b0af91b..1d49b0af91b 100644 --- a/staging_vespalib/src/tests/memorydatastore/memorydatastore.cpp +++ b/vespalib/src/tests/memorydatastore/memorydatastore.cpp diff --git a/staging_vespalib/src/tests/objects/.gitignore b/vespalib/src/tests/objects/identifiable/.gitignore index 2b10aff029c..a547ace8ee4 100644 --- a/staging_vespalib/src/tests/objects/.gitignore +++ b/vespalib/src/tests/objects/identifiable/.gitignore @@ -2,4 +2,4 @@ Makefile asciistream_test identifiable_test -staging_vespalib_identifiable_test_app +vespalib_identifiable_test_app diff --git a/vespalib/src/tests/objects/identifiable/CMakeLists.txt b/vespalib/src/tests/objects/identifiable/CMakeLists.txt new file mode 100644 index 00000000000..c4aefa44350 --- /dev/null +++ b/vespalib/src/tests/objects/identifiable/CMakeLists.txt @@ -0,0 +1,9 @@ +# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(vespalib_identifiable_test_app TEST + SOURCES + identifiable_test.cpp + namedobject.cpp + DEPENDS + vespalib +) +vespa_add_test(NAME vespalib_identifiable_test_app COMMAND vespalib_identifiable_test_app) diff --git a/staging_vespalib/src/tests/objects/identifiable_test.cpp b/vespalib/src/tests/objects/identifiable/identifiable_test.cpp index bc20a525d23..b3adfbfa9e2 100644 --- a/staging_vespalib/src/tests/objects/identifiable_test.cpp +++ b/vespalib/src/tests/objects/identifiable/identifiable_test.cpp @@ -1,10 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/vespalib/testkit/testapp.h> +#include "namedobject.h" #include <vespa/vespalib/objects/identifiable.hpp> -#include <vespa/vespalib/objects/namedobject.h> #include <vespa/vespalib/objects/nbostream.h> #include <vespa/vespalib/util/exceptions.h> +#include <vespa/vespalib/testkit/testapp.h> using namespace vespalib; diff --git a/staging_vespalib/src/vespa/vespalib/objects/namedobject.cpp b/vespalib/src/tests/objects/identifiable/namedobject.cpp index 3e8d3291177..3e8d3291177 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/namedobject.cpp +++ b/vespalib/src/tests/objects/identifiable/namedobject.cpp diff --git a/staging_vespalib/src/vespa/vespalib/objects/namedobject.h b/vespalib/src/tests/objects/identifiable/namedobject.h index 784715a66f6..784715a66f6 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/namedobject.h +++ b/vespalib/src/tests/objects/identifiable/namedobject.h diff --git a/vespalib/src/tests/objects/objectdump/.gitignore b/vespalib/src/tests/objects/objectdump/.gitignore new file mode 100644 index 00000000000..6ddd515391d --- /dev/null +++ b/vespalib/src/tests/objects/objectdump/.gitignore @@ -0,0 +1,4 @@ +.depend +Makefile +objectdump_test +vespalib_objectdump_test_app diff --git a/vespalib/src/tests/objects/objectdump/CMakeLists.txt b/vespalib/src/tests/objects/objectdump/CMakeLists.txt new file mode 100644 index 00000000000..67395998b39 --- /dev/null +++ b/vespalib/src/tests/objects/objectdump/CMakeLists.txt @@ -0,0 +1,8 @@ +# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(vespalib_objectdump_test_app TEST + SOURCES + objectdump.cpp + DEPENDS + vespalib +) +vespa_add_test(NAME vespalib_objectdump_test_app COMMAND vespalib_objectdump_test_app) diff --git a/staging_vespalib/src/tests/objectdump/objectdump.cpp b/vespalib/src/tests/objects/objectdump/objectdump.cpp index 812b1e79e17..812b1e79e17 100644 --- a/staging_vespalib/src/tests/objectdump/objectdump.cpp +++ b/vespalib/src/tests/objects/objectdump/objectdump.cpp diff --git a/vespalib/src/tests/objects/objectselection/.gitignore b/vespalib/src/tests/objects/objectselection/.gitignore new file mode 100644 index 00000000000..f6aefd07270 --- /dev/null +++ b/vespalib/src/tests/objects/objectselection/.gitignore @@ -0,0 +1,4 @@ +.depend +Makefile +objectselection_test +vespalib_objectselection_test_app diff --git a/vespalib/src/tests/objects/objectselection/CMakeLists.txt b/vespalib/src/tests/objects/objectselection/CMakeLists.txt new file mode 100644 index 00000000000..94f43078820 --- /dev/null +++ b/vespalib/src/tests/objects/objectselection/CMakeLists.txt @@ -0,0 +1,8 @@ +# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(vespalib_objectselection_test_app TEST + SOURCES + objectselection.cpp + DEPENDS + vespalib +) +vespa_add_test(NAME vespalib_objectselection_test_app COMMAND vespalib_objectselection_test_app) diff --git a/staging_vespalib/src/tests/objectselection/objectselection.cpp b/vespalib/src/tests/objects/objectselection/objectselection.cpp index aa9c841f2dc..aa9c841f2dc 100644 --- a/staging_vespalib/src/tests/objectselection/objectselection.cpp +++ b/vespalib/src/tests/objects/objectselection/objectselection.cpp diff --git a/vespalib/src/tests/polymorphicarray/.gitignore b/vespalib/src/tests/polymorphicarray/.gitignore new file mode 100644 index 00000000000..e0decc87f2c --- /dev/null +++ b/vespalib/src/tests/polymorphicarray/.gitignore @@ -0,0 +1 @@ +vespalib_polymorphicarray_test_app diff --git a/vespalib/src/tests/polymorphicarray/CMakeLists.txt b/vespalib/src/tests/polymorphicarray/CMakeLists.txt new file mode 100644 index 00000000000..14edfbec4b4 --- /dev/null +++ b/vespalib/src/tests/polymorphicarray/CMakeLists.txt @@ -0,0 +1,8 @@ +# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(vespalib_polymorphicarray_test_app TEST + SOURCES + polymorphicarray_test.cpp + DEPENDS + vespalib +) +vespa_add_test(NAME vespalib_polymorphicarray_test_app COMMAND vespalib_polymorphicarray_test_app) diff --git a/staging_vespalib/src/tests/polymorphicarray/polymorphicarray_test.cpp b/vespalib/src/tests/polymorphicarray/polymorphicarray_test.cpp index d4ec8f3ed7c..d4ec8f3ed7c 100644 --- a/staging_vespalib/src/tests/polymorphicarray/polymorphicarray_test.cpp +++ b/vespalib/src/tests/polymorphicarray/polymorphicarray_test.cpp diff --git a/vespalib/src/tests/programoptions/.gitignore b/vespalib/src/tests/programoptions/.gitignore new file mode 100644 index 00000000000..f083a1e093d --- /dev/null +++ b/vespalib/src/tests/programoptions/.gitignore @@ -0,0 +1,4 @@ +.depend +Makefile +programoptions_test +vespalib_programoptions_test_app diff --git a/vespalib/src/tests/programoptions/CMakeLists.txt b/vespalib/src/tests/programoptions/CMakeLists.txt new file mode 100644 index 00000000000..fb2fdb48dd7 --- /dev/null +++ b/vespalib/src/tests/programoptions/CMakeLists.txt @@ -0,0 +1,9 @@ +# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(vespalib_programoptions_test_app TEST + SOURCES + programoptions_test.cpp + programoptions_testutils.cpp + DEPENDS + vespalib +) +vespa_add_test(NAME vespalib_programoptions_test_app COMMAND vespalib_programoptions_test_app) diff --git a/staging_vespalib/src/tests/programoptions/programoptions_test.cpp b/vespalib/src/tests/programoptions/programoptions_test.cpp index 4a5be1d1397..4b63eae949b 100644 --- a/staging_vespalib/src/tests/programoptions/programoptions_test.cpp +++ b/vespalib/src/tests/programoptions/programoptions_test.cpp @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/vespalib/testkit/testapp.h> +#include "programoptions_testutils.h" #include <vespa/vespalib/util/programoptions.h> -#include <vespa/vespalib/util/programoptions_testutils.h> +#include <vespa/vespalib/testkit/testapp.h> #include <iostream> namespace vespalib { diff --git a/staging_vespalib/src/vespa/vespalib/util/programoptions_testutils.cpp b/vespalib/src/tests/programoptions/programoptions_testutils.cpp index 4f77a01aa02..948413c36db 100644 --- a/staging_vespalib/src/vespa/vespalib/util/programoptions_testutils.cpp +++ b/vespalib/src/tests/programoptions/programoptions_testutils.cpp @@ -1,6 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/vespalib/util/programoptions_testutils.h> +#include "programoptions_testutils.h" namespace vespalib { diff --git a/staging_vespalib/src/vespa/vespalib/util/programoptions_testutils.h b/vespalib/src/tests/programoptions/programoptions_testutils.h index a6f103f3e95..a6f103f3e95 100644 --- a/staging_vespalib/src/vespa/vespalib/util/programoptions_testutils.h +++ b/vespalib/src/tests/programoptions/programoptions_testutils.h diff --git a/vespalib/src/tests/rusage/.gitignore b/vespalib/src/tests/rusage/.gitignore new file mode 100644 index 00000000000..c01c01ed328 --- /dev/null +++ b/vespalib/src/tests/rusage/.gitignore @@ -0,0 +1 @@ +vespalib_rusage_test_app diff --git a/vespalib/src/tests/rusage/CMakeLists.txt b/vespalib/src/tests/rusage/CMakeLists.txt new file mode 100644 index 00000000000..1c1ab85facd --- /dev/null +++ b/vespalib/src/tests/rusage/CMakeLists.txt @@ -0,0 +1,8 @@ +# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(vespalib_rusage_test_app TEST + SOURCES + rusage_test.cpp + DEPENDS + vespalib +) +vespa_add_test(NAME vespalib_rusage_test_app COMMAND vespalib_rusage_test_app) diff --git a/staging_vespalib/src/tests/rusage/rusage_test.cpp b/vespalib/src/tests/rusage/rusage_test.cpp index 7e30f3b968b..7e30f3b968b 100644 --- a/staging_vespalib/src/tests/rusage/rusage_test.cpp +++ b/vespalib/src/tests/rusage/rusage_test.cpp diff --git a/vespalib/src/tests/shutdownguard/.gitignore b/vespalib/src/tests/shutdownguard/.gitignore new file mode 100644 index 00000000000..c167d4784ca --- /dev/null +++ b/vespalib/src/tests/shutdownguard/.gitignore @@ -0,0 +1 @@ +vespalib_shutdownguard_test_app diff --git a/vespalib/src/tests/shutdownguard/CMakeLists.txt b/vespalib/src/tests/shutdownguard/CMakeLists.txt new file mode 100644 index 00000000000..6714842fbbf --- /dev/null +++ b/vespalib/src/tests/shutdownguard/CMakeLists.txt @@ -0,0 +1,8 @@ +# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(vespalib_shutdownguard_test_app TEST + SOURCES + shutdownguard_test.cpp + DEPENDS + vespalib +) +vespa_add_test(NAME vespalib_shutdownguard_test_app NO_VALGRIND COMMAND vespalib_shutdownguard_test_app) diff --git a/staging_vespalib/src/tests/shutdownguard/shutdownguard_test.cpp b/vespalib/src/tests/shutdownguard/shutdownguard_test.cpp index 348e9bbd503..348e9bbd503 100644 --- a/staging_vespalib/src/tests/shutdownguard/shutdownguard_test.cpp +++ b/vespalib/src/tests/shutdownguard/shutdownguard_test.cpp diff --git a/vespalib/src/tests/stllike/CMakeLists.txt b/vespalib/src/tests/stllike/CMakeLists.txt index 80509c565c6..005ef3d1ed0 100644 --- a/vespalib/src/tests/stllike/CMakeLists.txt +++ b/vespalib/src/tests/stllike/CMakeLists.txt @@ -55,3 +55,17 @@ vespa_add_executable(vespalib_replace_variable_test_app TEST GTest::GTest ) vespa_add_test(NAME vespalib_replace_variable_test_app COMMAND vespalib_replace_variable_test_app) +vespa_add_executable(vespalib_lrucache_test_app TEST + SOURCES + lrucache.cpp + DEPENDS + vespalib +) +vespa_add_test(NAME vespalib_lrucache_test_app COMMAND vespalib_lrucache_test_app) +vespa_add_executable(vespalib_cache_test_app TEST + SOURCES + cache_test.cpp + DEPENDS + vespalib +) +vespa_add_test(NAME vespalib_cache_test_app COMMAND vespalib_cache_test_app) diff --git a/staging_vespalib/src/tests/stllike/cache_test.cpp b/vespalib/src/tests/stllike/cache_test.cpp index 35f04d91510..35f04d91510 100644 --- a/staging_vespalib/src/tests/stllike/cache_test.cpp +++ b/vespalib/src/tests/stllike/cache_test.cpp diff --git a/staging_vespalib/src/tests/stllike/lrucache.cpp b/vespalib/src/tests/stllike/lrucache.cpp index 2cc6f2b4ee8..2cc6f2b4ee8 100644 --- a/staging_vespalib/src/tests/stllike/lrucache.cpp +++ b/vespalib/src/tests/stllike/lrucache.cpp diff --git a/vespalib/src/tests/util/process_memory_stats/.gitignore b/vespalib/src/tests/util/process_memory_stats/.gitignore new file mode 100644 index 00000000000..81af04ee64f --- /dev/null +++ b/vespalib/src/tests/util/process_memory_stats/.gitignore @@ -0,0 +1,2 @@ +mapfile +vespalib_process_memory_stats_test_app diff --git a/vespalib/src/tests/util/process_memory_stats/CMakeLists.txt b/vespalib/src/tests/util/process_memory_stats/CMakeLists.txt new file mode 100644 index 00000000000..30a0f90d952 --- /dev/null +++ b/vespalib/src/tests/util/process_memory_stats/CMakeLists.txt @@ -0,0 +1,9 @@ +# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(vespalib_process_memory_stats_test_app TEST + SOURCES + process_memory_stats_test.cpp + DEPENDS + vespalib +) +vespa_add_test(NAME vespalib_process_memory_stats_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/process_memory_stats_test.sh + DEPENDS vespalib_process_memory_stats_test_app) diff --git a/staging_vespalib/src/tests/util/process_memory_stats/process_memory_stats_test.cpp b/vespalib/src/tests/util/process_memory_stats/process_memory_stats_test.cpp index 6d0917e6d15..6d0917e6d15 100644 --- a/staging_vespalib/src/tests/util/process_memory_stats/process_memory_stats_test.cpp +++ b/vespalib/src/tests/util/process_memory_stats/process_memory_stats_test.cpp diff --git a/staging_vespalib/src/tests/util/process_memory_stats/process_memory_stats_test.sh b/vespalib/src/tests/util/process_memory_stats/process_memory_stats_test.sh index 6441a5e3039..7fe5261ab2d 100755 --- a/staging_vespalib/src/tests/util/process_memory_stats/process_memory_stats_test.sh +++ b/vespalib/src/tests/util/process_memory_stats/process_memory_stats_test.sh @@ -2,5 +2,5 @@ # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. set -e rm -f mapfile -$VALGRIND ./staging_vespalib_process_memory_stats_test_app +$VALGRIND ./vespalib_process_memory_stats_test_app rm -f mapfile diff --git a/vespalib/src/tests/xmlserializable/.gitignore b/vespalib/src/tests/xmlserializable/.gitignore new file mode 100644 index 00000000000..8573da1cd93 --- /dev/null +++ b/vespalib/src/tests/xmlserializable/.gitignore @@ -0,0 +1,4 @@ +*_test +.depend +Makefile +vespalib_xmlserializable_test_app diff --git a/vespalib/src/tests/xmlserializable/CMakeLists.txt b/vespalib/src/tests/xmlserializable/CMakeLists.txt new file mode 100644 index 00000000000..119a1294253 --- /dev/null +++ b/vespalib/src/tests/xmlserializable/CMakeLists.txt @@ -0,0 +1,8 @@ +# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(vespalib_xmlserializable_test_app TEST + SOURCES + xmlserializabletest.cpp + DEPENDS + vespalib +) +vespa_add_test(NAME vespalib_xmlserializable_test_app COMMAND vespalib_xmlserializable_test_app) diff --git a/staging_vespalib/src/tests/xmlserializable/xmlserializabletest.cpp b/vespalib/src/tests/xmlserializable/xmlserializabletest.cpp index cc8d61cb7c2..cc8d61cb7c2 100644 --- a/staging_vespalib/src/tests/xmlserializable/xmlserializabletest.cpp +++ b/vespalib/src/tests/xmlserializable/xmlserializabletest.cpp diff --git a/vespalib/src/vespa/vespalib/objects/CMakeLists.txt b/vespalib/src/vespa/vespalib/objects/CMakeLists.txt index a4b2192d98f..ddf01d5a935 100644 --- a/vespalib/src/vespa/vespalib/objects/CMakeLists.txt +++ b/vespalib/src/vespa/vespalib/objects/CMakeLists.txt @@ -1,7 +1,19 @@ # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(vespalib_vespalib_objects OBJECT SOURCES - nbostream.cpp + asciiserializer.cpp + deserializer.cpp + floatingpointtype.cpp hexdump.cpp + identifiable.cpp + nboserializer.cpp + nbostream.cpp + object2slime.cpp + objectdumper.cpp + objectoperation.cpp + objectpredicate.cpp + objectvisitor.cpp + serializer.cpp + visit.cpp DEPENDS ) diff --git a/staging_vespalib/src/vespa/vespalib/objects/asciiserializer.cpp b/vespalib/src/vespa/vespalib/objects/asciiserializer.cpp index fadaea9b054..fadaea9b054 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/asciiserializer.cpp +++ b/vespalib/src/vespa/vespalib/objects/asciiserializer.cpp diff --git a/staging_vespalib/src/vespa/vespalib/objects/asciiserializer.h b/vespalib/src/vespa/vespalib/objects/asciiserializer.h index 3964c52949d..3964c52949d 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/asciiserializer.h +++ b/vespalib/src/vespa/vespalib/objects/asciiserializer.h diff --git a/staging_vespalib/src/vespa/vespalib/objects/deserializer.cpp b/vespalib/src/vespa/vespalib/objects/deserializer.cpp index f320b2d2489..f320b2d2489 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/deserializer.cpp +++ b/vespalib/src/vespa/vespalib/objects/deserializer.cpp diff --git a/staging_vespalib/src/vespa/vespalib/objects/deserializer.h b/vespalib/src/vespa/vespalib/objects/deserializer.h index e59d3e07581..e59d3e07581 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/deserializer.h +++ b/vespalib/src/vespa/vespalib/objects/deserializer.h diff --git a/staging_vespalib/src/vespa/vespalib/objects/deserializer.hpp b/vespalib/src/vespa/vespalib/objects/deserializer.hpp index b90867fa153..b90867fa153 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/deserializer.hpp +++ b/vespalib/src/vespa/vespalib/objects/deserializer.hpp diff --git a/staging_vespalib/src/vespa/vespalib/objects/floatingpointtype.cpp b/vespalib/src/vespa/vespalib/objects/floatingpointtype.cpp index b011dbdd23e..b011dbdd23e 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/floatingpointtype.cpp +++ b/vespalib/src/vespa/vespalib/objects/floatingpointtype.cpp diff --git a/staging_vespalib/src/vespa/vespalib/objects/floatingpointtype.h b/vespalib/src/vespa/vespalib/objects/floatingpointtype.h index d1fd80cdcd6..d1fd80cdcd6 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/floatingpointtype.h +++ b/vespalib/src/vespa/vespalib/objects/floatingpointtype.h diff --git a/staging_vespalib/src/vespa/vespalib/objects/identifiable.cpp b/vespalib/src/vespa/vespalib/objects/identifiable.cpp index 224fda1a0a4..224fda1a0a4 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/identifiable.cpp +++ b/vespalib/src/vespa/vespalib/objects/identifiable.cpp diff --git a/staging_vespalib/src/vespa/vespalib/objects/identifiable.h b/vespalib/src/vespa/vespalib/objects/identifiable.h index 586fbc7ed0c..586fbc7ed0c 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/identifiable.h +++ b/vespalib/src/vespa/vespalib/objects/identifiable.h diff --git a/staging_vespalib/src/vespa/vespalib/objects/identifiable.hpp b/vespalib/src/vespa/vespalib/objects/identifiable.hpp index d86f5490bc9..d86f5490bc9 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/identifiable.hpp +++ b/vespalib/src/vespa/vespalib/objects/identifiable.hpp diff --git a/staging_vespalib/src/vespa/vespalib/objects/ids.h b/vespalib/src/vespa/vespalib/objects/ids.h index 21d4d92aef1..21d4d92aef1 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/ids.h +++ b/vespalib/src/vespa/vespalib/objects/ids.h diff --git a/staging_vespalib/src/vespa/vespalib/objects/nboserializer.cpp b/vespalib/src/vespa/vespalib/objects/nboserializer.cpp index 0508210bd09..0508210bd09 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/nboserializer.cpp +++ b/vespalib/src/vespa/vespalib/objects/nboserializer.cpp diff --git a/staging_vespalib/src/vespa/vespalib/objects/nboserializer.h b/vespalib/src/vespa/vespalib/objects/nboserializer.h index 4e11771d64b..4e11771d64b 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/nboserializer.h +++ b/vespalib/src/vespa/vespalib/objects/nboserializer.h diff --git a/staging_vespalib/src/vespa/vespalib/objects/object2slime.cpp b/vespalib/src/vespa/vespalib/objects/object2slime.cpp index ee7b0501832..ee7b0501832 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/object2slime.cpp +++ b/vespalib/src/vespa/vespalib/objects/object2slime.cpp diff --git a/staging_vespalib/src/vespa/vespalib/objects/object2slime.h b/vespalib/src/vespa/vespalib/objects/object2slime.h index ffab739ed15..ffab739ed15 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/object2slime.h +++ b/vespalib/src/vespa/vespalib/objects/object2slime.h diff --git a/staging_vespalib/src/vespa/vespalib/objects/objectdumper.cpp b/vespalib/src/vespa/vespalib/objects/objectdumper.cpp index 61230ace2f9..61230ace2f9 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/objectdumper.cpp +++ b/vespalib/src/vespa/vespalib/objects/objectdumper.cpp diff --git a/staging_vespalib/src/vespa/vespalib/objects/objectdumper.h b/vespalib/src/vespa/vespalib/objects/objectdumper.h index 0fb27c03ac2..0fb27c03ac2 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/objectdumper.h +++ b/vespalib/src/vespa/vespalib/objects/objectdumper.h diff --git a/staging_vespalib/src/vespa/vespalib/objects/objectoperation.cpp b/vespalib/src/vespa/vespalib/objects/objectoperation.cpp index 0a84ad4b70f..0a84ad4b70f 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/objectoperation.cpp +++ b/vespalib/src/vespa/vespalib/objects/objectoperation.cpp diff --git a/staging_vespalib/src/vespa/vespalib/objects/objectoperation.h b/vespalib/src/vespa/vespalib/objects/objectoperation.h index ba2820f1a85..ba2820f1a85 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/objectoperation.h +++ b/vespalib/src/vespa/vespalib/objects/objectoperation.h diff --git a/staging_vespalib/src/vespa/vespalib/objects/objectpredicate.cpp b/vespalib/src/vespa/vespalib/objects/objectpredicate.cpp index 61986ed4cf8..61986ed4cf8 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/objectpredicate.cpp +++ b/vespalib/src/vespa/vespalib/objects/objectpredicate.cpp diff --git a/staging_vespalib/src/vespa/vespalib/objects/objectpredicate.h b/vespalib/src/vespa/vespalib/objects/objectpredicate.h index 12af9bab3e6..12af9bab3e6 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/objectpredicate.h +++ b/vespalib/src/vespa/vespalib/objects/objectpredicate.h diff --git a/staging_vespalib/src/vespa/vespalib/objects/objectvisitor.cpp b/vespalib/src/vespa/vespalib/objects/objectvisitor.cpp index 5466b19f6d7..5466b19f6d7 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/objectvisitor.cpp +++ b/vespalib/src/vespa/vespalib/objects/objectvisitor.cpp diff --git a/staging_vespalib/src/vespa/vespalib/objects/objectvisitor.h b/vespalib/src/vespa/vespalib/objects/objectvisitor.h index dba731a8940..dba731a8940 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/objectvisitor.h +++ b/vespalib/src/vespa/vespalib/objects/objectvisitor.h diff --git a/staging_vespalib/src/vespa/vespalib/objects/serializer.cpp b/vespalib/src/vespa/vespalib/objects/serializer.cpp index 3c1e22e52ac..3c1e22e52ac 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/serializer.cpp +++ b/vespalib/src/vespa/vespalib/objects/serializer.cpp diff --git a/staging_vespalib/src/vespa/vespalib/objects/serializer.h b/vespalib/src/vespa/vespalib/objects/serializer.h index f10d03b1c04..f10d03b1c04 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/serializer.h +++ b/vespalib/src/vespa/vespalib/objects/serializer.h diff --git a/staging_vespalib/src/vespa/vespalib/objects/serializer.hpp b/vespalib/src/vespa/vespalib/objects/serializer.hpp index 87c02ddf693..87c02ddf693 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/serializer.hpp +++ b/vespalib/src/vespa/vespalib/objects/serializer.hpp diff --git a/staging_vespalib/src/vespa/vespalib/objects/visit.cpp b/vespalib/src/vespa/vespalib/objects/visit.cpp index 03f46d4c354..03f46d4c354 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/visit.cpp +++ b/vespalib/src/vespa/vespalib/objects/visit.cpp diff --git a/staging_vespalib/src/vespa/vespalib/objects/visit.h b/vespalib/src/vespa/vespalib/objects/visit.h index 87d42923d61..87d42923d61 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/visit.h +++ b/vespalib/src/vespa/vespalib/objects/visit.h diff --git a/staging_vespalib/src/vespa/vespalib/objects/visit.hpp b/vespalib/src/vespa/vespalib/objects/visit.hpp index e3a82b212c0..e3a82b212c0 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/visit.hpp +++ b/vespalib/src/vespa/vespalib/objects/visit.hpp diff --git a/staging_vespalib/src/vespa/vespalib/stllike/cache.h b/vespalib/src/vespa/vespalib/stllike/cache.h index bf58f1aef98..bf58f1aef98 100644 --- a/staging_vespalib/src/vespa/vespalib/stllike/cache.h +++ b/vespalib/src/vespa/vespalib/stllike/cache.h diff --git a/staging_vespalib/src/vespa/vespalib/stllike/cache.hpp b/vespalib/src/vespa/vespalib/stllike/cache.hpp index bb05d564f1f..bb05d564f1f 100644 --- a/staging_vespalib/src/vespa/vespalib/stllike/cache.hpp +++ b/vespalib/src/vespa/vespalib/stllike/cache.hpp diff --git a/staging_vespalib/src/vespa/vespalib/stllike/cache_stats.h b/vespalib/src/vespa/vespalib/stllike/cache_stats.h index 7c83da2b004..7c83da2b004 100644 --- a/staging_vespalib/src/vespa/vespalib/stllike/cache_stats.h +++ b/vespalib/src/vespa/vespalib/stllike/cache_stats.h diff --git a/staging_vespalib/src/vespa/vespalib/stllike/lrucache_map.h b/vespalib/src/vespa/vespalib/stllike/lrucache_map.h index ffb7a427d11..ffb7a427d11 100644 --- a/staging_vespalib/src/vespa/vespalib/stllike/lrucache_map.h +++ b/vespalib/src/vespa/vespalib/stllike/lrucache_map.h diff --git a/staging_vespalib/src/vespa/vespalib/stllike/lrucache_map.hpp b/vespalib/src/vespa/vespalib/stllike/lrucache_map.hpp index 73e9956ffdf..73e9956ffdf 100644 --- a/staging_vespalib/src/vespa/vespalib/stllike/lrucache_map.hpp +++ b/vespalib/src/vespa/vespalib/stllike/lrucache_map.hpp diff --git a/vespalib/src/vespa/vespalib/util/CMakeLists.txt b/vespalib/src/vespa/vespalib/util/CMakeLists.txt index c61de250f53..59c05dffbc6 100644 --- a/vespalib/src/vespa/vespalib/util/CMakeLists.txt +++ b/vespalib/src/vespa/vespalib/util/CMakeLists.txt @@ -13,15 +13,20 @@ vespa_add_library(vespalib_vespalib_util OBJECT benchmark_timer.cpp bfloat16.cpp binary_hamming_distance.cpp + bits.cpp blockingthreadstackexecutor.cpp box.cpp cgroup_resource_limits.cpp classname.cpp + clock.cpp compress.cpp compressor.cpp count_down_latch.cpp cpu_usage.cpp + crc.cpp destructor_callbacks.cpp + doom.cpp + document_runnable.cpp dual_merge_director.cpp error.cpp exception.cpp @@ -33,8 +38,11 @@ vespa_add_library(vespalib_vespalib_util OBJECT gencnt.cpp generationhandler.cpp generationholder.cpp + growablebytebuffer.cpp hdr_abort.cpp host_name.cpp + jsonexception.cpp + jsonstream.cpp jsonwriter.cpp invokeserviceimpl.cpp isequencedtaskexecutor.cpp @@ -43,6 +51,7 @@ vespa_add_library(vespalib_vespalib_util OBJECT latch.cpp left_right_heap.cpp lz4compressor.cpp + malloc_mmap_guard.cpp md5.c memoryusage.cpp mmap_file_allocator.cpp @@ -51,6 +60,8 @@ vespa_add_library(vespalib_vespalib_util OBJECT nice.cpp printable.cpp priority_queue.cpp + process_memory_stats.cpp + programoptions.cpp random.cpp rcuvector.cpp regexp.cpp @@ -62,12 +73,14 @@ vespa_add_library(vespalib_vespalib_util OBJECT round_up_to_page_size.cpp runnable.cpp runnable_pair.cpp + rusage.cpp sequence.cpp sequencedtaskexecutor.cpp sequencedtaskexecutorobserver.cpp sha1.cpp shared_operation_throttler.cpp shared_string_repo.cpp + shutdownguard.cpp sig_catch.cpp signalhandler.cpp simple_thread_bundle.cpp @@ -76,6 +89,7 @@ vespa_add_library(vespalib_vespalib_util OBJECT stash.cpp string_hash.cpp stringfmt.cpp + testclock.cpp thread.cpp thread_bundle.cpp threadstackexecutor.cpp @@ -83,6 +97,8 @@ vespa_add_library(vespalib_vespalib_util OBJECT time.cpp unwind_message.cpp valgrind.cpp + xmlserializable.cpp + xmlstream.cpp zstdcompressor.cpp DEPENDS ) diff --git a/staging_vespalib/src/vespa/vespalib/util/bits.cpp b/vespalib/src/vespa/vespalib/util/bits.cpp index 2d9848f3cdf..2d9848f3cdf 100644 --- a/staging_vespalib/src/vespa/vespalib/util/bits.cpp +++ b/vespalib/src/vespa/vespalib/util/bits.cpp diff --git a/staging_vespalib/src/vespa/vespalib/util/bits.h b/vespalib/src/vespa/vespalib/util/bits.h index fbe1a59f62a..fbe1a59f62a 100644 --- a/staging_vespalib/src/vespa/vespalib/util/bits.h +++ b/vespalib/src/vespa/vespalib/util/bits.h diff --git a/staging_vespalib/src/vespa/vespalib/util/clock.cpp b/vespalib/src/vespa/vespalib/util/clock.cpp index 4b6e1e8ab85..4b6e1e8ab85 100644 --- a/staging_vespalib/src/vespa/vespalib/util/clock.cpp +++ b/vespalib/src/vespa/vespalib/util/clock.cpp diff --git a/staging_vespalib/src/vespa/vespalib/util/clock.h b/vespalib/src/vespa/vespalib/util/clock.h index 4cd579b8f69..4cd579b8f69 100644 --- a/staging_vespalib/src/vespa/vespalib/util/clock.h +++ b/vespalib/src/vespa/vespalib/util/clock.h diff --git a/staging_vespalib/src/vespa/vespalib/util/crc.cpp b/vespalib/src/vespa/vespalib/util/crc.cpp index 1a9baf8e600..1a9baf8e600 100644 --- a/staging_vespalib/src/vespa/vespalib/util/crc.cpp +++ b/vespalib/src/vespa/vespalib/util/crc.cpp diff --git a/staging_vespalib/src/vespa/vespalib/util/crc.h b/vespalib/src/vespa/vespalib/util/crc.h index f5acafeff36..f5acafeff36 100644 --- a/staging_vespalib/src/vespa/vespalib/util/crc.h +++ b/vespalib/src/vespa/vespalib/util/crc.h diff --git a/staging_vespalib/src/vespa/vespalib/util/document_runnable.cpp b/vespalib/src/vespa/vespalib/util/document_runnable.cpp index d7534514f41..d7534514f41 100644 --- a/staging_vespalib/src/vespa/vespalib/util/document_runnable.cpp +++ b/vespalib/src/vespa/vespalib/util/document_runnable.cpp diff --git a/staging_vespalib/src/vespa/vespalib/util/document_runnable.h b/vespalib/src/vespa/vespalib/util/document_runnable.h index 5ca344ea7ef..5ca344ea7ef 100644 --- a/staging_vespalib/src/vespa/vespalib/util/document_runnable.h +++ b/vespalib/src/vespa/vespalib/util/document_runnable.h diff --git a/staging_vespalib/src/vespa/vespalib/util/doom.cpp b/vespalib/src/vespa/vespalib/util/doom.cpp index 93ebe317ae0..93ebe317ae0 100644 --- a/staging_vespalib/src/vespa/vespalib/util/doom.cpp +++ b/vespalib/src/vespa/vespalib/util/doom.cpp diff --git a/staging_vespalib/src/vespa/vespalib/util/doom.h b/vespalib/src/vespa/vespalib/util/doom.h index e7db0795fb7..e7db0795fb7 100644 --- a/staging_vespalib/src/vespa/vespalib/util/doom.h +++ b/vespalib/src/vespa/vespalib/util/doom.h diff --git a/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.cpp b/vespalib/src/vespa/vespalib/util/growablebytebuffer.cpp index 424ad7ba470..424ad7ba470 100644 --- a/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.cpp +++ b/vespalib/src/vespa/vespalib/util/growablebytebuffer.cpp diff --git a/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.h b/vespalib/src/vespa/vespalib/util/growablebytebuffer.h index b0fb30606d4..b0fb30606d4 100644 --- a/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.h +++ b/vespalib/src/vespa/vespalib/util/growablebytebuffer.h diff --git a/staging_vespalib/src/vespa/vespalib/util/jsonexception.cpp b/vespalib/src/vespa/vespalib/util/jsonexception.cpp index 5c04aefe2d1..5c04aefe2d1 100644 --- a/staging_vespalib/src/vespa/vespalib/util/jsonexception.cpp +++ b/vespalib/src/vespa/vespalib/util/jsonexception.cpp diff --git a/staging_vespalib/src/vespa/vespalib/util/jsonexception.h b/vespalib/src/vespa/vespalib/util/jsonexception.h index 3bf954420a6..3bf954420a6 100644 --- a/staging_vespalib/src/vespa/vespalib/util/jsonexception.h +++ b/vespalib/src/vespa/vespalib/util/jsonexception.h diff --git a/staging_vespalib/src/vespa/vespalib/util/jsonstream.cpp b/vespalib/src/vespa/vespalib/util/jsonstream.cpp index 135611e975f..135611e975f 100644 --- a/staging_vespalib/src/vespa/vespalib/util/jsonstream.cpp +++ b/vespalib/src/vespa/vespalib/util/jsonstream.cpp diff --git a/staging_vespalib/src/vespa/vespalib/util/jsonstream.h b/vespalib/src/vespa/vespalib/util/jsonstream.h index d60151f0478..d60151f0478 100644 --- a/staging_vespalib/src/vespa/vespalib/util/jsonstream.h +++ b/vespalib/src/vespa/vespalib/util/jsonstream.h diff --git a/staging_vespalib/src/vespa/vespalib/util/malloc_mmap_guard.cpp b/vespalib/src/vespa/vespalib/util/malloc_mmap_guard.cpp index 67181dfd16f..67181dfd16f 100644 --- a/staging_vespalib/src/vespa/vespalib/util/malloc_mmap_guard.cpp +++ b/vespalib/src/vespa/vespalib/util/malloc_mmap_guard.cpp diff --git a/staging_vespalib/src/vespa/vespalib/util/malloc_mmap_guard.h b/vespalib/src/vespa/vespalib/util/malloc_mmap_guard.h index 03e6d38c03c..03e6d38c03c 100644 --- a/staging_vespalib/src/vespa/vespalib/util/malloc_mmap_guard.h +++ b/vespalib/src/vespa/vespalib/util/malloc_mmap_guard.h diff --git a/staging_vespalib/src/vespa/vespalib/util/polymorphicarray.h b/vespalib/src/vespa/vespalib/util/polymorphicarray.h index de93ae03657..de93ae03657 100644 --- a/staging_vespalib/src/vespa/vespalib/util/polymorphicarray.h +++ b/vespalib/src/vespa/vespalib/util/polymorphicarray.h diff --git a/staging_vespalib/src/vespa/vespalib/util/polymorphicarraybase.h b/vespalib/src/vespa/vespalib/util/polymorphicarraybase.h index f3f63f6a43c..f3f63f6a43c 100644 --- a/staging_vespalib/src/vespa/vespalib/util/polymorphicarraybase.h +++ b/vespalib/src/vespa/vespalib/util/polymorphicarraybase.h diff --git a/staging_vespalib/src/vespa/vespalib/util/polymorphicarrays.h b/vespalib/src/vespa/vespalib/util/polymorphicarrays.h index 55f64ec51cd..55f64ec51cd 100644 --- a/staging_vespalib/src/vespa/vespalib/util/polymorphicarrays.h +++ b/vespalib/src/vespa/vespalib/util/polymorphicarrays.h diff --git a/staging_vespalib/src/vespa/vespalib/util/process_memory_stats.cpp b/vespalib/src/vespa/vespalib/util/process_memory_stats.cpp index f7e8e087727..f7e8e087727 100644 --- a/staging_vespalib/src/vespa/vespalib/util/process_memory_stats.cpp +++ b/vespalib/src/vespa/vespalib/util/process_memory_stats.cpp diff --git a/staging_vespalib/src/vespa/vespalib/util/process_memory_stats.h b/vespalib/src/vespa/vespalib/util/process_memory_stats.h index 000c0942905..000c0942905 100644 --- a/staging_vespalib/src/vespa/vespalib/util/process_memory_stats.h +++ b/vespalib/src/vespa/vespalib/util/process_memory_stats.h diff --git a/staging_vespalib/src/vespa/vespalib/util/programoptions.cpp b/vespalib/src/vespa/vespalib/util/programoptions.cpp index 9ea7c1648d1..9ea7c1648d1 100644 --- a/staging_vespalib/src/vespa/vespalib/util/programoptions.cpp +++ b/vespalib/src/vespa/vespalib/util/programoptions.cpp diff --git a/staging_vespalib/src/vespa/vespalib/util/programoptions.h b/vespalib/src/vespa/vespalib/util/programoptions.h index 0c75f9b2c72..0c75f9b2c72 100644 --- a/staging_vespalib/src/vespa/vespalib/util/programoptions.h +++ b/vespalib/src/vespa/vespalib/util/programoptions.h diff --git a/staging_vespalib/src/vespa/vespalib/util/rusage.cpp b/vespalib/src/vespa/vespalib/util/rusage.cpp index ed0ec125dcf..ed0ec125dcf 100644 --- a/staging_vespalib/src/vespa/vespalib/util/rusage.cpp +++ b/vespalib/src/vespa/vespalib/util/rusage.cpp diff --git a/staging_vespalib/src/vespa/vespalib/util/rusage.h b/vespalib/src/vespa/vespalib/util/rusage.h index 4c741f7699d..4c741f7699d 100644 --- a/staging_vespalib/src/vespa/vespalib/util/rusage.h +++ b/vespalib/src/vespa/vespalib/util/rusage.h diff --git a/staging_vespalib/src/vespa/vespalib/util/shutdownguard.cpp b/vespalib/src/vespa/vespalib/util/shutdownguard.cpp index 12e58898c06..12e58898c06 100644 --- a/staging_vespalib/src/vespa/vespalib/util/shutdownguard.cpp +++ b/vespalib/src/vespa/vespalib/util/shutdownguard.cpp diff --git a/staging_vespalib/src/vespa/vespalib/util/shutdownguard.h b/vespalib/src/vespa/vespalib/util/shutdownguard.h index d76d4deb5d2..d76d4deb5d2 100644 --- a/staging_vespalib/src/vespa/vespalib/util/shutdownguard.h +++ b/vespalib/src/vespa/vespalib/util/shutdownguard.h diff --git a/staging_vespalib/src/vespa/vespalib/util/sort.h b/vespalib/src/vespa/vespalib/util/sort.h index ce3f6772ef1..ce3f6772ef1 100644 --- a/staging_vespalib/src/vespa/vespalib/util/sort.h +++ b/vespalib/src/vespa/vespalib/util/sort.h diff --git a/staging_vespalib/src/vespa/vespalib/util/testclock.cpp b/vespalib/src/vespa/vespalib/util/testclock.cpp index bc5d37ca437..bc5d37ca437 100644 --- a/staging_vespalib/src/vespa/vespalib/util/testclock.cpp +++ b/vespalib/src/vespa/vespalib/util/testclock.cpp diff --git a/staging_vespalib/src/vespa/vespalib/util/testclock.h b/vespalib/src/vespa/vespalib/util/testclock.h index 9446ff32cb2..9446ff32cb2 100644 --- a/staging_vespalib/src/vespa/vespalib/util/testclock.h +++ b/vespalib/src/vespa/vespalib/util/testclock.h diff --git a/staging_vespalib/src/vespa/vespalib/util/varholder.h b/vespalib/src/vespa/vespalib/util/varholder.h index d92c00e0081..d92c00e0081 100644 --- a/staging_vespalib/src/vespa/vespalib/util/varholder.h +++ b/vespalib/src/vespa/vespalib/util/varholder.h diff --git a/staging_vespalib/src/vespa/vespalib/util/xmlserializable.cpp b/vespalib/src/vespa/vespalib/util/xmlserializable.cpp index c687609df74..c687609df74 100644 --- a/staging_vespalib/src/vespa/vespalib/util/xmlserializable.cpp +++ b/vespalib/src/vespa/vespalib/util/xmlserializable.cpp diff --git a/staging_vespalib/src/vespa/vespalib/util/xmlserializable.h b/vespalib/src/vespa/vespalib/util/xmlserializable.h index 76f0ad1fa3a..76f0ad1fa3a 100644 --- a/staging_vespalib/src/vespa/vespalib/util/xmlserializable.h +++ b/vespalib/src/vespa/vespalib/util/xmlserializable.h diff --git a/staging_vespalib/src/vespa/vespalib/util/xmlstream.cpp b/vespalib/src/vespa/vespalib/util/xmlstream.cpp index bdc09da127b..bdc09da127b 100644 --- a/staging_vespalib/src/vespa/vespalib/util/xmlstream.cpp +++ b/vespalib/src/vespa/vespalib/util/xmlstream.cpp diff --git a/staging_vespalib/src/vespa/vespalib/util/xmlstream.h b/vespalib/src/vespa/vespalib/util/xmlstream.h index b197ff5c7c8..b197ff5c7c8 100644 --- a/staging_vespalib/src/vespa/vespalib/util/xmlstream.h +++ b/vespalib/src/vespa/vespalib/util/xmlstream.h diff --git a/staging_vespalib/src/vespa/vespalib/util/xmlstream.hpp b/vespalib/src/vespa/vespalib/util/xmlstream.hpp index 82f1146df29..82f1146df29 100644 --- a/staging_vespalib/src/vespa/vespalib/util/xmlstream.hpp +++ b/vespalib/src/vespa/vespalib/util/xmlstream.hpp |