diff --git a/Scheduler/ReadHelper.cci b/Scheduler/ReadHelper.cci
new file mode 100644
index 0000000000000000000000000000000000000000..81d7e6ad563d1645cb5f10879a29e66a1168b386
--- /dev/null
+++ b/Scheduler/ReadHelper.cci
@@ -0,0 +1,27 @@
+// $Id$
+//
+// Copyright (C) 2006
+
+// Definition of inline non-template functions
+
+// Custom includes
+
+#define prefix_ inline
+///////////////////////////////cci.p///////////////////////////////////////
+
+prefix_ satcom::lib::ReadUntil::ReadUntil(std::string target_)
+ : target(target_)
+{}
+
+prefix_ std::string::size_type satcom::lib::ReadUntil::operator()(std::string data)
+{
+ return data.find(target);
+}
+
+///////////////////////////////cci.e///////////////////////////////////////
+#undef prefix_
+
+
+// Local Variables:
+// mode: c++
+// End:
diff --git a/Scheduler/ReadHelper.ct b/Scheduler/ReadHelper.ct
new file mode 100644
index 0000000000000000000000000000000000000000..16d2850617a484bdc5b6cd45e9178dc2f4fdef84
--- /dev/null
+++ b/Scheduler/ReadHelper.ct
@@ -0,0 +1,98 @@
+// $Id$
+//
+// Copyright (C) 2006
+
+// Definition of non-inline template functions
+
+#include "ReadHelper.ih"
+
+// Custom includes
+#include <errno.h>
+#include "Utils/membind.hh"
+#include "Utils/Exception.hh"
+#include "Scheduler.hh"
+
+#define prefix_
+///////////////////////////////ct.p////////////////////////////////////////
+
+template <class Handle>
+prefix_ satcom::lib::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)
+{
+ // 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.
+ satcom::lib::Scheduler::instance()
+ .add(handle,boost::bind(&ReadHelper::dispatchProcess,ptr(this),_1,_2),
+ satcom::lib::Scheduler::EV_READ);
+}
+
+template <class Handle>
+prefix_ void satcom::lib::ReadHelper<Handle>::revoke()
+{
+ ptr guard (this); // To ensure, 'this' is deleted only after this method terminates ...
+ satcom::lib::Scheduler::instance()
+ .remove(handle_,satcom::lib::Scheduler::EV_READ);
+}
+
+template <class Handle>
+prefix_ void
+satcom::lib::ReadHelper<Handle>::dispatchProcess(ptr helper, Handle handle,
+ satcom::lib::Scheduler::EventId event)
+{
+ // since we have a 'ptr' argument, the instance cannot be deleted
+ // before this method returns
+ return helper->process(handle,event);
+}
+
+template <class Handle>
+prefix_ void satcom::lib::ReadHelper<Handle>::process(Handle handle,
+ satcom::lib::Scheduler::EventId event)
+{
+ try {
+ if (event != satcom::lib::Scheduler::EV_READ)
+ throw SystemException(EPIPE);
+ std::string rcv (handle.read(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) {
+ complete_ = true;
+ if (n < data_.size()) {
+ tail_.assign(data_,n,std::string::npos);
+ data_.erase(n);
+ }
+ done();
+ }
+ }
+ catch (satcom::lib::SystemException const & ex) {
+ errno_ = ex.err;
+ done();
+ }
+}
+
+template <class Handle>
+prefix_ void satcom::lib::ReadHelper<Handle>::done()
+{
+ revoke();
+ callback_(ptr(this));
+}
+
+template <class Handle>
+template <class Predicate>
+prefix_ std::string::size_type
+satcom::lib::ReadHelper<Handle>::InternalPredicate::Dispatcher<Predicate>::
+operator()(std::string const & data)
+{
+ return predicate(data);
+}
+
+///////////////////////////////ct.e////////////////////////////////////////
+#undef prefix_
+
+
+// Local Variables:
+// mode: c++
+// End:
diff --git a/Scheduler/ReadHelper.cti b/Scheduler/ReadHelper.cti
new file mode 100644
index 0000000000000000000000000000000000000000..75613d2d7cdfbc16030a275da0f1028f1ee4025a
--- /dev/null
+++ b/Scheduler/ReadHelper.cti
@@ -0,0 +1,89 @@
+// $Id$
+//
+// Copyright (C) 2006
+
+// Definition of inline template functions
+
+#include "ReadHelper.ih"
+
+// Custom includes
+#include "Utils/Exception.hh"
+
+#define prefix_ inline
+///////////////////////////////cti.p///////////////////////////////////////
+
+template <class Handle>
+prefix_ typename satcom::lib::ReadHelper<Handle>::ptr
+satcom::lib::ReadHelper<Handle>::dispatch(Handle handle, std::string::size_type maxSize,
+ Callback callback)
+{
+ return ptr(new ReadHelper(handle, maxSize, 0, callback));
+}
+
+template <class Handle>
+template <class Predicate>
+prefix_ typename satcom::lib::ReadHelper<Handle>::ptr
+satcom::lib::ReadHelper<Handle>::dispatch(Handle handle, std::string::size_type maxSize,
+ Predicate predicate, Callback callback)
+{
+ return ptr(new ReadHelper(handle, maxSize,
+ new typename InternalPredicate::template Dispatcher<Predicate>(predicate),
+ callback));
+}
+
+template <class Handle>
+prefix_ Handle satcom::lib::ReadHelper<Handle>::handle()
+ const
+{
+ return handle_;
+}
+
+template <class Handle>
+prefix_ unsigned satcom::lib::ReadHelper<Handle>::maxSize()
+ const
+{
+ return maxSize_;
+}
+
+template <class Handle>
+prefix_ std::string const & satcom::lib::ReadHelper<Handle>::data()
+ const
+{
+ return data_;
+}
+
+template <class Handle>
+prefix_ std::string const & satcom::lib::ReadHelper<Handle>::tail()
+ const
+{
+ return tail_;
+}
+
+template <class Handle>
+prefix_ bool satcom::lib::ReadHelper<Handle>::complete()
+ const
+{
+ return complete_;
+}
+
+template <class Handle>
+prefix_ bool satcom::lib::ReadHelper<Handle>::error()
+ const
+{
+ return errno_ != 0;
+}
+
+template <class Handle>
+prefix_ void satcom::lib::ReadHelper<Handle>::throw_error()
+ const
+{
+ if (errno_ != 0) throw SystemException(errno_);
+}
+
+///////////////////////////////cti.e///////////////////////////////////////
+#undef prefix_
+
+
+// Local Variables:
+// mode: c++
+// End:
diff --git a/Scheduler/ReadHelper.hh b/Scheduler/ReadHelper.hh
new file mode 100644
index 0000000000000000000000000000000000000000..8f38b1696d0f9268916868b3677efb8b2f95735e
--- /dev/null
+++ b/Scheduler/ReadHelper.hh
@@ -0,0 +1,103 @@
+// $Id$
+//
+// Copyright (C) 2006
+
+// TODO: Move all not Handle dependent members to a ReadHandleBase class
+
+#ifndef HH_ReadHelper_
+#define HH_ReadHelper_ 1
+
+// Custom includes
+#include <string>
+#include <boost/function.hpp>
+#include <boost/intrusive_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
+
+#include "Utils/intrusive_refcount.hh"
+#include "Scheduler.hh"
+
+//#include "ReadHelper.mpp"
+///////////////////////////////hh.p////////////////////////////////////////
+
+namespace satcom {
+namespace lib {
+
+ template <class Handle>
+ class ReadHelper
+ : public satcom::lib::intrusive_refcount
+ {
+ public:
+ ///////////////////////////////////////////////////////////////////////////
+ // Types
+
+ typedef boost::intrusive_ptr<ReadHelper> ptr;
+ typedef boost::function<void (ptr)> Callback;
+
+ ///////////////////////////////////////////////////////////////////////////
+ ///\name Structors and default members
+ ///@{
+
+ static ptr dispatch(Handle handle, std::string::size_type maxSize,
+ Callback callback);
+
+ template <class Predicate>
+ static ptr dispatch(Handle handle, std::string::size_type maxSize, Predicate predicate,
+ Callback callback);
+
+ ///@}
+ ///////////////////////////////////////////////////////////////////////////
+
+ Handle handle() const;
+ unsigned maxSize() const;
+
+ std::string const & data() const;
+ std::string const & tail() const;
+
+ bool complete() const;
+ bool error() const;
+ void throw_error() const;
+
+ void revoke();
+
+ protected:
+
+ private:
+ struct InternalPredicate;
+
+ ReadHelper(Handle handle, unsigned maxSize, InternalPredicate * predicate, Callback cb);
+
+ static void dispatchProcess(ptr helper, Handle handle, satcom::lib::Scheduler::EventId event);
+ void process(Handle handle, satcom::lib::Scheduler::EventId event);
+ void done();
+
+ Handle handle_;
+ std::string::size_type maxSize_;
+ boost::scoped_ptr<InternalPredicate> predicate_;
+ Callback callback_;
+
+ std::string data_;
+ std::string tail_;
+ int errno_;
+ bool complete_;
+ };
+
+ struct ReadUntil
+ {
+ ReadUntil(std::string target);
+ std::string::size_type operator()(std::string data);
+ std::string target;
+ };
+
+}}
+
+///////////////////////////////hh.e////////////////////////////////////////
+#include "ReadHelper.cci"
+#include "ReadHelper.ct"
+#include "ReadHelper.cti"
+//#include "ReadHelper.mpp"
+#endif
+
+
+// Local Variables:
+// mode: c++
+// End:
diff --git a/Scheduler/ReadHelper.ih b/Scheduler/ReadHelper.ih
new file mode 100644
index 0000000000000000000000000000000000000000..e174b5f640671f22e89585bb5f5d99445539f35a
--- /dev/null
+++ b/Scheduler/ReadHelper.ih
@@ -0,0 +1,40 @@
+// $Id$
+//
+// Copyright (C) 2006
+
+#ifndef IH_ReadHelper_
+#define IH_ReadHelper_ 1
+
+// Custom includes
+
+///////////////////////////////ih.p////////////////////////////////////////
+
+namespace satcom {
+namespace lib {
+
+ template <class Handle>
+ struct ReadHelper<Handle>::InternalPredicate
+ {
+ virtual ~InternalPredicate() {}
+ template <class Predicate>
+ struct Dispatcher
+ : public ReadHelper<Handle>::InternalPredicate
+ {
+ Dispatcher(Predicate p) : predicate(p) {}
+ virtual std::string::size_type operator()(std::string const & data);
+ Predicate predicate;
+ };
+
+ virtual std::string::size_type operator()(std::string const & data) = 0;
+ };
+
+}}
+
+
+///////////////////////////////ih.e////////////////////////////////////////
+#endif
+
+
+// Local Variables:
+// mode: c++
+// End:
diff --git a/Scheduler/ReadHelper.test.cc b/Scheduler/ReadHelper.test.cc
new file mode 100644
index 0000000000000000000000000000000000000000..14a3686164ef4646d9c280b1d5fbf2997fcbc6c7
--- /dev/null
+++ b/Scheduler/ReadHelper.test.cc
@@ -0,0 +1,27 @@
+// $Id$
+//
+// Copyright (C) 2006
+
+// Unit tests
+
+//#include "ReadHelper.test.hh"
+//#include "ReadHelper.test.ih"
+
+// Custom includes
+#include "ReadHelper.hh"
+
+#include <boost/test/auto_unit_test.hpp>
+#include <boost/test/test_tools.hpp>
+
+#define prefix_
+///////////////////////////////cc.p////////////////////////////////////////
+
+
+
+///////////////////////////////cc.e////////////////////////////////////////
+#undef prefix_
+
+
+// Local Variables:
+// mode: c++
+// End:
diff --git a/Scheduler/SConscript b/Scheduler/SConscript
index fc9284efcaa81bdcc4d7259de65d38bf05e6abc0..2909ad34a8243f9f7c942eb1441e83dd189c2fda 100644
--- a/Scheduler/SConscript
+++ b/Scheduler/SConscript
@@ -7,4 +7,4 @@ SatSCons.StandardTargets(env)
SatSCons.Lib(env,
library = 'Scheduler',
sources = SatSCons.GlobSources(),
- LIBS = [ 'Utils' ])
+ LIBS = [ 'Socket', 'Utils' ])
diff --git a/Scheduler/Scheduler.cc b/Scheduler/Scheduler.cc
index 4f39c4ba7e2429cfdf843d0828651a08127ee3f8..75ed7f8d72b25b0dacb556523830c7ae30d72d14 100644
--- a/Scheduler/Scheduler.cc
+++ b/Scheduler/Scheduler.cc
@@ -96,7 +96,7 @@ prefix_ satcom::lib::Scheduler::Scheduler()
throw SystemException(errno);
}
-prefix_ void satcom::lib::Scheduler::do_add(int fd, SimpleCallback const & cb, EventId eventMask)
+prefix_ void satcom::lib::Scheduler::do_add(int fd, SimpleCallback const & cb, int eventMask)
{
FdTable::iterator i (fdTable_.find(fd));
int action (EPOLL_CTL_MOD);
@@ -120,7 +120,7 @@ prefix_ void satcom::lib::Scheduler::do_add(int fd, SimpleCallback const & cb, E
throw SystemException(errno);
}
-prefix_ void satcom::lib::Scheduler::do_remove(int fd, EventId eventMask)
+prefix_ void satcom::lib::Scheduler::do_remove(int fd, int eventMask)
{
FdTable::iterator i (fdTable_.find(fd));
if (i == fdTable_.end())
@@ -136,7 +136,7 @@ prefix_ void satcom::lib::Scheduler::do_remove(int fd, EventId eventMask)
memset(&ev,0,sizeof(ev));
ev.events = i->second.epollMask();
ev.data.fd = fd;
-
+
int action (EPOLL_CTL_MOD);
if (ev.events==0) {
action = EPOLL_CTL_DEL;
@@ -164,7 +164,7 @@ prefix_ void satcom::lib::Scheduler::process()
{
terminate_ = false;
while (! terminate_) {
- struct epoll_event ev;
+
MicroTime timeNow = now();
while ( ! timerQueue_.empty() && timerQueue_.top().timeout <= timeNow ) {
timerQueue_.top().cb();
@@ -174,6 +174,7 @@ prefix_ void satcom::lib::Scheduler::process()
return;
int timeout = timerQueue_.empty() ? -1 : int((timerQueue_.top().timeout - timeNow)/1000);
+ struct epoll_event ev;
int events = epoll_wait(epollFd_, &ev, 1, timeout);
if (events<0)
// Hmm ... man epoll says, it will NOT return with EINTR ??
@@ -200,13 +201,22 @@ prefix_ void satcom::lib::Scheduler::process()
}
else if (ev.events & EPOLLHUP) {
- BOOST_ASSERT(spec.cb_hup);
- spec.cb_hup(EV_HUP);
+ if (spec.cb_hup)
+ spec.cb_hup(EV_HUP);
+ else if (ev.events & EPOLLERR) {
+ if (spec.cb_write) spec.cb_write(EV_HUP);
+ if (spec.cb_read) spec.cb_read(EV_HUP);
+ }
}
- else if (ev.events & EPOLLERR) {
- BOOST_ASSERT(spec.cb_err);
- spec.cb_err(EV_ERR);
+ else if (ev.events & EPOLLERR && ! ev.events & EPOLLHUP) {
+ if (spec.cb_err)
+ spec.cb_err(EV_ERR);
+ else {
+ if (spec.cb_write) spec.cb_write(EV_ERR);
+ if (spec.cb_read) spec.cb_read(EV_ERR);
+ }
}
+
}
}
diff --git a/Scheduler/Scheduler.cti b/Scheduler/Scheduler.cti
index be4196168cbb64208eceb587bb06c5f94c0b365b..0bd2d7f2f4ec6e9634c13f56df5c64b6829ff29d 100644
--- a/Scheduler/Scheduler.cti
+++ b/Scheduler/Scheduler.cti
@@ -33,14 +33,16 @@
template <class Handle>
prefix_ void satcom::lib::Scheduler::add(Handle const & handle,
typename GenericCallback<Handle>::Callback const & cb,
- EventId eventMask)
+ int eventMask)
{
// retrieve_filehandle is found via ADL
- do_add(retrieve_filehandle(handle),boost::bind(cb,handle,_1),eventMask);
+ SimpleCallback scb (boost::bind(cb,handle,_1));
+ int fd = retrieve_filehandle(handle);
+ do_add(fd,scb,eventMask);
}
template <class Handle>
-prefix_ void satcom::lib::Scheduler::remove(Handle const & handle, EventId eventMask)
+prefix_ void satcom::lib::Scheduler::remove(Handle const & handle, int eventMask)
{
// retrieve_filehandle is found via ADL
do_remove(retrieve_filehandle(handle),eventMask);
diff --git a/Scheduler/Scheduler.hh b/Scheduler/Scheduler.hh
index a535fad11610748518a2ca4f71590c6a7da92a6c..6788f61aa283127a1d638c69bd5fdb91e6f4661d 100644
--- a/Scheduler/Scheduler.hh
+++ b/Scheduler/Scheduler.hh
@@ -20,6 +20,8 @@
// Free Software Foundation, Inc.,
// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+// TODO: Fix EventId parameter (probably to int) to allow |-ing without casting ...
+
#ifndef HH_Scheduler_
#define HH_Scheduler_ 1
@@ -83,9 +85,9 @@ namespace lib {
template <class Handle>
void add(Handle const & handle,
typename GenericCallback<Handle>::Callback const & cb,
- EventId eventMask = EV_ALL);
+ int eventMask = EV_ALL);
template <class Handle>
- void remove(Handle const & handle, EventId eventMask = EV_ALL);
+ void remove(Handle const & handle, int eventMask = EV_ALL);
void timeout(unsigned long timeout, TimerCallback const & cb);
@@ -97,8 +99,8 @@ namespace lib {
private:
Scheduler();
- void do_add(int fd, SimpleCallback const & cb, EventId eventMask = EV_ALL);
- void do_remove(int fd, EventId eventMask = EV_ALL);
+ void do_add(int fd, SimpleCallback const & cb, int eventMask = EV_ALL);
+ void do_remove(int fd, int eventMask = EV_ALL);
struct EventSpec
{
diff --git a/Scheduler/Scheduler.test.cc b/Scheduler/Scheduler.test.cc
index 26dd7fd50add55252ba6b7c3f1427036ca0aee57..6845277b50e312c6ecfd5d1eeec78bc61be19620 100644
--- a/Scheduler/Scheduler.test.cc
+++ b/Scheduler/Scheduler.test.cc
@@ -190,7 +190,7 @@ namespace {
bool is_close(MicroTime a, MicroTime b)
{
- return (a<b ? b-a : a-b) < 1100;
+ return (a<b ? b-a : a-b) < 10100; // a little bit over 10ms
}
}
diff --git a/Scheduler/WriteHelper.ct b/Scheduler/WriteHelper.ct
new file mode 100644
index 0000000000000000000000000000000000000000..8ef626da982856c34c621a56bf494976c6102e80
--- /dev/null
+++ b/Scheduler/WriteHelper.ct
@@ -0,0 +1,89 @@
+// $Id$
+//
+// Copyright (C) 2006
+
+// Definition of non-inline template functions
+
+//#include "WriteHelper.ih"
+
+// Custom includes
+#include <errno.h>
+#include "Utils/Exception.hh"
+#include "Scheduler.hh"
+
+#define prefix_
+///////////////////////////////ct.p////////////////////////////////////////
+
+template <class Handle>
+prefix_ satcom::lib::WriteHelper<Handle>::WriteHelper(Handle handle, std::string data,
+ Callback callback)
+ : handle_(handle), data_(data), callback_(callback),
+ offset_(0), errno_(0)
+{
+ satcom::lib::Scheduler::instance()
+ .add(handle_, boost::bind(&WriteHelper::dispatchProcess, ptr(this), _1, _2),
+ satcom::lib::Scheduler::EV_WRITE);
+}
+
+template <class Handle>
+prefix_ std::string const & satcom::lib::WriteHelper<Handle>::data()
+ const
+{
+ if (offset_ > 0) {
+ data_.erase(0,offset_);
+ offset_ = 0;
+ }
+ return data_;
+}
+
+template <class Handle>
+prefix_ void satcom::lib::WriteHelper<Handle>::revoke()
+{
+ ptr guard (this); // To ensure, 'this' is deleted only after this method terminates ...
+ satcom::lib::Scheduler::instance()
+ .remove(handle_, satcom::lib::Scheduler::EV_WRITE);
+}
+
+template <class Handle>
+prefix_ void
+satcom::lib::WriteHelper<Handle>::dispatchProcess(ptr helper, Handle handle,
+ satcom::lib::Scheduler::EventId event)
+{
+ // since we have a 'ptr' argument, the instance cannot be deleted
+ // before this method returns
+ return helper->process(handle,event);
+}
+
+template <class Handle>
+prefix_ void satcom::lib::WriteHelper<Handle>::process(Handle handle,
+ satcom::lib::Scheduler::EventId event)
+{
+ try {
+ if (event != satcom::lib::Scheduler::EV_WRITE)
+ throw satcom::lib::SystemException(EPIPE);
+ offset_ += handle.write(data_.data()+offset_,data_.size()-offset_);
+ if (offset_ >= data_.size()) {
+ data_.erase();
+ done();
+ }
+ }
+ catch (satcom::lib::SystemException const & ex) {
+ errno_ = ex.err;
+ done();
+ }
+}
+
+template <class Handle>
+prefix_ void satcom::lib::WriteHelper<Handle>::done()
+{
+ revoke();
+ callback_(ptr(this));
+}
+
+///////////////////////////////ct.e////////////////////////////////////////
+#undef prefix_
+
+
+// Local Variables:
+// mode: c++
+// End:
diff --git a/Scheduler/WriteHelper.cti b/Scheduler/WriteHelper.cti
new file mode 100644
index 0000000000000000000000000000000000000000..e73fd195310543650f9a2760a7c7cf10a26c4c7d
--- /dev/null
+++ b/Scheduler/WriteHelper.cti
@@ -0,0 +1,58 @@
+// $Id$
+//
+// Copyright (C) 2006
+
+// Definition of inline template functions
+
+//#include "WriteHelper.ih"
+
+// Custom includes
+#include "Utils/Exception.hh"
+
+#define prefix_ inline
+///////////////////////////////cti.p///////////////////////////////////////
+
+template <class Handle>
+prefix_ typename satcom::lib::WriteHelper<Handle>::ptr
+satcom::lib::WriteHelper<Handle>::dispatch(Handle handle, std::string data, Callback callback)
+{
+ return ptr(new WriteHelper(handle, data, callback));
+}
+
+template <class Handle>
+prefix_ Handle satcom::lib::WriteHelper<Handle>::handle()
+ const
+{
+ return handle_;
+}
+
+template <class Handle>
+prefix_ bool satcom::lib::WriteHelper<Handle>::complete()
+ const
+{
+ return data_.empty();
+}
+
+template <class Handle>
+prefix_ bool satcom::lib::WriteHelper<Handle>::error()
+ const
+{
+ return errno_ != 0;
+}
+
+template <class Handle>
+prefix_ void satcom::lib::WriteHelper<Handle>::throw_error()
+ const
+{
+ if (errno_ != 0)
+ throw satcom::lib::SystemException(errno_);
+}
+
+
+///////////////////////////////cti.e///////////////////////////////////////
+#undef prefix_
+
+
+// Local Variables:
+// mode: c++
+// End:
diff --git a/Scheduler/WriteHelper.hh b/Scheduler/WriteHelper.hh
new file mode 100644
index 0000000000000000000000000000000000000000..02c316124112107e1b0ecabb18a931035072274b
--- /dev/null
+++ b/Scheduler/WriteHelper.hh
@@ -0,0 +1,81 @@
+// $Id$
+//
+// Copyright (C) 2006
+
+#ifndef HH_WriteHelper_
+#define HH_WriteHelper_ 1
+
+// Custom includes
+#include <string>
+#include <boost/intrusive_ptr.hpp>
+#include <boost/function.hpp>
+#include "Utils/intrusive_refcount.hh"
+#include "Scheduler.hh"
+
+//#include "WriteHelper.mpp"
+///////////////////////////////hh.p////////////////////////////////////////
+
+namespace satcom {
+namespace lib {
+
+ template <class Handle>
+ class WriteHelper
+ : public satcom::lib::intrusive_refcount
+ {
+ public:
+ ///////////////////////////////////////////////////////////////////////////
+ // Types
+
+ typedef boost::intrusive_ptr<WriteHelper> ptr;
+ typedef boost::function<void (ptr)> Callback;
+
+ ///////////////////////////////////////////////////////////////////////////
+ ///\name Structors and default members
+ ///@{
+
+ static ptr dispatch(Handle handle, std::string data, Callback callback);
+
+ ///@}
+ ///////////////////////////////////////////////////////////////////////////
+
+ Handle handle() const;
+
+ std::string const & data() const;
+
+ bool complete() const;
+ bool error() const;
+ void throw_error() const;
+
+ void revoke();
+
+ protected:
+
+ private:
+ WriteHelper(Handle handle, std::string data, Callback callback);
+
+ static void dispatchProcess(ptr helper, Handle handle, satcom::lib::Scheduler::EventId event);
+ void process(Handle handle, satcom::lib::Scheduler::EventId event);
+ void done();
+
+ Handle handle_;
+ mutable std::string data_;
+ Callback callback_;
+
+ mutable std::string::size_type offset_;
+ int errno_;
+ };
+
+
+}}
+
+///////////////////////////////hh.e////////////////////////////////////////
+//#include "WriteHelper.cci"
+#include "WriteHelper.ct"
+#include "WriteHelper.cti"
+//#include "WriteHelper.mpp"
+#endif
+
+
+// Local Variables:
+// mode: c++
+// End:
diff --git a/Scheduler/WriteHelper.test.cc b/Scheduler/WriteHelper.test.cc
new file mode 100644
index 0000000000000000000000000000000000000000..7cb91dfa00738727756e903c1765fadff27d4c28
--- /dev/null
+++ b/Scheduler/WriteHelper.test.cc
@@ -0,0 +1,27 @@
+// $Id$
+//
+// Copyright (C) 2006
+
+// Unit tests
+
+//#include "WriteHelper.test.hh"
+//#include "WriteHelper.test.ih"
+
+// Custom includes
+#include "WriteHelper.hh"
+
+#include <boost/test/auto_unit_test.hpp>
+#include <boost/test/test_tools.hpp>
+
+#define prefix_
+///////////////////////////////cc.p////////////////////////////////////////
+
+
+
+///////////////////////////////cc.e////////////////////////////////////////
+#undef prefix_
+
+
+// Local Variables:
+// mode: c++
+// End: