X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FWriteHelper.ct;h=3d688ef5f61694eacc1b7639f8ab432f536f8d05;hb=b89e3166f7680755683dccee5e48cb3a820185c0;hp=2fa26020aca199ab7786dc6768caa8410ad92973;hpb=85ab07d100a382467a42e19d741d403a7a96c951;p=senf.git

diff --git a/Scheduler/WriteHelper.ct b/Scheduler/WriteHelper.ct
index 2fa2602..3d688ef 100644
--- a/Scheduler/WriteHelper.ct
+++ b/Scheduler/WriteHelper.ct
@@ -25,30 +25,29 @@
 
 // Custom includes
 #include <errno.h>
-#include "Utils/Exception.hh"
+#include <boost/bind.hpp>
+#include "../Utils/Exception.hh"
 #include "Scheduler.hh"
 
 #define prefix_
 ///////////////////////////////ct.p////////////////////////////////////////
 
 template <class Handle>
-prefix_ senf::WriteHelper<Handle>::WriteHelper(Handle handle, std::string data,
+prefix_ senf::WriteHelper<Handle>::WriteHelper(Handle handle, std::string const & data,
                                                       Callback callback)
-    : handle_(handle), data_(data), callback_(callback),
-      offset_(0), 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()
     const
 {
-    if (offset_ > 0) {
-        data_.erase(0,offset_);
-        offset_ = 0;
+    if (offset_ > data_.begin()) {
+        data_.erase(data_.begin(),offset_);
+        offset_ = data_.begin();
     }
     return 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,22 +71,26 @@ 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)
 {
-    /** \fixme Move the done() calls to outside the try/catch block */
+    bool complete_ (false);
     try {
-        if (event != senf::Scheduler::EV_WRITE)
-            throw senf::SystemException(EPIPE);
-        offset_ += handle.write(data_.data()+offset_,data_.size()-offset_);
-        if (offset_ >= data_.size()) {
+        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();
-            done();
+            offset_ = data_.begin();
+            complete_ = true;
         }
     }
     catch (senf::SystemException const & ex) {
-        errno_ = ex.err;
+        errno_ = ex.errorNumber();
         done();
+        return;
     }
+    if (complete_)
+        done();
 }
 
 template <class Handle>
@@ -108,4 +110,6 @@ prefix_ void senf::WriteHelper<Handle>::done()
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End: