Skip to content

Use system_timer instead of deprecated deadline_timer #1874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
heifner wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Use system_timer instead of deprecated deadline_timer #1874

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fac299
Use high_resolution_timer instead of deprecated deadline_timer
heifner Dec 2, 2025
03a2594
Use system_timer instead of high_resolution_timer. See https://github…
heifner Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions plugins/producer_plugin/producer_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <fc/time.hpp>

#include <boost/asio.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/asio/system_timer.hpp>
#include <boost/signals2/connection.hpp>

#include <cstdint>
Expand Down Expand Up @@ -706,7 +706,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
bool _pause_production = false;

eosio::chain::named_thread_pool<struct prod> _timer_thread;
boost::asio::deadline_timer _timer{_timer_thread.get_executor()};
boost::asio::system_timer _timer{_timer_thread.get_executor()};

using signature_provider_type = signature_provider_plugin::signature_provider_type;
std::map<chain::public_key_type, signature_provider_type> _signature_providers;
Expand Down Expand Up @@ -826,7 +826,7 @@ class producer_plugin_impl : public std::enable_shared_from_this<producer_plugin
// use atomic for simplicity and performance
fc::time_point _ro_read_window_start_time;
fc::time_point _ro_window_deadline; // only modified on app thread, read-window deadline or write-window deadline
boost::asio::deadline_timer _ro_timer{_timer_thread.get_executor()}; // only accessible from the main thread
boost::asio::system_timer _ro_timer{_timer_thread.get_executor()}; // only accessible from the main thread
fc::microseconds _ro_max_trx_time_us{0}; // calculated during option initialization
ro_trx_queue_t _ro_exhausted_trx_queue;
alignas(hardware_destructive_interference_sz)
Expand Down Expand Up @@ -2824,7 +2824,7 @@ void producer_plugin_impl::schedule_production_loop() {

if (result == start_block_result::failed) {
fc_wlog(_log, "Failed to start a pending block, will try again later");
_timer.expires_from_now(boost::posix_time::microseconds(config::block_interval_us / 10));
_timer.expires_after(std::chrono::microseconds(config::block_interval_us / 10));

// we failed to start a block, so try again later?
_timer.async_wait([this, cid = ++_timer_corelation_id](const boost::system::error_code& ec) {
Expand Down Expand Up @@ -2878,18 +2878,18 @@ void producer_plugin_impl::schedule_maybe_produce_block(bool exhausted) {

assert(in_producing_mode());
// we succeeded but block may be exhausted
static const boost::posix_time::ptime epoch(boost::gregorian::date(1970, 1, 1));
auto deadline = block_timing_util::calculate_producing_block_deadline(_produce_block_cpu_effort, chain.pending_block_time());

if (!exhausted && deadline > fc::time_point::now()) {
// ship this block off no later than its deadline
EOS_ASSERT(chain.is_building_block(), missing_pending_block_state, "producing without pending_block_state, start_block succeeded");
_timer.expires_at(epoch + boost::posix_time::microseconds(deadline.time_since_epoch().count()));
std::chrono::time_point<std::chrono::system_clock> wake_time{std::chrono::microseconds{deadline.time_since_epoch().count()}};
_timer.expires_at(wake_time);
fc_dlog(_log, "Scheduling Block Production on Normal Block #${num} for ${time}",
("num", chain.head().block_num() + 1)("time", deadline));
} else {
EOS_ASSERT(chain.is_building_block(), missing_pending_block_state, "producing without pending_block_state");
_timer.expires_from_now(boost::posix_time::microseconds(0));
_timer.expires_after(std::chrono::microseconds(0));
fc_dlog(_log, "Scheduling Block Production on ${desc} Block #${num} immediately",
("num", chain.head().block_num() + 1)("desc", block_is_exhausted() ? "Exhausted" : "Deadline exceeded"));
}
Expand All @@ -2911,8 +2911,8 @@ void producer_plugin_impl::schedule_delayed_production_loop(const std::weak_ptr<
std::optional<fc::time_point> wake_up_time) {
if (wake_up_time) {
fc_dlog(_log, "Scheduling Speculative/Production Change at ${time}", ("time", wake_up_time));
static const boost::posix_time::ptime epoch(boost::gregorian::date(1970, 1, 1));
_timer.expires_at(epoch + boost::posix_time::microseconds(wake_up_time->time_since_epoch().count()));
std::chrono::time_point<std::chrono::system_clock> wake_time{std::chrono::microseconds{wake_up_time->time_since_epoch().count()}};
_timer.expires_at(wake_time);
_timer.async_wait([this, cid = ++_timer_corelation_id](const boost::system::error_code& ec) {
if (ec != boost::asio::error::operation_aborted && cid == _timer_corelation_id) {
interrupt_transaction(controller::interrupt_t::all_trx);
Expand Down Expand Up @@ -3108,8 +3108,8 @@ void producer_plugin_impl::start_write_window() {
_time_tracker.unpause(now);

_ro_window_deadline = now + _ro_write_window_time_us; // not allowed on block producers, so no need to limit to block deadline
auto expire_time = boost::posix_time::microseconds(_ro_write_window_time_us.count());
_ro_timer.expires_from_now(expire_time);
auto expire_time = std::chrono::microseconds(_ro_write_window_time_us.count());
_ro_timer.expires_after(expire_time);
_ro_timer.async_wait([this](const boost::system::error_code& ec) {
if (ec != boost::asio::error::operation_aborted) {
app().executor().post(priority::high, exec_queue::read_write, // placed in read_write so only called from main thread
Expand Down Expand Up @@ -3154,8 +3154,8 @@ void producer_plugin_impl::switch_to_read_window() {
_ro_thread_pool.get_executor(), [self = this, pending_block_num]() { return self->read_only_execution_task(pending_block_num); }));
}

auto expire_time = boost::posix_time::microseconds(_ro_read_window_time_us.count());
_ro_timer.expires_from_now(expire_time);
auto expire_time = std::chrono::microseconds(_ro_read_window_time_us.count());
_ro_timer.expires_after(expire_time);
// Needs to be on read_only because that is what is being processed until switch_to_write_window().
_ro_timer.async_wait([this](const boost::system::error_code& ec) {
app().executor().post(priority::high, exec_queue::read_only, [this, ec]() {
Expand Down
Loading