X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FWriteHelper.ct;h=3d688ef5f61694eacc1b7639f8ab432f536f8d05;hb=532240d72e09e19e57fac9bb55c2560b9c9e5b97;hp=49d096c899b4902b171e6c17a339bf578d76f9cc;hpb=1d247d12d1759ffd77f456efe3a52f03dd289994;p=senf.git

diff --git a/Scheduler/WriteHelper.ct b/Scheduler/WriteHelper.ct
index 49d096c..3d688ef 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,14 +56,13 @@ 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>
-prefix_ void
-senf::WriteHelper<Handle>::dispatchProcess(ptr helper, Handle handle,
-                                                  senf::Scheduler::EventId event)
+prefix_ void senf::WriteHelper<Handle>::dispatchProcess(ptr helper, Handle handle,
+                                                        senf::scheduler::FdEvent::Events event)
 {
     // since we have a 'ptr' argument, the instance cannot be deleted
     // before this method returns
@@ -73,12 +71,12 @@ senf::WriteHelper<Handle>::dispatchProcess(ptr helper, Handle handle,
 
 template <class Handle>
 prefix_ void senf::WriteHelper<Handle>::process(Handle handle,
-                                                       senf::Scheduler::EventId event)
+                                                senf::scheduler::FdEvent::Events event)
 {
     bool complete_ (false);
     try {
-        if (event != senf::Scheduler::EV_WRITE)
-            throw SystemException(EPIPE);
+        if (event != senf::scheduler::FdEvent::EV_WRITE)
+            throw SystemException(EPIPE SENF_EXC_DEBUGINFO);
         offset_ = handle.write(std::make_pair(offset_,data_.end()));
         if (offset_ == data_.end()) {
             data_.erase();