X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FFdEvent.cc;h=f6a6396fa0d4fdc658dcf5fd51d02606efc98fc2;hb=ac90835cbb00ca83a51ab9efb23fdcb75518e808;hp=58c3d7e3424cfcd95073024b0be26aea3f37ddb1;hpb=6159637c51fd562b2bf68a026a3946b2c84f4e0d;p=senf.git

diff --git a/Scheduler/FdEvent.cc b/Scheduler/FdEvent.cc
index 58c3d7e..f6a6396 100644
--- a/Scheduler/FdEvent.cc
+++ b/Scheduler/FdEvent.cc
@@ -39,8 +39,8 @@
 prefix_ senf::scheduler::detail::FdDispatcher::~FdDispatcher()
 {
     for (FdSet::iterator i (fds_.begin()); i != fds_.end(); ++i) {
-        FdManager::instance().remove(i->fd_);
-        FIFORunner::instance().dequeue(&(*i));
+        detail::FdManager::instance().remove(i->fd_);
+        detail::FIFORunner::instance().dequeue(&(*i));
     }
 }
 
@@ -53,10 +53,10 @@ prefix_ bool senf::scheduler::detail::FdDispatcher::add(FdEvent & event)
     if (event.events_ & events)
 	throw FdEvent::DuplicateEventRegistrationException();
 
-    if (! FdManager::instance().set(event.fd_, events | event.events_, &event))
+    if (! detail::FdManager::instance().set(event.fd_, events | event.events_, &event))
         return false;
 
-    FIFORunner::instance().enqueue(&event);
+    detail::FIFORunner::instance().enqueue(&event);
     fds_.insert(range.first, event);
 
     return true;
@@ -65,16 +65,16 @@ prefix_ bool senf::scheduler::detail::FdDispatcher::add(FdEvent & event)
 prefix_ void senf::scheduler::detail::FdDispatcher::remove(FdEvent & event)
 {
     fds_.erase(FdSet::current(event));
-    FIFORunner::instance().dequeue(&event);
+    detail::FIFORunner::instance().dequeue(&event);
 
     std::pair<FdSet::iterator,FdSet::iterator> range (fds_.equal_range(event));
     if (range.first == range.second)
-	FdManager::instance().remove(event.fd_);
+	detail::FdManager::instance().remove(event.fd_);
     else {
         int events (0);
         for (FdSet::iterator i (range.first); i != range.second; ++i)
             events |= i->events_;
-	FdManager::instance().set(event.fd_, events, &(*range.first));
+	detail::FdManager::instance().set(event.fd_, events, &(*range.first));
     }
 }
 
@@ -90,21 +90,21 @@ prefix_ void senf::scheduler::detail::FileDispatcher::add(FdEvent & event)
     if (event.events_ & events)
 	throw FdEvent::DuplicateEventRegistrationException();
 
-    FIFORunner::instance().enqueue(&event);
+    detail::FIFORunner::instance().enqueue(&event);
     fds_.insert(range.first, event);
 
-    FdManager::instance().timeout(0);
+    detail::FdManager::instance().timeout(0);
 }
 
 prefix_ senf::scheduler::detail::FileDispatcher::FileDispatcher()
-    : managerTimeout_ (scheduler::FdManager::instance().timeout())
+    : managerTimeout_ (scheduler::detail::FdManager::instance().timeout())
 {}
 
 prefix_ senf::scheduler::detail::FileDispatcher::~FileDispatcher()
 {
-    FdManager::instance().timeout(-1);
+    detail::FdManager::instance().timeout(-1);
     for (FdSet::iterator i (fds_.begin()); i != fds_.end(); ++i)
-        FIFORunner::instance().dequeue(&(*i));
+        detail::FIFORunner::instance().dequeue(&(*i));
 }
 
 prefix_ void senf::scheduler::detail::FileDispatcher::prepareRun()
@@ -118,9 +118,9 @@ prefix_ void senf::scheduler::detail::FileDispatcher::prepareRun()
 prefix_ void senf::scheduler::detail::FileDispatcher::remove(FdEvent & event)
 {
     fds_.erase(FdSet::current(event));
-    FIFORunner::instance().dequeue(&event);
+    detail::FIFORunner::instance().dequeue(&event);
     if (fds_.empty())
-        FdManager::instance().timeout(managerTimeout_);
+        detail::FdManager::instance().timeout(managerTimeout_);
 }
 
 ///////////////////////////////////////////////////////////////////////////