boost/asio
2
0
Fork 0
mirror of https://github.com/boostorg/asio.git synced 2026-02-25 14:32:08 +00:00
Code Issues Projects Releases Wiki Activity

Treat 0-byte reads and writes as no-ops to comply with the documented type

Browse Source 
requirements for SyncReadStream, AsyncReadStream, SyncWriteStream and
AsyncWriteStream.


[SVN r54467]
This commit is contained in:
Christopher Kohlhoff
2009-06-28 13:20:17 +00:00
parent d83faa57ae
commit eacb3aefde
2 changed files with 84 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
include/boost/asio/buffered_read_stream.hpp
View File

@@ -230,8 +230,21 @@ public:
template <typename MutableBufferSequence>
std::size_t read_some(const MutableBufferSequence& buffers)
{
typename MutableBufferSequence::const_iterator iter = buffers.begin();
typename MutableBufferSequence::const_iterator end = buffers.end();
size_t total_buffer_size = 0;
for (; iter != end; ++iter)
{
boost::asio::mutable_buffer buffer(*iter);
total_buffer_size += boost::asio::buffer_size(buffer);
}
if (total_buffer_size == 0)
return 0;
if (storage_.empty())
fill();
return copy(buffers);
}
@@ -242,8 +255,22 @@ public:
boost::system::error_code& ec)
{
ec = boost::system::error_code();
typename MutableBufferSequence::const_iterator iter = buffers.begin();
typename MutableBufferSequence::const_iterator end = buffers.end();
size_t total_buffer_size = 0;
for (; iter != end; ++iter)
{
boost::asio::mutable_buffer buffer(*iter);
total_buffer_size += boost::asio::buffer_size(buffer);
}
if (total_buffer_size == 0)
return 0;
if (storage_.empty() && !fill(ec))
return 0;
return copy(buffers);
}
@@ -306,7 +333,21 @@ public:
void async_read_some(const MutableBufferSequence& buffers,
ReadHandler handler)
{
if (storage_.empty())
typename MutableBufferSequence::const_iterator iter = buffers.begin();
typename MutableBufferSequence::const_iterator end = buffers.end();
size_t total_buffer_size = 0;
for (; iter != end; ++iter)
{
boost::asio::mutable_buffer buffer(*iter);
total_buffer_size += boost::asio::buffer_size(buffer);
}
if (total_buffer_size == 0)
{
get_io_service().post(detail::bind_handler(
handler, boost::system::error_code(), 0));
}
else if (storage_.empty())
{
async_fill(read_some_handler<MutableBufferSequence, ReadHandler>(
get_io_service(), storage_, buffers, handler));

43
include/boost/asio/buffered_write_stream.hpp
View File

@@ -187,8 +187,21 @@ public:
template <typename ConstBufferSequence>
std::size_t write_some(const ConstBufferSequence& buffers)
{
typename ConstBufferSequence::const_iterator iter = buffers.begin();
typename ConstBufferSequence::const_iterator end = buffers.end();
size_t total_buffer_size = 0;
for (; iter != end; ++iter)
{
boost::asio::const_buffer buffer(*iter);
total_buffer_size += boost::asio::buffer_size(buffer);
}
if (total_buffer_size == 0)
return 0;
if (storage_.size() == storage_.capacity())
flush();
return copy(buffers);
}
@@ -199,8 +212,22 @@ public:
boost::system::error_code& ec)
{
ec = boost::system::error_code();
typename ConstBufferSequence::const_iterator iter = buffers.begin();
typename ConstBufferSequence::const_iterator end = buffers.end();
size_t total_buffer_size = 0;
for (; iter != end; ++iter)
{
boost::asio::const_buffer buffer(*iter);
total_buffer_size += boost::asio::buffer_size(buffer);
}
if (total_buffer_size == 0)
return 0;
if (storage_.size() == storage_.capacity() && !flush(ec))
return 0;
return copy(buffers);
}
@@ -264,7 +291,21 @@ public:
void async_write_some(const ConstBufferSequence& buffers,
WriteHandler handler)
{
if (storage_.size() == storage_.capacity())
typename ConstBufferSequence::const_iterator iter = buffers.begin();
typename ConstBufferSequence::const_iterator end = buffers.end();
size_t total_buffer_size = 0;
for (; iter != end; ++iter)
{
boost::asio::const_buffer buffer(*iter);
total_buffer_size += boost::asio::buffer_size(buffer);
}
if (total_buffer_size == 0)
{
get_io_service().post(detail::bind_handler(
handler, boost::system::error_code(), 0));
}
else if (storage_.size() == storage_.capacity())
{
async_flush(write_some_handler<ConstBufferSequence, WriteHandler>(
get_io_service(), storage_, buffers, handler));