Add an interface to get the queue depth out of CValidationInterface

TheBlueMatt · furszy · commit 0c68e2fba500 · 2021-02-21T10:49:49.000-03:00
diff --git a/src/scheduler.cpp b/src/scheduler.cpp
@@ -186,3 +186,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
@@ -109,6 +109,8 @@ class SingleThreadedSchedulerClient {
     // 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
@@ -72,6 +72,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(std::bind(&CMainSignals::MempoolEntryRemoved, this, std::placeholders::_1, std::placeholders::_2));
 }
diff --git a/src/validationinterface.h b/src/validationinterface.h
@@ -118,6 +118,8 @@ class CMainSignals {
     /** 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 */

Original file line number	Diff line number	Diff line change
`@@ -186,3 +186,8 @@ void SingleThreadedSchedulerClient::EmptyQueue() {`
`186`	`186`	`should_continue = !m_callbacks_pending.empty();`
`187`	`187`	`}`
`188`	`188`	`}`
	`189`	`+`
	`190`	`+size_t SingleThreadedSchedulerClient::CallbacksPending() {`
	`191`	`+ LOCK(m_cs_callbacks_pending);`
	`192`	`+ return m_callbacks_pending.size();`
	`193`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,11 @@ void CMainSignals::FlushBackgroundCallbacks() {`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
	`75`	`+size_t CMainSignals::CallbacksPending() {`
	`76`	`+ if (!m_internals) return 0;`
	`77`	`+ return m_internals->m_schedulerClient.CallbacksPending();`
	`78`	`+}`
	`79`	`+`
`75`	`80`	`void CMainSignals::RegisterWithMempoolSignals(CTxMemPool& pool) {`
`76`	`81`	`pool.NotifyEntryRemoved.connect(std::bind(&CMainSignals::MempoolEntryRemoved, this, std::placeholders::_1, std::placeholders::_2));`
`77`	`82`	`}`