From 79fc85ea09926d80d89d33e5af87cd2380911a49 Mon Sep 17 00:00:00 2001 From: g0dil <g0dil@wiback.org> Date: Fri, 20 Mar 2009 13:38:24 +0000 Subject: [PATCH] PPI: Fix IntervalTimer unit test --- PPI/IntervalTimer.test.cc | 6 +++--- PPI/SocketSource.ct | 10 ++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/PPI/IntervalTimer.test.cc b/PPI/IntervalTimer.test.cc index b32cc31fa..45f87f9ad 100644 --- a/PPI/IntervalTimer.test.cc +++ b/PPI/IntervalTimer.test.cc @@ -56,7 +56,7 @@ namespace { unsigned n; public: - TimerTest(senf::ClockService::clock_type d_, unsigned n_) + TimerTest(senf::ClockService::int64_type d_, unsigned n_) : timer ( senf::ClockService::milliseconds(d_) ), n ( n_ ) { @@ -73,13 +73,13 @@ namespace { BOOST_AUTO_UNIT_TEST(intervalTimer) { - TimerTest timer (100,4); + TimerTest timer (100,3); senf::ClockService::clock_type start (senf::ClockService::now()); senf::ppi::run(); BOOST_CHECK_PREDICATE( is_close_clock, (senf::ClockService::now()) (start+senf::ClockService::milliseconds(300)) - (senf::ClockService::milliseconds(100)) ); + (senf::ClockService::milliseconds(80)) ); } ///////////////////////////////cc.e//////////////////////////////////////// diff --git a/PPI/SocketSource.ct b/PPI/SocketSource.ct index 7ea550697..a57385831 100644 --- a/PPI/SocketSource.ct +++ b/PPI/SocketSource.ct @@ -46,12 +46,18 @@ prefix_ Packet senf::ppi::DgramReader<Packet>::operator()(Handle handle) template <class Reader> prefix_ senf::ppi::module::ActiveSocketSource<Reader>::ActiveSocketSource() -{} +{ + registerEvent( event_, &ActiveSocketSource::read ); + route(event_, output); +} template <class Reader> prefix_ senf::ppi::module::ActiveSocketSource<Reader>::ActiveSocketSource(Reader reader) : reader_(reader) -{} +{ + registerEvent( event_, &ActiveSocketSource::read ); + route(event_, output); +} template <class Reader> prefix_ senf::ppi::module::ActiveSocketSource<Reader>:: -- GitLab