X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FWriteHelper.ct;h=16f386b6207ad971591cf46362c2de82d3ff673b;hb=6159637c51fd562b2bf68a026a3946b2c84f4e0d;hp=afc09c69f64582b5c34aeba1e5cb0da0fc8deba5;hpb=34378cabd0ef59515f60b8e535d50fd5488c84e2;p=senf.git

diff --git a/Scheduler/WriteHelper.ct b/Scheduler/WriteHelper.ct
index afc09c6..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>
@@ -78,7 +77,7 @@ prefix_ void senf::WriteHelper<Handle>::process(Handle handle,
     bool complete_ (false);
     try {
         if (event != senf::Scheduler::EV_WRITE)
-            throwErrno(EPIPE);
+            throw SystemException(EPIPE SENF_EXC_DEBUGINFO);
         offset_ = handle.write(std::make_pair(offset_,data_.end()));
         if (offset_ == data_.end()) {
             data_.erase();
@@ -87,7 +86,7 @@ prefix_ void senf::WriteHelper<Handle>::process(Handle handle,
         }
     }
     catch (senf::SystemException const & ex) {
-        errno_ = ex.code();
+        errno_ = ex.errorNumber();
         done();
         return;
     }