X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FClientSocketHandle.ct;h=b51abbd6a39c620761bff53fad16727017a5b51a;hb=81ffa1c459b96dd44472bcef37e1e373934ee138;hp=8e51c2bfd1252f8c8be6e8b96ffd79fb910ea179;hpb=7a1872f6702d6206bf1d8364c4e894f98d1c64f0;p=senf.git

diff --git a/Socket/ClientSocketHandle.ct b/Socket/ClientSocketHandle.ct
index 8e51c2b..b51abbd 100644
--- a/Socket/ClientSocketHandle.ct
+++ b/Socket/ClientSocketHandle.ct
@@ -36,8 +36,6 @@
 ///////////////////////////////////////////////////////////////////////////
 // senf::detail::ReadRange<Handle,ForwardWritableRange,IsContiguous>
 
-// senf::detail::ReadRange<Handle,ForwardWritableRange,IsContiguous>::read
-
 template <class Handle, class ForwardWritableRange, bool IsContiguous>
 prefix_ typename boost::range_iterator<ForwardWritableRange>::type
 senf::detail::ReadRange<Handle,ForwardWritableRange,IsContiguous>::
@@ -48,8 +46,6 @@ read(Handle & handle, ForwardWritableRange & range)
     return std::copy(buffer, handle.read(buffer,buffer+nread), boost::begin(range));
 }
 
-// senf::detail::ReadRange<Handle,ForwardWritableRange,IsContiguous>::readfrom
-
 template <class Handle, class ForwardWritableRange, bool IsContiguous>
 prefix_ typename boost::range_iterator<ForwardWritableRange>::type
 senf::detail::ReadRange<Handle,ForwardWritableRange,IsContiguous>::
@@ -61,6 +57,31 @@ readfrom(Handle & handle, ForwardWritableRange & range, typename Handle::Address
 }
 
 ///////////////////////////////////////////////////////////////////////////
+// senf::detail::WriteRange<Handle,ForwardReadableRange,IsContiguous>
+
+template <class Handle, class ForwardReadableRange, bool IsContiguous>
+prefix_ typename boost::range_iterator<ForwardReadableRange>::type
+senf::detail::WriteRange<Handle,ForwardReadableRange,IsContiguous>::
+write(Handle & handle, ForwardReadableRange & range)
+{
+    typename boost::range_size<ForwardReadableRange>::type nwrite (boost::size(range));
+    SENF_SCOPED_BUFFER(char, buffer, nwrite);
+    std::copy(boost::begin(range), boost::end(range), buffer);
+    return handle.write(std::make_pair(buffer, buffer+nwrite));
+}
+
+template <class Handle, class ForwardReadableRange, bool IsContiguous>
+prefix_ typename boost::range_iterator<ForwardReadableRange>::type
+senf::detail::WriteRange<Handle,ForwardReadableRange,IsContiguous>::
+writeto(Handle & handle, ForwardReadableRange & range, typename Handle::Address const & addr)
+{
+    typename boost::range_size<ForwardReadableRange>::type nwrite (boost::size(range));
+    SENF_SCOPED_BUFFER(char, buffer, nwrite);
+    std::copy(boost::begin(range), boost::end(range), buffer);
+    return handle.writeto(std::make_pair(buffer, buffer+nwrite), addr);
+}
+
+///////////////////////////////////////////////////////////////////////////
 // senf::ClientSocketHandle<Policy>
 
 ////////////////////////////////////////
@@ -113,29 +134,6 @@ prefix_ void senf::ClientSocketHandle<Policy>::readfrom(Sequence & container, Ad
                     container.end());
 }
 
-// senf::ClientSocketHandle<Policy>::write
-
-template <class Policy>
-prefix_ unsigned senf::ClientSocketHandle<Policy>::write(std::string const & data)
-{
-    unsigned written = this->write(data.data(),data.size());
-    if (written == 0)
-        throw SystemException(EPIPE);
-    // This implementation ensures, we only call blocking() when
-    // necessary (since it incurs a system call overhead ...)
-    if (written < data.size() && this->blocking())
-        // We need to enforce in the WritePolicy implementation, that
-        // DatagramFramingPolicy sockets will ALWAYS either write the
-        // complete datagram or nothing at all
-        while (written < data.size()) {
-            unsigned n = this->write(data.data()+written,data.size()-written);
-            if (n == 0)
-                throw SystemException(EPIPE);
-            written += n;
-        }
-    return written;
-}
-
 ////////////////////////////////////////
 // private members
 
@@ -168,4 +166,6 @@ prefix_ unsigned senf::ClientSocketHandle<Policy>::available()
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End: