gc last usages of closures

7 files changed, 10 insertions, 14 deletions

diff --git a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
index 203b6646880..d231040aeda 100644
--- a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
@@ -48,7 +48,6 @@ using std::make_shared;
 using CCR = DocumentDBConfig::ComparisonResult;
 using Configurer = SearchableDocSubDBConfigurer;
 using ConfigurerUP = std::unique_ptr<SearchableDocSubDBConfigurer>;
-using SummarySetup = SummaryManager::SummarySetup;
 using DocumenttypesConfigSP = proton::DocumentDBConfig::DocumenttypesConfigSP;
 
 const vespalib::string BASE_DIR("baseDir");
@@ -56,10 +55,10 @@ const vespalib::string DOC_TYPE("invalid");
 
 class IndexManagerDummyReconfigurer : public searchcorespi::IIndexManager::Reconfigurer
 {
-    bool reconfigure(vespalib::Closure0<bool>::UP closure) override {
+    bool reconfigure(std::unique_ptr<Configure> configure) override {
         bool ret = true;
-        if (closure)
-            ret = closure->call(); // Perform index manager reconfiguration now
+        if (configure)
+            ret = configure->configure(); // Perform index manager reconfiguration now
         return ret;
     }
 };
diff --git a/searchcore/src/tests/proton/index/indexmanager_test.cpp b/searchcore/src/tests/proton/index/indexmanager_test.cpp
index 50d23529413..065d95e82fa 100644
--- a/searchcore/src/tests/proton/index/indexmanager_test.cpp
+++ b/searchcore/src/tests/proton/index/indexmanager_test.cpp
@@ -61,10 +61,10 @@ namespace {
 
 class IndexManagerDummyReconfigurer : public searchcorespi::IIndexManager::Reconfigurer {
 
-    virtual bool reconfigure(vespalib::Closure0<bool>::UP closure) override {
+    virtual bool reconfigure(std::unique_ptr<Configure> configure) override {
         bool ret = true;
-        if (closure.get() != nullptr) {
-            ret = closure->call(); // Perform index manager reconfiguration now
+        if (configure) {
+            ret = configure->configure(); // Perform index manager reconfiguration now
         }
         return ret;
     }
diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_thread.cpp b/searchcore/src/vespa/searchcore/proton/matching/match_thread.cpp
index 5cb4394880f..2b8f32f2835 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/match_thread.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/match_thread.cpp
@@ -10,7 +10,6 @@
 #include <vespa/searchlib/common/bitvector.h>
 #include <vespa/searchlib/queryeval/multibitvectoriterator.h>
 #include <vespa/searchlib/queryeval/andnotsearch.h>
-#include <vespa/vespalib/util/closure.h>
 #include <vespa/vespalib/util/thread_bundle.h>
 #include <vespa/vespalib/data/slime/cursor.h>
 #include <vespa/vespalib/data/slime/inserter.h>
diff --git a/searchcore/src/vespa/searchcore/proton/matching/matcher.h b/searchcore/src/vespa/searchcore/proton/matching/matcher.h
index 39d1fa38007..1a04940b2f4 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/matcher.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/matcher.h
@@ -18,7 +18,6 @@
 #include <vespa/searchlib/queryeval/blueprint.h>
 #include <vespa/searchlib/query/base.h>
 #include <vespa/vespalib/util/clock.h>
-#include <vespa/vespalib/util/closure.h>
 #include <vespa/vespalib/util/thread_bundle.h>
 #include <mutex>
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.h b/searchcore/src/vespa/searchcore/proton/server/documentdb.h
index 9f6cf44c75d..9c2facdddb0 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdb.h
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.h
@@ -87,7 +87,6 @@ private:
     InitializeThreads             _initializeThreads;
 
     typedef search::SerialNum      SerialNum;
-    typedef vespalib::Closure      Closure;
     typedef search::index::Schema  Schema;
     using lock_guard = std::lock_guard<std::mutex>;
     // variables related to reconfig
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp
index 987d19bb8a8..2768c7ea337 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp
@@ -243,7 +243,7 @@ SearchableDocSubDB::initFeedView(IAttributeWriter::SP attrWriter,
  * flush engine has not started.
  */
 bool
-SearchableDocSubDB::reconfigure(vespalib::Closure0<bool>::UP closure)
+SearchableDocSubDB::reconfigure(std::unique_ptr<Configure> configure)
 {
     assert(_writeService.master().isCurrentThread());
 
@@ -255,8 +255,8 @@ SearchableDocSubDB::reconfigure(vespalib::Closure0<bool>::UP closure)
 
     bool ret = true;
 
-    if (closure)
-        ret = closure->call();  // Perform index manager reconfiguration now
+    if (configure)
+        ret = configure->configure();  // Perform index manager reconfiguration now
     reconfigureIndexSearchable();
     return ret;
 }
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h
index 4e021e74189..12d9d24b525 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h
+++ b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h
@@ -94,7 +94,7 @@ private:
     void initFeedView(IAttributeWriter::SP attrWriter, const DocumentDBConfig &configSnapshot);
     void reconfigureMatchingMetrics(const vespa::config::search::RankProfilesConfig &config);
 
-    bool reconfigure(vespalib::Closure0<bool>::UP closure) override;
+    bool reconfigure(std::unique_ptr<Configure> configure) override;
     void reconfigureIndexSearchable();
     void syncViews();
     void applyFlushConfig(const DocumentDBFlushConfig &flushConfig);