diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-06-21 14:18:45 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-06-21 14:18:45 +0000 |
| commit | 80a5a9cbd8dc8c22b207d49fa8cec93568adda54 (patch) | |
| tree | 9999fce2de5ee17b95db10fa7ecd1fddfbba3337 | |
| parent | b73c2d3d2d0102ebf26b8f545455028cecca03ad (diff) | |
Remove mlock as option for backend too
| -rw-r--r-- | searchcore/src/vespa/searchcore/config/proton.def | 4 | ||||
| -rw-r--r-- | searchlib/src/apps/docstore/benchmarkdatastore.cpp | 2 | ||||
| -rw-r--r-- | searchlib/src/vespa/searchlib/common/tunefileinfo.hpp | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/searchcore/src/vespa/searchcore/config/proton.def b/searchcore/src/vespa/searchcore/config/proton.def index 3b94bb9984e..dd411d7f30f 100644 --- a/searchcore/src/vespa/searchcore/config/proton.def +++ b/searchcore/src/vespa/searchcore/config/proton.def @@ -175,7 +175,7 @@ index.cache.size long default=0 restart attribute.write.io enum {NORMAL, OSYNC, DIRECTIO} default=DIRECTIO restart ## Multiple optional options for use with mmap -search.mmap.options[] enum {MLOCK, POPULATE, HUGETLB} restart +search.mmap.options[] enum {POPULATE, HUGETLB} restart ## Advise to give to os when mapping memory. search.mmap.advise enum {NORMAL, RANDOM, SEQUENTIAL} default=NORMAL restart @@ -277,7 +277,7 @@ summary.write.io enum {NORMAL, OSYNC, DIRECTIO} default=DIRECTIO summary.read.io enum {NORMAL, DIRECTIO, MMAP } default=MMAP restart ## Multiple optional options for use with mmap -summary.read.mmap.options[] enum {MLOCK, POPULATE, HUGETLB} restart +summary.read.mmap.options[] enum {POPULATE, HUGETLB} restart ## Advise to give to os when mapping memory. summary.read.mmap.advise enum {NORMAL, RANDOM, SEQUENTIAL} default=NORMAL restart diff --git a/searchlib/src/apps/docstore/benchmarkdatastore.cpp b/searchlib/src/apps/docstore/benchmarkdatastore.cpp index 20f06a087f5..5277c71cea2 100644 --- a/searchlib/src/apps/docstore/benchmarkdatastore.cpp +++ b/searchlib/src/apps/docstore/benchmarkdatastore.cpp @@ -29,7 +29,7 @@ class BenchmarkDataStoreApp : public FastOS_Application void BenchmarkDataStoreApp::usage() { - printf("Usage: %s <direcory> <numreads> <numthreads> <objects per read> <normal,directio,mmap,mlock>\n", _argv[0]); + printf("Usage: %s <direcory> <numreads> <numthreads> <objects per read> <normal,directio,mmap>\n", _argv[0]); fflush(stdout); } diff --git a/searchlib/src/vespa/searchlib/common/tunefileinfo.hpp b/searchlib/src/vespa/searchlib/common/tunefileinfo.hpp index 7cba56d5d72..a99bf8fcfd0 100644 --- a/searchlib/src/vespa/searchlib/common/tunefileinfo.hpp +++ b/searchlib/src/vespa/searchlib/common/tunefileinfo.hpp @@ -26,7 +26,6 @@ TuneFileRandRead::setFromMmapConfig(const MMapConfig & mmapFlags) { for (size_t i(0), m(mmapFlags.options.size()); i < m; i++) { #ifdef __linux__ switch (mmapFlags.options[i]) { - case MMapConfig::Options::MLOCK: _mmapFlags |= MAP_LOCKED; break; case MMapConfig::Options::POPULATE: _mmapFlags |= MAP_POPULATE; break; case MMapConfig::Options::HUGETLB: _mmapFlags |= MAP_HUGETLB; break; } |