diff options
Diffstat (limited to '3rdparty/asio/include/asio/impl/read_until.hpp')
-rw-r--r-- | 3rdparty/asio/include/asio/impl/read_until.hpp | 2595 |
1 files changed, 2018 insertions, 577 deletions
diff --git a/3rdparty/asio/include/asio/impl/read_until.hpp b/3rdparty/asio/include/asio/impl/read_until.hpp index c0a435e63b8..7592263723f 100644 --- a/3rdparty/asio/include/asio/impl/read_until.hpp +++ b/3rdparty/asio/include/asio/impl/read_until.hpp @@ -2,7 +2,7 @@ // impl/read_until.hpp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2024 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) @@ -19,46 +19,95 @@ #include <string> #include <vector> #include <utility> -#include "asio/associated_allocator.hpp" -#include "asio/associated_executor.hpp" +#include "asio/associator.hpp" #include "asio/buffer.hpp" #include "asio/buffers_iterator.hpp" +#include "asio/detail/base_from_cancellation_state.hpp" #include "asio/detail/bind_handler.hpp" -#include "asio/detail/handler_alloc_helpers.hpp" #include "asio/detail/handler_cont_helpers.hpp" -#include "asio/detail/handler_invoke_helpers.hpp" +#include "asio/detail/handler_tracking.hpp" #include "asio/detail/handler_type_requirements.hpp" #include "asio/detail/limits.hpp" +#include "asio/detail/non_const_lvalue.hpp" #include "asio/detail/throw_error.hpp" #include "asio/detail/push_options.hpp" namespace asio { -template <typename SyncReadStream, typename DynamicBuffer> +namespace detail +{ + // Algorithm that finds a subsequence of equal values in a sequence. Returns + // (iterator,true) if a full match was found, in which case the iterator + // points to the beginning of the match. Returns (iterator,false) if a + // partial match was found at the end of the first sequence, in which case + // the iterator points to the beginning of the partial match. Returns + // (last1,false) if no full or partial match was found. + template <typename Iterator1, typename Iterator2> + std::pair<Iterator1, bool> partial_search( + Iterator1 first1, Iterator1 last1, Iterator2 first2, Iterator2 last2) + { + for (Iterator1 iter1 = first1; iter1 != last1; ++iter1) + { + Iterator1 test_iter1 = iter1; + Iterator2 test_iter2 = first2; + for (;; ++test_iter1, ++test_iter2) + { + if (test_iter2 == last2) + return std::make_pair(iter1, true); + if (test_iter1 == last1) + { + if (test_iter2 != first2) + return std::make_pair(iter1, false); + else + break; + } + if (*test_iter1 != *test_iter2) + break; + } + } + return std::make_pair(last1, false); + } +} // namespace detail + +#if !defined(ASIO_NO_DYNAMIC_BUFFER_V1) + +template <typename SyncReadStream, typename DynamicBuffer_v1> inline std::size_t read_until(SyncReadStream& s, - ASIO_MOVE_ARG(DynamicBuffer) buffers, char delim) + DynamicBuffer_v1&& buffers, char delim, + constraint_t< + is_dynamic_buffer_v1<decay_t<DynamicBuffer_v1>>::value + >, + constraint_t< + !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value + >) { asio::error_code ec; std::size_t bytes_transferred = read_until(s, - ASIO_MOVE_CAST(DynamicBuffer)(buffers), delim, ec); + static_cast<DynamicBuffer_v1&&>(buffers), delim, ec); asio::detail::throw_error(ec, "read_until"); return bytes_transferred; } -template <typename SyncReadStream, typename DynamicBuffer> +template <typename SyncReadStream, typename DynamicBuffer_v1> std::size_t read_until(SyncReadStream& s, - ASIO_MOVE_ARG(DynamicBuffer) buffers, - char delim, asio::error_code& ec) + DynamicBuffer_v1&& buffers, + char delim, asio::error_code& ec, + constraint_t< + is_dynamic_buffer_v1<decay_t<DynamicBuffer_v1>>::value + >, + constraint_t< + !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value + >) { - typename decay<DynamicBuffer>::type b( - ASIO_MOVE_CAST(DynamicBuffer)(buffers)); + decay_t<DynamicBuffer_v1> b( + static_cast<DynamicBuffer_v1&&>(buffers)); std::size_t search_position = 0; for (;;) { // Determine the range of the data to be searched. - typedef typename DynamicBuffer::const_buffers_type buffers_type; + typedef typename DynamicBuffer_v1::const_buffers_type buffers_type; typedef buffers_iterator<buffers_type> iterator; buffers_type data_buffers = b.data(); iterator begin = iterator::begin(data_buffers); @@ -96,66 +145,43 @@ std::size_t read_until(SyncReadStream& s, } } -template <typename SyncReadStream, typename DynamicBuffer> +template <typename SyncReadStream, typename DynamicBuffer_v1> inline std::size_t read_until(SyncReadStream& s, - ASIO_MOVE_ARG(DynamicBuffer) buffers, - ASIO_STRING_VIEW_PARAM delim) + DynamicBuffer_v1&& buffers, + ASIO_STRING_VIEW_PARAM delim, + constraint_t< + is_dynamic_buffer_v1<decay_t<DynamicBuffer_v1>>::value + >, + constraint_t< + !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value + >) { asio::error_code ec; std::size_t bytes_transferred = read_until(s, - ASIO_MOVE_CAST(DynamicBuffer)(buffers), delim, ec); + static_cast<DynamicBuffer_v1&&>(buffers), delim, ec); asio::detail::throw_error(ec, "read_until"); return bytes_transferred; } -namespace detail -{ - // Algorithm that finds a subsequence of equal values in a sequence. Returns - // (iterator,true) if a full match was found, in which case the iterator - // points to the beginning of the match. Returns (iterator,false) if a - // partial match was found at the end of the first sequence, in which case - // the iterator points to the beginning of the partial match. Returns - // (last1,false) if no full or partial match was found. - template <typename Iterator1, typename Iterator2> - std::pair<Iterator1, bool> partial_search( - Iterator1 first1, Iterator1 last1, Iterator2 first2, Iterator2 last2) - { - for (Iterator1 iter1 = first1; iter1 != last1; ++iter1) - { - Iterator1 test_iter1 = iter1; - Iterator2 test_iter2 = first2; - for (;; ++test_iter1, ++test_iter2) - { - if (test_iter2 == last2) - return std::make_pair(iter1, true); - if (test_iter1 == last1) - { - if (test_iter2 != first2) - return std::make_pair(iter1, false); - else - break; - } - if (*test_iter1 != *test_iter2) - break; - } - } - return std::make_pair(last1, false); - } -} // namespace detail - -template <typename SyncReadStream, typename DynamicBuffer> +template <typename SyncReadStream, typename DynamicBuffer_v1> std::size_t read_until(SyncReadStream& s, - ASIO_MOVE_ARG(DynamicBuffer) buffers, - ASIO_STRING_VIEW_PARAM delim, asio::error_code& ec) + DynamicBuffer_v1&& buffers, + ASIO_STRING_VIEW_PARAM delim, asio::error_code& ec, + constraint_t< + is_dynamic_buffer_v1<decay_t<DynamicBuffer_v1>>::value + >, + constraint_t< + !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value + >) { - typename decay<DynamicBuffer>::type b( - ASIO_MOVE_CAST(DynamicBuffer)(buffers)); + decay_t<DynamicBuffer_v1> b( + static_cast<DynamicBuffer_v1&&>(buffers)); std::size_t search_position = 0; for (;;) { // Determine the range of the data to be searched. - typedef typename DynamicBuffer::const_buffers_type buffers_type; + typedef typename DynamicBuffer_v1::const_buffers_type buffers_type; typedef buffers_iterator<buffers_type> iterator; buffers_type data_buffers = b.data(); iterator begin = iterator::begin(data_buffers); @@ -205,31 +231,54 @@ std::size_t read_until(SyncReadStream& s, #if !defined(ASIO_NO_EXTENSIONS) #if defined(ASIO_HAS_BOOST_REGEX) -template <typename SyncReadStream, typename DynamicBuffer> -inline std::size_t read_until(SyncReadStream& s, - ASIO_MOVE_ARG(DynamicBuffer) buffers, - const boost::regex& expr) +namespace detail { + +struct regex_match_flags +{ + template <typename T> + operator T() const + { + return T::match_default | T::match_partial; + } +}; + +} // namespace detail + +template <typename SyncReadStream, typename DynamicBuffer_v1, typename Traits> +inline std::size_t read_until(SyncReadStream& s, DynamicBuffer_v1&& buffers, + const boost::basic_regex<char, Traits>& expr, + constraint_t< + is_dynamic_buffer_v1<decay_t<DynamicBuffer_v1>>::value + >, + constraint_t< + !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value + >) { asio::error_code ec; std::size_t bytes_transferred = read_until(s, - ASIO_MOVE_CAST(DynamicBuffer)(buffers), expr, ec); + static_cast<DynamicBuffer_v1&&>(buffers), expr, ec); asio::detail::throw_error(ec, "read_until"); return bytes_transferred; } -template <typename SyncReadStream, typename DynamicBuffer> -std::size_t read_until(SyncReadStream& s, - ASIO_MOVE_ARG(DynamicBuffer) buffers, - const boost::regex& expr, asio::error_code& ec) +template <typename SyncReadStream, typename DynamicBuffer_v1, typename Traits> +std::size_t read_until(SyncReadStream& s, DynamicBuffer_v1&& buffers, + const boost::basic_regex<char, Traits>& expr, asio::error_code& ec, + constraint_t< + is_dynamic_buffer_v1<decay_t<DynamicBuffer_v1>>::value + >, + constraint_t< + !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value + >) { - typename decay<DynamicBuffer>::type b( - ASIO_MOVE_CAST(DynamicBuffer)(buffers)); + decay_t<DynamicBuffer_v1> b( + static_cast<DynamicBuffer_v1&&>(buffers)); std::size_t search_position = 0; for (;;) { // Determine the range of the data to be searched. - typedef typename DynamicBuffer::const_buffers_type buffers_type; + typedef typename DynamicBuffer_v1::const_buffers_type buffers_type; typedef buffers_iterator<buffers_type> iterator; buffers_type data_buffers = b.data(); iterator begin = iterator::begin(data_buffers); @@ -238,10 +287,10 @@ std::size_t read_until(SyncReadStream& s, // Look for a match. boost::match_results<iterator, - typename std::vector<boost::sub_match<iterator> >::allocator_type> + typename std::vector<boost::sub_match<iterator>>::allocator_type> match_results; - if (regex_search(start_pos, end, match_results, expr, - boost::match_default | boost::match_partial)) + if (regex_search(start_pos, end, match_results, + expr, detail::regex_match_flags())) { if (match_results[0].matched) { @@ -269,7 +318,9 @@ std::size_t read_until(SyncReadStream& s, } // Need more data. - std::size_t bytes_to_read = read_size_helper(b, 65536); + std::size_t bytes_to_read = std::min<std::size_t>( + std::max<std::size_t>(512, b.capacity() - b.size()), + std::min<std::size_t>(65536, b.max_size() - b.size())); b.commit(s.read_some(b.prepare(bytes_to_read), ec)); if (ec) return 0; @@ -279,35 +330,51 @@ std::size_t read_until(SyncReadStream& s, #endif // defined(ASIO_HAS_BOOST_REGEX) template <typename SyncReadStream, - typename DynamicBuffer, typename MatchCondition> + typename DynamicBuffer_v1, typename MatchCondition> inline std::size_t read_until(SyncReadStream& s, - ASIO_MOVE_ARG(DynamicBuffer) buffers, + DynamicBuffer_v1&& buffers, MatchCondition match_condition, - typename enable_if<is_match_condition<MatchCondition>::value>::type*) + constraint_t< + is_match_condition<MatchCondition>::value + >, + constraint_t< + is_dynamic_buffer_v1<decay_t<DynamicBuffer_v1>>::value + >, + constraint_t< + !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value + >) { asio::error_code ec; std::size_t bytes_transferred = read_until(s, - ASIO_MOVE_CAST(DynamicBuffer)(buffers), + static_cast<DynamicBuffer_v1&&>(buffers), match_condition, ec); asio::detail::throw_error(ec, "read_until"); return bytes_transferred; } template <typename SyncReadStream, - typename DynamicBuffer, typename MatchCondition> + typename DynamicBuffer_v1, typename MatchCondition> std::size_t read_until(SyncReadStream& s, - ASIO_MOVE_ARG(DynamicBuffer) buffers, + DynamicBuffer_v1&& buffers, MatchCondition match_condition, asio::error_code& ec, - typename enable_if<is_match_condition<MatchCondition>::value>::type*) + constraint_t< + is_match_condition<MatchCondition>::value + >, + constraint_t< + is_dynamic_buffer_v1<decay_t<DynamicBuffer_v1>>::value + >, + constraint_t< + !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value + >) { - typename decay<DynamicBuffer>::type b( - ASIO_MOVE_CAST(DynamicBuffer)(buffers)); + decay_t<DynamicBuffer_v1> b( + static_cast<DynamicBuffer_v1&&>(buffers)); std::size_t search_position = 0; for (;;) { // Determine the range of the data to be searched. - typedef typename DynamicBuffer::const_buffers_type buffers_type; + typedef typename DynamicBuffer_v1::const_buffers_type buffers_type; typedef buffers_iterator<buffers_type> iterator; buffers_type data_buffers = b.data(); iterator begin = iterator::begin(data_buffers); @@ -385,16 +452,18 @@ inline std::size_t read_until(SyncReadStream& s, #if defined(ASIO_HAS_BOOST_REGEX) -template <typename SyncReadStream, typename Allocator> +template <typename SyncReadStream, typename Allocator, typename Traits> inline std::size_t read_until(SyncReadStream& s, - asio::basic_streambuf<Allocator>& b, const boost::regex& expr) + asio::basic_streambuf<Allocator>& b, + const boost::basic_regex<char, Traits>& expr) { return read_until(s, basic_streambuf_ref<Allocator>(b), expr); } -template <typename SyncReadStream, typename Allocator> +template <typename SyncReadStream, typename Allocator, typename Traits> inline std::size_t read_until(SyncReadStream& s, - asio::basic_streambuf<Allocator>& b, const boost::regex& expr, + asio::basic_streambuf<Allocator>& b, + const boost::basic_regex<char, Traits>& expr, asio::error_code& ec) { return read_until(s, basic_streambuf_ref<Allocator>(b), expr, ec); @@ -405,7 +474,7 @@ inline std::size_t read_until(SyncReadStream& s, template <typename SyncReadStream, typename Allocator, typename MatchCondition> inline std::size_t read_until(SyncReadStream& s, asio::basic_streambuf<Allocator>& b, MatchCondition match_condition, - typename enable_if<is_match_condition<MatchCondition>::value>::type*) + constraint_t<is_match_condition<MatchCondition>::value>) { return read_until(s, basic_streambuf_ref<Allocator>(b), match_condition); } @@ -414,37 +483,360 @@ template <typename SyncReadStream, typename Allocator, typename MatchCondition> inline std::size_t read_until(SyncReadStream& s, asio::basic_streambuf<Allocator>& b, MatchCondition match_condition, asio::error_code& ec, - typename enable_if<is_match_condition<MatchCondition>::value>::type*) + constraint_t<is_match_condition<MatchCondition>::value>) { return read_until(s, basic_streambuf_ref<Allocator>(b), match_condition, ec); } #endif // !defined(ASIO_NO_IOSTREAM) #endif // !defined(ASIO_NO_EXTENSIONS) +#endif // !defined(ASIO_NO_DYNAMIC_BUFFER_V1) + +template <typename SyncReadStream, typename DynamicBuffer_v2> +inline std::size_t read_until(SyncReadStream& s, + DynamicBuffer_v2 buffers, char delim, + constraint_t< + is_dynamic_buffer_v2<DynamicBuffer_v2>::value + >) +{ + asio::error_code ec; + std::size_t bytes_transferred = read_until(s, + static_cast<DynamicBuffer_v2&&>(buffers), delim, ec); + asio::detail::throw_error(ec, "read_until"); + return bytes_transferred; +} + +template <typename SyncReadStream, typename DynamicBuffer_v2> +std::size_t read_until(SyncReadStream& s, DynamicBuffer_v2 buffers, + char delim, asio::error_code& ec, + constraint_t< + is_dynamic_buffer_v2<DynamicBuffer_v2>::value + >) +{ + DynamicBuffer_v2& b = buffers; + + std::size_t search_position = 0; + for (;;) + { + // Determine the range of the data to be searched. + typedef typename DynamicBuffer_v2::const_buffers_type buffers_type; + typedef buffers_iterator<buffers_type> iterator; + buffers_type data_buffers = + const_cast<const DynamicBuffer_v2&>(b).data(0, b.size()); + iterator begin = iterator::begin(data_buffers); + iterator start_pos = begin + search_position; + iterator end = iterator::end(data_buffers); + + // Look for a match. + iterator iter = std::find(start_pos, end, delim); + if (iter != end) + { + // Found a match. We're done. + ec = asio::error_code(); + return iter - begin + 1; + } + else + { + // No match. Next search can start with the new data. + search_position = end - begin; + } + + // Check if buffer is full. + if (b.size() == b.max_size()) + { + ec = error::not_found; + return 0; + } + + // Need more data. + std::size_t bytes_to_read = std::min<std::size_t>( + std::max<std::size_t>(512, b.capacity() - b.size()), + std::min<std::size_t>(65536, b.max_size() - b.size())); + std::size_t pos = b.size(); + b.grow(bytes_to_read); + std::size_t bytes_transferred = s.read_some(b.data(pos, bytes_to_read), ec); + b.shrink(bytes_to_read - bytes_transferred); + if (ec) + return 0; + } +} + +template <typename SyncReadStream, typename DynamicBuffer_v2> +inline std::size_t read_until(SyncReadStream& s, + DynamicBuffer_v2 buffers, ASIO_STRING_VIEW_PARAM delim, + constraint_t< + is_dynamic_buffer_v2<DynamicBuffer_v2>::value + >) +{ + asio::error_code ec; + std::size_t bytes_transferred = read_until(s, + static_cast<DynamicBuffer_v2&&>(buffers), delim, ec); + asio::detail::throw_error(ec, "read_until"); + return bytes_transferred; +} + +template <typename SyncReadStream, typename DynamicBuffer_v2> +std::size_t read_until(SyncReadStream& s, DynamicBuffer_v2 buffers, + ASIO_STRING_VIEW_PARAM delim, asio::error_code& ec, + constraint_t< + is_dynamic_buffer_v2<DynamicBuffer_v2>::value + >) +{ + DynamicBuffer_v2& b = buffers; + + std::size_t search_position = 0; + for (;;) + { + // Determine the range of the data to be searched. + typedef typename DynamicBuffer_v2::const_buffers_type buffers_type; + typedef buffers_iterator<buffers_type> iterator; + buffers_type data_buffers = + const_cast<const DynamicBuffer_v2&>(b).data(0, b.size()); + iterator begin = iterator::begin(data_buffers); + iterator start_pos = begin + search_position; + iterator end = iterator::end(data_buffers); + + // Look for a match. + std::pair<iterator, bool> result = detail::partial_search( + start_pos, end, delim.begin(), delim.end()); + if (result.first != end) + { + if (result.second) + { + // Full match. We're done. + ec = asio::error_code(); + return result.first - begin + delim.length(); + } + else + { + // Partial match. Next search needs to start from beginning of match. + search_position = result.first - begin; + } + } + else + { + // No match. Next search can start with the new data. + search_position = end - begin; + } + + // Check if buffer is full. + if (b.size() == b.max_size()) + { + ec = error::not_found; + return 0; + } + + // Need more data. + std::size_t bytes_to_read = std::min<std::size_t>( + std::max<std::size_t>(512, b.capacity() - b.size()), + std::min<std::size_t>(65536, b.max_size() - b.size())); + std::size_t pos = b.size(); + b.grow(bytes_to_read); + std::size_t bytes_transferred = s.read_some(b.data(pos, bytes_to_read), ec); + b.shrink(bytes_to_read - bytes_transferred); + if (ec) + return 0; + } +} + +#if !defined(ASIO_NO_EXTENSIONS) +#if defined(ASIO_HAS_BOOST_REGEX) + +template <typename SyncReadStream, typename DynamicBuffer_v2, typename Traits> +inline std::size_t read_until(SyncReadStream& s, DynamicBuffer_v2 buffers, + const boost::basic_regex<char, Traits>& expr, + constraint_t< + is_dynamic_buffer_v2<DynamicBuffer_v2>::value + >) +{ + asio::error_code ec; + std::size_t bytes_transferred = read_until(s, + static_cast<DynamicBuffer_v2&&>(buffers), expr, ec); + asio::detail::throw_error(ec, "read_until"); + return bytes_transferred; +} + +template <typename SyncReadStream, typename DynamicBuffer_v2, typename Traits> +std::size_t read_until(SyncReadStream& s, DynamicBuffer_v2 buffers, + const boost::basic_regex<char, Traits>& expr, asio::error_code& ec, + constraint_t< + is_dynamic_buffer_v2<DynamicBuffer_v2>::value + >) +{ + DynamicBuffer_v2& b = buffers; + + std::size_t search_position = 0; + for (;;) + { + // Determine the range of the data to be searched. + typedef typename DynamicBuffer_v2::const_buffers_type buffers_type; + typedef buffers_iterator<buffers_type> iterator; + buffers_type data_buffers = + const_cast<const DynamicBuffer_v2&>(b).data(0, b.size()); + iterator begin = iterator::begin(data_buffers); + iterator start_pos = begin + search_position; + iterator end = iterator::end(data_buffers); + + // Look for a match. + boost::match_results<iterator, + typename std::vector<boost::sub_match<iterator>>::allocator_type> + match_results; + if (regex_search(start_pos, end, match_results, + expr, detail::regex_match_flags())) + { + if (match_results[0].matched) + { + // Full match. We're done. + ec = asio::error_code(); + return match_results[0].second - begin; + } + else + { + // Partial match. Next search needs to start from beginning of match. + search_position = match_results[0].first - begin; + } + } + else + { + // No match. Next search can start with the new data. + search_position = end - begin; + } + + // Check if buffer is full. + if (b.size() == b.max_size()) + { + ec = error::not_found; + return 0; + } + + // Need more data. + std::size_t bytes_to_read = std::min<std::size_t>( + std::max<std::size_t>(512, b.capacity() - b.size()), + std::min<std::size_t>(65536, b.max_size() - b.size())); + std::size_t pos = b.size(); + b.grow(bytes_to_read); + std::size_t bytes_transferred = s.read_some(b.data(pos, bytes_to_read), ec); + b.shrink(bytes_to_read - bytes_transferred); + if (ec) + return 0; + } +} + +#endif // defined(ASIO_HAS_BOOST_REGEX) + +template <typename SyncReadStream, + typename DynamicBuffer_v2, typename MatchCondition> +inline std::size_t read_until(SyncReadStream& s, + DynamicBuffer_v2 buffers, MatchCondition match_condition, + constraint_t< + is_match_condition<MatchCondition>::value + >, + constraint_t< + is_dynamic_buffer_v2<DynamicBuffer_v2>::value + >) +{ + asio::error_code ec; + std::size_t bytes_transferred = read_until(s, + static_cast<DynamicBuffer_v2&&>(buffers), + match_condition, ec); + asio::detail::throw_error(ec, "read_until"); + return bytes_transferred; +} + +template <typename SyncReadStream, + typename DynamicBuffer_v2, typename MatchCondition> +std::size_t read_until(SyncReadStream& s, DynamicBuffer_v2 buffers, + MatchCondition match_condition, asio::error_code& ec, + constraint_t< + is_match_condition<MatchCondition>::value + >, + constraint_t< + is_dynamic_buffer_v2<DynamicBuffer_v2>::value + >) +{ + DynamicBuffer_v2& b = buffers; + + std::size_t search_position = 0; + for (;;) + { + // Determine the range of the data to be searched. + typedef typename DynamicBuffer_v2::const_buffers_type buffers_type; + typedef buffers_iterator<buffers_type> iterator; + buffers_type data_buffers = + const_cast<const DynamicBuffer_v2&>(b).data(0, b.size()); + iterator begin = iterator::begin(data_buffers); + iterator start_pos = begin + search_position; + iterator end = iterator::end(data_buffers); + + // Look for a match. + std::pair<iterator, bool> result = match_condition(start_pos, end); + if (result.second) + { + // Full match. We're done. + ec = asio::error_code(); + return result.first - begin; + } + else if (result.first != end) + { + // Partial match. Next search needs to start from beginning of match. + search_position = result.first - begin; + } + else + { + // No match. Next search can start with the new data. + search_position = end - begin; + } + + // Check if buffer is full. + if (b.size() == b.max_size()) + { + ec = error::not_found; + return 0; + } + + // Need more data. + std::size_t bytes_to_read = std::min<std::size_t>( + std::max<std::size_t>(512, b.capacity() - b.size()), + std::min<std::size_t>(65536, b.max_size() - b.size())); + std::size_t pos = b.size(); + b.grow(bytes_to_read); + std::size_t bytes_transferred = s.read_some(b.data(pos, bytes_to_read), ec); + b.shrink(bytes_to_read - bytes_transferred); + if (ec) + return 0; + } +} + +#endif // !defined(ASIO_NO_EXTENSIONS) + +#if !defined(ASIO_NO_DYNAMIC_BUFFER_V1) namespace detail { template <typename AsyncReadStream, - typename DynamicBuffer, typename ReadHandler> - class read_until_delim_op + typename DynamicBuffer_v1, typename ReadHandler> + class read_until_delim_op_v1 + : public base_from_cancellation_state<ReadHandler> { public: template <typename BufferSequence> - read_until_delim_op(AsyncReadStream& stream, - ASIO_MOVE_ARG(BufferSequence) buffers, + read_until_delim_op_v1(AsyncReadStream& stream, + BufferSequence&& buffers, char delim, ReadHandler& handler) - : stream_(stream), - buffers_(ASIO_MOVE_CAST(BufferSequence)(buffers)), + : base_from_cancellation_state<ReadHandler>( + handler, enable_partial_cancellation()), + stream_(stream), + buffers_(static_cast<BufferSequence&&>(buffers)), delim_(delim), start_(0), search_position_(0), - handler_(ASIO_MOVE_CAST(ReadHandler)(handler)) + handler_(static_cast<ReadHandler&&>(handler)) { } -#if defined(ASIO_HAS_MOVE) - read_until_delim_op(const read_until_delim_op& other) - : stream_(other.stream_), + read_until_delim_op_v1(const read_until_delim_op_v1& other) + : base_from_cancellation_state<ReadHandler>(other), + stream_(other.stream_), buffers_(other.buffers_), delim_(other.delim_), start_(other.start_), @@ -453,18 +845,19 @@ namespace detail { } - read_until_delim_op(read_until_delim_op&& other) - : stream_(other.stream_), - buffers_(ASIO_MOVE_CAST(DynamicBuffer)(other.buffers_)), + read_until_delim_op_v1(read_until_delim_op_v1&& other) + : base_from_cancellation_state<ReadHandler>( + static_cast<base_from_cancellation_state<ReadHandler>&&>(other)), + stream_(other.stream_), + buffers_(static_cast<DynamicBuffer_v1&&>(other.buffers_)), delim_(other.delim_), start_(other.start_), search_position_(other.search_position_), - handler_(ASIO_MOVE_CAST(ReadHandler)(other.handler_)) + handler_(static_cast<ReadHandler&&>(other.handler_)) { } -#endif // defined(ASIO_HAS_MOVE) - void operator()(const asio::error_code& ec, + void operator()(asio::error_code ec, std::size_t bytes_transferred, int start = 0) { const std::size_t not_found = (std::numeric_limits<std::size_t>::max)(); @@ -476,7 +869,7 @@ namespace detail { { // Determine the range of the data to be searched. - typedef typename DynamicBuffer::const_buffers_type + typedef typename DynamicBuffer_v1::const_buffers_type buffers_type; typedef buffers_iterator<buffers_type> iterator; buffers_type data_buffers = buffers_.data(); @@ -518,12 +911,21 @@ namespace detail break; // Start a new asynchronous read operation to obtain more data. - stream_.async_read_some(buffers_.prepare(bytes_to_read), - ASIO_MOVE_CAST(read_until_delim_op)(*this)); + { + ASIO_HANDLER_LOCATION(( + __FILE__, __LINE__, "async_read_until")); + stream_.async_read_some(buffers_.prepare(bytes_to_read), + static_cast<read_until_delim_op_v1&&>(*this)); + } return; default: buffers_.commit(bytes_transferred); if (ec || bytes_transferred == 0) break; + if (this->cancelled() != cancellation_type::none) + { + ec = error::operation_aborted; + break; + } } const asio::error_code result_ec = @@ -534,13 +936,13 @@ namespace detail (ec || search_position_ == not_found) ? 0 : search_position_; - handler_(result_ec, result_n); + static_cast<ReadHandler&&>(handler_)(result_ec, result_n); } } //private: AsyncReadStream& stream_; - DynamicBuffer buffers_; + DynamicBuffer_v1 buffers_; char delim_; int start_; std::size_t search_position_; @@ -548,145 +950,133 @@ namespace detail }; template <typename AsyncReadStream, - typename DynamicBuffer, typename ReadHandler> - inline void* asio_handler_allocate(std::size_t size, - read_until_delim_op<AsyncReadStream, - DynamicBuffer, ReadHandler>* this_handler) - { - return asio_handler_alloc_helpers::allocate( - size, this_handler->handler_); - } - - template <typename AsyncReadStream, - typename DynamicBuffer, typename ReadHandler> - inline void asio_handler_deallocate(void* pointer, std::size_t size, - read_until_delim_op<AsyncReadStream, - DynamicBuffer, ReadHandler>* this_handler) - { - asio_handler_alloc_helpers::deallocate( - pointer, size, this_handler->handler_); - } - - template <typename AsyncReadStream, - typename DynamicBuffer, typename ReadHandler> + typename DynamicBuffer_v1, typename ReadHandler> inline bool asio_handler_is_continuation( - read_until_delim_op<AsyncReadStream, - DynamicBuffer, ReadHandler>* this_handler) + read_until_delim_op_v1<AsyncReadStream, + DynamicBuffer_v1, ReadHandler>* this_handler) { return this_handler->start_ == 0 ? true : asio_handler_cont_helpers::is_continuation( this_handler->handler_); } - template <typename Function, typename AsyncReadStream, - typename DynamicBuffer, typename ReadHandler> - inline void asio_handler_invoke(Function& function, - read_until_delim_op<AsyncReadStream, - DynamicBuffer, ReadHandler>* this_handler) + template <typename AsyncReadStream> + class initiate_async_read_until_delim_v1 { - asio_handler_invoke_helpers::invoke( - function, this_handler->handler_); - } + public: + typedef typename AsyncReadStream::executor_type executor_type; - template <typename Function, typename AsyncReadStream, - typename DynamicBuffer, typename ReadHandler> - inline void asio_handler_invoke(const Function& function, - read_until_delim_op<AsyncReadStream, - DynamicBuffer, ReadHandler>* this_handler) - { - asio_handler_invoke_helpers::invoke( - function, this_handler->handler_); - } + explicit initiate_async_read_until_delim_v1(AsyncReadStream& stream) + : stream_(stream) + { + } + + executor_type get_executor() const noexcept + { + return stream_.get_executor(); + } + + template <typename ReadHandler, typename DynamicBuffer_v1> + void operator()(ReadHandler&& handler, + DynamicBuffer_v1&& buffers, + char delim) const + { + // If you get an error on the following line it means that your handler + // does not meet the documented type requirements for a ReadHandler. + ASIO_READ_HANDLER_CHECK(ReadHandler, handler) type_check; + + non_const_lvalue<ReadHandler> handler2(handler); + read_until_delim_op_v1<AsyncReadStream, + decay_t<DynamicBuffer_v1>, + decay_t<ReadHandler>>( + stream_, static_cast<DynamicBuffer_v1&&>(buffers), + delim, handler2.value)(asio::error_code(), 0, 1); + } + + private: + AsyncReadStream& stream_; + }; } // namespace detail #if !defined(GENERATING_DOCUMENTATION) -template <typename AsyncReadStream, typename DynamicBuffer, - typename ReadHandler, typename Allocator> -struct associated_allocator< - detail::read_until_delim_op<AsyncReadStream, - DynamicBuffer, ReadHandler>, - Allocator> +template <template <typename, typename> class Associator, + typename AsyncReadStream, typename DynamicBuffer_v1, + typename ReadHandler, typename DefaultCandidate> +struct associator<Associator, + detail::read_until_delim_op_v1<AsyncReadStream, + DynamicBuffer_v1, ReadHandler>, + DefaultCandidate> + : Associator<ReadHandler, DefaultCandidate> { - typedef typename associated_allocator<ReadHandler, Allocator>::type type; - - static type get( - const detail::read_until_delim_op<AsyncReadStream, - DynamicBuffer, ReadHandler>& h, - const Allocator& a = Allocator()) ASIO_NOEXCEPT + static typename Associator<ReadHandler, DefaultCandidate>::type get( + const detail::read_until_delim_op_v1<AsyncReadStream, + DynamicBuffer_v1, ReadHandler>& h) noexcept { - return associated_allocator<ReadHandler, Allocator>::get(h.handler_, a); + return Associator<ReadHandler, DefaultCandidate>::get(h.handler_); } -}; -template <typename AsyncReadStream, typename DynamicBuffer, - typename ReadHandler, typename Executor> -struct associated_executor< - detail::read_until_delim_op<AsyncReadStream, - DynamicBuffer, ReadHandler>, - Executor> -{ - typedef typename associated_executor<ReadHandler, Executor>::type type; - - static type get( - const detail::read_until_delim_op<AsyncReadStream, - DynamicBuffer, ReadHandler>& h, - const Executor& ex = Executor()) ASIO_NOEXCEPT + static auto get( + const detail::read_until_delim_op_v1<AsyncReadStream, + DynamicBuffer_v1, ReadHandler>& h, + const DefaultCandidate& c) noexcept + -> decltype(Associator<ReadHandler, DefaultCandidate>::get(h.handler_, c)) { - return associated_executor<ReadHandler, Executor>::get(h.handler_, ex); + return Associator<ReadHandler, DefaultCandidate>::get(h.handler_, c); } }; #endif // !defined(GENERATING_DOCUMENTATION) -template <typename AsyncReadStream, - typename DynamicBuffer, typename ReadHandler> -ASIO_INITFN_RESULT_TYPE(ReadHandler, - void (asio::error_code, std::size_t)) -async_read_until(AsyncReadStream& s, - ASIO_MOVE_ARG(DynamicBuffer) buffers, - char delim, ASIO_MOVE_ARG(ReadHandler) handler) +template <typename AsyncReadStream, typename DynamicBuffer_v1, + ASIO_COMPLETION_TOKEN_FOR(void (asio::error_code, + std::size_t)) ReadToken> +inline auto async_read_until(AsyncReadStream& s, + DynamicBuffer_v1&& buffers, char delim, ReadToken&& token, + constraint_t< + is_dynamic_buffer_v1<decay_t<DynamicBuffer_v1>>::value + >, + constraint_t< + !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value + >) + -> decltype( + async_initiate<ReadToken, + void (asio::error_code, std::size_t)>( + declval<detail::initiate_async_read_until_delim_v1<AsyncReadStream>>(), + token, static_cast<DynamicBuffer_v1&&>(buffers), delim)) { - // If you get an error on the following line it means that your handler does - // not meet the documented type requirements for a ReadHandler. - ASIO_READ_HANDLER_CHECK(ReadHandler, handler) type_check; - - async_completion<ReadHandler, - void (asio::error_code, std::size_t)> init(handler); - - detail::read_until_delim_op<AsyncReadStream, - typename decay<DynamicBuffer>::type, - ASIO_HANDLER_TYPE(ReadHandler, - void (asio::error_code, std::size_t))>( - s, ASIO_MOVE_CAST(DynamicBuffer)(buffers), - delim, init.completion_handler)(asio::error_code(), 0, 1); - - return init.result.get(); + return async_initiate<ReadToken, + void (asio::error_code, std::size_t)>( + detail::initiate_async_read_until_delim_v1<AsyncReadStream>(s), + token, static_cast<DynamicBuffer_v1&&>(buffers), delim); } namespace detail { template <typename AsyncReadStream, - typename DynamicBuffer, typename ReadHandler> - class read_until_delim_string_op + typename DynamicBuffer_v1, typename ReadHandler> + class read_until_delim_string_op_v1 + : public base_from_cancellation_state<ReadHandler> { public: template <typename BufferSequence> - read_until_delim_string_op(AsyncReadStream& stream, - ASIO_MOVE_ARG(BufferSequence) buffers, + read_until_delim_string_op_v1(AsyncReadStream& stream, + BufferSequence&& buffers, const std::string& delim, ReadHandler& handler) - : stream_(stream), - buffers_(ASIO_MOVE_CAST(BufferSequence)(buffers)), + : base_from_cancellation_state<ReadHandler>( + handler, enable_partial_cancellation()), + stream_(stream), + buffers_(static_cast<BufferSequence&&>(buffers)), delim_(delim), start_(0), search_position_(0), - handler_(ASIO_MOVE_CAST(ReadHandler)(handler)) + handler_(static_cast<ReadHandler&&>(handler)) { } -#if defined(ASIO_HAS_MOVE) - read_until_delim_string_op(const read_until_delim_string_op& other) - : stream_(other.stream_), + read_until_delim_string_op_v1(const read_until_delim_string_op_v1& other) + : base_from_cancellation_state<ReadHandler>(other), + stream_(other.stream_), buffers_(other.buffers_), delim_(other.delim_), start_(other.start_), @@ -695,18 +1085,19 @@ namespace detail { } - read_until_delim_string_op(read_until_delim_string_op&& other) - : stream_(other.stream_), - buffers_(ASIO_MOVE_CAST(DynamicBuffer)(other.buffers_)), - delim_(ASIO_MOVE_CAST(std::string)(other.delim_)), + read_until_delim_string_op_v1(read_until_delim_string_op_v1&& other) + : base_from_cancellation_state<ReadHandler>( + static_cast<base_from_cancellation_state<ReadHandler>&&>(other)), + stream_(other.stream_), + buffers_(static_cast<DynamicBuffer_v1&&>(other.buffers_)), + delim_(static_cast<std::string&&>(other.delim_)), start_(other.start_), search_position_(other.search_position_), - handler_(ASIO_MOVE_CAST(ReadHandler)(other.handler_)) + handler_(static_cast<ReadHandler&&>(other.handler_)) { } -#endif // defined(ASIO_HAS_MOVE) - void operator()(const asio::error_code& ec, + void operator()(asio::error_code ec, std::size_t bytes_transferred, int start = 0) { const std::size_t not_found = (std::numeric_limits<std::size_t>::max)(); @@ -718,7 +1109,7 @@ namespace detail { { // Determine the range of the data to be searched. - typedef typename DynamicBuffer::const_buffers_type + typedef typename DynamicBuffer_v1::const_buffers_type buffers_type; typedef buffers_iterator<buffers_type> iterator; buffers_type data_buffers = buffers_.data(); @@ -771,12 +1162,21 @@ namespace detail break; // Start a new asynchronous read operation to obtain more data. - stream_.async_read_some(buffers_.prepare(bytes_to_read), - ASIO_MOVE_CAST(read_until_delim_string_op)(*this)); + { + ASIO_HANDLER_LOCATION(( + __FILE__, __LINE__, "async_read_until")); + stream_.async_read_some(buffers_.prepare(bytes_to_read), + static_cast<read_until_delim_string_op_v1&&>(*this)); + } return; default: buffers_.commit(bytes_transferred); if (ec || bytes_transferred == 0) break; + if (this->cancelled() != cancellation_type::none) + { + ec = error::operation_aborted; + break; + } } const asio::error_code result_ec = @@ -787,13 +1187,13 @@ namespace detail (ec || search_position_ == not_found) ? 0 : search_position_; - handler_(result_ec, result_n); + static_cast<ReadHandler&&>(handler_)(result_ec, result_n); } } //private: AsyncReadStream& stream_; - DynamicBuffer buffers_; + DynamicBuffer_v1 buffers_; std::string delim_; int start_; std::size_t search_position_; @@ -801,122 +1201,108 @@ namespace detail }; template <typename AsyncReadStream, - typename DynamicBuffer, typename ReadHandler> - inline void* asio_handler_allocate(std::size_t size, - read_until_delim_string_op<AsyncReadStream, - DynamicBuffer, ReadHandler>* this_handler) - { - return asio_handler_alloc_helpers::allocate( - size, this_handler->handler_); - } - - template <typename AsyncReadStream, - typename DynamicBuffer, typename ReadHandler> - inline void asio_handler_deallocate(void* pointer, std::size_t size, - read_until_delim_string_op<AsyncReadStream, - DynamicBuffer, ReadHandler>* this_handler) - { - asio_handler_alloc_helpers::deallocate( - pointer, size, this_handler->handler_); - } - - template <typename AsyncReadStream, - typename DynamicBuffer, typename ReadHandler> + typename DynamicBuffer_v1, typename ReadHandler> inline bool asio_handler_is_continuation( - read_until_delim_string_op<AsyncReadStream, - DynamicBuffer, ReadHandler>* this_handler) + read_until_delim_string_op_v1<AsyncReadStream, + DynamicBuffer_v1, ReadHandler>* this_handler) { return this_handler->start_ == 0 ? true : asio_handler_cont_helpers::is_continuation( this_handler->handler_); } - template <typename Function, typename AsyncReadStream, - typename DynamicBuffer, typename ReadHandler> - inline void asio_handler_invoke(Function& function, - read_until_delim_string_op<AsyncReadStream, - DynamicBuffer, ReadHandler>* this_handler) + template <typename AsyncReadStream> + class initiate_async_read_until_delim_string_v1 { - asio_handler_invoke_helpers::invoke( - function, this_handler->handler_); - } + public: + typedef typename AsyncReadStream::executor_type executor_type; - template <typename Function, typename AsyncReadStream, - typename DynamicBuffer, typename ReadHandler> - inline void asio_handler_invoke(const Function& function, - read_until_delim_string_op<AsyncReadStream, - DynamicBuffer, ReadHandler>* this_handler) - { - asio_handler_invoke_helpers::invoke( - function, this_handler->handler_); - } + explicit initiate_async_read_until_delim_string_v1(AsyncReadStream& stream) + : stream_(stream) + { + } + + executor_type get_executor() const noexcept + { + return stream_.get_executor(); + } + + template <typename ReadHandler, typename DynamicBuffer_v1> + void operator()(ReadHandler&& handler, + DynamicBuffer_v1&& buffers, + const std::string& delim) const + { + // If you get an error on the following line it means that your handler + // does not meet the documented type requirements for a ReadHandler. + ASIO_READ_HANDLER_CHECK(ReadHandler, handler) type_check; + + non_const_lvalue<ReadHandler> handler2(handler); + read_until_delim_string_op_v1<AsyncReadStream, + decay_t<DynamicBuffer_v1>, + decay_t<ReadHandler>>( + stream_, static_cast<DynamicBuffer_v1&&>(buffers), + delim, handler2.value)(asio::error_code(), 0, 1); + } + + private: + AsyncReadStream& stream_; + }; } // namespace detail #if !defined(GENERATING_DOCUMENTATION) -template <typename AsyncReadStream, typename DynamicBuffer, - typename ReadHandler, typename Allocator> -struct associated_allocator< - detail::read_until_delim_string_op<AsyncReadStream, - DynamicBuffer, ReadHandler>, - Allocator> +template <template <typename, typename> class Associator, + typename AsyncReadStream, typename DynamicBuffer_v1, + typename ReadHandler, typename DefaultCandidate> +struct associator<Associator, + detail::read_until_delim_string_op_v1<AsyncReadStream, + DynamicBuffer_v1, ReadHandler>, + DefaultCandidate> + : Associator<ReadHandler, DefaultCandidate> { - typedef typename associated_allocator<ReadHandler, Allocator>::type type; - - static type get( - const detail::read_until_delim_string_op<AsyncReadStream, - DynamicBuffer, ReadHandler>& h, - const Allocator& a = Allocator()) ASIO_NOEXCEPT + static typename Associator<ReadHandler, DefaultCandidate>::type get( + const detail::read_until_delim_string_op_v1< + AsyncReadStream, DynamicBuffer_v1, ReadHandler>& h) noexcept { - return associated_allocator<ReadHandler, Allocator>::get(h.handler_, a); + return Associator<ReadHandler, DefaultCandidate>::get(h.handler_); } -}; - -template <typename AsyncReadStream, typename DynamicBuffer, - typename ReadHandler, typename Executor> -struct associated_executor< - detail::read_until_delim_string_op<AsyncReadStream, - DynamicBuffer, ReadHandler>, - Executor> -{ - typedef typename associated_executor<ReadHandler, Executor>::type type; - static type get( - const detail::read_until_delim_string_op<AsyncReadStream, - DynamicBuffer, ReadHandler>& h, - const Executor& ex = Executor()) ASIO_NOEXCEPT + static auto get( + const detail::read_until_delim_string_op_v1< + AsyncReadStream, DynamicBuffer_v1, ReadHandler>& h, + const DefaultCandidate& c) noexcept + -> decltype(Associator<ReadHandler, DefaultCandidate>::get(h.handler_, c)) { - return associated_executor<ReadHandler, Executor>::get(h.handler_, ex); + return Associator<ReadHandler, DefaultCandidate>::get(h.handler_, c); } }; #endif // !defined(GENERATING_DOCUMENTATION) -template <typename AsyncReadStream, - typename DynamicBuffer, typename ReadHandler> -ASIO_INITFN_RESULT_TYPE(ReadHandler, - void (asio::error_code, std::size_t)) -async_read_until(AsyncReadStream& s, - ASIO_MOVE_ARG(DynamicBuffer) buffers, - ASIO_STRING_VIEW_PARAM delim, - ASIO_MOVE_ARG(ReadHandler) handler) +template <typename AsyncReadStream, typename DynamicBuffer_v1, + ASIO_COMPLETION_TOKEN_FOR(void (asio::error_code, + std::size_t)) ReadToken> +inline auto async_read_until(AsyncReadStream& s, DynamicBuffer_v1&& buffers, + ASIO_STRING_VIEW_PARAM delim, ReadToken&& token, + constraint_t< + is_dynamic_buffer_v1<decay_t<DynamicBuffer_v1>>::value + >, + constraint_t< + !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value + >) + -> decltype( + async_initiate<ReadToken, + void (asio::error_code, std::size_t)>( + declval<detail::initiate_async_read_until_delim_string_v1< + AsyncReadStream>>(), + token, static_cast<DynamicBuffer_v1&&>(buffers), + static_cast<std::string>(delim))) { - // If you get an error on the following line it means that your handler does - // not meet the documented type requirements for a ReadHandler. - ASIO_READ_HANDLER_CHECK(ReadHandler, handler) type_check; - - async_completion<ReadHandler, - void (asio::error_code, std::size_t)> init(handler); - - detail::read_until_delim_string_op<AsyncReadStream, - typename decay<DynamicBuffer>::type, - ASIO_HANDLER_TYPE(ReadHandler, - void (asio::error_code, std::size_t))>( - s, ASIO_MOVE_CAST(DynamicBuffer)(buffers), - static_cast<std::string>(delim), - init.completion_handler)(asio::error_code(), 0, 1); - - return init.result.get(); + return async_initiate<ReadToken, + void (asio::error_code, std::size_t)>( + detail::initiate_async_read_until_delim_string_v1<AsyncReadStream>(s), + token, static_cast<DynamicBuffer_v1&&>(buffers), + static_cast<std::string>(delim)); } #if !defined(ASIO_NO_EXTENSIONS) @@ -924,27 +1310,29 @@ async_read_until(AsyncReadStream& s, namespace detail { - template <typename AsyncReadStream, typename DynamicBuffer, + template <typename AsyncReadStream, typename DynamicBuffer_v1, typename RegEx, typename ReadHandler> - class read_until_expr_op + class read_until_expr_op_v1 + : public base_from_cancellation_state<ReadHandler> { public: - template <typename BufferSequence> - read_until_expr_op(AsyncReadStream& stream, - ASIO_MOVE_ARG(BufferSequence) buffers, - const boost::regex& expr, ReadHandler& handler) - : stream_(stream), - buffers_(ASIO_MOVE_CAST(BufferSequence)(buffers)), + template <typename BufferSequence, typename Traits> + read_until_expr_op_v1(AsyncReadStream& stream, BufferSequence&& buffers, + const boost::basic_regex<char, Traits>& expr, ReadHandler& handler) + : base_from_cancellation_state<ReadHandler>( + handler, enable_partial_cancellation()), + stream_(stream), + buffers_(static_cast<BufferSequence&&>(buffers)), expr_(expr), start_(0), search_position_(0), - handler_(ASIO_MOVE_CAST(ReadHandler)(handler)) + handler_(static_cast<ReadHandler&&>(handler)) { } -#if defined(ASIO_HAS_MOVE) - read_until_expr_op(const read_until_expr_op& other) - : stream_(other.stream_), + read_until_expr_op_v1(const read_until_expr_op_v1& other) + : base_from_cancellation_state<ReadHandler>(other), + stream_(other.stream_), buffers_(other.buffers_), expr_(other.expr_), start_(other.start_), @@ -953,18 +1341,19 @@ namespace detail { } - read_until_expr_op(read_until_expr_op&& other) - : stream_(other.stream_), - buffers_(ASIO_MOVE_CAST(DynamicBuffer)(other.buffers_)), + read_until_expr_op_v1(read_until_expr_op_v1&& other) + : base_from_cancellation_state<ReadHandler>( + static_cast<base_from_cancellation_state<ReadHandler>&&>(other)), + stream_(other.stream_), + buffers_(static_cast<DynamicBuffer_v1&&>(other.buffers_)), expr_(other.expr_), start_(other.start_), search_position_(other.search_position_), - handler_(ASIO_MOVE_CAST(ReadHandler)(other.handler_)) + handler_(static_cast<ReadHandler&&>(other.handler_)) { } -#endif // defined(ASIO_HAS_MOVE) - void operator()(const asio::error_code& ec, + void operator()(asio::error_code ec, std::size_t bytes_transferred, int start = 0) { const std::size_t not_found = (std::numeric_limits<std::size_t>::max)(); @@ -976,7 +1365,7 @@ namespace detail { { // Determine the range of the data to be searched. - typedef typename DynamicBuffer::const_buffers_type + typedef typename DynamicBuffer_v1::const_buffers_type buffers_type; typedef buffers_iterator<buffers_type> iterator; buffers_type data_buffers = buffers_.data(); @@ -986,10 +1375,10 @@ namespace detail // Look for a match. boost::match_results<iterator, - typename std::vector<boost::sub_match<iterator> >::allocator_type> + typename std::vector<boost::sub_match<iterator>>::allocator_type> match_results; - bool match = regex_search(start_pos, end, match_results, expr_, - boost::match_default | boost::match_partial); + bool match = regex_search(start_pos, end, + match_results, expr_, regex_match_flags()); if (match && match_results[0].matched) { // Full match. We're done. @@ -1032,12 +1421,21 @@ namespace detail break; // Start a new asynchronous read operation to obtain more data. - stream_.async_read_some(buffers_.prepare(bytes_to_read), - ASIO_MOVE_CAST(read_until_expr_op)(*this)); + { + ASIO_HANDLER_LOCATION(( + __FILE__, __LINE__, "async_read_until")); + stream_.async_read_some(buffers_.prepare(bytes_to_read), + static_cast<read_until_expr_op_v1&&>(*this)); + } return; default: buffers_.commit(bytes_transferred); if (ec || bytes_transferred == 0) break; + if (this->cancelled() != cancellation_type::none) + { + ec = error::operation_aborted; + break; + } } const asio::error_code result_ec = @@ -1048,162 +1446,148 @@ namespace detail (ec || search_position_ == not_found) ? 0 : search_position_; - handler_(result_ec, result_n); + static_cast<ReadHandler&&>(handler_)(result_ec, result_n); } } //private: AsyncReadStream& stream_; - DynamicBuffer buffers_; + DynamicBuffer_v1 buffers_; RegEx expr_; int start_; std::size_t search_position_; ReadHandler handler_; }; - template <typename AsyncReadStream, typename DynamicBuffer, - typename RegEx, typename ReadHandler> - inline void* asio_handler_allocate(std::size_t size, - read_until_expr_op<AsyncReadStream, - DynamicBuffer, RegEx, ReadHandler>* this_handler) - { - return asio_handler_alloc_helpers::allocate( - size, this_handler->handler_); - } - - template <typename AsyncReadStream, typename DynamicBuffer, - typename RegEx, typename ReadHandler> - inline void asio_handler_deallocate(void* pointer, std::size_t size, - read_until_expr_op<AsyncReadStream, - DynamicBuffer, RegEx, ReadHandler>* this_handler) - { - asio_handler_alloc_helpers::deallocate( - pointer, size, this_handler->handler_); - } - - template <typename AsyncReadStream, typename DynamicBuffer, + template <typename AsyncReadStream, typename DynamicBuffer_v1, typename RegEx, typename ReadHandler> inline bool asio_handler_is_continuation( - read_until_expr_op<AsyncReadStream, - DynamicBuffer, RegEx, ReadHandler>* this_handler) + read_until_expr_op_v1<AsyncReadStream, + DynamicBuffer_v1, RegEx, ReadHandler>* this_handler) { return this_handler->start_ == 0 ? true : asio_handler_cont_helpers::is_continuation( this_handler->handler_); } - template <typename Function, typename AsyncReadStream, - typename DynamicBuffer, typename RegEx, typename ReadHandler> - inline void asio_handler_invoke(Function& function, - read_until_expr_op<AsyncReadStream, - DynamicBuffer, RegEx, ReadHandler>* this_handler) + template <typename AsyncReadStream> + class initiate_async_read_until_expr_v1 { - asio_handler_invoke_helpers::invoke( - function, this_handler->handler_); - } + public: + typedef typename AsyncReadStream::executor_type executor_type; - template <typename Function, typename AsyncReadStream, - typename DynamicBuffer, typename RegEx, typename ReadHandler> - inline void asio_handler_invoke(const Function& function, - read_until_expr_op<AsyncReadStream, - DynamicBuffer, RegEx, ReadHandler>* this_handler) - { - asio_handler_invoke_helpers::invoke( - function, this_handler->handler_); - } + explicit initiate_async_read_until_expr_v1(AsyncReadStream& stream) + : stream_(stream) + { + } + + executor_type get_executor() const noexcept + { + return stream_.get_executor(); + } + + template <typename ReadHandler, typename DynamicBuffer_v1, typename RegEx> + void operator()(ReadHandler&& handler, + DynamicBuffer_v1&& buffers, const RegEx& expr) const + { + // If you get an error on the following line it means that your handler + // does not meet the documented type requirements for a ReadHandler. + ASIO_READ_HANDLER_CHECK(ReadHandler, handler) type_check; + + non_const_lvalue<ReadHandler> handler2(handler); + read_until_expr_op_v1<AsyncReadStream, + decay_t<DynamicBuffer_v1>, + RegEx, decay_t<ReadHandler>>( + stream_, static_cast<DynamicBuffer_v1&&>(buffers), + expr, handler2.value)(asio::error_code(), 0, 1); + } + + private: + AsyncReadStream& stream_; + }; } // namespace detail #if !defined(GENERATING_DOCUMENTATION) -template <typename AsyncReadStream, typename DynamicBuffer, - typename RegEx, typename ReadHandler, typename Allocator> -struct associated_allocator< - detail::read_until_expr_op<AsyncReadStream, - DynamicBuffer, RegEx, ReadHandler>, - Allocator> +template <template <typename, typename> class Associator, + typename AsyncReadStream, typename DynamicBuffer_v1, + typename RegEx, typename ReadHandler, typename DefaultCandidate> +struct associator<Associator, + detail::read_until_expr_op_v1<AsyncReadStream, + DynamicBuffer_v1, RegEx, ReadHandler>, + DefaultCandidate> + : Associator<ReadHandler, DefaultCandidate> { - typedef typename associated_allocator<ReadHandler, Allocator>::type type; - - static type get( - const detail::read_until_expr_op<AsyncReadStream, - DynamicBuffer, RegEx, ReadHandler>& h, - const Allocator& a = Allocator()) ASIO_NOEXCEPT + static typename Associator<ReadHandler, DefaultCandidate>::type get( + const detail::read_until_expr_op_v1<AsyncReadStream, + DynamicBuffer_v1, RegEx, ReadHandler>& h) noexcept { - return associated_allocator<ReadHandler, Allocator>::get(h.handler_, a); + return Associator<ReadHandler, DefaultCandidate>::get(h.handler_); } -}; -template <typename AsyncReadStream, typename DynamicBuffer, - typename RegEx, typename ReadHandler, typename Executor> -struct associated_executor< - detail::read_until_expr_op<AsyncReadStream, - DynamicBuffer, RegEx, ReadHandler>, - Executor> -{ - typedef typename associated_executor<ReadHandler, Executor>::type type; - - static type get( - const detail::read_until_expr_op<AsyncReadStream, - DynamicBuffer, RegEx, ReadHandler>& h, - const Executor& ex = Executor()) ASIO_NOEXCEPT + static auto get( + const detail::read_until_expr_op_v1<AsyncReadStream, + DynamicBuffer_v1, RegEx, ReadHandler>& h, + const DefaultCandidate& c) noexcept + -> decltype(Associator<ReadHandler, DefaultCandidate>::get(h.handler_, c)) { - return associated_executor<ReadHandler, Executor>::get(h.handler_, ex); + return Associator<ReadHandler, DefaultCandidate>::get(h.handler_, c); } }; #endif // !defined(GENERATING_DOCUMENTATION) -template <typename AsyncReadStream, - typename DynamicBuffer, typename ReadHandler> -ASIO_INITFN_RESULT_TYPE(ReadHandler, - void (asio::error_code, std::size_t)) -async_read_until(AsyncReadStream& s, - ASIO_MOVE_ARG(DynamicBuffer) buffers, - const boost::regex& expr, - ASIO_MOVE_ARG(ReadHandler) handler) +template <typename AsyncReadStream, typename DynamicBuffer_v1, typename Traits, + ASIO_COMPLETION_TOKEN_FOR(void (asio::error_code, + std::size_t)) ReadToken> +inline auto async_read_until(AsyncReadStream& s, DynamicBuffer_v1&& buffers, + const boost::basic_regex<char, Traits>& expr, ReadToken&& token, + constraint_t< + is_dynamic_buffer_v1<decay_t<DynamicBuffer_v1>>::value + >, + constraint_t< + !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value + >) + -> decltype( + async_initiate<ReadToken, + void (asio::error_code, std::size_t)>( + declval<detail::initiate_async_read_until_expr_v1<AsyncReadStream>>(), + token, static_cast<DynamicBuffer_v1&&>(buffers), expr)) { - // If you get an error on the following line it means that your handler does - // not meet the documented type requirements for a ReadHandler. - ASIO_READ_HANDLER_CHECK(ReadHandler, handler) type_check; - - async_completion<ReadHandler, - void (asio::error_code, std::size_t)> init(handler); - - detail::read_until_expr_op<AsyncReadStream, - typename decay<DynamicBuffer>::type, - boost::regex, ASIO_HANDLER_TYPE(ReadHandler, - void (asio::error_code, std::size_t))>( - s, ASIO_MOVE_CAST(DynamicBuffer)(buffers), - expr, init.completion_handler)(asio::error_code(), 0, 1); - - return init.result.get(); + return async_initiate<ReadToken, + void (asio::error_code, std::size_t)>( + detail::initiate_async_read_until_expr_v1<AsyncReadStream>(s), + token, static_cast<DynamicBuffer_v1&&>(buffers), expr); } #endif // defined(ASIO_HAS_BOOST_REGEX) namespace detail { - template <typename AsyncReadStream, typename DynamicBuffer, + template <typename AsyncReadStream, typename DynamicBuffer_v1, typename MatchCondition, typename ReadHandler> - class read_until_match_op + class read_until_match_op_v1 + : public base_from_cancellation_state<ReadHandler> { public: template <typename BufferSequence> - read_until_match_op(AsyncReadStream& stream, - ASIO_MOVE_ARG(BufferSequence) buffers, + read_until_match_op_v1(AsyncReadStream& stream, + BufferSequence&& buffers, MatchCondition match_condition, ReadHandler& handler) - : stream_(stream), - buffers_(ASIO_MOVE_CAST(BufferSequence)(buffers)), + : base_from_cancellation_state<ReadHandler>( + handler, enable_partial_cancellation()), + stream_(stream), + buffers_(static_cast<BufferSequence&&>(buffers)), match_condition_(match_condition), start_(0), search_position_(0), - handler_(ASIO_MOVE_CAST(ReadHandler)(handler)) + handler_(static_cast<ReadHandler&&>(handler)) { } -#if defined(ASIO_HAS_MOVE) - read_until_match_op(const read_until_match_op& other) - : stream_(other.stream_), + read_until_match_op_v1(const read_until_match_op_v1& other) + : base_from_cancellation_state<ReadHandler>(other), + stream_(other.stream_), buffers_(other.buffers_), match_condition_(other.match_condition_), start_(other.start_), @@ -1212,18 +1596,19 @@ namespace detail { } - read_until_match_op(read_until_match_op&& other) - : stream_(other.stream_), - buffers_(ASIO_MOVE_CAST(DynamicBuffer)(other.buffers_)), + read_until_match_op_v1(read_until_match_op_v1&& other) + : base_from_cancellation_state<ReadHandler>( + static_cast<base_from_cancellation_state<ReadHandler>&&>(other)), + stream_(other.stream_), + buffers_(static_cast<DynamicBuffer_v1&&>(other.buffers_)), match_condition_(other.match_condition_), start_(other.start_), search_position_(other.search_position_), - handler_(ASIO_MOVE_CAST(ReadHandler)(other.handler_)) + handler_(static_cast<ReadHandler&&>(other.handler_)) { } -#endif // defined(ASIO_HAS_MOVE) - void operator()(const asio::error_code& ec, + void operator()(asio::error_code ec, std::size_t bytes_transferred, int start = 0) { const std::size_t not_found = (std::numeric_limits<std::size_t>::max)(); @@ -1235,7 +1620,7 @@ namespace detail { { // Determine the range of the data to be searched. - typedef typename DynamicBuffer::const_buffers_type + typedef typename DynamicBuffer_v1::const_buffers_type buffers_type; typedef buffers_iterator<buffers_type> iterator; buffers_type data_buffers = buffers_.data(); @@ -1287,12 +1672,21 @@ namespace detail break; // Start a new asynchronous read operation to obtain more data. - stream_.async_read_some(buffers_.prepare(bytes_to_read), - ASIO_MOVE_CAST(read_until_match_op)(*this)); + { + ASIO_HANDLER_LOCATION(( + __FILE__, __LINE__, "async_read_until")); + stream_.async_read_some(buffers_.prepare(bytes_to_read), + static_cast<read_until_match_op_v1&&>(*this)); + } return; default: buffers_.commit(bytes_transferred); if (ec || bytes_transferred == 0) break; + if (this->cancelled() != cancellation_type::none) + { + ec = error::operation_aborted; + break; + } } const asio::error_code result_ec = @@ -1303,194 +1697,1241 @@ namespace detail (ec || search_position_ == not_found) ? 0 : search_position_; - handler_(result_ec, result_n); + static_cast<ReadHandler&&>(handler_)(result_ec, result_n); } } //private: AsyncReadStream& stream_; - DynamicBuffer buffers_; + DynamicBuffer_v1 buffers_; MatchCondition match_condition_; int start_; std::size_t search_position_; ReadHandler handler_; }; - template <typename AsyncReadStream, typename DynamicBuffer, + template <typename AsyncReadStream, typename DynamicBuffer_v1, typename MatchCondition, typename ReadHandler> - inline void* asio_handler_allocate(std::size_t size, - read_until_match_op<AsyncReadStream, DynamicBuffer, + inline bool asio_handler_is_continuation( + read_until_match_op_v1<AsyncReadStream, DynamicBuffer_v1, MatchCondition, ReadHandler>* this_handler) { - return asio_handler_alloc_helpers::allocate( - size, this_handler->handler_); + return this_handler->start_ == 0 ? true + : asio_handler_cont_helpers::is_continuation( + this_handler->handler_); } - template <typename AsyncReadStream, typename DynamicBuffer, - typename MatchCondition, typename ReadHandler> - inline void asio_handler_deallocate(void* pointer, std::size_t size, - read_until_match_op<AsyncReadStream, DynamicBuffer, - MatchCondition, ReadHandler>* this_handler) + template <typename AsyncReadStream> + class initiate_async_read_until_match_v1 { - asio_handler_alloc_helpers::deallocate( - pointer, size, this_handler->handler_); + public: + typedef typename AsyncReadStream::executor_type executor_type; + + explicit initiate_async_read_until_match_v1(AsyncReadStream& stream) + : stream_(stream) + { + } + + executor_type get_executor() const noexcept + { + return stream_.get_executor(); + } + + template <typename ReadHandler, + typename DynamicBuffer_v1, typename MatchCondition> + void operator()(ReadHandler&& handler, + DynamicBuffer_v1&& buffers, + MatchCondition match_condition) const + { + // If you get an error on the following line it means that your handler + // does not meet the documented type requirements for a ReadHandler. + ASIO_READ_HANDLER_CHECK(ReadHandler, handler) type_check; + + non_const_lvalue<ReadHandler> handler2(handler); + read_until_match_op_v1<AsyncReadStream, + decay_t<DynamicBuffer_v1>, + MatchCondition, decay_t<ReadHandler>>( + stream_, static_cast<DynamicBuffer_v1&&>(buffers), + match_condition, handler2.value)(asio::error_code(), 0, 1); + } + + private: + AsyncReadStream& stream_; + }; +} // namespace detail + +#if !defined(GENERATING_DOCUMENTATION) + +template <template <typename, typename> class Associator, + typename AsyncReadStream, typename DynamicBuffer_v1, + typename MatchCondition, typename ReadHandler, typename DefaultCandidate> +struct associator<Associator, + detail::read_until_match_op_v1<AsyncReadStream, + DynamicBuffer_v1, MatchCondition, ReadHandler>, + DefaultCandidate> + : Associator<ReadHandler, DefaultCandidate> +{ + static typename Associator<ReadHandler, DefaultCandidate>::type get( + const detail::read_until_match_op_v1<AsyncReadStream, + DynamicBuffer_v1, MatchCondition, ReadHandler>& h) noexcept + { + return Associator<ReadHandler, DefaultCandidate>::get(h.handler_); } - template <typename AsyncReadStream, typename DynamicBuffer, - typename MatchCondition, typename ReadHandler> + static auto get( + const detail::read_until_match_op_v1<AsyncReadStream, + DynamicBuffer_v1, MatchCondition, ReadHandler>& h, + const DefaultCandidate& c) noexcept + -> decltype(Associator<ReadHandler, DefaultCandidate>::get(h.handler_, c)) + { + return Associator<ReadHandler, DefaultCandidate>::get(h.handler_, c); + } +}; + +#endif // !defined(GENERATING_DOCUMENTATION) + +template <typename AsyncReadStream, + typename DynamicBuffer_v1, typename MatchCondition, + ASIO_COMPLETION_TOKEN_FOR(void (asio::error_code, + std::size_t)) ReadToken> +inline auto async_read_until(AsyncReadStream& s, DynamicBuffer_v1&& buffers, + MatchCondition match_condition, ReadToken&& token, + constraint_t< + is_match_condition<MatchCondition>::value + >, + constraint_t< + is_dynamic_buffer_v1<decay_t<DynamicBuffer_v1>>::value + >, + constraint_t< + !is_dynamic_buffer_v2<decay_t<DynamicBuffer_v1>>::value + >) + -> decltype( + async_initiate<ReadToken, + void (asio::error_code, std::size_t)>( + declval<detail::initiate_async_read_until_match_v1<AsyncReadStream>>(), + token, static_cast<DynamicBuffer_v1&&>(buffers), + match_condition)) +{ + return async_initiate<ReadToken, + void (asio::error_code, std::size_t)>( + detail::initiate_async_read_until_match_v1<AsyncReadStream>(s), + token, static_cast<DynamicBuffer_v1&&>(buffers), + match_condition); +} + +#if !defined(ASIO_NO_IOSTREAM) + +template <typename AsyncReadStream, typename Allocator, + ASIO_COMPLETION_TOKEN_FOR(void (asio::error_code, + std::size_t)) ReadToken> +inline auto async_read_until(AsyncReadStream& s, + asio::basic_streambuf<Allocator>& b, char delim, ReadToken&& token) + -> decltype( + async_initiate<ReadToken, + void (asio::error_code, std::size_t)>( + declval<detail::initiate_async_read_until_delim_v1<AsyncReadStream>>(), + token, basic_streambuf_ref<Allocator>(b), delim)) +{ + return async_initiate<ReadToken, + void (asio::error_code, std::size_t)>( + detail::initiate_async_read_until_delim_v1<AsyncReadStream>(s), + token, basic_streambuf_ref<Allocator>(b), delim); +} + +template <typename AsyncReadStream, typename Allocator, + ASIO_COMPLETION_TOKEN_FOR(void (asio::error_code, + std::size_t)) ReadToken> +inline auto async_read_until(AsyncReadStream& s, + asio::basic_streambuf<Allocator>& b, + ASIO_STRING_VIEW_PARAM delim, ReadToken&& token) + -> decltype( + async_initiate<ReadToken, + void (asio::error_code, std::size_t)>( + declval<detail::initiate_async_read_until_delim_string_v1< + AsyncReadStream>>(), + token, basic_streambuf_ref<Allocator>(b), + static_cast<std::string>(delim))) +{ + return async_initiate<ReadToken, + void (asio::error_code, std::size_t)>( + detail::initiate_async_read_until_delim_string_v1<AsyncReadStream>(s), + token, basic_streambuf_ref<Allocator>(b), + static_cast<std::string>(delim)); +} + +#if defined(ASIO_HAS_BOOST_REGEX) + +template <typename AsyncReadStream, typename Allocator, typename Traits, + ASIO_COMPLETION_TOKEN_FOR(void (asio::error_code, + std::size_t)) ReadToken> +inline auto async_read_until(AsyncReadStream& s, + asio::basic_streambuf<Allocator>& b, + const boost::basic_regex<char, Traits>& expr, ReadToken&& token) + -> decltype( + async_initiate<ReadToken, + void (asio::error_code, std::size_t)>( + declval<detail::initiate_async_read_until_expr_v1<AsyncReadStream>>(), + token, basic_streambuf_ref<Allocator>(b), expr)) +{ + return async_initiate<ReadToken, + void (asio::error_code, std::size_t)>( + detail::initiate_async_read_until_expr_v1<AsyncReadStream>(s), + token, basic_streambuf_ref<Allocator>(b), expr); +} + +#endif // defined(ASIO_HAS_BOOST_REGEX) + +template <typename AsyncReadStream, typename Allocator, typename MatchCondition, + ASIO_COMPLETION_TOKEN_FOR(void (asio::error_code, + std::size_t)) ReadToken> +inline auto async_read_until(AsyncReadStream& s, + asio::basic_streambuf<Allocator>& b, + MatchCondition match_condition, ReadToken&& token, + constraint_t<is_match_condition<MatchCondition>::value>) + -> decltype( + async_initiate<ReadToken, + void (asio::error_code, std::size_t)>( + declval<detail::initiate_async_read_until_match_v1<AsyncReadStream>>(), + token, basic_streambuf_ref<Allocator>(b), match_condition)) +{ + return async_initiate<ReadToken, + void (asio::error_code, std::size_t)>( + detail::initiate_async_read_until_match_v1<AsyncReadStream>(s), + token, basic_streambuf_ref<Allocator>(b), match_condition); +} + +#endif // !defined(ASIO_NO_IOSTREAM) +#endif // !defined(ASIO_NO_EXTENSIONS) +#endif // !defined(ASIO_NO_DYNAMIC_BUFFER_V1) + +namespace detail +{ + template <typename AsyncReadStream, + typename DynamicBuffer_v2, typename ReadHandler> + class read_until_delim_op_v2 + : public base_from_cancellation_state<ReadHandler> + { + public: + template <typename BufferSequence> + read_until_delim_op_v2(AsyncReadStream& stream, + BufferSequence&& buffers, + char delim, ReadHandler& handler) + : base_from_cancellation_state<ReadHandler>( + handler, enable_partial_cancellation()), + stream_(stream), + buffers_(static_cast<BufferSequence&&>(buffers)), + delim_(delim), + start_(0), + search_position_(0), + bytes_to_read_(0), + handler_(static_cast<ReadHandler&&>(handler)) + { + } + + read_until_delim_op_v2(const read_until_delim_op_v2& other) + : base_from_cancellation_state<ReadHandler>(other), + stream_(other.stream_), + buffers_(other.buffers_), + delim_(other.delim_), + start_(other.start_), + search_position_(other.search_position_), + bytes_to_read_(other.bytes_to_read_), + handler_(other.handler_) + { + } + + read_until_delim_op_v2(read_until_delim_op_v2&& other) + : base_from_cancellation_state<ReadHandler>( + static_cast<base_from_cancellation_state<ReadHandler>&&>(other)), + stream_(other.stream_), + buffers_(static_cast<DynamicBuffer_v2&&>(other.buffers_)), + delim_(other.delim_), + start_(other.start_), + search_position_(other.search_position_), + bytes_to_read_(other.bytes_to_read_), + handler_(static_cast<ReadHandler&&>(other.handler_)) + { + } + + void operator()(asio::error_code ec, + std::size_t bytes_transferred, int start = 0) + { + const std::size_t not_found = (std::numeric_limits<std::size_t>::max)(); + std::size_t pos; + switch (start_ = start) + { + case 1: + for (;;) + { + { + // Determine the range of the data to be searched. + typedef typename DynamicBuffer_v2::const_buffers_type + buffers_type; + typedef buffers_iterator<buffers_type> iterator; + buffers_type data_buffers = + const_cast<const DynamicBuffer_v2&>(buffers_).data( + 0, buffers_.size()); + iterator begin = iterator::begin(data_buffers); + iterator start_pos = begin + search_position_; + iterator end = iterator::end(data_buffers); + + // Look for a match. + iterator iter = std::find(start_pos, end, delim_); + if (iter != end) + { + // Found a match. We're done. + search_position_ = iter - begin + 1; + bytes_to_read_ = 0; + } + + // No match yet. Check if buffer is full. + else if (buffers_.size() == buffers_.max_size()) + { + search_position_ = not_found; + bytes_to_read_ = 0; + } + + // Need to read some more data. + else + { + // Next search can start with the new data. + search_position_ = end - begin; + bytes_to_read_ = std::min<std::size_t>( + std::max<std::size_t>(512, + buffers_.capacity() - buffers_.size()), + std::min<std::size_t>(65536, + buffers_.max_size() - buffers_.size())); + } + } + + // Check if we're done. + if (!start && bytes_to_read_ == 0) + break; + + // Start a new asynchronous read operation to obtain more data. + pos = buffers_.size(); + buffers_.grow(bytes_to_read_); + { + ASIO_HANDLER_LOCATION(( + __FILE__, __LINE__, "async_read_until")); + stream_.async_read_some(buffers_.data(pos, bytes_to_read_), + static_cast<read_until_delim_op_v2&&>(*this)); + } + return; default: + buffers_.shrink(bytes_to_read_ - bytes_transferred); + if (ec || bytes_transferred == 0) + break; + if (this->cancelled() != cancellation_type::none) + { + ec = error::operation_aborted; + break; + } + } + + const asio::error_code result_ec = + (search_position_ == not_found) + ? error::not_found : ec; + + const std::size_t result_n = + (ec || search_position_ == not_found) + ? 0 : search_position_; + + static_cast<ReadHandler&&>(handler_)(result_ec, result_n); + } + } + + //private: + AsyncReadStream& stream_; + DynamicBuffer_v2 buffers_; + char delim_; + int start_; + std::size_t search_position_; + std::size_t bytes_to_read_; + ReadHandler handler_; + }; + + template <typename AsyncReadStream, + typename DynamicBuffer_v2, typename ReadHandler> inline bool asio_handler_is_continuation( - read_until_match_op<AsyncReadStream, DynamicBuffer, - MatchCondition, ReadHandler>* this_handler) + read_until_delim_op_v2<AsyncReadStream, + DynamicBuffer_v2, ReadHandler>* this_handler) { return this_handler->start_ == 0 ? true : asio_handler_cont_helpers::is_continuation( this_handler->handler_); } - template <typename Function, typename AsyncReadStream, - typename DynamicBuffer, typename MatchCondition, - typename ReadHandler> - inline void asio_handler_invoke(Function& function, - read_until_match_op<AsyncReadStream, DynamicBuffer, - MatchCondition, ReadHandler>* this_handler) + template <typename AsyncReadStream> + class initiate_async_read_until_delim_v2 { - asio_handler_invoke_helpers::invoke( - function, this_handler->handler_); - } + public: + typedef typename AsyncReadStream::executor_type executor_type; - template <typename Function, typename AsyncReadStream, - typename DynamicBuffer, typename MatchCondition, - typename ReadHandler> - inline void asio_handler_invoke(const Function& function, - read_until_match_op<AsyncReadStream, DynamicBuffer, - MatchCondition, ReadHandler>* this_handler) - { - asio_handler_invoke_helpers::invoke( - function, this_handler->handler_); - } + explicit initiate_async_read_until_delim_v2(AsyncReadStream& stream) + : stream_(stream) + { + } + + executor_type get_executor() const noexcept + { + return stream_.get_executor(); + } + + template <typename ReadHandler, typename DynamicBuffer_v2> + void operator()(ReadHandler&& handler, + DynamicBuffer_v2&& buffers, char delim) const + { + // If you get an error on the following line it means that your handler + // does not meet the documented type requirements for a ReadHandler. + ASIO_READ_HANDLER_CHECK(ReadHandler, handler) type_check; + + non_const_lvalue<ReadHandler> handler2(handler); + read_until_delim_op_v2<AsyncReadStream, + decay_t<DynamicBuffer_v2>, + decay_t<ReadHandler>>( + stream_, static_cast<DynamicBuffer_v2&&>(buffers), + delim, handler2.value)(asio::error_code(), 0, 1); + } + + private: + AsyncReadStream& stream_; + }; } // namespace detail #if !defined(GENERATING_DOCUMENTATION) -template <typename AsyncReadStream, typename DynamicBuffer, - typename MatchCondition, typename ReadHandler, typename Allocator> -struct associated_allocator< - detail::read_until_match_op<AsyncReadStream, - DynamicBuffer, MatchCondition, ReadHandler>, - Allocator> +template <template <typename, typename> class Associator, + typename AsyncReadStream, typename DynamicBuffer_v2, + typename ReadHandler, typename DefaultCandidate> +struct associator<Associator, + detail::read_until_delim_op_v2<AsyncReadStream, + DynamicBuffer_v2, ReadHandler>, + DefaultCandidate> + : Associator<ReadHandler, DefaultCandidate> { - typedef typename associated_allocator<ReadHandler, Allocator>::type type; + static typename Associator<ReadHandler, DefaultCandidate>::type get( + const detail::read_until_delim_op_v2<AsyncReadStream, + DynamicBuffer_v2, ReadHandler>& h) noexcept + { + return Associator<ReadHandler, DefaultCandidate>::get(h.handler_); + } - static type get( - const detail::read_until_match_op<AsyncReadStream, - DynamicBuffer, MatchCondition, ReadHandler>& h, - const Allocator& a = Allocator()) ASIO_NOEXCEPT + static auto get( + const detail::read_until_delim_op_v2<AsyncReadStream, + DynamicBuffer_v2, ReadHandler>& h, + const DefaultCandidate& c) noexcept + -> decltype(Associator<ReadHandler, DefaultCandidate>::get(h.handler_, c)) { - return associated_allocator<ReadHandler, Allocator>::get(h.handler_, a); + return Associator<ReadHandler, DefaultCandidate>::get(h.handler_, c); } }; -template <typename AsyncReadStream, typename DynamicBuffer, - typename MatchCondition, typename ReadHandler, typename Executor> -struct associated_executor< - detail::read_until_match_op<AsyncReadStream, - DynamicBuffer, MatchCondition, ReadHandler>, - Executor> +#endif // !defined(GENERATING_DOCUMENTATION) + +template <typename AsyncReadStream, typename DynamicBuffer_v2, + ASIO_COMPLETION_TOKEN_FOR(void (asio::error_code, + std::size_t)) ReadToken> +inline auto async_read_until(AsyncReadStream& s, + DynamicBuffer_v2 buffers, char delim, ReadToken&& token, + constraint_t< + is_dynamic_buffer_v2<DynamicBuffer_v2>::value + >) + -> decltype( + async_initiate<ReadToken, + void (asio::error_code, std::size_t)>( + declval<detail::initiate_async_read_until_delim_v2<AsyncReadStream>>(), + token, static_cast<DynamicBuffer_v2&&>(buffers), delim)) { - typedef typename associated_executor<ReadHandler, Executor>::type type; + return async_initiate<ReadToken, + void (asio::error_code, std::size_t)>( + detail::initiate_async_read_until_delim_v2<AsyncReadStream>(s), + token, static_cast<DynamicBuffer_v2&&>(buffers), delim); +} - static type get( - const detail::read_until_match_op<AsyncReadStream, - DynamicBuffer, MatchCondition, ReadHandler>& h, - const Executor& ex = Executor()) ASIO_NOEXCEPT +namespace detail +{ + template <typename AsyncReadStream, + typename DynamicBuffer_v2, typename ReadHandler> + class read_until_delim_string_op_v2 + : public base_from_cancellation_state<ReadHandler> { - return associated_executor<ReadHandler, Executor>::get(h.handler_, ex); + public: + template <typename BufferSequence> + read_until_delim_string_op_v2(AsyncReadStream& stream, + BufferSequence&& buffers, + const std::string& delim, ReadHandler& handler) + : base_from_cancellation_state<ReadHandler>( + handler, enable_partial_cancellation()), + stream_(stream), + buffers_(static_cast<BufferSequence&&>(buffers)), + delim_(delim), + start_(0), + search_position_(0), + bytes_to_read_(0), + handler_(static_cast<ReadHandler&&>(handler)) + { + } + + read_until_delim_string_op_v2(const read_until_delim_string_op_v2& other) + : base_from_cancellation_state<ReadHandler>(other), + stream_(other.stream_), + buffers_(other.buffers_), + delim_(other.delim_), + start_(other.start_), + search_position_(other.search_position_), + bytes_to_read_(other.bytes_to_read_), + handler_(other.handler_) + { + } + + read_until_delim_string_op_v2(read_until_delim_string_op_v2&& other) + : base_from_cancellation_state<ReadHandler>( + static_cast<base_from_cancellation_state<ReadHandler>&&>(other)), + stream_(other.stream_), + buffers_(static_cast<DynamicBuffer_v2&&>(other.buffers_)), + delim_(static_cast<std::string&&>(other.delim_)), + start_(other.start_), + search_position_(other.search_position_), + bytes_to_read_(other.bytes_to_read_), + handler_(static_cast<ReadHandler&&>(other.handler_)) + { + } + + void operator()(asio::error_code ec, + std::size_t bytes_transferred, int start = 0) + { + const std::size_t not_found = (std::numeric_limits<std::size_t>::max)(); + std::size_t pos; + switch (start_ = start) + { + case 1: + for (;;) + { + { + // Determine the range of the data to be searched. + typedef typename DynamicBuffer_v2::const_buffers_type + buffers_type; + typedef buffers_iterator<buffers_type> iterator; + buffers_type data_buffers = + const_cast<const DynamicBuffer_v2&>(buffers_).data( + 0, buffers_.size()); + iterator begin = iterator::begin(data_buffers); + iterator start_pos = begin + search_position_; + iterator end = iterator::end(data_buffers); + + // Look for a match. + std::pair<iterator, bool> result = detail::partial_search( + start_pos, end, delim_.begin(), delim_.end()); + if (result.first != end && result.second) + { + // Full match. We're done. + search_position_ = result.first - begin + delim_.length(); + bytes_to_read_ = 0; + } + + // No match yet. Check if buffer is full. + else if (buffers_.size() == buffers_.max_size()) + { + search_position_ = not_found; + bytes_to_read_ = 0; + } + + // Need to read some more data. + else + { + if (result.first != end) + { + // Partial match. Next search needs to start from beginning of + // match. + search_position_ = result.first - begin; + } + else + { + // Next search can start with the new data. + search_position_ = end - begin; + } + + bytes_to_read_ = std::min<std::size_t>( + std::max<std::size_t>(512, + buffers_.capacity() - buffers_.size()), + std::min<std::size_t>(65536, + buffers_.max_size() - buffers_.size())); + } + } + + // Check if we're done. + if (!start && bytes_to_read_ == 0) + break; + + // Start a new asynchronous read operation to obtain more data. + pos = buffers_.size(); + buffers_.grow(bytes_to_read_); + { + ASIO_HANDLER_LOCATION(( + __FILE__, __LINE__, "async_read_until")); + stream_.async_read_some(buffers_.data(pos, bytes_to_read_), + static_cast<read_until_delim_string_op_v2&&>(*this)); + } + return; default: + buffers_.shrink(bytes_to_read_ - bytes_transferred); + if (ec || bytes_transferred == 0) + break; + if (this->cancelled() != cancellation_type::none) + { + ec = error::operation_aborted; + break; + } + } + + const asio::error_code result_ec = + (search_position_ == not_found) + ? error::not_found : ec; + + const std::size_t result_n = + (ec || search_position_ == not_found) + ? 0 : search_position_; + + static_cast<ReadHandler&&>(handler_)(result_ec, result_n); + } + } + + //private: + AsyncReadStream& stream_; + DynamicBuffer_v2 buffers_; + std::string delim_; + int start_; + std::size_t search_position_; + std::size_t bytes_to_read_; + ReadHandler handler_; + }; + + template <typename AsyncReadStream, + typename DynamicBuffer_v2, typename ReadHandler> + inline bool asio_handler_is_continuation( + read_until_delim_string_op_v2<AsyncReadStream, + DynamicBuffer_v2, ReadHandler>* this_handler) + { + return this_handler->start_ == 0 ? true + : asio_handler_cont_helpers::is_continuation( + this_handler->handler_); + } + + template <typename AsyncReadStream> + class initiate_async_read_until_delim_string_v2 + { + public: + typedef typename AsyncReadStream::executor_type executor_type; + + explicit initiate_async_read_until_delim_string_v2(AsyncReadStream& stream) + : stream_(stream) + { + } + + executor_type get_executor() const noexcept + { + return stream_.get_executor(); + } + + template <typename ReadHandler, typename DynamicBuffer_v2> + void operator()(ReadHandler&& handler, + DynamicBuffer_v2&& buffers, + const std::string& delim) const + { + // If you get an error on the following line it means that your handler + // does not meet the documented type requirements for a ReadHandler. + ASIO_READ_HANDLER_CHECK(ReadHandler, handler) type_check; + + non_const_lvalue<ReadHandler> handler2(handler); + read_until_delim_string_op_v2<AsyncReadStream, + decay_t<DynamicBuffer_v2>, + decay_t<ReadHandler>>( + stream_, static_cast<DynamicBuffer_v2&&>(buffers), + delim, handler2.value)(asio::error_code(), 0, 1); + } + + private: + AsyncReadStream& stream_; + }; +} // namespace detail + +#if !defined(GENERATING_DOCUMENTATION) + +template <template <typename, typename> class Associator, + typename AsyncReadStream, typename DynamicBuffer_v2, + typename ReadHandler, typename DefaultCandidate> +struct associator<Associator, + detail::read_until_delim_string_op_v2<AsyncReadStream, + DynamicBuffer_v2, ReadHandler>, + DefaultCandidate> + : Associator<ReadHandler, DefaultCandidate> +{ + static typename Associator<ReadHandler, DefaultCandidate>::type get( + const detail::read_until_delim_string_op_v2< + AsyncReadStream, DynamicBuffer_v2, ReadHandler>& h) noexcept + { + return Associator<ReadHandler, DefaultCandidate>::get(h.handler_); + } + + static auto get( + const detail::read_until_delim_string_op_v2< + AsyncReadStream, DynamicBuffer_v2, ReadHandler>& h, + const DefaultCandidate& c) noexcept + -> decltype(Associator<ReadHandler, DefaultCandidate>::get(h.handler_, c)) + { + return Associator<ReadHandler, DefaultCandidate>::get(h.handler_, c); } }; #endif // !defined(GENERATING_DOCUMENTATION) -template <typename AsyncReadStream, typename DynamicBuffer, - typename MatchCondition, typename ReadHandler> -ASIO_INITFN_RESULT_TYPE(ReadHandler, - void (asio::error_code, std::size_t)) -async_read_until(AsyncReadStream& s, - ASIO_MOVE_ARG(DynamicBuffer) buffers, - MatchCondition match_condition, ASIO_MOVE_ARG(ReadHandler) handler, - typename enable_if<is_match_condition<MatchCondition>::value>::type*) +template <typename AsyncReadStream, + typename DynamicBuffer_v2, + ASIO_COMPLETION_TOKEN_FOR(void (asio::error_code, + std::size_t)) ReadToken> +inline auto async_read_until(AsyncReadStream& s, DynamicBuffer_v2 buffers, + ASIO_STRING_VIEW_PARAM delim, ReadToken&& token, + constraint_t< + is_dynamic_buffer_v2<DynamicBuffer_v2>::value + >) + -> decltype( + async_initiate<ReadToken, + void (asio::error_code, std::size_t)>( + declval<detail::initiate_async_read_until_delim_string_v2< + AsyncReadStream>>(), + token, static_cast<DynamicBuffer_v2&&>(buffers), + static_cast<std::string>(delim))) { - // If you get an error on the following line it means that your handler does - // not meet the documented type requirements for a ReadHandler. - ASIO_READ_HANDLER_CHECK(ReadHandler, handler) type_check; - - async_completion<ReadHandler, - void (asio::error_code, std::size_t)> init(handler); - - detail::read_until_match_op<AsyncReadStream, - typename decay<DynamicBuffer>::type, - MatchCondition, ASIO_HANDLER_TYPE(ReadHandler, - void (asio::error_code, std::size_t))>( - s, ASIO_MOVE_CAST(DynamicBuffer)(buffers), - match_condition, init.completion_handler)( - asio::error_code(), 0, 1); - - return init.result.get(); + return async_initiate<ReadToken, + void (asio::error_code, std::size_t)>( + detail::initiate_async_read_until_delim_string_v2<AsyncReadStream>(s), + token, static_cast<DynamicBuffer_v2&&>(buffers), + static_cast<std::string>(delim)); } -#if !defined(ASIO_NO_IOSTREAM) +#if !defined(ASIO_NO_EXTENSIONS) +#if defined(ASIO_HAS_BOOST_REGEX) -template <typename AsyncReadStream, typename Allocator, typename ReadHandler> -inline ASIO_INITFN_RESULT_TYPE(ReadHandler, - void (asio::error_code, std::size_t)) -async_read_until(AsyncReadStream& s, - asio::basic_streambuf<Allocator>& b, - char delim, ASIO_MOVE_ARG(ReadHandler) handler) +namespace detail { - return async_read_until(s, basic_streambuf_ref<Allocator>(b), - delim, ASIO_MOVE_CAST(ReadHandler)(handler)); -} + template <typename AsyncReadStream, typename DynamicBuffer_v2, + typename RegEx, typename ReadHandler> + class read_until_expr_op_v2 + : public base_from_cancellation_state<ReadHandler> + { + public: + template <typename BufferSequence, typename Traits> + read_until_expr_op_v2(AsyncReadStream& stream, BufferSequence&& buffers, + const boost::basic_regex<char, Traits>& expr, ReadHandler& handler) + : base_from_cancellation_state<ReadHandler>( + handler, enable_partial_cancellation()), + stream_(stream), + buffers_(static_cast<BufferSequence&&>(buffers)), + expr_(expr), + start_(0), + search_position_(0), + bytes_to_read_(0), + handler_(static_cast<ReadHandler&&>(handler)) + { + } -template <typename AsyncReadStream, typename Allocator, typename ReadHandler> -inline ASIO_INITFN_RESULT_TYPE(ReadHandler, - void (asio::error_code, std::size_t)) -async_read_until(AsyncReadStream& s, - asio::basic_streambuf<Allocator>& b, - ASIO_STRING_VIEW_PARAM delim, - ASIO_MOVE_ARG(ReadHandler) handler) + read_until_expr_op_v2(const read_until_expr_op_v2& other) + : base_from_cancellation_state<ReadHandler>(other), + stream_(other.stream_), + buffers_(other.buffers_), + expr_(other.expr_), + start_(other.start_), + search_position_(other.search_position_), + bytes_to_read_(other.bytes_to_read_), + handler_(other.handler_) + { + } + + read_until_expr_op_v2(read_until_expr_op_v2&& other) + : base_from_cancellation_state<ReadHandler>( + static_cast<base_from_cancellation_state<ReadHandler>&&>(other)), + stream_(other.stream_), + buffers_(static_cast<DynamicBuffer_v2&&>(other.buffers_)), + expr_(other.expr_), + start_(other.start_), + search_position_(other.search_position_), + bytes_to_read_(other.bytes_to_read_), + handler_(static_cast<ReadHandler&&>(other.handler_)) + { + } + + void operator()(asio::error_code ec, + std::size_t bytes_transferred, int start = 0) + { + const std::size_t not_found = (std::numeric_limits<std::size_t>::max)(); + std::size_t pos; + switch (start_ = start) + { + case 1: + for (;;) + { + { + // Determine the range of the data to be searched. + typedef typename DynamicBuffer_v2::const_buffers_type + buffers_type; + typedef buffers_iterator<buffers_type> iterator; + buffers_type data_buffers = + const_cast<const DynamicBuffer_v2&>(buffers_).data( + 0, buffers_.size()); + iterator begin = iterator::begin(data_buffers); + iterator start_pos = begin + search_position_; + iterator end = iterator::end(data_buffers); + + // Look for a match. + boost::match_results<iterator, + typename std::vector<boost::sub_match<iterator>>::allocator_type> + match_results; + bool match = regex_search(start_pos, end, + match_results, expr_, regex_match_flags()); + if (match && match_results[0].matched) + { + // Full match. We're done. + search_position_ = match_results[0].second - begin; + bytes_to_read_ = 0; + } + + // No match yet. Check if buffer is full. + else if (buffers_.size() == buffers_.max_size()) + { + search_position_ = not_found; + bytes_to_read_ = 0; + } + + // Need to read some more data. + else + { + if (match) + { + // Partial match. Next search needs to start from beginning of + // match. + search_position_ = match_results[0].first - begin; + } + else + { + // Next search can start with the new data. + search_position_ = end - begin; + } + + bytes_to_read_ = std::min<std::size_t>( + std::max<std::size_t>(512, + buffers_.capacity() - buffers_.size()), + std::min<std::size_t>(65536, + buffers_.max_size() - buffers_.size())); + } + } + + // Check if we're done. + if (!start && bytes_to_read_ == 0) + break; + + // Start a new asynchronous read operation to obtain more data. + pos = buffers_.size(); + buffers_.grow(bytes_to_read_); + { + ASIO_HANDLER_LOCATION(( + __FILE__, __LINE__, "async_read_until")); + stream_.async_read_some(buffers_.data(pos, bytes_to_read_), + static_cast<read_until_expr_op_v2&&>(*this)); + } + return; default: + buffers_.shrink(bytes_to_read_ - bytes_transferred); + if (ec || bytes_transferred == 0) + break; + if (this->cancelled() != cancellation_type::none) + { + ec = error::operation_aborted; + break; + } + } + + const asio::error_code result_ec = + (search_position_ == not_found) + ? error::not_found : ec; + + const std::size_t result_n = + (ec || search_position_ == not_found) + ? 0 : search_position_; + + static_cast<ReadHandler&&>(handler_)(result_ec, result_n); + } + } + + //private: + AsyncReadStream& stream_; + DynamicBuffer_v2 buffers_; + RegEx expr_; + int start_; + std::size_t search_position_; + std::size_t bytes_to_read_; + ReadHandler handler_; + }; + + template <typename AsyncReadStream, typename DynamicBuffer_v2, + typename RegEx, typename ReadHandler> + inline bool asio_handler_is_continuation( + read_until_expr_op_v2<AsyncReadStream, + DynamicBuffer_v2, RegEx, ReadHandler>* this_handler) + { + return this_handler->start_ == 0 ? true + : asio_handler_cont_helpers::is_continuation( + this_handler->handler_); + } + + template <typename AsyncReadStream> + class initiate_async_read_until_expr_v2 + { + public: + typedef typename AsyncReadStream::executor_type executor_type; + + explicit initiate_async_read_until_expr_v2(AsyncReadStream& stream) + : stream_(stream) + { + } + + executor_type get_executor() const noexcept + { + return stream_.get_executor(); + } + + template <typename ReadHandler, typename DynamicBuffer_v2, typename RegEx> + void operator()(ReadHandler&& handler, + DynamicBuffer_v2&& buffers, + const RegEx& expr) const + { + // If you get an error on the following line it means that your handler + // does not meet the documented type requirements for a ReadHandler. + ASIO_READ_HANDLER_CHECK(ReadHandler, handler) type_check; + + non_const_lvalue<ReadHandler> handler2(handler); + read_until_expr_op_v2<AsyncReadStream, + decay_t<DynamicBuffer_v2>, + RegEx, decay_t<ReadHandler>>( + stream_, static_cast<DynamicBuffer_v2&&>(buffers), + expr, handler2.value)(asio::error_code(), 0, 1); + } + + private: + AsyncReadStream& stream_; + }; +} // namespace detail + +#if !defined(GENERATING_DOCUMENTATION) + +template <template <typename, typename> class Associator, + typename AsyncReadStream, typename DynamicBuffer_v2, + typename RegEx, typename ReadHandler, typename DefaultCandidate> +struct associator<Associator, + detail::read_until_expr_op_v2<AsyncReadStream, + DynamicBuffer_v2, RegEx, ReadHandler>, + DefaultCandidate> + : Associator<ReadHandler, DefaultCandidate> { - return async_read_until(s, basic_streambuf_ref<Allocator>(b), - delim, ASIO_MOVE_CAST(ReadHandler)(handler)); -} + static typename Associator<ReadHandler, DefaultCandidate>::type get( + const detail::read_until_expr_op_v2<AsyncReadStream, + DynamicBuffer_v2, RegEx, ReadHandler>& h) noexcept + { + return Associator<ReadHandler, DefaultCandidate>::get(h.handler_); + } -#if defined(ASIO_HAS_BOOST_REGEX) + static auto get( + const detail::read_until_expr_op_v2<AsyncReadStream, + DynamicBuffer_v2, RegEx, ReadHandler>& h, + const DefaultCandidate& c) noexcept + -> decltype(Associator<ReadHandler, DefaultCandidate>::get(h.handler_, c)) + { + return Associator<ReadHandler, DefaultCandidate>::get(h.handler_, c); + } +}; + +#endif // !defined(GENERATING_DOCUMENTATION) -template <typename AsyncReadStream, typename Allocator, typename ReadHandler> -inline ASIO_INITFN_RESULT_TYPE(ReadHandler, - void (asio::error_code, std::size_t)) -async_read_until(AsyncReadStream& s, - asio::basic_streambuf<Allocator>& b, const boost::regex& expr, - ASIO_MOVE_ARG(ReadHandler) handler) +template <typename AsyncReadStream, typename DynamicBuffer_v2, typename Traits, + ASIO_COMPLETION_TOKEN_FOR(void (asio::error_code, + std::size_t)) ReadToken> +inline auto async_read_until(AsyncReadStream& s, DynamicBuffer_v2 buffers, + const boost::basic_regex<char, Traits>& expr, ReadToken&& token, + constraint_t< + is_dynamic_buffer_v2<DynamicBuffer_v2>::value + >) + -> decltype( + async_initiate<ReadToken, + void (asio::error_code, std::size_t)>( + declval<detail::initiate_async_read_until_expr_v2<AsyncReadStream>>(), + token, static_cast<DynamicBuffer_v2&&>(buffers), expr)) { - return async_read_until(s, basic_streambuf_ref<Allocator>(b), - expr, ASIO_MOVE_CAST(ReadHandler)(handler)); + return async_initiate<ReadToken, + void (asio::error_code, std::size_t)>( + detail::initiate_async_read_until_expr_v2<AsyncReadStream>(s), + token, static_cast<DynamicBuffer_v2&&>(buffers), expr); } #endif // defined(ASIO_HAS_BOOST_REGEX) -template <typename AsyncReadStream, typename Allocator, - typename MatchCondition, typename ReadHandler> -inline ASIO_INITFN_RESULT_TYPE(ReadHandler, - void (asio::error_code, std::size_t)) -async_read_until(AsyncReadStream& s, - asio::basic_streambuf<Allocator>& b, - MatchCondition match_condition, ASIO_MOVE_ARG(ReadHandler) handler, - typename enable_if<is_match_condition<MatchCondition>::value>::type*) +namespace detail +{ + template <typename AsyncReadStream, typename DynamicBuffer_v2, + typename MatchCondition, typename ReadHandler> + class read_until_match_op_v2 + : public base_from_cancellation_state<ReadHandler> + { + public: + template <typename BufferSequence> + read_until_match_op_v2(AsyncReadStream& stream, + BufferSequence&& buffers, + MatchCondition match_condition, ReadHandler& handler) + : base_from_cancellation_state<ReadHandler>( + handler, enable_partial_cancellation()), + stream_(stream), + buffers_(static_cast<BufferSequence&&>(buffers)), + match_condition_(match_condition), + start_(0), + search_position_(0), + bytes_to_read_(0), + handler_(static_cast<ReadHandler&&>(handler)) + { + } + + read_until_match_op_v2(const read_until_match_op_v2& other) + : base_from_cancellation_state<ReadHandler>(other), + stream_(other.stream_), + buffers_(other.buffers_), + match_condition_(other.match_condition_), + start_(other.start_), + search_position_(other.search_position_), + bytes_to_read_(other.bytes_to_read_), + handler_(other.handler_) + { + } + + read_until_match_op_v2(read_until_match_op_v2&& other) + : base_from_cancellation_state<ReadHandler>( + static_cast<base_from_cancellation_state<ReadHandler>&&>(other)), + stream_(other.stream_), + buffers_(static_cast<DynamicBuffer_v2&&>(other.buffers_)), + match_condition_(other.match_condition_), + start_(other.start_), + search_position_(other.search_position_), + bytes_to_read_(other.bytes_to_read_), + handler_(static_cast<ReadHandler&&>(other.handler_)) + { + } + + void operator()(asio::error_code ec, + std::size_t bytes_transferred, int start = 0) + { + const std::size_t not_found = (std::numeric_limits<std::size_t>::max)(); + std::size_t pos; + switch (start_ = start) + { + case 1: + for (;;) + { + { + // Determine the range of the data to be searched. + typedef typename DynamicBuffer_v2::const_buffers_type + buffers_type; + typedef buffers_iterator<buffers_type> iterator; + buffers_type data_buffers = + const_cast<const DynamicBuffer_v2&>(buffers_).data( + 0, buffers_.size()); + iterator begin = iterator::begin(data_buffers); + iterator start_pos = begin + search_position_; + iterator end = iterator::end(data_buffers); + + // Look for a match. + std::pair<iterator, bool> result = match_condition_(start_pos, end); + if (result.second) + { + // Full match. We're done. + search_position_ = result.first - begin; + bytes_to_read_ = 0; + } + + // No match yet. Check if buffer is full. + else if (buffers_.size() == buffers_.max_size()) + { + search_position_ = not_found; + bytes_to_read_ = 0; + } + + // Need to read some more data. + else + { + if (result.first != end) + { + // Partial match. Next search needs to start from beginning of + // match. + search_position_ = result.first - begin; + } + else + { + // Next search can start with the new data. + search_position_ = end - begin; + } + + bytes_to_read_ = std::min<std::size_t>( + std::max<std::size_t>(512, + buffers_.capacity() - buffers_.size()), + std::min<std::size_t>(65536, + buffers_.max_size() - buffers_.size())); + } + } + + // Check if we're done. + if (!start && bytes_to_read_ == 0) + break; + + // Start a new asynchronous read operation to obtain more data. + pos = buffers_.size(); + buffers_.grow(bytes_to_read_); + { + ASIO_HANDLER_LOCATION(( + __FILE__, __LINE__, "async_read_until")); + stream_.async_read_some(buffers_.data(pos, bytes_to_read_), + static_cast<read_until_match_op_v2&&>(*this)); + } + return; default: + buffers_.shrink(bytes_to_read_ - bytes_transferred); + if (ec || bytes_transferred == 0) + break; + if (this->cancelled() != cancellation_type::none) + { + ec = error::operation_aborted; + break; + } + } + + const asio::error_code result_ec = + (search_position_ == not_found) + ? error::not_found : ec; + + const std::size_t result_n = + (ec || search_position_ == not_found) + ? 0 : search_position_; + + static_cast<ReadHandler&&>(handler_)(result_ec, result_n); + } + } + + //private: + AsyncReadStream& stream_; + DynamicBuffer_v2 buffers_; + MatchCondition match_condition_; + int start_; + std::size_t search_position_; + std::size_t bytes_to_read_; + ReadHandler handler_; + }; + + template <typename AsyncReadStream, typename DynamicBuffer_v2, + typename MatchCondition, typename ReadHandler> + inline bool asio_handler_is_continuation( + read_until_match_op_v2<AsyncReadStream, DynamicBuffer_v2, + MatchCondition, ReadHandler>* this_handler) + { + return this_handler->start_ == 0 ? true + : asio_handler_cont_helpers::is_continuation( + this_handler->handler_); + } + + template <typename AsyncReadStream> + class initiate_async_read_until_match_v2 + { + public: + typedef typename AsyncReadStream::executor_type executor_type; + + explicit initiate_async_read_until_match_v2(AsyncReadStream& stream) + : stream_(stream) + { + } + + executor_type get_executor() const noexcept + { + return stream_.get_executor(); + } + + template <typename ReadHandler, + typename DynamicBuffer_v2, typename MatchCondition> + void operator()(ReadHandler&& handler, + DynamicBuffer_v2&& buffers, + MatchCondition match_condition) const + { + // If you get an error on the following line it means that your handler + // does not meet the documented type requirements for a ReadHandler. + ASIO_READ_HANDLER_CHECK(ReadHandler, handler) type_check; + + non_const_lvalue<ReadHandler> handler2(handler); + read_until_match_op_v2<AsyncReadStream, decay_t<DynamicBuffer_v2>, + MatchCondition, decay_t<ReadHandler>>( + stream_, static_cast<DynamicBuffer_v2&&>(buffers), + match_condition, handler2.value)(asio::error_code(), 0, 1); + } + + private: + AsyncReadStream& stream_; + }; +} // namespace detail + +#if !defined(GENERATING_DOCUMENTATION) + +template <template <typename, typename> class Associator, + typename AsyncReadStream, typename DynamicBuffer_v2, + typename MatchCondition, typename ReadHandler, typename DefaultCandidate> +struct associator<Associator, + detail::read_until_match_op_v2<AsyncReadStream, + DynamicBuffer_v2, MatchCondition, ReadHandler>, + DefaultCandidate> + : Associator<ReadHandler, DefaultCandidate> +{ + static typename Associator<ReadHandler, DefaultCandidate>::type get( + const detail::read_until_match_op_v2<AsyncReadStream, + DynamicBuffer_v2, MatchCondition, ReadHandler>& h) noexcept + { + return Associator<ReadHandler, DefaultCandidate>::get(h.handler_); + } + + static auto get( + const detail::read_until_match_op_v2<AsyncReadStream, + DynamicBuffer_v2, MatchCondition, ReadHandler>& h, + const DefaultCandidate& c) noexcept + -> decltype(Associator<ReadHandler, DefaultCandidate>::get(h.handler_, c)) + { + return Associator<ReadHandler, DefaultCandidate>::get(h.handler_, c); + } +}; + +#endif // !defined(GENERATING_DOCUMENTATION) + +template <typename AsyncReadStream, + typename DynamicBuffer_v2, typename MatchCondition, + ASIO_COMPLETION_TOKEN_FOR(void (asio::error_code, + std::size_t)) ReadToken> +inline auto async_read_until(AsyncReadStream& s, DynamicBuffer_v2 buffers, + MatchCondition match_condition, ReadToken&& token, + constraint_t< + is_match_condition<MatchCondition>::value + >, + constraint_t< + is_dynamic_buffer_v2<DynamicBuffer_v2>::value + >) + -> decltype( + async_initiate<ReadToken, + void (asio::error_code, std::size_t)>( + declval<detail::initiate_async_read_until_match_v2<AsyncReadStream>>(), + token, static_cast<DynamicBuffer_v2&&>(buffers), + match_condition)) { - return async_read_until(s, basic_streambuf_ref<Allocator>(b), - match_condition, ASIO_MOVE_CAST(ReadHandler)(handler)); + return async_initiate<ReadToken, + void (asio::error_code, std::size_t)>( + detail::initiate_async_read_until_match_v2<AsyncReadStream>(s), + token, static_cast<DynamicBuffer_v2&&>(buffers), + match_condition); } -#endif // !defined(ASIO_NO_IOSTREAM) #endif // !defined(ASIO_NO_EXTENSIONS) } // namespace asio |