X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FReadHelper.ct;h=ca4397a90a6dc3350e983ae99af6a1464e50d1e2;hb=a1fdb7bb122f0b05be809a922d4b7ef5e125fa67;hp=40ac19936dcb6e2c31d470ddf1ac9a306eee0d6b;hpb=8421c3a8da7485cb8781045494ecaab3ed84f403;p=senf.git

diff --git a/Scheduler/ReadHelper.ct b/Scheduler/ReadHelper.ct
index 40ac199..ca4397a 100644
--- a/Scheduler/ReadHelper.ct
+++ b/Scheduler/ReadHelper.ct
@@ -25,8 +25,8 @@
 
 // Custom includes
 #include <errno.h>
-#include "Utils/membind.hh"
-#include "Utils/Exception.hh"
+#include "../Utils/membind.hh"
+#include "../Utils/Exception.hh"
 #include "Scheduler.hh"
 
 #define prefix_
@@ -35,30 +35,28 @@
 template <class Handle>
 prefix_ senf::ReadHelper<Handle>::ReadHelper(Handle handle, std::string::size_type maxSize,
                                                     InternalPredicate * predicate, Callback cb)
-    : handle_(handle), maxSize_(maxSize), predicate_(predicate), callback_(cb),
-      errno_(0), complete_(false)
+    : handle_(handle), 
+      fde_("senf::ReadHelper", boost::bind(&ReadHelper::dispatchProcess,ptr(this), handle, _1),
+           handle, senf::scheduler::FdEvent::EV_READ),
+      maxSize_(maxSize), predicate_(predicate), callback_(cb), errno_(0), complete_(false)
 {
     // Here we add a *static* member taking a *smart* pointer as first
     // argumnet instead of a simple bound-member as callback to the
     // scheduler. This ensures, that the refcount is at least 1 as
     // long as the helper is registered with the scheduler.
-    senf::Scheduler::instance()
-        .add(handle,boost::bind(&ReadHelper::dispatchProcess,ptr(this),_1,_2),
-             senf::Scheduler::EV_READ);
 }
 
 template <class Handle>
 prefix_ void senf::ReadHelper<Handle>::revoke()
 {
     ptr guard (this); // To ensure, 'this' is deleted only after this method terminates ...
-    senf::Scheduler::instance()
-        .remove(handle_,senf::Scheduler::EV_READ);
+    fde_.disable();
+    fde_.action(0); // Remove smart pointer reference to this
 }
 
 template <class Handle>
 prefix_ void
-senf::ReadHelper<Handle>::dispatchProcess(ptr helper, Handle handle,
-                                                 senf::Scheduler::EventId event)
+senf::ReadHelper<Handle>::dispatchProcess(ptr helper, Handle handle, int event)
 {
     // since we have a 'ptr' argument, the instance cannot be deleted
     // before this method returns
@@ -66,13 +64,13 @@ senf::ReadHelper<Handle>::dispatchProcess(ptr helper, Handle handle,
 }
 
 template <class Handle>
-prefix_ void senf::ReadHelper<Handle>::process(Handle handle,
-                                                      senf::Scheduler::EventId event)
+prefix_ void senf::ReadHelper<Handle>::process(Handle handle,int event)
 {
     try {
-        if (event != senf::Scheduler::EV_READ)
-            throw SystemException(EPIPE);
-        std::string rcv (handle.read(maxSize_ - data_.size()));
+        if (event != senf::scheduler::FdEvent::EV_READ)
+            throw SystemException(EPIPE SENF_EXC_DEBUGINFO);
+        std::string rcv;
+        handle.read(rcv, maxSize_ - data_.size());
         data_.append(rcv);
         std::string::size_type n = predicate_ ? (*predicate_)(data_) : std::string::npos;
         if (n != std::string::npos || data_.size() >= maxSize_ || rcv.size() == 0) {
@@ -84,7 +82,7 @@ prefix_ void senf::ReadHelper<Handle>::process(Handle handle,
         }
     }
     catch (senf::SystemException const & ex) {
-        errno_ = ex.err;
+        errno_ = ex.errorNumber();
         done();
         return;
     }
@@ -118,4 +116,6 @@ operator()(std::string const & data)
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End: