From: Pavel Emelyanov <
xe...@scylladb.com>
Committer: Pavel Emelyanov <
xe...@scylladb.com>
Branch: master
timer: Add type alias for timer_set
And use it in reactor class
Signed-off-by: Pavel Emelyanov <
xe...@scylladb.com>
---
diff --git a/include/seastar/core/reactor.hh b/include/seastar/core/reactor.hh
--- a/include/seastar/core/reactor.hh
+++ b/include/seastar/core/reactor.hh
@@ -266,12 +266,12 @@ private:
std::unique_ptr<internal::cpu_stall_detector> _cpu_stall_detector;
unsigned _max_task_backlog = 1000;
- timer_set<timer<>, &timer<>::_link> _timers;
- timer_set<timer<>, &timer<>::_link>::timer_list_t _expired_timers;
- timer_set<timer<lowres_clock>, &timer<lowres_clock>::_link> _lowres_timers;
- timer_set<timer<lowres_clock>, &timer<lowres_clock>::_link>::timer_list_t _expired_lowres_timers;
- timer_set<timer<manual_clock>, &timer<manual_clock>::_link> _manual_timers;
- timer_set<timer<manual_clock>, &timer<manual_clock>::_link>::timer_list_t _expired_manual_timers;
+ timer<>::set_t _timers;
+ timer<>::set_t::timer_list_t _expired_timers;
+ timer<lowres_clock>::set_t _lowres_timers;
+ timer<lowres_clock>::set_t::timer_list_t _expired_lowres_timers;
+ timer<manual_clock>::set_t _manual_timers;
+ timer<manual_clock>::set_t::timer_list_t _expired_manual_timers;
io_stats _io_stats;
uint64_t _fsyncs = 0;
uint64_t _cxx_exceptions = 0;
diff --git a/include/seastar/core/timer.hh b/include/seastar/core/timer.hh
--- a/include/seastar/core/timer.hh
+++ b/include/seastar/core/timer.hh
@@ -219,6 +219,7 @@ public:
}
friend class reactor;
friend class timer_set<timer, &timer::_link>;
+ using set_t = timer_set<timer, &timer::_link>;
};
extern template class timer<steady_clock_type>;