Skip to content

Commit

Permalink
GH-1039 Rename interrupt_transaction() to interrupt_apply_block_trans…
Browse files Browse the repository at this point in the history
…action()
  • Loading branch information
heifner committed Nov 20, 2024
1 parent ca99a11 commit f3665ba
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions libraries/chain/controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4538,7 +4538,7 @@ struct controller_impl {
return applied_trxs;
}

void interrupt_transaction() {
void interrupt_apply_block_transaction() {
// Only interrupt transaction if applying a block. Speculative trxs already have a deadline set so they
// have limited run time already. This is to allow killing a long-running transaction in a block being
// validated.
Expand Down Expand Up @@ -5308,8 +5308,8 @@ deque<transaction_metadata_ptr> controller::abort_block() {
return my->abort_block();
}

void controller::interrupt_transaction() {
my->interrupt_transaction();
void controller::interrupt_apply_block_transaction() {
my->interrupt_apply_block_transaction();
}

boost::asio::io_context& controller::get_thread_pool() {
Expand Down
4 changes: 2 additions & 2 deletions libraries/chain/include/eosio/chain/controller.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,8 @@ namespace eosio::chain {
*/
deque<transaction_metadata_ptr> abort_block();

/// Expected to be called from signal handler
void interrupt_transaction();
/// Expected to be called from signal handler, or producer_plugin
void interrupt_apply_block_transaction();

/**
*
Expand Down
2 changes: 1 addition & 1 deletion programs/nodeos/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ int main(int argc, char** argv)
controller& chain = app->get_plugin<chain_plugin>().chain();
app->set_stop_executor_cb([&app, &chain]() {
ilog("appbase quit called");
chain.interrupt_transaction();
chain.interrupt_apply_block_transaction();
app->get_io_context().stop();
});
if (auto resmon_plugin = app->find_plugin<resource_monitor_plugin>()) {
Expand Down
2 changes: 1 addition & 1 deletion unittests/checktime_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ BOOST_AUTO_TEST_CASE( checktime_interrupt_test) { try {

std::thread th( [&c=*other.control]() {
std::this_thread::sleep_for( std::chrono::milliseconds(50) );
c.interrupt_transaction();
c.interrupt_apply_block_transaction();
} );

// apply block, caught in an "infinite" loop
Expand Down

0 comments on commit f3665ba

Please sign in to comment.