// 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_
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
}
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);
+ 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);
}
}
catch (senf::SystemException const & ex) {
- errno_ = ex.err;
+ errno_ = ex.errorNumber();
done();
return;
}