Skip to content

Commit ffcff42

Browse files
committed
Refactor execution
1 parent 49ff8c2 commit ffcff42

9 files changed

Lines changed: 16 additions & 28 deletions

File tree

include/boost/http/impl/parser.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ set_body(
102102

103103
// Check ElasticBuffer type requirements
104104
static_assert(
105-
capy::is_dynamic_buffer<ElasticBuffer>::value,
105+
capy::is_DynamicBuffer<ElasticBuffer>::value,
106106
"Type requirements not met.");
107107

108108
// body must not already be set
@@ -114,7 +114,7 @@ set_body(
114114
detail::throw_logic_error();
115115

116116
auto& dyn = ws().emplace<
117-
capy::any_dynamic_buffer_impl<typename
117+
capy::any_DynamicBuffer_impl<typename
118118
std::decay<ElasticBuffer>::type,
119119
buffers_N>>(std::forward<ElasticBuffer>(eb));
120120

@@ -129,7 +129,7 @@ set_body(
129129
{
130130
// Check ElasticBuffer type requirements
131131
static_assert(
132-
capy::is_dynamic_buffer<ElasticBuffer>::value,
132+
capy::is_DynamicBuffer<ElasticBuffer>::value,
133133
"Type requirements not met.");
134134

135135
// body must not already be set
@@ -142,7 +142,7 @@ set_body(
142142

143143
// Use dynamic_buffer_ref to provide reference semantics
144144
auto& dyn = ws().emplace<
145-
capy::any_dynamic_buffer_impl<
145+
capy::any_DynamicBuffer_impl<
146146
detail::dynamic_buffer_ref<ElasticBuffer>,
147147
buffers_N>>(eb.get());
148148

include/boost/http/impl/serializer.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ start(
121121
ConstBufferSequence&& cbs)
122122
{
123123
static_assert(
124-
capy::const_buffer_sequence<ConstBufferSequence>,
124+
capy::ConstBufferSequence<ConstBufferSequence>,
125125
"ConstBufferSequence type requirements not met");
126126

127127
start_init(m);

include/boost/http/parser.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ class parser
642642

643643
BOOST_HTTP_DECL
644644
void
645-
set_body_impl(capy::any_dynamic_buffer&) noexcept;
645+
set_body_impl(capy::any_DynamicBuffer&) noexcept;
646646

647647
BOOST_HTTP_DECL
648648
void

include/boost/http/serializer.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ class serializer
246246
247247
@par Constraints
248248
@code
249-
capy::const_buffer_sequence<ConstBufferSequence>
249+
capy::ConstBufferSequence<ConstBufferSequence>
250250
@endcode
251251
252252
@par Exception Safety
@@ -275,7 +275,7 @@ class serializer
275275
template<
276276
class ConstBufferSequence,
277277
class = typename std::enable_if<
278-
capy::const_buffer_sequence<ConstBufferSequence>>::type
278+
capy::ConstBufferSequence<ConstBufferSequence>>::type
279279
>
280280
void
281281
start(

include/boost/http/server/route_handler.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ struct BOOST_HTTP_SYMBOL_VISIBLE
8484

8585
/** Executor associated with the session.
8686
*/
87-
capy::any_dispatcher ex;
87+
capy::any_executor_ref ex;
8888

8989
/** Destructor
9090
*/

include/boost/http/sink.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ struct BOOST_HTTP_SYMBOL_VISIBLE
108108
bool more)
109109
{
110110
static_assert(
111-
capy::const_buffer_sequence<ConstBufferSequence>,
111+
capy::ConstBufferSequence<ConstBufferSequence>,
112112
"Type requirements not met");
113113

114114
return write_impl(bs, more);

include/boost/http/source.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ struct BOOST_HTTP_SYMBOL_VISIBLE
111111
read(MutableBufferSequence const& bs)
112112
{
113113
static_assert(
114-
capy::mutable_buffer_sequence<MutableBufferSequence>,
114+
capy::MutableBufferSequence<MutableBufferSequence>,
115115
"Type requirements not met");
116116

117117
return read_impl(bs);

src/parser.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ class parser::impl
554554
capy::const_buffer_pair cbp_;
555555

556556
detail::filter* filter_;
557-
capy::any_dynamic_buffer* eb_;
557+
capy::any_DynamicBuffer* eb_;
558558
sink* sink_;
559559

560560
state state_;
@@ -1675,7 +1675,7 @@ class parser::impl
16751675

16761676
void
16771677
set_body(
1678-
capy::any_dynamic_buffer& eb) noexcept
1678+
capy::any_DynamicBuffer& eb) noexcept
16791679
{
16801680
eb_ = &eb;
16811681
style_ = style::elastic;
@@ -2051,7 +2051,7 @@ is_body_set() const noexcept
20512051
void
20522052
parser::
20532053
set_body_impl(
2054-
capy::any_dynamic_buffer& eb) noexcept
2054+
capy::any_DynamicBuffer& eb) noexcept
20552055
{
20562056
BOOST_ASSERT(impl_);
20572057
impl_->set_body(eb);

src/server/route_handler.cpp

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include <boost/http/server/route_handler.hpp>
1111
#include <boost/http/string_body.hpp>
12-
#include <boost/capy/ex/run_async.hpp>
12+
#include <boost/capy/ex/run_sync.hpp>
1313

1414
namespace boost {
1515
namespace http {
@@ -56,19 +56,7 @@ spawn(
5656
capy::task<route_result> t) ->
5757
route_result
5858
{
59-
return this->suspend(
60-
[ex = this->ex, t = std::move(t)](resumer resume) mutable
61-
{
62-
capy::run_async(ex,
63-
[resume](route_result rv)
64-
{
65-
resume(rv);
66-
},
67-
[resume](std::exception_ptr ep)
68-
{
69-
resume(ep);
70-
})(std::move(t));
71-
});
59+
return capy::run_sync()(std::move(t));
7260
}
7361

7462
} // http

0 commit comments

Comments
 (0)