From 5a933cefcc5e0595a1ec46fc5ea287aa163ecd3f Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Mon, 4 Dec 2017 18:31:36 -0500
Subject: Add an interface to get the queue depth out of CValidationInterface

---
 src/validationinterface.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/validationinterface.cpp')

diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp
index abbd8cc4d2..1ddff4b335 100644
--- a/src/validationinterface.cpp
+++ b/src/validationinterface.cpp
@@ -54,6 +54,11 @@ void CMainSignals::FlushBackgroundCallbacks() {
     }
 }
 
+size_t CMainSignals::CallbacksPending() {
+    if (!m_internals) return 0;
+    return m_internals->m_schedulerClient.CallbacksPending();
+}
+
 void CMainSignals::RegisterWithMempoolSignals(CTxMemPool& pool) {
     pool.NotifyEntryRemoved.connect(boost::bind(&CMainSignals::MempoolEntryRemoved, this, _1, _2));
 }
-- 
cgit v1.2.3


From 97d2b09c124e6e5803f7fd4503348d9710d1260f Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sun, 24 Dec 2017 12:13:13 -0500
Subject: Add helper to wait for validation interface queue to catch up

---
 src/validationinterface.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/validationinterface.cpp')

diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp
index 1ddff4b335..1e13465bf7 100644
--- a/src/validationinterface.cpp
+++ b/src/validationinterface.cpp
@@ -11,9 +11,11 @@
 #include <sync.h>
 #include <txmempool.h>
 #include <util.h>
+#include <validation.h>
 
 #include <list>
 #include <atomic>
+#include <future>
 
 #include <boost/signals2/signal.hpp>
 
@@ -118,6 +120,16 @@ void CallFunctionInValidationInterfaceQueue(std::function<void ()> func) {
     g_signals.m_internals->m_schedulerClient.AddToProcessQueue(std::move(func));
 }
 
+void SyncWithValidationInterfaceQueue() {
+    AssertLockNotHeld(cs_main);
+    // Block until the validation queue drains
+    std::promise<void> promise;
+    CallFunctionInValidationInterfaceQueue([&promise] {
+        promise.set_value();
+    });
+    promise.get_future().wait();
+}
+
 void CMainSignals::MempoolEntryRemoved(CTransactionRef ptx, MemPoolRemovalReason reason) {
     if (reason != MemPoolRemovalReason::BLOCK && reason != MemPoolRemovalReason::CONFLICT) {
         m_internals->m_schedulerClient.AddToProcessQueue([ptx, this] {
-- 
cgit v1.2.3