Use std::mutex over vespalib::Lock and reduce code visibility.

9 files changed, 30 insertions, 20 deletions

diff --git a/config/src/tests/api/api.cpp b/config/src/tests/api/api.cpp
index 0af2b848ea5..a48f36aea9a 100644
--- a/config/src/tests/api/api.cpp
+++ b/config/src/tests/api/api.cpp
@@ -1,13 +1,14 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/config/config.h>
+#include <vespa/config/common/configcontext.h>
 #include <config-my.h>
 
 using namespace config;
 
 TEST("require that can subscribe with empty config id") {
     ConfigSet set;
-    ConfigContext::SP ctx(new ConfigContext(set));
+    auto ctx = std::make_shared<ConfigContext>(set);
     MyConfigBuilder builder;
     builder.myField = "myfoo";
     set.addBuilder("", &builder);
diff --git a/config/src/tests/configfetcher/configfetcher.cpp b/config/src/tests/configfetcher/configfetcher.cpp
index 856b1198ce8..508322bb74e 100644
--- a/config/src/tests/configfetcher/configfetcher.cpp
+++ b/config/src/tests/configfetcher/configfetcher.cpp
@@ -1,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/config/helper/configfetcher.h>
+#include <vespa/config/common/configcontext.h>
 #include <vespa/vespalib/util/exception.h>
 #include "config-my.h"
 #include <atomic>
@@ -12,7 +13,7 @@ class MyCallback : public IFetcherCallback<MyConfig>
 {
 public:
     MyCallback(const std::string & badConfig="");
-    ~MyCallback();
+    ~MyCallback() override;
     void configure(std::unique_ptr<MyConfig> config) override
     {
         _config = std::move(config);
@@ -126,7 +127,7 @@ struct ConfigFixture {
     ConfigContext::SP context;
     ConfigFixture() : builder(), set(), context() {
         set.addBuilder("cfgid", &builder);
-        context.reset(new ConfigContext(set));
+        context = std::make_shared<ConfigContext>(set);
     }
 };
 
diff --git a/config/src/tests/configretriever/configretriever.cpp b/config/src/tests/configretriever/configretriever.cpp
index 2c1954bcd95..d4ebe2da994 100644
--- a/config/src/tests/configretriever/configretriever.cpp
+++ b/config/src/tests/configretriever/configretriever.cpp
@@ -7,7 +7,9 @@
 #include <vespa/config/retriever/simpleconfigretriever.h>
 #include <vespa/config/retriever/simpleconfigurer.h>
 #include <vespa/config/common/configholder.h>
+#include <vespa/config/common/configcontext.h>
 #include <vespa/config/subscription/configsubscription.h>
+#include <vespa/config/subscription/sourcespec.h>
 #include <vespa/config/common/exceptions.h>
 #include "config-bootstrap.h"
 #include "config-foo.h"
@@ -39,7 +41,7 @@ struct ConfigTestFixture {
           bootstrapBuilder(),
           componentConfig(),
           set(),
-          context(new ConfigContext(set)),
+          context(std::make_shared<ConfigContext>(set)),
           idcounter(-1)
     {
         set.addBuilder(configId, &bootstrapBuilder);
diff --git a/config/src/tests/configuri/configuri_test.cpp b/config/src/tests/configuri/configuri_test.cpp
index c813761e763..38d49848596 100644
--- a/config/src/tests/configuri/configuri_test.cpp
+++ b/config/src/tests/configuri/configuri_test.cpp
@@ -1,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/config/config.h>
+#include <vespa/config/common/configcontext.h>
 #include "config-my.h"
 
 using namespace config;
diff --git a/config/src/tests/failover/failover.cpp b/config/src/tests/failover/failover.cpp
index 0ca09b228f3..99b6967c929 100644
--- a/config/src/tests/failover/failover.cpp
+++ b/config/src/tests/failover/failover.cpp
@@ -4,10 +4,12 @@
 #include <vespa/config/common/misc.h>
 #include <vespa/config/frt/protocol.h>
 #include <vespa/config/config.h>
+#include <vespa/config/common/configcontext.h>
 #include <vespa/fnet/frt/frt.h>
 #include "config-my.h"
 #include <vespa/vespalib/data/slime/slime.h>
 #include <vespa/vespalib/data/simple_buffer.h>
+
 #include <vespa/log/log.h>
 LOG_SETUP("failover");
 
@@ -189,7 +191,7 @@ struct ConfigCheckFixture {
     NetworkFixture & nf;
 
     ConfigCheckFixture(NetworkFixture & f2)
-        : ctx(new ConfigContext(testTimingValues, f2.spec)),
+        : ctx(std::make_shared<ConfigContext>(testTimingValues, f2.spec)),
           nf(f2)
     {
     }
@@ -223,7 +225,7 @@ struct ConfigReloadFixture {
     ConfigHandle<MyConfig>::UP handle;
 
     ConfigReloadFixture(NetworkFixture & f2)
-        : ctx(new ConfigContext(testTimingValues, f2.spec)),
+        : ctx(std::make_shared<ConfigContext>(testTimingValues, f2.spec)),
           nf(f2),
           s(ctx),
           handle(s.subscribe<MyConfig>("myId"))
diff --git a/config/src/tests/file_subscription/file_subscription.cpp b/config/src/tests/file_subscription/file_subscription.cpp
index ceaf16c9191..836ca6593f8 100644
--- a/config/src/tests/file_subscription/file_subscription.cpp
+++ b/config/src/tests/file_subscription/file_subscription.cpp
@@ -4,6 +4,8 @@
 #include <vespa/config/common/configholder.h>
 #include <vespa/config/file/filesource.h>
 #include <vespa/config/common/exceptions.h>
+#include <vespa/config/common/sourcefactory.h>
+#include <vespa/config/common/configcontext.h>
 #include <vespa/vespalib/util/sync.h>
 #include <fstream>
 #include <config-my.h>
@@ -61,7 +63,7 @@ TEST("requireThatFileSpecGivesCorrectSource") {
 
     SourceFactory::UP factory(spec.createSourceFactory(TimingValues()));
     ASSERT_TRUE(factory);
-    IConfigHolder::SP holder(new ConfigHolder());
+    auto holder = std::make_shared<ConfigHolder>();
     Source::UP src = factory->createSource(holder, ConfigKey("my", "my", "bar", "foo"));
     ASSERT_TRUE(src);
 
@@ -89,7 +91,7 @@ TEST("requireThatFileSubscriptionReturnsCorrectConfig") {
 TEST("requireThatReconfigIsCalledWhenConfigChanges") {
     writeFile("my.cfg", "foo");
     {
-        IConfigContext::SP context(new ConfigContext(FileSpec("my.cfg")));
+        auto context = std::make_shared<ConfigContext>(FileSpec("my.cfg"));
         ConfigSubscriber s(context);
         std::unique_ptr<ConfigHandle<MyConfig> > handle = s.subscribe<MyConfig>("");
         s.nextConfigNow();
diff --git a/config/src/tests/getconfig/getconfig.cpp b/config/src/tests/getconfig/getconfig.cpp
index 0cbac7aa456..b091e347ff2 100644
--- a/config/src/tests/getconfig/getconfig.cpp
+++ b/config/src/tests/getconfig/getconfig.cpp
@@ -1,9 +1,8 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/vespalib/testkit/test_kit.h>
-#include <vespa/config/config.h>
 #include <vespa/config/helper/configgetter.hpp>
-#include <vespa/config/raw/rawsource.h>
+#include <vespa/config/common/configcontext.h>
 #include "config-my.h"
 
 using namespace config;
@@ -16,7 +15,7 @@ struct ConfigFixture {
     ConfigContext::SP context;
     ConfigFixture() : builder(), set(), context() {
         set.addBuilder("cfgid", &builder);
-        context.reset(new ConfigContext(set));
+        context = std::make_shared<ConfigContext>(set);
     }
 };
 
@@ -27,7 +26,7 @@ TEST("requireThatGetConfigReturnsCorrectConfig")
     RawSpec spec("myField \"foo\"\n");
 
     std::unique_ptr<MyConfig> cfg = ConfigGetter<MyConfig>::getConfig("myid", spec);
-    ASSERT_TRUE(cfg.get() != NULL);
+    ASSERT_TRUE(cfg);
     ASSERT_EQUAL("my", cfg->defName());
     ASSERT_EQUAL("foo", cfg->myField);
 }
@@ -37,7 +36,7 @@ TEST("requireThatGetConfigReturnsCorrectConfig")
 {
     FileSpec spec(TEST_PATH("my.cfg"));
     std::unique_ptr<MyConfig> cfg = ConfigGetter<MyConfig>::getConfig("", spec);
-    ASSERT_TRUE(cfg.get() != NULL);
+    ASSERT_TRUE(cfg);
     ASSERT_EQUAL("my", cfg->defName());
     ASSERT_EQUAL("foobar", cfg->myField);
 }
diff --git a/config/src/tests/raw_subscription/raw_subscription.cpp b/config/src/tests/raw_subscription/raw_subscription.cpp
index 478b4611bac..39062f4e7ac 100644
--- a/config/src/tests/raw_subscription/raw_subscription.cpp
+++ b/config/src/tests/raw_subscription/raw_subscription.cpp
@@ -2,6 +2,7 @@
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/config/config.h>
 #include <vespa/config/common/configholder.h>
+#include <vespa/config/common/sourcefactory.h>
 #include <vespa/config/raw/rawsource.h>
 #include "config-my.h"
 
@@ -10,7 +11,7 @@ using namespace config;
 TEST("require that raw spec can create source factory")
 {
     RawSpec spec("myField \"foo\"\n");
-    SourceFactory::UP raw = spec.createSourceFactory(TimingValues());
+    auto raw = spec.createSourceFactory(TimingValues());
     ASSERT_TRUE(raw);
     IConfigHolder::SP holder(new ConfigHolder());
     Source::UP src = raw->createSource(holder, ConfigKey("myid", "my", "bar", "foo"));
diff --git a/config/src/tests/unittest/unittest.cpp b/config/src/tests/unittest/unittest.cpp
index 4b46dcef900..46aefe152af 100644
--- a/config/src/tests/unittest/unittest.cpp
+++ b/config/src/tests/unittest/unittest.cpp
@@ -2,6 +2,7 @@
 
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/config/config.h>
+#include <vespa/config/common/configcontext.h>
 #include "config-my.h"
 #include "config-foo.h"
 #include "config-bar.h"
@@ -15,13 +16,13 @@ using namespace std::chrono_literals;
 namespace {
     void verifyConfig(const std::string & expected, std::unique_ptr<FooConfig> cfg)
     {
-        ASSERT_TRUE(cfg.get() != NULL);
+        ASSERT_TRUE(cfg);
         ASSERT_EQUAL(expected, cfg->fooValue);
     }
 
     void verifyConfig(const std::string & expected, std::unique_ptr<BarConfig> cfg)
     {
-        ASSERT_TRUE(cfg.get() != NULL);
+        ASSERT_TRUE(cfg);
         ASSERT_EQUAL(expected, cfg->barValue);
     }
 }
@@ -37,7 +38,7 @@ TEST("requireThatUnitTestsCanBeCreated") {
 
 TEST("requireThatConfigCanBeReloaded") {
     ConfigSet set;
-    ConfigContext::SP ctx(new ConfigContext(set));
+    auto ctx = std::make_shared<ConfigContext>(set);
     MyConfigBuilder builder;
     builder.myField = "myfoo";
     set.addBuilder("myid", &builder);
@@ -46,7 +47,7 @@ TEST("requireThatConfigCanBeReloaded") {
     ConfigHandle<MyConfig>::UP handle = subscriber.subscribe<MyConfig>("myid");
     ASSERT_TRUE(subscriber.nextConfigNow());
     std::unique_ptr<MyConfig> cfg(handle->getConfig());
-    ASSERT_TRUE(cfg.get() != NULL);
+    ASSERT_TRUE(cfg);
     ASSERT_EQUAL("myfoo", cfg->myField);
     ctx->reload();
     ASSERT_FALSE(subscriber.nextConfig(1000ms));
@@ -54,13 +55,13 @@ TEST("requireThatConfigCanBeReloaded") {
     ctx->reload();
     ASSERT_TRUE(subscriber.nextConfig(10000ms));
     cfg = handle->getConfig();
-    ASSERT_TRUE(cfg.get() != NULL);
+    ASSERT_TRUE(cfg);
     ASSERT_EQUAL("foobar", cfg->myField);
 }
 
 TEST("requireThatCanSubscribeWithSameIdToDifferentDefs") {
     ConfigSet set;
-    ConfigContext::SP ctx(new ConfigContext(set));
+    auto ctx = std::make_shared<ConfigContext>(set);
     FooConfigBuilder fooBuilder;
     BarConfigBuilder barBuilder;