X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FWriteHelper.ct;h=16f386b6207ad971591cf46362c2de82d3ff673b;hb=03516e8371a90f908ce54dedb3c874eec7dd08ff;hp=fadb65f441effc34576ea42a22f7e4c6f6b471b6;hpb=09010bdcf81888480d4d481a523f9714a89f2625;p=senf.git

diff --git a/Scheduler/WriteHelper.ct b/Scheduler/WriteHelper.ct
index fadb65f..16f386b 100644
--- a/Scheduler/WriteHelper.ct
+++ b/Scheduler/WriteHelper.ct
@@ -25,6 +25,7 @@
 
 // Custom includes
 #include <errno.h>
+#include <boost/bind.hpp>
 #include "../Utils/Exception.hh"
 #include "Scheduler.hh"
 
@@ -34,13 +35,11 @@
 template <class Handle>
 prefix_ senf::WriteHelper<Handle>::WriteHelper(Handle handle, std::string const & data,
                                                       Callback callback)
-    : handle_(handle), data_(data), callback_(callback),
-      offset_(data_.begin()), errno_(0)
-{
-    senf::Scheduler::instance()
-        .add(handle_, boost::bind(&WriteHelper::dispatchProcess, ptr(this), _1, _2),
-             senf::Scheduler::EV_WRITE);
-}
+    : handle_(handle), 
+      fde_("WriteHelper", boost::bind(&WriteHelper::dispatchProcess, ptr(this), _1, _2), 
+           handle, scheduler::FdEvent::EV_WRITE),
+      data_(data), callback_(callback), offset_(data_.begin()), errno_(0)
+{}
 
 template <class Handle>
 prefix_ std::string const & senf::WriteHelper<Handle>::data()
@@ -57,8 +56,8 @@ template <class Handle>
 prefix_ void senf::WriteHelper<Handle>::revoke()
 {
     ptr guard (this); // To ensure, 'this' is deleted only after this method terminates ...
-    senf::Scheduler::instance()
-        .remove(handle_, senf::Scheduler::EV_WRITE);
+    fde_.disable();
+    fde_.action(0); // To remove the smart pointer reference to this
 }
 
 template <class Handle>