///////////////////////////////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)
+ offset_(data_.begin()), errno_(0)
{
senf::Scheduler::instance()
.add(handle_, boost::bind(&WriteHelper::dispatchProcess, ptr(this), _1, _2),
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_;
}
prefix_ void senf::WriteHelper<Handle>::process(Handle handle,
senf::Scheduler::EventId 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()) {
+ 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;
done();
+ return;
}
+ if (complete_)
+ done();
}
template <class Handle>
// c-file-style: "senf"
// indent-tabs-mode: nil
// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
// End: