Only include what you need

28 files changed, 45 insertions, 106 deletions

diff --git a/config/src/vespa/config/common/configcontext.cpp b/config/src/vespa/config/common/configcontext.cpp
index d770c5f1371..f0ca2ddd566 100644
--- a/config/src/vespa/config/common/configcontext.cpp
+++ b/config/src/vespa/config/common/configcontext.cpp
@@ -1,11 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".config.common.configcontext");
 #include "configcontext.h"
 #include "configmanager.h"
-#include "exceptions.h"
 
 namespace config {
 
@@ -13,15 +9,13 @@ ConfigContext::ConfigContext(const SourceSpec & spec)
     : _timingValues(),
       _generation(1),
       _manager(spec.createSourceFactory(_timingValues), _generation)
-{
-}
+{ }
 
 ConfigContext::ConfigContext(const TimingValues & timingValues, const SourceSpec & spec)
     : _timingValues(timingValues),
       _generation(1),
       _manager(spec.createSourceFactory(_timingValues), _generation)
-{
-}
+{ }
 
 IConfigManager &
 ConfigContext::getManagerInstance()
diff --git a/config/src/vespa/config/common/configmanager.cpp b/config/src/vespa/config/common/configmanager.cpp
index 4c93ddcf8e4..a73e8caf206 100644
--- a/config/src/vespa/config/common/configmanager.cpp
+++ b/config/src/vespa/config/common/configmanager.cpp
@@ -1,13 +1,16 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".config.common.configmanager");
 #include "configmanager.h"
 #include "exceptions.h"
 #include "configholder.h"
-#include <vespa/vespalib/util/exception.h>
 #include <vespa/vespalib/util/atomic.h>
 #include <memory>
+#include <thread>
+#include <chrono>
+
+#include <vespa/log/log.h>
+LOG_SETUP(".config.common.configmanager");
+
+using namespace std::chrono_literals;
 
 namespace config {
 
@@ -42,7 +45,7 @@ ConfigManager::subscribe(const ConfigKey & key, uint64_t timeoutInMillis)
     while (timer.MilliSecsToNow() < timeoutInMillis) {
         if (holder->poll())
             break;
-        FastOS_Thread::Sleep(10);
+        std::this_thread::sleep_for(10ms);
     }
     if (!holder->poll()) {
         std::ostringstream oss;
diff --git a/config/src/vespa/config/common/configparser.cpp b/config/src/vespa/config/common/configparser.cpp
index 67237ef9fdc..fde55f257dc 100644
--- a/config/src/vespa/config/common/configparser.cpp
+++ b/config/src/vespa/config/common/configparser.cpp
@@ -1,5 +1,4 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
 #include <vespa/config/common/configparser.h>
 #include <vespa/vespalib/stllike/string.h>
 #include <vespa/vespalib/stllike/asciistream.h>
diff --git a/config/src/vespa/config/common/configsystem.cpp b/config/src/vespa/config/common/configsystem.cpp
index 373dfa83b4b..bc22cfaa4cf 100644
--- a/config/src/vespa/config/common/configsystem.cpp
+++ b/config/src/vespa/config/common/configsystem.cpp
@@ -1,8 +1,10 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/fastos/fastos.h>
 #include "configsystem.h"
 #include <vespa/defaults.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 namespace config {
 
diff --git a/config/src/vespa/config/common/errorcode.cpp b/config/src/vespa/config/common/errorcode.cpp
index 07907650f50..da6d75e4ac6 100644
--- a/config/src/vespa/config/common/errorcode.cpp
+++ b/config/src/vespa/config/common/errorcode.cpp
@@ -1,11 +1,5 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/**
- * @author  Gunnar Gauslaa Bergem
- * @date    2008-05-22
- * @version $Id: errorcode.cpp 119439 2011-04-19 09:32:27Z arnej $
- */
 
-#include <vespa/fastos/fastos.h>
 #include "errorcode.h"
 
 namespace config {
diff --git a/config/src/vespa/config/common/timingvalues.cpp b/config/src/vespa/config/common/timingvalues.cpp
index 13844bcdfe9..638d7b702ee 100644
--- a/config/src/vespa/config/common/timingvalues.cpp
+++ b/config/src/vespa/config/common/timingvalues.cpp
@@ -1,11 +1,5 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/**
- * @author  Gunnar Gauslaa Bergem
- * @date    2008-05-22
- * @version $Id: timingvalues.cpp 119439 2011-04-19 09:32:27Z arnej $
- */
 
-#include <vespa/fastos/fastos.h>
 #include "timingvalues.h"
 
 namespace config {
@@ -22,8 +16,7 @@ TimingValues::TimingValues()
       maxDelayMultiplier(10),
       transientDelay(10000),
       fatalDelay(60000)
-{
-}
+{ }
 
 
 TimingValues::TimingValues(uint64_t initSuccessTimeout,
@@ -48,7 +41,6 @@ TimingValues::TimingValues(uint64_t initSuccessTimeout,
       maxDelayMultiplier(initMaxDelayMultiplier),
       transientDelay(initTransientDelay),
       fatalDelay(initFatalDelay)
-{
-}
+{ }
 
 }
diff --git a/config/src/vespa/config/common/timingvalues.h b/config/src/vespa/config/common/timingvalues.h
index 4741e9063fe..244e80540c4 100644
--- a/config/src/vespa/config/common/timingvalues.h
+++ b/config/src/vespa/config/common/timingvalues.h
@@ -1,13 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/**
- * @author  Gunnar Gauslaa Bergem
- * @date    2008-05-22
- * @version $Id: timingvalues.h 119465 2011-04-20 15:21:46Z arnej $
- */
 
 #pragma once
 
-
+#include <cstdint>
 namespace config {
 
 static const uint64_t DEFAULT_NEXTCONFIG_TIMEOUT = 55000;
diff --git a/config/src/vespa/config/common/trace.cpp b/config/src/vespa/config/common/trace.cpp
index 70f5ddb85a2..5698c60d0e4 100644
--- a/config/src/vespa/config/common/trace.cpp
+++ b/config/src/vespa/config/common/trace.cpp
@@ -1,5 +1,4 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
 #include "trace.h"
 #include <vespa/vespalib/trace/slime_trace_serializer.h>
 #include <vespa/vespalib/trace/slime_trace_deserializer.h>
diff --git a/config/src/vespa/config/file/filesource.cpp b/config/src/vespa/config/file/filesource.cpp
index e2ee7248943..e5e676e141d 100644
--- a/config/src/vespa/config/file/filesource.cpp
+++ b/config/src/vespa/config/file/filesource.cpp
@@ -1,13 +1,13 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".config.file.filesource");
 #include "filesource.h"
 #include <vespa/config/subscription/sourcespec.h>
 #include <vespa/config/common/misc.h>
 #include <vespa/vespalib/io/fileutil.h>
 #include <vespa/vespalib/stllike/asciistream.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 using vespalib::asciistream;
 
@@ -18,8 +18,7 @@ FileSource::FileSource(const IConfigHolder::SP & holder, const vespalib::string
       _fileName(fileName),
       _lastLoaded(-1),
       _generation(1)
-{
-}
+{ }
 
 void
 FileSource::getConfig()
diff --git a/config/src/vespa/config/file_acquirer/file_acquirer.cpp b/config/src/vespa/config/file_acquirer/file_acquirer.cpp
index c6bf4066eec..147da7caaf9 100644
--- a/config/src/vespa/config/file_acquirer/file_acquirer.cpp
+++ b/config/src/vespa/config/file_acquirer/file_acquirer.cpp
@@ -1,9 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/fastos/fastos.h>
+#include "file_acquirer.h"
 #include <vespa/log/log.h>
 LOG_SETUP(".config.file_acquirer");
-#include "file_acquirer.h"
 
 namespace config {
 
diff --git a/config/src/vespa/config/frt/frtconfigagent.cpp b/config/src/vespa/config/frt/frtconfigagent.cpp
index 397067b85a1..ca95e9500db 100644
--- a/config/src/vespa/config/frt/frtconfigagent.cpp
+++ b/config/src/vespa/config/frt/frtconfigagent.cpp
@@ -1,12 +1,12 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".config.frt.frtconfigagent");
 #include "frtconfigagent.h"
 #include <vespa/config/common/trace.h>
 #include <vespa/config/common/configrequest.h>
 #include <vespa/config/common/configkey.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP(".config.frt.frtconfigagent");
+
 namespace config {
 
 FRTConfigAgent::FRTConfigAgent(const IConfigHolder::SP & holder, const TimingValues & timingValues)
diff --git a/config/src/vespa/config/frt/frtconfigrequest.cpp b/config/src/vespa/config/frt/frtconfigrequest.cpp
index 0a8088a191a..6f696536c49 100644
--- a/config/src/vespa/config/frt/frtconfigrequest.cpp
+++ b/config/src/vespa/config/frt/frtconfigrequest.cpp
@@ -1,7 +1,4 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".config.frt.frtconfigrequest");
 #include "frtconfigrequest.h"
 #include "frtconfigresponse.h"
 #include "connection.h"
diff --git a/config/src/vespa/config/frt/frtconfigrequestv2.cpp b/config/src/vespa/config/frt/frtconfigrequestv2.cpp
index 97335468a97..ab6e9377d1f 100644
--- a/config/src/vespa/config/frt/frtconfigrequestv2.cpp
+++ b/config/src/vespa/config/frt/frtconfigrequestv2.cpp
@@ -1,7 +1,4 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".config.frt.frtconfigrequestv2");
 #include "frtconfigrequestv2.h"
 #include "frtconfigresponsev2.h"
 #include "connection.h"
diff --git a/config/src/vespa/config/frt/frtconfigrequestv3.cpp b/config/src/vespa/config/frt/frtconfigrequestv3.cpp
index 11a3496348f..cc08525ce67 100644
--- a/config/src/vespa/config/frt/frtconfigrequestv3.cpp
+++ b/config/src/vespa/config/frt/frtconfigrequestv3.cpp
@@ -1,7 +1,4 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".config.frt.frtconfigrequestv3");
 #include "frtconfigrequestv3.h"
 #include "frtconfigresponsev3.h"
 #include "connection.h"
diff --git a/config/src/vespa/config/frt/frtconfigresponse.cpp b/config/src/vespa/config/frt/frtconfigresponse.cpp
index d815525cb40..1aa55dc9ce3 100644
--- a/config/src/vespa/config/frt/frtconfigresponse.cpp
+++ b/config/src/vespa/config/frt/frtconfigresponse.cpp
@@ -1,7 +1,4 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".config.frt.frtconfigresponse");
 #include "frtconfigresponse.h"
 #include <vespa/config/common/misc.h>
 #include <vespa/fnet/frt/frt.h>
@@ -68,9 +65,6 @@ void
 FRTConfigResponseV1::fill()
 {
     const std::vector<vespalib::string> payload(getPayLoad());
-    for (size_t i = 0; i < payload.size(); i++) {
-        LOG(spam, "payload(%lu): %s", i, payload[i].c_str());
-    }
     _value = ConfigValue(payload, calculateContentMd5(payload));
     _key = readKey();
     _state = ConfigState(vespalib::string((*_returnValues)[4]._string._str), (*_returnValues)[6]._intval64);
diff --git a/config/src/vespa/config/frt/frtconfigresponsev2.cpp b/config/src/vespa/config/frt/frtconfigresponsev2.cpp
index 8de19b95145..53392baa73a 100644
--- a/config/src/vespa/config/frt/frtconfigresponsev2.cpp
+++ b/config/src/vespa/config/frt/frtconfigresponsev2.cpp
@@ -1,7 +1,4 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".config.frt.frtconfigresponsev2");
 #include "frtconfigresponsev2.h"
 #include <vespa/config/common/misc.h>
 #include <vespa/fnet/frt/frt.h>
diff --git a/config/src/vespa/config/frt/frtconfigresponsev3.cpp b/config/src/vespa/config/frt/frtconfigresponsev3.cpp
index 5421f0cb667..b9550ba0ec4 100644
--- a/config/src/vespa/config/frt/frtconfigresponsev3.cpp
+++ b/config/src/vespa/config/frt/frtconfigresponsev3.cpp
@@ -1,12 +1,11 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".config.frt.frtconfigresponsev3");
 #include "frtconfigresponsev3.h"
 #include "compressioninfo.h"
 #include <vespa/config/common/misc.h>
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/vespalib/stllike/string.h>
+#include <vespa/log/log.h>
+LOG_SETUP(".config.frt.frtconfigresponsev3");
 
 using namespace vespalib;
 using namespace vespalib::slime;
diff --git a/config/src/vespa/config/frt/frtconnection.cpp b/config/src/vespa/config/frt/frtconnection.cpp
index 13e37f71b42..40e59000aef 100644
--- a/config/src/vespa/config/frt/frtconnection.cpp
+++ b/config/src/vespa/config/frt/frtconnection.cpp
@@ -1,11 +1,10 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
+#include "frtconnection.h"
+#include <vespa/vespalib/util/atomic.h>
+#include <vespa/config/common/errorcode.h>
 #include <time.h>
 #include <vespa/log/log.h>
 LOG_SETUP(".config.frt.frtconnection");
-#include <vespa/vespalib/util/atomic.h>
-#include <vespa/config/common/errorcode.h>
-#include "frtconnection.h"
 
 using namespace vespalib;
 
diff --git a/config/src/vespa/config/frt/frtconnectionpool.cpp b/config/src/vespa/config/frt/frtconnectionpool.cpp
index 1772598f92b..70225b9dd04 100644
--- a/config/src/vespa/config/frt/frtconnectionpool.cpp
+++ b/config/src/vespa/config/frt/frtconnectionpool.cpp
@@ -1,9 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/fastos/fastos.h>
-#include <cstdlib>
-#include <vespa/vespalib/util/host_name.h>
 #include "frtconnectionpool.h"
+#include <vespa/vespalib/util/host_name.h>
+#include <cstdlib>
 
 namespace config {
 
diff --git a/config/src/vespa/config/frt/frtsource.cpp b/config/src/vespa/config/frt/frtsource.cpp
index c209dc69618..7081cbc0e3a 100644
--- a/config/src/vespa/config/frt/frtsource.cpp
+++ b/config/src/vespa/config/frt/frtsource.cpp
@@ -1,13 +1,13 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".config.frt.frtsource");
-#include <vespa/fnet/frt/frt.h>
 #include "frtconfigrequest.h"
 #include "frtconfigresponse.h"
 #include "frtsource.h"
 #include "connection.h"
 #include <vespa/vespalib/util/closuretask.h>
+#include <vespa/fnet/frt/frt.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP(".config.frt.frtsource");
 
 using vespalib::Closure;
 using vespalib::makeClosure;
diff --git a/config/src/vespa/config/frt/frtsourcefactory.cpp b/config/src/vespa/config/frt/frtsourcefactory.cpp
index d11b5d6799c..e985ca47a72 100644
--- a/config/src/vespa/config/frt/frtsourcefactory.cpp
+++ b/config/src/vespa/config/frt/frtsourcefactory.cpp
@@ -1,7 +1,4 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".config.frt.frtsourcefactory");
 #include "frtsourcefactory.h"
 #include "frtsource.h"
 
diff --git a/config/src/vespa/config/frt/slimeconfigrequest.cpp b/config/src/vespa/config/frt/slimeconfigrequest.cpp
index 0f6458d0d66..922b5ee8b7e 100644
--- a/config/src/vespa/config/frt/slimeconfigrequest.cpp
+++ b/config/src/vespa/config/frt/slimeconfigrequest.cpp
@@ -1,7 +1,4 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".config.frt.slimeconfigrequest");
 #include "slimeconfigrequest.h"
 #include "connection.h"
 #include <vespa/fnet/frt/frt.h>
diff --git a/config/src/vespa/config/frt/slimeconfigresponse.cpp b/config/src/vespa/config/frt/slimeconfigresponse.cpp
index ac84852b256..4a42ca0457c 100644
--- a/config/src/vespa/config/frt/slimeconfigresponse.cpp
+++ b/config/src/vespa/config/frt/slimeconfigresponse.cpp
@@ -1,11 +1,10 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".config.frt.slimeconfigresponse");
 #include "slimeconfigresponse.h"
 #include <vespa/config/common/misc.h>
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/vespalib/stllike/string.h>
+#include <vespa/log/log.h>
+LOG_SETUP(".config.frt.slimeconfigresponse");
 
 using namespace vespalib;
 using namespace vespalib::slime;
diff --git a/config/src/vespa/config/raw/rawsource.cpp b/config/src/vespa/config/raw/rawsource.cpp
index 3cb3003cb7e..eb7e1c5d902 100644
--- a/config/src/vespa/config/raw/rawsource.cpp
+++ b/config/src/vespa/config/raw/rawsource.cpp
@@ -1,7 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/config/common/misc.h>
 #include "rawsource.h"
+#include <vespa/config/common/misc.h>
 #include <vespa/vespalib/stllike/asciistream.h>
 
 namespace config {
diff --git a/config/src/vespa/config/retriever/configretriever.cpp b/config/src/vespa/config/retriever/configretriever.cpp
index d09aaf0d332..711fe5f574d 100644
--- a/config/src/vespa/config/retriever/configretriever.cpp
+++ b/config/src/vespa/config/retriever/configretriever.cpp
@@ -1,14 +1,10 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-#include <vespa/config/common/exceptions.h>
-LOG_SETUP(".config.retriever.configretriever");
 #include "configretriever.h"
+#include <vespa/config/common/exceptions.h>
 
 namespace config {
 
-
 ConfigRetriever::ConfigRetriever(const ConfigKeySet & bootstrapSet,
                                  const IConfigContext::SP & context,
                                  int64_t subscribeTimeout)
diff --git a/config/src/vespa/config/subscription/configsubscriber.cpp b/config/src/vespa/config/subscription/configsubscriber.cpp
index 092c460ece1..cf687548e26 100644
--- a/config/src/vespa/config/subscription/configsubscriber.cpp
+++ b/config/src/vespa/config/subscription/configsubscriber.cpp
@@ -1,11 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".config.subscription.configsubscriber");
-
 #include "configsubscriber.h"
-#include <vespa/config/common/exceptions.h>
 
 namespace config {
 
diff --git a/config/src/vespa/config/subscription/configsubscription.cpp b/config/src/vespa/config/subscription/configsubscription.cpp
index c8d4f66091c..c20aa93d714 100644
--- a/config/src/vespa/config/subscription/configsubscription.cpp
+++ b/config/src/vespa/config/subscription/configsubscription.cpp
@@ -1,6 +1,5 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/fastos/fastos.h>
 #include <vespa/config/common/exceptions.h>
 #include <vespa/config/common/misc.h>
 #include "configsubscription.h"
diff --git a/config/src/vespa/config/subscription/configsubscriptionset.cpp b/config/src/vespa/config/subscription/configsubscriptionset.cpp
index b19812a3fc6..91635a33222 100644
--- a/config/src/vespa/config/subscription/configsubscriptionset.cpp
+++ b/config/src/vespa/config/subscription/configsubscriptionset.cpp
@@ -1,11 +1,13 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/fastos/fastos.h>
+#include "configsubscriptionset.h"
+#include <vespa/config/common/exceptions.h>
+#include <thread>
+#include <chrono>
 #include <vespa/log/log.h>
 LOG_SETUP(".config.subscription.configsubscriptionset");
 
-#include "configsubscriptionset.h"
-#include <vespa/config/common/exceptions.h>
+using namespace std::chrono_literals;
 
 namespace config {
 
@@ -80,7 +82,7 @@ ConfigSubscriptionSet::acquireSnapshot(uint64_t timeoutInMillis, bool ignoreChan
         lastGeneration = generation;
         timeLeft = timeoutInMillis - static_cast<uint64_t>(timer.MilliSecsToNow());
         if (!inSync && timeLeft > 0) {
-            FastOS_Thread::Sleep(10);
+            std::this_thread::sleep_for(10ms);
         }
     }