Issue #767 - Hived does not close on SIGINT while using --stop-at-block flag

Author: Mariusz-Trela

libraries/plugins/chain/chain_plugin.cpp

@@ -482,7 +482,7 @@ void chain_plugin_impl::start_write_processing()
           }
         } );
         {
-          std::unique_lock<std::mutex> _guard(this_->finish.mtx);
+          std::lock_guard<std::mutex> _guard(this_->finish.mtx);
           this_->finish.status = true;
         }
         /// Notify waiting (main-thread) that starting shutdown procedure is allowed, since main-writer thread activity finished.
@@ -580,6 +580,8 @@ void chain_plugin_impl::start_write_processing()
 
           if (!is_running()) // we woke because the node is shutting down
           {
+            std::lock_guard<std::mutex> _guard(finish.mtx);
+            finish.status = true;
             if( priority_write_queue.empty() && write_queue.empty() )
               break;
           }
@@ -1960,7 +1962,7 @@ bool chain_plugin::accept_block( const std::shared_ptr< p2p_block_flow_control >
   fc::future<void> accept_block_future(accept_block_promise);
   block_ctrl->attach_promise( accept_block_promise );
   my->add_to_priority_write_queue( &cxt, accept_block_promise );
-  if( my->theApp.is_interrupt_request() )
+  if( is_finished_write_processing() )
     FC_THROW_EXCEPTION( fc::canceled_exception, "Interrupt request occured during a block accepting");
   else
     accept_block_future.wait();
@@ -1989,7 +1991,7 @@ void chain_plugin::accept_transaction( const std::shared_ptr<full_transaction_ty
     boost::unique_future<void> accept_transaction_future(accept_transaction_promise->get_future());
     tx_ctrl.attach_promise( accept_transaction_promise );
     my->add_to_write_queue( &cxt, accept_transaction_promise );
-    if( my->theApp.is_interrupt_request() )
+    if( is_finished_write_processing() )
       FC_THROW_EXCEPTION( fc::canceled_exception, "Interrupt request occured a transaction accepting");
     else
       accept_transaction_future.get();
@@ -2001,7 +2003,7 @@ void chain_plugin::accept_transaction( const std::shared_ptr<full_transaction_ty
     fc::future<void> accept_transaction_future(accept_transaction_promise);
     tx_ctrl.attach_promise( accept_transaction_promise );
     my->add_to_write_queue( &cxt, accept_transaction_promise );
-    if( my->theApp.is_interrupt_request() )
+    if( is_finished_write_processing() )
       FC_THROW_EXCEPTION( fc::canceled_exception, "Interrupt request occured a transaction accepting");
     else
       accept_transaction_future.wait();
@@ -2063,7 +2065,7 @@ void chain_plugin::push_generate_block_request( const std::shared_ptr< generate_
   boost::unique_future<void> generate_block_future(generate_block_promise->get_future());
   generate_block_ctrl->attach_promise( generate_block_promise );
   my->add_to_priority_write_queue( &cxt, generate_block_promise );
-  if( my->theApp.is_interrupt_request() )
+  if( is_finished_write_processing() )
     FC_THROW_EXCEPTION( fc::canceled_exception, "Interrupt request occured during a block generation");
   else
     generate_block_future.get();
@@ -2079,7 +2081,7 @@ void chain_plugin::queue_generate_block_request( const std::shared_ptr< generate
   std::shared_ptr<boost::promise<void>> generate_block_promise = std::make_shared<boost::promise<void>>();
   generate_block_ctrl->attach_promise( generate_block_promise );
   my->add_to_priority_write_queue( &cxt, generate_block_promise );
-  if( my->theApp.is_interrupt_request() )
+  if( is_finished_write_processing() )
     FC_THROW_EXCEPTION( fc::canceled_exception, "Interrupt request occured during a block generation");
 }
 

libraries/plugins/witness/witness_plugin.cpp

@@ -497,7 +497,7 @@ class witness_plugin_impl
         break;
     }
 
-    if( theApp.is_interrupt_request() )
+    if( _chain_plugin.is_finished_write_processing() )
       ilog( "ending block_production_loop" );
     else
       schedule_production_loop();