X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FClientSocketHandle.hh;h=fbecf6dce463780258049e3518c8a48566b52205;hb=52a1b4f399650138cdd7f5e111200ac5f6702be3;hp=e07dccf99960ff5f1156658d0d0a8e16a19197ba;hpb=7a1872f6702d6206bf1d8364c4e894f98d1c64f0;p=senf.git diff --git a/Socket/ClientSocketHandle.hh b/Socket/ClientSocketHandle.hh index e07dccf..fbecf6d 100644 --- a/Socket/ClientSocketHandle.hh +++ b/Socket/ClientSocketHandle.hh @@ -79,15 +79,12 @@ namespace senf { typelist of Poclicy classes which can be accessed. You use protocol() to access a protocol class. \c Policies can of course be underspecified or even empty. - \idea add more flexible read/write members for a) boost::arrays and arrays of other types b) - std::vector (which uses contiguous memory ..) c) other random-access containers (we should - use some configurable trait class to identify containers with contiguous storage). Probably - we should just use a generic Boost.Range interface. Here we again come to the point: make - all except the most basic members be non-member algorithms ? this would make the - configuration of such extenden members more flexible. - \see \ref policy_group \n \ref protocol_group + + \fixme Add enable_if conditions so anything convertible to unsigned will not be interpreted + as a Range template argument but will use the unsigned variant of + read/readfrom/write/writeto. */ template class ClientSocketHandle @@ -116,11 +113,14 @@ namespace senf { ///\name Structors and default members ///@{ - // no default constructor + // default default constructor // default copy constructor // default copy assignment // default destructor + // here to implement + ClientSocketHandle(); + // conversion constructors template ClientSocketHandle(ClientSocketHandle other, @@ -181,14 +181,15 @@ namespace senf { \param[in/out] range Range to store data in \returns past-the-end iterator pointer to after the last read character - \see \ref read() */ + \see \ref read() \n + Boost.Range */ template typename boost::range_iterator::type read (ForwardWritableRange & range); ///< Read data into range - /**< \see - read(ForwardWritableRange const &) \n - read() */ + /**< \see read(ForwardWritableRange const &) \n + read() \n + Boost.Range */ template void read (Sequence & container, unsigned limit); ///< Read data into container @@ -229,7 +230,7 @@ namespace senf { std::pair readfrom (unsigned limit=0); template - typename boost::range_iterator::type + typename boost::range_iterator::type readfrom (ForwardWritableRange const & range, Address & from); ///< Read data into range /**< Read data into the given range. At most @@ -243,14 +244,15 @@ namespace senf { received \returns past-the-end iterator pointer to after the last read character - \see \ref readfrom() */ + \see \ref readfrom() \n + Boost.Range */ template typename boost::range_iterator::type readfrom (ForwardWritableRange & range, Address & from); ///< Read data into range - /**< \see - readfrom(ForwardWritableRange const&,Address&) \n - readfrom() */ + /**< \see readfrom(ForwardWritableRange const&,Address&) \n + readfrom() \n + Boost.Range */ template void readfrom (Sequence & container, Address & from, unsigned limit); ///< Read data into container @@ -265,14 +267,15 @@ namespace senf { \see \ref readfrom() */ char * readfrom (char * start, char * end, Address & from); ///< Read data into memory buffer - /**< This variant will read data into the memory area at \c - buffer of size \c size. This is the most performant - version of readfrom(). - \param[in] buffer address of buffer to store data at - \param[in] size size of buffer - \param[out] from peer address - \returns Number of bytes read - \see \ref readfrom() */ + /**< This variant will read data into the memory area from + \a start to before \a end. This is guaranteed to be the + most efficient version of readfrom(). + \param[in] start address of buffer to store data at + \param[in] end address one past the end of the buffer + \param[out] from peers address from which the data was + received + \returns pointer past the end of the data read + \see \ref read() */ /** \brief Write data to socket @@ -288,20 +291,23 @@ namespace senf { \throws senf::SystemException - This variant will write out the string \c data. + This variant will write out the range \c data. - \param[in] data Data to write - \returns number of bytes written + \param[in] range Data to write + \returns past-the-end iterator after last element written \implementation The write() family of members will use POSIX \c write calls, not \c send. */ - unsigned write (std::string const & data); - unsigned write (char const * buffer, unsigned size); + template + typename boost::range_const_iterator::type + write (ForwardReadableRange const & range); + char const * write (char const * start, char const * end); ///< Write data to socket from memory buffer - /**< \param[in] buffer address of buffer to write - \param[in] size amount of data to write - \returns Number of bytes written - \see \ref write() */ + /**< \param[in] start beginning of area to write + \param[in] end past-the-end pointer to area to write + \returns past-the-end pointer after last byte written + \see \ref write() \n + Boost.Range */ /** \brief Write data to unconnected socket @@ -315,20 +321,23 @@ namespace senf { \throw senf::SystemException - This variant will send the string \c data to the peer \c addr. + This variant will send the range \c range to peer \c addr. \param[in] addr Address of peer to send data to - \param[in] data data to send + \param[in] range data to send \returns Number of bytes written */ - unsigned writeto (AddressParam addr, std::string const & data); - unsigned writeto (AddressParam addr, char const * buffer, unsigned size); + template + typename boost::range_const_iterator::type + writeto (AddressParam addr, ForwardReadableRange const & range); + char const * writeto (AddressParam addr, char const * start, char const * end); ///< Write data from memory buffer to unconnected socket /**< \param[in] addr Address of peer to send data to - \param[in] buffer address of buffer to write - \param[in] size amount of data to write - \returns Number of bytes written - \see \ref writeto() */ + \param[in] start address of buffer to write + \param[in] end past-the-end pointer after data to write + \returns past-the-end iterator after last byte written + \see \ref writeto() \n + Boost.Range */ /////////////////////////////////////////////////////////////////////////// ///\name Addressing @@ -442,4 +451,5 @@ namespace senf { // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" // End: