bypass zc callback until container is initialized

goatpig · May 6, 2017 · a2a94e8 · a2a94e8
1 parent f6312a8
commit a2a94e8
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 deletions.
diff --git a/cppForSwig/BDM_supportClasses.cpp b/cppForSwig/BDM_supportClasses.cpp
@@ -1838,6 +1838,8 @@ void ZeroConfContainer::init(
    function<shared_ptr<set<ScrAddrFilter::AddrSyncState>>(void)> getAddrFilter,
    bool clearMempool)
 {
+   LOGINFO << "Enabling zero-conf tracking";
+
    getMainAddressSet_ = getAddrFilter;
    loadZeroConfMempool(clearMempool);
 
@@ -1859,11 +1861,16 @@ void ZeroConfContainer::init(
    {
       parserThreads_.push_back(thread(txthread));
    }
+
+   zcEnabled_.store(true, memory_order_relaxed);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 void ZeroConfContainer::processInvTxVec(vector<InvEntry> invVec, bool extend)
 {
+   if (!isEnabled())
+      return;
+
    for (unsigned i = 0; i < invVec.size(); i++)
    {
       auto& entry = invVec[i];
@@ -2091,6 +2098,7 @@ void ZeroConfContainer::broadcastZC(const BinaryData& rawzc,
 ///////////////////////////////////////////////////////////////////////////////
 void ZeroConfContainer::shutdown()
 {
+   zcEnabled_.store(false, memory_order_relaxed);
    newZcStack_.completed();
 
    //shutdow invtx processing threads by pushing inventries of 

diff --git a/cppForSwig/BDM_supportClasses.h b/cppForSwig/BDM_supportClasses.h
@@ -433,6 +433,7 @@ class ZeroConfContainer
    mutex parserMutex_;
 
    Stack<thread> parserThreads_;
+   atomic<bool> zcEnabled_;
 
 private:
    BulkFilterData ZCisMineBulkFilter(const Tx & tx,
@@ -458,6 +459,8 @@ class ZeroConfContainer
       topId_(0), db_(db), 
       networkNode_(node)
    {
+      zcEnabled_.store(false, memory_order_relaxed);
+
       //register ZC callback
       auto processInvTx = [this](vector<InvEntry> entryVec)->void
       {
@@ -502,6 +505,8 @@ class ZeroConfContainer
 
    void broadcastZC(const BinaryData& rawzc, 
       const string& bdvId, uint32_t timeout_sec = 5);
+
+   bool isEnabled(void) const { return zcEnabled_.load(memory_order_relaxed); }
 };
 
 //////

diff --git a/cppForSwig/BlockUtils.cpp b/cppForSwig/BlockUtils.cpp
@@ -1202,9 +1202,8 @@ shared_future<bool> BlockDataManager::registerAddressBatch(
 ////////////////////////////////////////////////////////////////////////////////
 void BlockDataManager::enableZeroConf(bool clearMempool)
 {
-   SCOPED_TIMER("enableZeroConf");
-   LOGINFO << "Enabling zero-conf tracking ";
-   zcEnabled_ = true;
+   if (zeroConfCont_ == nullptr)
+      throw runtime_error("null zc object");
 
    auto zcFilter = [this](void)->shared_ptr<set<ScrAddrFilter::AddrSyncState>>
    { 
@@ -1214,11 +1213,20 @@ void BlockDataManager::enableZeroConf(bool clearMempool)
    zeroConfCont_->init(zcFilter, clearMempool);
 }
 
+////////////////////////////////////////////////////////////////////////////////
+bool BlockDataManager::isZcEnabled(void) const
+{
+   if (zeroConfCont_ == nullptr)
+      return false;
+
+   return zeroConfCont_->isEnabled();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 void BlockDataManager::disableZeroConf(void)
 {
-   SCOPED_TIMER("disableZeroConf");
-   zcEnabled_ = false;
+   if (zeroConfCont_ == nullptr)
+      return;
 
    zeroConfCont_->shutdown();
 }

diff --git a/cppForSwig/BlockUtils.h b/cppForSwig/BlockUtils.h
@@ -116,8 +116,6 @@ class BlockDataManager
 
    class BDM_ScrAddrFilter;
    shared_ptr<BDM_ScrAddrFilter>    scrAddrData_;
-   bool     zcEnabled_;
-
    shared_ptr<Blockchain> blockchain_ = nullptr;
 
    BDM_state BDMstate_ = BDM_offline;
@@ -209,7 +207,7 @@ class BlockDataManager
 
    void enableZeroConf(bool cleanMempool = false);
    void disableZeroConf(void);
-   bool isZcEnabled() const { return zcEnabled_; }
+   bool isZcEnabled(void) const;
    shared_ptr<ZeroConfContainer> zeroConfCont(void) const
    {
       return zeroConfCont_;