update boost on linux
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
// windows/basic_stream_handle.hpp
|
||||
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
//
|
||||
// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
|
||||
// Copyright (c) 2003-2019 Christopher M. Kohlhoff (chris at kohlhoff dot com)
|
||||
//
|
||||
// Distributed under the Boost Software License, Version 1.0. (See accompanying
|
||||
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
@@ -16,17 +16,11 @@
|
||||
#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
|
||||
|
||||
#include <boost/asio/detail/config.hpp>
|
||||
#include <boost/asio/windows/basic_overlapped_handle.hpp>
|
||||
|
||||
#if defined(BOOST_ASIO_HAS_WINDOWS_STREAM_HANDLE) \
|
||||
|| defined(GENERATING_DOCUMENTATION)
|
||||
|
||||
#include <cstddef>
|
||||
#include <boost/asio/detail/handler_type_requirements.hpp>
|
||||
#include <boost/asio/detail/throw_error.hpp>
|
||||
#include <boost/asio/error.hpp>
|
||||
#include <boost/asio/windows/basic_handle.hpp>
|
||||
#include <boost/asio/windows/stream_handle_service.hpp>
|
||||
|
||||
#include <boost/asio/detail/push_options.hpp>
|
||||
|
||||
namespace boost {
|
||||
@@ -35,8 +29,8 @@ namespace windows {
|
||||
|
||||
/// Provides stream-oriented handle functionality.
|
||||
/**
|
||||
* The windows::basic_stream_handle class template provides asynchronous and
|
||||
* blocking stream-oriented handle functionality.
|
||||
* The windows::basic_stream_handle class provides asynchronous and blocking
|
||||
* stream-oriented handle functionality.
|
||||
*
|
||||
* @par Thread Safety
|
||||
* @e Distinct @e objects: Safe.@n
|
||||
@@ -45,82 +39,126 @@ namespace windows {
|
||||
* @par Concepts:
|
||||
* AsyncReadStream, AsyncWriteStream, Stream, SyncReadStream, SyncWriteStream.
|
||||
*/
|
||||
template <typename StreamHandleService = stream_handle_service>
|
||||
template <typename Executor = executor>
|
||||
class basic_stream_handle
|
||||
: public basic_handle<StreamHandleService>
|
||||
: public basic_overlapped_handle<Executor>
|
||||
{
|
||||
public:
|
||||
/// (Deprecated: Use native_handle_type.) The native representation of a
|
||||
/// handle.
|
||||
typedef typename StreamHandleService::native_handle_type native_type;
|
||||
/// The type of the executor associated with the object.
|
||||
typedef Executor executor_type;
|
||||
|
||||
/// The native representation of a handle.
|
||||
typedef typename StreamHandleService::native_handle_type native_handle_type;
|
||||
#if defined(GENERATING_DOCUMENTATION)
|
||||
typedef implementation_defined native_handle_type;
|
||||
#else
|
||||
typedef boost::asio::detail::win_iocp_handle_service::native_handle_type
|
||||
native_handle_type;
|
||||
#endif
|
||||
|
||||
/// Construct a basic_stream_handle without opening it.
|
||||
/// Construct a stream handle without opening it.
|
||||
/**
|
||||
* This constructor creates a stream handle without opening it. The handle
|
||||
* needs to be opened and then connected or accepted before data can be sent
|
||||
* or received on it.
|
||||
* This constructor creates a stream handle without opening it.
|
||||
*
|
||||
* @param io_service The io_service object that the stream handle will use to
|
||||
* dispatch handlers for any asynchronous operations performed on the handle.
|
||||
* @param ex The I/O executor that the stream handle will use, by default, to
|
||||
* dispatch handlers for any asynchronous operations performed on the stream
|
||||
* handle.
|
||||
*/
|
||||
explicit basic_stream_handle(boost::asio::io_service& io_service)
|
||||
: basic_handle<StreamHandleService>(io_service)
|
||||
explicit basic_stream_handle(const executor_type& ex)
|
||||
: basic_overlapped_handle<Executor>(ex)
|
||||
{
|
||||
}
|
||||
|
||||
/// Construct a basic_stream_handle on an existing native handle.
|
||||
/// Construct a stream handle without opening it.
|
||||
/**
|
||||
* This constructor creates a stream handle without opening it. The handle
|
||||
* needs to be opened or assigned before data can be sent or received on it.
|
||||
*
|
||||
* @param context An execution context which provides the I/O executor that
|
||||
* the stream handle will use, by default, to dispatch handlers for any
|
||||
* asynchronous operations performed on the stream handle.
|
||||
*/
|
||||
template <typename ExecutionContext>
|
||||
explicit basic_stream_handle(ExecutionContext& context,
|
||||
typename enable_if<
|
||||
is_convertible<ExecutionContext&, execution_context&>::value,
|
||||
basic_stream_handle
|
||||
>::type* = 0)
|
||||
: basic_overlapped_handle<Executor>(context)
|
||||
{
|
||||
}
|
||||
|
||||
/// Construct a stream handle on an existing native handle.
|
||||
/**
|
||||
* This constructor creates a stream handle object to hold an existing native
|
||||
* handle.
|
||||
*
|
||||
* @param io_service The io_service object that the stream handle will use to
|
||||
* dispatch handlers for any asynchronous operations performed on the handle.
|
||||
* @param ex The I/O executor that the stream handle will use, by default, to
|
||||
* dispatch handlers for any asynchronous operations performed on the stream
|
||||
* handle.
|
||||
*
|
||||
* @param handle The new underlying handle implementation.
|
||||
*
|
||||
* @throws boost::system::system_error Thrown on failure.
|
||||
*/
|
||||
basic_stream_handle(boost::asio::io_service& io_service,
|
||||
const native_handle_type& handle)
|
||||
: basic_handle<StreamHandleService>(io_service, handle)
|
||||
basic_stream_handle(const executor_type& ex, const native_handle_type& handle)
|
||||
: basic_overlapped_handle<Executor>(ex, handle)
|
||||
{
|
||||
}
|
||||
|
||||
/// Construct a stream handle on an existing native handle.
|
||||
/**
|
||||
* This constructor creates a stream handle object to hold an existing native
|
||||
* handle.
|
||||
*
|
||||
* @param context An execution context which provides the I/O executor that
|
||||
* the stream handle will use, by default, to dispatch handlers for any
|
||||
* asynchronous operations performed on the stream handle.
|
||||
*
|
||||
* @param handle The new underlying handle implementation.
|
||||
*
|
||||
* @throws boost::system::system_error Thrown on failure.
|
||||
*/
|
||||
template <typename ExecutionContext>
|
||||
basic_stream_handle(ExecutionContext& context,
|
||||
const native_handle_type& handle,
|
||||
typename enable_if<
|
||||
is_convertible<ExecutionContext&, execution_context&>::value
|
||||
>::type* = 0)
|
||||
: basic_overlapped_handle<Executor>(context, handle)
|
||||
{
|
||||
}
|
||||
|
||||
#if defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
|
||||
/// Move-construct a basic_stream_handle from another.
|
||||
/// Move-construct a stream handle from another.
|
||||
/**
|
||||
* This constructor moves a stream handle from one object to another.
|
||||
*
|
||||
* @param other The other basic_stream_handle object from which the move
|
||||
* @param other The other stream handle object from which the move
|
||||
* will occur.
|
||||
*
|
||||
* @note Following the move, the moved-from object is in the same state as if
|
||||
* constructed using the @c basic_stream_handle(io_service&) constructor.
|
||||
* constructed using the @c basic_stream_handle(const executor_type&)
|
||||
* constructor.
|
||||
*/
|
||||
basic_stream_handle(basic_stream_handle&& other)
|
||||
: basic_handle<StreamHandleService>(
|
||||
BOOST_ASIO_MOVE_CAST(basic_stream_handle)(other))
|
||||
: basic_overlapped_handle<Executor>(std::move(other))
|
||||
{
|
||||
}
|
||||
|
||||
/// Move-assign a basic_stream_handle from another.
|
||||
/// Move-assign a stream handle from another.
|
||||
/**
|
||||
* This assignment operator moves a stream handle from one object to
|
||||
* another.
|
||||
*
|
||||
* @param other The other basic_stream_handle object from which the move
|
||||
* will occur.
|
||||
* @param other The other stream handle object from which the move will occur.
|
||||
*
|
||||
* @note Following the move, the moved-from object is in the same state as if
|
||||
* constructed using the @c basic_stream_handle(io_service&) constructor.
|
||||
* constructed using the @c basic_stream_handle(const executor_type&)
|
||||
* constructor.
|
||||
*/
|
||||
basic_stream_handle& operator=(basic_stream_handle&& other)
|
||||
{
|
||||
basic_handle<StreamHandleService>::operator=(
|
||||
BOOST_ASIO_MOVE_CAST(basic_stream_handle)(other));
|
||||
basic_overlapped_handle<Executor>::operator=(std::move(other));
|
||||
return *this;
|
||||
}
|
||||
#endif // defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
|
||||
@@ -156,8 +194,8 @@ public:
|
||||
std::size_t write_some(const ConstBufferSequence& buffers)
|
||||
{
|
||||
boost::system::error_code ec;
|
||||
std::size_t s = this->get_service().write_some(
|
||||
this->get_implementation(), buffers, ec);
|
||||
std::size_t s = this->impl_.get_service().write_some(
|
||||
this->impl_.get_implementation(), buffers, ec);
|
||||
boost::asio::detail::throw_error(ec, "write_some");
|
||||
return s;
|
||||
}
|
||||
@@ -182,8 +220,8 @@ public:
|
||||
std::size_t write_some(const ConstBufferSequence& buffers,
|
||||
boost::system::error_code& ec)
|
||||
{
|
||||
return this->get_service().write_some(
|
||||
this->get_implementation(), buffers, ec);
|
||||
return this->impl_.get_service().write_some(
|
||||
this->impl_.get_implementation(), buffers, ec);
|
||||
}
|
||||
|
||||
/// Start an asynchronous write.
|
||||
@@ -204,9 +242,9 @@ public:
|
||||
* std::size_t bytes_transferred // Number of bytes written.
|
||||
* ); @endcode
|
||||
* Regardless of whether the asynchronous operation completes immediately or
|
||||
* not, the handler will not be invoked from within this function. Invocation
|
||||
* of the handler will be performed in a manner equivalent to using
|
||||
* boost::asio::io_service::post().
|
||||
* not, the handler will not be invoked from within this function. On
|
||||
* immediate completion, invocation of the handler will be performed in a
|
||||
* manner equivalent to using boost::asio::post().
|
||||
*
|
||||
* @note The write operation may not transmit all of the data to the peer.
|
||||
* Consider using the @ref async_write function if you need to ensure that all
|
||||
@@ -231,8 +269,15 @@ public:
|
||||
// not meet the documented type requirements for a WriteHandler.
|
||||
BOOST_ASIO_WRITE_HANDLER_CHECK(WriteHandler, handler) type_check;
|
||||
|
||||
return this->get_service().async_write_some(this->get_implementation(),
|
||||
buffers, BOOST_ASIO_MOVE_CAST(WriteHandler)(handler));
|
||||
boost::asio::async_completion<WriteHandler,
|
||||
void (boost::system::error_code, std::size_t)> init(handler);
|
||||
|
||||
this->impl_.get_service().async_write_some(
|
||||
this->impl_.get_implementation(),
|
||||
buffers, init.completion_handler,
|
||||
this->impl_.get_implementation_executor());
|
||||
|
||||
return init.result.get();
|
||||
}
|
||||
|
||||
/// Read some data from the handle.
|
||||
@@ -267,8 +312,8 @@ public:
|
||||
std::size_t read_some(const MutableBufferSequence& buffers)
|
||||
{
|
||||
boost::system::error_code ec;
|
||||
std::size_t s = this->get_service().read_some(
|
||||
this->get_implementation(), buffers, ec);
|
||||
std::size_t s = this->impl_.get_service().read_some(
|
||||
this->impl_.get_implementation(), buffers, ec);
|
||||
boost::asio::detail::throw_error(ec, "read_some");
|
||||
return s;
|
||||
}
|
||||
@@ -294,8 +339,8 @@ public:
|
||||
std::size_t read_some(const MutableBufferSequence& buffers,
|
||||
boost::system::error_code& ec)
|
||||
{
|
||||
return this->get_service().read_some(
|
||||
this->get_implementation(), buffers, ec);
|
||||
return this->impl_.get_service().read_some(
|
||||
this->impl_.get_implementation(), buffers, ec);
|
||||
}
|
||||
|
||||
/// Start an asynchronous read.
|
||||
@@ -316,9 +361,9 @@ public:
|
||||
* std::size_t bytes_transferred // Number of bytes read.
|
||||
* ); @endcode
|
||||
* Regardless of whether the asynchronous operation completes immediately or
|
||||
* not, the handler will not be invoked from within this function. Invocation
|
||||
* of the handler will be performed in a manner equivalent to using
|
||||
* boost::asio::io_service::post().
|
||||
* not, the handler will not be invoked from within this function. On
|
||||
* immediate completion, invocation of the handler will be performed in a
|
||||
* manner equivalent to using boost::asio::post().
|
||||
*
|
||||
* @note The read operation may not read all of the requested number of bytes.
|
||||
* Consider using the @ref async_read function if you need to ensure that the
|
||||
@@ -344,8 +389,15 @@ public:
|
||||
// not meet the documented type requirements for a ReadHandler.
|
||||
BOOST_ASIO_READ_HANDLER_CHECK(ReadHandler, handler) type_check;
|
||||
|
||||
return this->get_service().async_read_some(this->get_implementation(),
|
||||
buffers, BOOST_ASIO_MOVE_CAST(ReadHandler)(handler));
|
||||
boost::asio::async_completion<ReadHandler,
|
||||
void (boost::system::error_code, std::size_t)> init(handler);
|
||||
|
||||
this->impl_.get_service().async_read_some(
|
||||
this->impl_.get_implementation(),
|
||||
buffers, init.completion_handler,
|
||||
this->impl_.get_implementation_executor());
|
||||
|
||||
return init.result.get();
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user