aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Corallo <git@bluematt.me>2017-12-04 18:31:36 -0500
committerMatt Corallo <git@bluematt.me>2017-12-26 11:54:49 -0500
commit5a933cefcc5e0595a1ec46fc5ea287aa163ecd3f (patch)
tree63bcb653e77c838a7e511dcdd6eb1d49cd125c5c
parenta99b76f26958829c2b9ca4ffa5b1d81912b8acc7 (diff)
Add an interface to get the queue depth out of CValidationInterface
-rw-r--r--src/scheduler.cpp5
-rw-r--r--src/scheduler.h2
-rw-r--r--src/validationinterface.cpp5
-rw-r--r--src/validationinterface.h2
4 files changed, 14 insertions, 0 deletions
diff --git a/src/scheduler.cpp b/src/scheduler.cpp
index 260f6fa60e..7d5ec14610 100644
--- a/src/scheduler.cpp
+++ b/src/scheduler.cpp
@@ -206,3 +206,8 @@ void SingleThreadedSchedulerClient::EmptyQueue() {
should_continue = !m_callbacks_pending.empty();
}
}
+
+size_t SingleThreadedSchedulerClient::CallbacksPending() {
+ LOCK(m_cs_callbacks_pending);
+ return m_callbacks_pending.size();
+}
diff --git a/src/scheduler.h b/src/scheduler.h
index b99f165343..39ecb849b9 100644
--- a/src/scheduler.h
+++ b/src/scheduler.h
@@ -108,6 +108,8 @@ public:
// Processes all remaining queue members on the calling thread, blocking until queue is empty
// Must be called after the CScheduler has no remaining processing threads!
void EmptyQueue();
+
+ size_t CallbacksPending();
};
#endif
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));
}
diff --git a/src/validationinterface.h b/src/validationinterface.h
index 7b5d138414..164059e3b9 100644
--- a/src/validationinterface.h
+++ b/src/validationinterface.h
@@ -131,6 +131,8 @@ public:
/** Call any remaining callbacks on the calling thread */
void FlushBackgroundCallbacks();
+ size_t CallbacksPending();
+
/** Register with mempool to call TransactionRemovedFromMempool callbacks */
void RegisterWithMempoolSignals(CTxMemPool& pool);
/** Unregister with mempool */