Commit e730ad4a authored by Dominik Charousset's avatar Dominik Charousset

Consistently use (in|out)bound path terminology

parent 0a1da9b7
......@@ -416,7 +416,7 @@ public:
/// Creates an output path for given source.
template <class Out, class Scatterer, class... Ts>
make_source_result<Out, Scatterer, Ts...>
add_output_path(stream_source_ptr<Out, Scatterer, Ts...> mgr) {
add_outbound_path(stream_source_ptr<Out, Scatterer, Ts...> mgr) {
auto slot = assign_next_pending_slot(mgr);
return {slot, std::move(mgr)};
}
......@@ -424,7 +424,7 @@ public:
/// Creates an output path for given stage.
template <class In, class Result, class Out, class Scatterer, class... Ts>
make_source_result<Out, Scatterer, Ts...>
add_output_path(stream_stage_ptr<In, Result, Out, Scatterer, Ts...> mgr) {
add_outbound_path(stream_stage_ptr<In, Result, Out, Scatterer, Ts...> mgr) {
auto slot = assign_next_pending_slot(mgr);
return {slot, std::move(mgr)};
}
......@@ -432,7 +432,7 @@ public:
/// Creates an output path for the given stage without any type checking.
/// @private
template <class Out, class... Ts>
output_stream<Out, Ts...> add_unsafe_output_path(stream_manager_ptr mgr) {
output_stream<Out, Ts...> add_unsafe_outbound_path(stream_manager_ptr mgr) {
auto slot = assign_next_pending_slot(mgr);
return {0, slot, std::move(mgr)};
}
......@@ -442,16 +442,16 @@ public:
/// @pre `pending_stream_managers_[slot] == mgr`
/// @pre `mgr->out().terminal() == false`
/// @private
void add_unsafe_output_path(stream_manager_ptr mgr, strong_actor_ptr next,
stream_slot slot, strong_actor_ptr origin,
mailbox_element::forwarding_stack stages,
message_id mid);
void add_unsafe_outbound_path(stream_manager_ptr mgr, strong_actor_ptr next,
stream_slot slot, strong_actor_ptr origin,
mailbox_element::forwarding_stack stages,
message_id mid);
/// Creates an input path for given stage.
template <class In, class Result, class Out, class Scatterer, class... Ts>
make_sink_result<In, Result>
add_input_path(const stream<In>&,
stream_stage_ptr<In, Result, Out, Scatterer, Ts...> mgr) {
add_inbound_path(const stream<In>&,
stream_stage_ptr<In, Result, Out, Scatterer, Ts...> mgr) {
auto slot = assign_next_slot(mgr);
return {slot, std::move(mgr)};
}
......@@ -459,8 +459,8 @@ public:
/// Creates an input path for given stage.
/// @private
template <class Result, class In>
stream_result<Result> add_unsafe_input_path(const stream<In>&,
stream_manager_ptr mgr) {
stream_result<Result> add_unsafe_inbound_path(const stream<In>&,
stream_manager_ptr mgr) {
auto slot = assign_next_slot(mgr);
return {slot, std::move(mgr)};
}
......@@ -552,9 +552,9 @@ public:
auto result = make_source(std::move(xs), std::move(init), std::move(pull),
std::move(done), scatterer_arg);
auto mid = new_request_id(message_priority::normal);
add_unsafe_output_path(result.ptr(), actor_cast<strong_actor_ptr>(dest),
result.out(), actor_cast<strong_actor_ptr>(this),
no_stages, mid);
add_unsafe_outbound_path(result.ptr(), actor_cast<strong_actor_ptr>(dest),
result.out(), actor_cast<strong_actor_ptr>(this),
no_stages, mid);
behavior tmp{
[=](handle_res_result& x) mutable { handle_res(std::move(x)); },
[=](error& err) mutable { handle_res(std::move(err)); }
......
......@@ -402,7 +402,7 @@ void scheduled_actor::quit(error x) {
// -- stream management --------------------------------------------------------
void scheduled_actor::add_unsafe_output_path(
void scheduled_actor::add_unsafe_outbound_path(
stream_manager_ptr mgr, strong_actor_ptr next, stream_slot slot,
strong_actor_ptr origin, mailbox_element::forwarding_stack stages,
message_id mid) {
......@@ -444,9 +444,9 @@ sec scheduled_actor::build_pipeline(stream_slot in, stream_slot out,
if (out != 0 && mgr->out().path(out) == nullptr) {
if (next == nullptr)
return fail(sec::no_downstream_stages_defined);
add_unsafe_output_path(mgr, std::move(next), out, current_sender(),
take_current_forwarding_stack(),
current_message_id());
add_unsafe_outbound_path(mgr, std::move(next), out, current_sender(),
take_current_forwarding_stack(),
current_message_id());
}
return sec::none;
}
......
......@@ -127,11 +127,11 @@ TESTEE(stream_multiplexer) {
return {
[=](join_atom) {
CAF_MESSAGE("received 'join' request");
return self->add_output_path(self->state.stage);
return self->add_outbound_path(self->state.stage);
},
[=](const stream<int>& in, std::string& fname) {
CAF_CHECK_EQUAL(fname, "numbers.txt");
return self->add_input_path(in, self->state.stage);
return self->add_inbound_path(in, self->state.stage);
},
};
}
......
......@@ -225,24 +225,24 @@ TESTEE(stream_multiplexer) {
[=](join_atom, ints_atom) {
auto& stg = self->state.stage;
CAF_MESSAGE("received 'join' request for integers");
auto result = self->add_unsafe_output_path<int>(stg);
auto result = self->add_unsafe_outbound_path<int>(stg);
stg->out().assign<int_scatterer>(result.out());
return result;
},
[=](join_atom, strings_atom) {
auto& stg = self->state.stage;
CAF_MESSAGE("received 'join' request for integers");
auto result = self->add_unsafe_output_path<string>(stg);
auto result = self->add_unsafe_outbound_path<string>(stg);
stg->out().assign<string_scatterer>(result.out());
return result;
},
[=](const stream<int>& in) {
CAF_MESSAGE("received handshake for integers");
return self->add_unsafe_input_path<void>(in, self->state.stage);
return self->add_unsafe_inbound_path<void>(in, self->state.stage);
},
[=](const stream<string>& in) {
CAF_MESSAGE("received handshake for strings");
return self->add_unsafe_input_path<void>(in, self->state.stage);
return self->add_unsafe_inbound_path<void>(in, self->state.stage);
}
};
}
......
......@@ -132,12 +132,12 @@ TESTEE(log_dispatcher) {
[=](join_atom, level lvl) {
auto& stg = self->state.stage;
CAF_MESSAGE("received 'join' request");
auto result = self->add_output_path(stg);
auto result = self->add_outbound_path(stg);
stg->out().set_filter(result.out(), lvl);
return result;
},
[=](const stream<value_type>& in) {
return self->add_input_path(in, self->state.stage);
return self->add_inbound_path(in, self->state.stage);
}
};
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment