X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FScheduler%2FTimerSource.cc;h=e8d3dbc0fcd21bbb47270d5b630cea1e585f7821;hb=394ced7000128fef7e753caea1deda8d55dec8e2;hp=c03002f285fabbd52b416761e5c65ed869f32646;hpb=57daeae6f2e924ce3f16f9677c3474f531cba9e5;p=senf.git diff --git a/senf/Scheduler/TimerSource.cc b/senf/Scheduler/TimerSource.cc index c03002f..e8d3dbc 100644 --- a/senf/Scheduler/TimerSource.cc +++ b/senf/Scheduler/TimerSource.cc @@ -51,8 +51,7 @@ prefix_ senf::scheduler::detail::POSIXTimerSource::POSIXTimerSource() { if (pipe(timerPipe_) < 0) SENF_THROW_SYSTEM_EXCEPTION("pipe()"); - senf::scheduler::detail::FdManager::instance().set( - timerPipe_[0], detail::FdManager::EV_READ, this); + FdManager::instance().set( timerPipe_[0], FdManager::EV_READ, this); sigemptyset(&sigSet_); sigaddset(&sigSet_, SIGALRM); @@ -79,7 +78,7 @@ prefix_ senf::scheduler::detail::POSIXTimerSource::~POSIXTimerSource() timer_delete(timerId_); ::signal(SIGALRM, SIG_IGN); sigprocmask(SIG_UNBLOCK, &sigSet_, 0); - senf::scheduler::detail::FdManager::instance().remove(timerPipe_[0]); + FdManager::instance().remove(timerPipe_[0]); close(timerPipe_[0]); close(timerPipe_[1]); } @@ -185,13 +184,12 @@ prefix_ senf::scheduler::detail::TimerFDTimerSource::TimerFDTimerSource() timerfd_ = timerfd_create(CLOCK_MONOTONIC, 0); if (timerfd_ < 0) SENF_THROW_SYSTEM_EXCEPTION("timerfd_create()"); - senf::scheduler::detail::FdManager::instance().set( - timerfd_, detail::FdManager::EV_READ, this); + FdManager::instance().set( timerfd_, FdManager::EV_READ, this); } prefix_ senf::scheduler::detail::TimerFDTimerSource::~TimerFDTimerSource() { - senf::scheduler::detail::FdManager::instance().remove(timerfd_); + FdManager::instance().remove(timerfd_); close(timerfd_); }