Commit 9728b50c authored by Dominik Charousset's avatar Dominik Charousset

Rename indefinite => infinite

parent c1a10f43
......@@ -115,11 +115,11 @@ template <class Handle, class... Ts>
void tester(scoped_actor& self, const Handle& hdl, int x, int y, Ts&&... xs) {
self->monitor(hdl);
// first test: x + y = z
self->request(hdl, indefinite, add_atom::value, x, y).receive(
self->request(hdl, infinite, add_atom::value, x, y).receive(
[&](int res1) {
aout(self) << x << " + " << y << " = " << res1 << endl;
// second test: x - y = z
self->request(hdl, indefinite, sub_atom::value, x, y).receive(
self->request(hdl, infinite, sub_atom::value, x, y).receive(
[&](int res2) {
aout(self) << x << " - " << y << " = " << res2 << endl;
self->send_exit(hdl, exit_reason::user_shutdown);
......
......@@ -66,7 +66,7 @@ public:
private:
void request_task(atom_value op, int lhs, int rhs) {
request(server_, indefinite, op, lhs, rhs).then(
request(server_, infinite, op, lhs, rhs).then(
[=](result_atom, int result) {
aout(this) << lhs << (op == plus_atom::value ? " + " : " - ")
<< rhs << " = " << result << endl;
......
......@@ -76,13 +76,13 @@ constexpr time_unit get_time_unit_from_period() {
}
/// Represents an infinite amount of timeout for specifying "invalid" timeouts.
struct indefinite_t {
constexpr indefinite_t() {
struct infinite_t {
constexpr infinite_t() {
// nop
}
};
static constexpr indefinite_t indefinite = indefinite_t{};
static constexpr infinite_t infinite = infinite_t{};
/// Time duration consisting of a `time_unit` and a 64 bit unsigned integer.
class duration {
......@@ -95,7 +95,7 @@ public:
// nop
}
constexpr duration(const indefinite_t&) : unit(time_unit::invalid), count(0) {
constexpr duration(const infinite_t&) : unit(time_unit::invalid), count(0) {
// nop
}
......
......@@ -136,7 +136,7 @@ public:
R result;
function_view_storage<R> h{result};
try {
self_->request(impl_, indefinite, std::forward<Ts>(xs)...).receive(h);
self_->request(impl_, infinite, std::forward<Ts>(xs)...).receive(h);
}
catch (std::exception&) {
assign(invalid_actor);
......
......@@ -49,7 +49,7 @@ std::string to_string(const duration& x) {
result += "us";
break;
default:
return "indefinite";
return "infinite";
}
return result;
}
......
......@@ -48,7 +48,7 @@ behavior fan_out_fan_in(stateful_actor<splitter_state>* self,
// request().await() has LIFO ordering
for (auto i = workers.rbegin(); i != workers.rend(); ++i)
// TODO: maybe infer some useful timeout or use config parameter?
self->request(actor_cast<actor>(*i), indefinite, msg)
self->request(actor_cast<actor>(*i), infinite, msg)
.generic_await(
[=](const message& tmp) {
self->state.result += tmp;
......
......@@ -84,7 +84,7 @@ CAF_TEST(round_robin_actor_pool) {
self->send(w, sys_atom::value, put_atom::value, spawn_worker());
std::vector<actor_addr> workers;
for (int i = 0; i < 6; ++i) {
self->request(w, indefinite, i, i).receive(
self->request(w, infinite, i, i).receive(
[&](int res) {
CAF_CHECK_EQUAL(res, i + i);
auto sender = self->current_sender();
......@@ -99,7 +99,7 @@ CAF_TEST(round_robin_actor_pool) {
return addr == invalid_actor_addr;
};
CAF_CHECK(std::none_of(workers.begin(), workers.end(), is_invalid));
self->request(w, indefinite, sys_atom::value, get_atom::value).receive(
self->request(w, infinite, sys_atom::value, get_atom::value).receive(
[&](std::vector<actor>& ws) {
std::sort(workers.begin(), workers.end());
std::sort(ws.begin(), ws.end());
......@@ -118,7 +118,7 @@ CAF_TEST(round_robin_actor_pool) {
CAF_CHECK(dm.source == workers.back());
workers.pop_back();
// check whether actor pool removed failed worker
self->request(w, indefinite, sys_atom::value, get_atom::value).receive(
self->request(w, infinite, sys_atom::value, get_atom::value).receive(
[&](std::vector<actor>& ws) {
std::sort(ws.begin(), ws.end());
CAF_CHECK(workers.size() == ws.size()
......@@ -209,12 +209,12 @@ CAF_TEST(split_join_actor_pool) {
scoped_actor self{system};
auto w = actor_pool::make(&context, 5, spawn_split_worker,
actor_pool::split_join<int>(join_fun, split_fun));
self->request(w, indefinite, std::vector<int>{1, 2, 3, 4, 5}).receive(
self->request(w, infinite, std::vector<int>{1, 2, 3, 4, 5}).receive(
[&](int res) {
CAF_CHECK_EQUAL(res, 15);
}
);
self->request(w, indefinite, std::vector<int>{6, 7, 8, 9, 10}).receive(
self->request(w, infinite, std::vector<int>{6, 7, 8, 9, 10}).receive(
[&](int res) {
CAF_CHECK_EQUAL(res, 40);
}
......
......@@ -113,7 +113,7 @@ CAF_TEST(lifetime_3) {
em_sender->link_to(bound->address());
anon_send_exit(em_sender, exit_reason::kill);
wait_until_exited();
self->request(dbl, indefinite, 1).receive(
self->request(dbl, infinite, 1).receive(
[](int v) {
CAF_CHECK(v == 2);
},
......@@ -129,7 +129,7 @@ CAF_TEST(request_response_promise) {
auto bound = dbl.bind(1);
anon_send_exit(bound, exit_reason::kill);
CAF_CHECK(exited(bound));
self->request(bound, indefinite, message{}).receive(
self->request(bound, infinite, message{}).receive(
[](int) {
CAF_CHECK(false);
},
......@@ -159,12 +159,12 @@ CAF_TEST(partial_currying) {
CAF_CHECK(aut.node() == bound.node());
CAF_CHECK(aut != bound);
CAF_CHECK(system.registry().running() == 1);
self->request(bound, indefinite, 2.0).receive(
self->request(bound, infinite, 2.0).receive(
[](double y) {
CAF_CHECK(y == 2.0);
}
);
self->request(bound, indefinite, 10).receive(
self->request(bound, infinite, 10).receive(
[](int y) {
CAF_CHECK(y == 10);
}
......@@ -175,7 +175,7 @@ CAF_TEST(partial_currying) {
CAF_TEST(full_currying) {
auto dbl_actor = system.spawn(testee);
auto bound = dbl_actor.bind(1);
self->request(bound, indefinite, message{}).receive(
self->request(bound, infinite, message{}).receive(
[](int v) {
CAF_CHECK(v == 2);
},
......@@ -210,12 +210,12 @@ CAF_TEST(type_safe_currying) {
CAF_CHECK(system.registry().running() == 1);
static_assert(std::is_same<decltype(bound), curried_signature>::value,
"bind returned wrong actor handle");
self->request(bound, indefinite, 2.0).receive(
self->request(bound, infinite, 2.0).receive(
[](double y) {
CAF_CHECK(y == 2.0);
}
);
self->request(bound, indefinite, 10).receive(
self->request(bound, infinite, 10).receive(
[](int y) {
CAF_CHECK(y == 10);
}
......@@ -237,7 +237,7 @@ CAF_TEST(reordering) {
auto bound = aut.bind(_2, _1);
CAF_CHECK(aut != bound);
CAF_CHECK(system.registry().running() == 1);
self->request(bound, indefinite, 2.0, 10).receive(
self->request(bound, infinite, 2.0, 10).receive(
[](double y) {
CAF_CHECK(y == 20.0);
}
......@@ -263,7 +263,7 @@ CAF_TEST(type_safe_reordering) {
CAF_CHECK(system.registry().running() == 1);
static_assert(std::is_same<decltype(bound), swapped_signature>::value,
"bind returned wrong actor handle");
self->request(bound, indefinite, 2.0, 10).receive(
self->request(bound, infinite, 2.0, 10).receive(
[](double y) {
CAF_CHECK(y == 20.0);
}
......
......@@ -133,7 +133,7 @@ testee::behavior_type testee_impl(testee::pointer self) {
CAF_TEST(request_atom_constants) {
scoped_actor self{system};
auto tst = system.spawn(testee_impl);
self->request(tst, indefinite, abc_atom::value).receive(
self->request(tst, infinite, abc_atom::value).receive(
[](int i) {
CAF_CHECK_EQUAL(i, 42);
}
......
......@@ -140,7 +140,7 @@ CAF_TEST(composable_behaviors) {
//auto x1 = sys.spawn<stateful_impl<foo_actor_state>>();
auto x1 = sys.spawn<foo_actor_state>();
scoped_actor self{sys};
self->request(x1, indefinite, 1, 2, 4).receive(
self->request(x1, infinite, 1, 2, 4).receive(
[](int y) {
CAF_CHECK(y == 7);
}
......@@ -148,12 +148,12 @@ CAF_TEST(composable_behaviors) {
self->send_exit(x1, exit_reason::kill);
//auto x2 = sys.spawn<stateful_impl<composed_behavior<i3_actor_state, d_actor_state>>>();
auto x2 = sys.spawn<composed_behavior<i3_actor_state, d_actor_state>>();
self->request(x2, indefinite, 1, 2, 4).receive(
self->request(x2, infinite, 1, 2, 4).receive(
[](int y) {
CAF_CHECK(y == 7);
}
);
self->request(x2, indefinite, 1.0).receive(
self->request(x2, infinite, 1.0).receive(
[](double y1, double y2) {
CAF_CHECK(y1 == 1.0);
CAF_CHECK(y1 == y2);
......@@ -162,7 +162,7 @@ CAF_TEST(composable_behaviors) {
self->send_exit(x2, exit_reason::kill);
//auto x3 = sys.spawn<stateful_impl<foo_actor_state2>>();
auto x3 = sys.spawn<foo_actor_state2>();
self->request(x3, indefinite, 1, 2, 4).receive(
self->request(x3, infinite, 1, 2, 4).receive(
[](int y) {
CAF_CHECK(y == -5);
}
......@@ -170,7 +170,7 @@ CAF_TEST(composable_behaviors) {
self->send_exit(x3, exit_reason::kill);
//auto x4 = sys.spawn<stateful_impl<dict_calc_state>>();
auto x4 = sys.spawn<dict_calc_state>();
self->request(x4, indefinite, add_atom::value, 10, 20).receive(
self->request(x4, infinite, add_atom::value, 10, 20).receive(
[](int y) {
CAF_CHECK(y == 30);
}
......
......@@ -603,7 +603,7 @@ typed_testee::behavior_type testee() {
CAF_TEST(typed_await) {
scoped_actor self{system};
auto x = system.spawn(testee);
self->request(x, indefinite, abc_atom::value).receive(
self->request(x, infinite, abc_atom::value).receive(
[](const std::string& str) {
CAF_CHECK_EQUAL(str, "abc");
}
......@@ -782,7 +782,7 @@ CAF_TEST(move_only_argument) {
};
auto testee = system.spawn(f, std::move(uptr));
scoped_actor self{system};
self->request(testee, indefinite, 1.f).receive(
self->request(testee, infinite, 1.f).receive(
[](int i) {
CAF_CHECK(i == 42);
}
......
......@@ -85,13 +85,13 @@ CAF_TEST(migrate_locally) {
scoped_actor self{system};
self->send(a, put_atom::value, 42);
// migrate from a to b
self->request(a, indefinite, sys_atom::value,
self->request(a, infinite, sys_atom::value,
migrate_atom::value, mm1).receive(
[&](ok_atom, const actor_addr& dest) {
CAF_CHECK(dest == b);
}
);
self->request(a, indefinite, get_atom::value).receive(
self->request(a, infinite, get_atom::value).receive(
[&](int result) {
CAF_CHECK(result == 42);
CAF_CHECK(self->current_sender() == b.address());
......@@ -100,13 +100,13 @@ CAF_TEST(migrate_locally) {
auto mm2 = system.spawn(pseudo_mm, a);
self->send(b, put_atom::value, 23);
// migrate back from b to a
self->request(b, indefinite, sys_atom::value,
self->request(b, infinite, sys_atom::value,
migrate_atom::value, mm2).receive(
[&](ok_atom, const actor_addr& dest) {
CAF_CHECK(dest == a);
}
);
self->request(b, indefinite, get_atom::value).receive(
self->request(b, infinite, get_atom::value).receive(
[&](int result) {
CAF_CHECK(result == 23);
CAF_CHECK(self->current_sender() == a.address());
......
......@@ -49,13 +49,13 @@ struct fixture {
void run_testee(actor testee) {
scoped_actor self{system};
self->request(testee, indefinite, a_atom::value).receive([](int i) {
self->request(testee, infinite, a_atom::value).receive([](int i) {
CAF_CHECK_EQUAL(i, 1);
});
self->request(testee, indefinite, b_atom::value).receive([](int i) {
self->request(testee, infinite, b_atom::value).receive([](int i) {
CAF_CHECK_EQUAL(i, 2);
});
self->request(testee, indefinite, c_atom::value).receive([](int i) {
self->request(testee, infinite, c_atom::value).receive([](int i) {
CAF_CHECK_EQUAL(i, 3);
});
self->send_exit(testee, exit_reason::user_shutdown);
......
......@@ -111,7 +111,7 @@ struct fixture {
CAF_REQUIRE(config_server != invalid_actor);
// clear config
scoped_actor self{system};
self->request(config_server, indefinite, get_atom::value, "*").receive(
self->request(config_server, infinite, get_atom::value, "*").receive(
[&](ok_atom, std::vector<std::pair<std::string, message>>& msgs) {
for (auto& kvp : msgs)
self->send(config_server, put_atom::value, kvp.first, message{});
......@@ -151,7 +151,7 @@ struct fixture {
>::type;
bool result = false;
scoped_actor self{system};
self->request(config_server, indefinite, get_atom::value, key).receive(
self->request(config_server, infinite, get_atom::value, key).receive(
[&](ok_atom, std::string&, message& msg) {
msg.apply(
[&](type& val) {
......@@ -186,7 +186,7 @@ struct fixture {
if (config_server != invalid_actor) {
size_t result = 0;
scoped_actor self{system};
self->request(config_server, indefinite, get_atom::value, "*").receive(
self->request(config_server, infinite, get_atom::value, "*").receive(
[&](ok_atom, std::vector<std::pair<std::string, message>>& msgs) {
for (auto& kvp : msgs)
if (! kvp.second.empty())
......
......@@ -120,7 +120,7 @@ public:
behavior make_behavior() override {
return {
[=](go_atom, const actor& next) {
request(next, indefinite, gogo_atom::value).then(
request(next, infinite, gogo_atom::value).then(
[=](atom_value) {
CAF_MESSAGE("send 'ok' to buddy");
send(buddy(), ok_atom::value);
......@@ -196,7 +196,7 @@ public:
return {
others >> [=](message& msg) -> response_promise {
auto rp = make_response_promise();
request(buddy(), indefinite, std::move(msg)).then(
request(buddy(), infinite, std::move(msg)).then(
[=](gogogo_atom x) mutable {
rp.deliver(x);
quit();
......@@ -270,7 +270,7 @@ CAF_TEST(test_void_res) {
};
});
scoped_actor self{system};
self->request(buddy, indefinite, 1, 2).receive(
self->request(buddy, infinite, 1, 2).receive(
[] {
CAF_MESSAGE("received void res");
}
......@@ -287,7 +287,7 @@ CAF_TEST(pending_quit) {
};
});
system.spawn([mirror](event_based_actor* self) {
self->request(mirror, indefinite, 42).then(
self->request(mirror, infinite, 42).then(
[](int) {
CAF_ERROR("received result, should've been terminated already");
},
......@@ -310,7 +310,7 @@ CAF_TEST(request) {
CAF_CHECK_EQUAL(i, 0);
}
);
s->request(foi, indefinite, i_atom::value).receive(
s->request(foi, infinite, i_atom::value).receive(
[&](int i) {
CAF_CHECK_EQUAL(i, 0);
++invocations;
......@@ -319,7 +319,7 @@ CAF_TEST(request) {
CAF_ERROR("Error: " << s->system().render(err));
}
);
s->request(foi, indefinite, f_atom::value).receive(
s->request(foi, infinite, f_atom::value).receive(
[&](float f) {
CAF_CHECK_EQUAL(f, 0.f);
++invocations;
......@@ -333,7 +333,7 @@ CAF_TEST(request) {
// provoke invocation of s->handle_sync_failure()
bool error_handler_called = false;
bool int_handler_called = false;
s->request(foi, indefinite, f_atom::value).receive(
s->request(foi, infinite, f_atom::value).receive(
[&](int) {
printf("******* %s %d\n", __FILE__, __LINE__);
CAF_ERROR("int handler called");
......@@ -359,7 +359,7 @@ printf("******* %s %d\n", __FILE__, __LINE__);
);
auto mirror = system.spawn<sync_mirror>();
bool continuation_called = false;
self->request(mirror, indefinite, 42).receive([&](int value) {
self->request(mirror, infinite, 42).receive([&](int value) {
continuation_called = true;
CAF_CHECK_EQUAL(value, 42);
});
......@@ -449,7 +449,7 @@ printf("******* %s %d\n", __FILE__, __LINE__);
}
);
CAF_CHECK_EQUAL(timeout_occured, true);
self->request(c, indefinite, gogo_atom::value).receive(
self->request(c, infinite, gogo_atom::value).receive(
[](gogogo_atom) {
CAF_MESSAGE("received `gogogo_atom`");
},
......@@ -474,7 +474,7 @@ printf("******* %s %d\n", __FILE__, __LINE__);
});
// first 'idle', then 'request'
anon_send(serv, idle_atom::value, work);
s->request(serv, indefinite, request_atom::value).receive(
s->request(serv, infinite, request_atom::value).receive(
[&](response_atom) {
CAF_MESSAGE("received 'response'");
CAF_CHECK(s->current_sender() == work);
......@@ -484,7 +484,7 @@ printf("******* %s %d\n", __FILE__, __LINE__);
}
);
// first 'request', then 'idle'
auto handle = s->request(serv, indefinite, request_atom::value);
auto handle = s->request(serv, infinite, request_atom::value);
send_as(work, serv, idle_atom::value, work);
handle.receive(
[&](response_atom) {
......@@ -516,7 +516,7 @@ behavior snyc_send_no_then_A(event_based_actor * self) {
behavior snyc_send_no_then_B(event_based_actor * self) {
return {
[=](int number) {
self->request(self->spawn(snyc_send_no_then_A), indefinite, number);
self->request(self->spawn(snyc_send_no_then_A), infinite, number);
self->quit();
}
};
......@@ -535,7 +535,7 @@ CAF_TEST(async_request) {
}
};
});
self->request(receiver, indefinite, 1).then(
self->request(receiver, infinite, 1).then(
[=](int) {}
);
return {
......
......@@ -158,7 +158,7 @@ CAF_TEST(lifetime_3) {
em_sender->link_to(h.address());
anon_send_exit(em_sender, exit_reason::kill);
wait_until_exited();
self->request(f, indefinite, 1).receive(
self->request(f, infinite, 1).receive(
[](int v) {
CAF_CHECK(v == 2);
},
......@@ -166,7 +166,7 @@ CAF_TEST(lifetime_3) {
CAF_CHECK(false);
}
);
self->request(g, indefinite, 1).receive(
self->request(g, infinite, 1).receive(
[](int v) {
CAF_CHECK(v == 2);
},
......@@ -184,7 +184,7 @@ CAF_TEST(request_response_promise) {
auto h = f * g;
anon_send_exit(h, exit_reason::kill);
CAF_CHECK(exited(h));
self->request(h, indefinite, 1).receive(
self->request(h, infinite, 1).receive(
[](int) {
CAF_CHECK(false);
},
......@@ -201,7 +201,7 @@ CAF_TEST(dot_composition_1) {
auto first = system.spawn(typed_first_stage);
auto second = system.spawn(typed_second_stage);
auto first_then_second = second * first;
self->request(first_then_second, indefinite, 42).receive(
self->request(first_then_second, infinite, 42).receive(
[](double res) {
CAF_CHECK(res == (42 * 2.0) * (42 * 4.0));
}
......@@ -215,7 +215,7 @@ CAF_TEST(dot_composition_2) {
auto dbl_actor = system.spawn(testee);
auto dbl_x4_actor = dbl_actor * dbl_actor
* dbl_actor * dbl_actor;
self->request(dbl_x4_actor, indefinite, 1).receive(
self->request(dbl_x4_actor, infinite, 1).receive(
[](int v) {
CAF_CHECK(v == 16);
},
......
......@@ -59,19 +59,19 @@ CAF_TEST(test_serial_reply) {
[=](hi_atom) mutable {
auto rp = self->make_response_promise();
CAF_MESSAGE("received 'hi there'");
self->request(c0, indefinite, sub0_atom::value).then(
self->request(c0, infinite, sub0_atom::value).then(
[=](sub0_atom) mutable {
CAF_MESSAGE("received 'sub0'");
self->request(c1, indefinite, sub1_atom::value).then(
self->request(c1, infinite, sub1_atom::value).then(
[=](sub1_atom) mutable {
CAF_MESSAGE("received 'sub1'");
self->request(c2, indefinite, sub2_atom::value).then(
self->request(c2, infinite, sub2_atom::value).then(
[=](sub2_atom) mutable {
CAF_MESSAGE("received 'sub2'");
self->request(c3, indefinite, sub3_atom::value).then(
self->request(c3, infinite, sub3_atom::value).then(
[=](sub3_atom) mutable {
CAF_MESSAGE("received 'sub3'");
self->request(c4, indefinite, sub4_atom::value).then(
self->request(c4, infinite, sub4_atom::value).then(
[=](sub4_atom) mutable {
CAF_MESSAGE("received 'sub4'");
rp.deliver(ho_atom::value);
......@@ -90,7 +90,7 @@ CAF_TEST(test_serial_reply) {
});
scoped_actor self{system};
CAF_MESSAGE("ID of main: " << self->id());
self->request(master, indefinite, hi_atom::value).receive(
self->request(master, infinite, hi_atom::value).receive(
[](ho_atom) {
CAF_MESSAGE("received 'ho'");
},
......
......@@ -108,7 +108,7 @@ CAF_TEST(kill_second) {
CAF_TEST(untyped_splicing) {
init_untyped();
self->request(first_and_second, indefinite, 42.0).receive(
self->request(first_and_second, infinite, 42.0).receive(
[](double x, double y, double z) {
CAF_CHECK(x == (42.0 * 2.0));
CAF_CHECK(y == (42.0 * 4.0));
......@@ -126,7 +126,7 @@ CAF_TEST(typed_splicing) {
::with<double, double, double>>;
static_assert(std::is_same<decltype(x_and_y), expected_type>::value,
"splice() did not compute the correct result");
self->request(x_and_y, indefinite, 42.0).receive(
self->request(x_and_y, infinite, 42.0).receive(
[](double x, double y, double z) {
CAF_CHECK(x == (42.0 * 2.0));
CAF_CHECK(y == (42.0 * 4.0));
......
......@@ -93,7 +93,7 @@ struct fixture {
self->send(aut, add_atom::value, 7);
self->send(aut, add_atom::value, 4);
self->send(aut, add_atom::value, 9);
self->request(aut, indefinite, get_atom::value).receive(
self->request(aut, infinite, get_atom::value).receive(
[](int x) {
CAF_CHECK_EQUAL(x, 20);
}
......@@ -110,7 +110,7 @@ struct fixture {
};
});
scoped_actor self{system};
self->request(aut, indefinite, get_atom::value).receive(
self->request(aut, infinite, get_atom::value).receive(
[&](const string& str) {
CAF_CHECK_EQUAL(str, expected);
}
......
......@@ -147,18 +147,18 @@ CAF_TEST_FIXTURE_SCOPE(typed_spawn_tests, fixture)
CAF_TEST(typed_response_promise) {
typed_response_promise<int> resp;
resp.deliver(1); // delivers on an invalid promise has no effect
self->request(foo, indefinite, get_atom::value, 42).receive(
self->request(foo, infinite, get_atom::value, 42).receive(
[](int x) {
CAF_CHECK_EQUAL(x, 84);
}
);
self->request(foo, indefinite, get_atom::value, 42, 52).receive(
self->request(foo, infinite, get_atom::value, 42, 52).receive(
[](int x, int y) {
CAF_CHECK_EQUAL(x, 84);
CAF_CHECK_EQUAL(y, 104);
}
);
self->request(foo, indefinite, get_atom::value, 3.14, 3.14).receive(
self->request(foo, infinite, get_atom::value, 3.14, 3.14).receive(
[](double x, double y) {
CAF_CHECK_EQUAL(x, 3.14 * 2);
CAF_CHECK_EQUAL(y, 3.14 * 2);
......@@ -172,7 +172,7 @@ CAF_TEST(typed_response_promise) {
CAF_TEST(typed_response_promise_chained) {
auto composed = foo * foo * foo;
self->request(composed, indefinite, 1).receive(
self->request(composed, infinite, 1).receive(
[](int v) {
CAF_CHECK_EQUAL(v, 8);
},
......@@ -185,7 +185,7 @@ CAF_TEST(typed_response_promise_chained) {
// verify that only requests get an error response message
CAF_TEST(error_response_message) {
self->request(foo, indefinite, get_atom::value, 3.14).receive(
self->request(foo, infinite, get_atom::value, 3.14).receive(
[](double) {
CAF_ERROR("unexpected ordinary response message received");
},
......
......@@ -118,10 +118,10 @@ public:
};
void client(event_based_actor* self, actor parent, server_type serv) {
self->request(serv, indefinite, my_request{0, 0}).then(
self->request(serv, infinite, my_request{0, 0}).then(
[=](bool val1) {
CAF_CHECK_EQUAL(val1, true);
self->request(serv, indefinite, my_request{10, 20}).then(
self->request(serv, infinite, my_request{10, 20}).then(
[=](bool val2) {
CAF_CHECK_EQUAL(val2, false);
self->send(parent, passed_atom::value);
......@@ -146,12 +146,12 @@ void test_typed_spawn(server_type ts) {
CAF_CHECK_EQUAL(value, true);
}
);
self->request(ts, indefinite, my_request{10, 20}).receive(
self->request(ts, infinite, my_request{10, 20}).receive(
[](bool value) {
CAF_CHECK_EQUAL(value, false);
}
);
self->request(ts, indefinite, my_request{0, 0}).receive(
self->request(ts, infinite, my_request{0, 0}).receive(
[](bool value) {
CAF_CHECK_EQUAL(value, true);
}
......@@ -402,7 +402,7 @@ CAF_TEST(string_delegator_chain) {
true);
set<string> iface{"caf::replies_to<@str>::with<@str>"};
CAF_CHECK(aut->message_types() == iface);
self->request(aut, indefinite, "Hello World!").receive(
self->request(aut, infinite, "Hello World!").receive(
[](const string& answer) {
CAF_CHECK_EQUAL(answer, "!dlroW olleH");
}
......@@ -416,7 +416,7 @@ CAF_TEST(maybe_string_delegator_chain) {
auto aut = system.spawn(maybe_string_delegator,
system.spawn(maybe_string_reverter));
CAF_MESSAGE("send empty string, expect error");
self->request(aut, indefinite, "").receive(
self->request(aut, infinite, "").receive(
[](ok_atom, const string&) {
throw std::logic_error("unexpected result!");
},
......@@ -427,7 +427,7 @@ CAF_TEST(maybe_string_delegator_chain) {
}
);
CAF_MESSAGE("send abcd string, expect dcba");
self->request(aut, indefinite, "abcd").receive(
self->request(aut, infinite, "abcd").receive(
[](ok_atom, const string& str) {
CAF_CHECK_EQUAL(str, "dcba");
},
......
......@@ -121,7 +121,7 @@ uint16_t middleman::publish(const actor_addr& whom, std::set<std::string> sigs,
uint16_t result;
std::string error_msg;
try {
self->request(mm, indefinite, publish_atom::value, port,
self->request(mm, infinite, publish_atom::value, port,
std::move(whom), std::move(sigs), str, ru).receive(
[&](ok_atom, uint16_t res) {
result = res;
......@@ -168,7 +168,7 @@ maybe<uint16_t> middleman::publish_local_groups(uint16_t port, const char* in) {
void middleman::unpublish(const actor_addr& whom, uint16_t port) {
CAF_LOG_TRACE(CAF_ARG(whom) << CAF_ARG(port));
scoped_actor self{system(), true};
self->request(actor_handle(), indefinite,
self->request(actor_handle(), infinite,
unpublish_atom::value, whom, port).receive(
[] {
// ok, basp_broker is done
......@@ -185,7 +185,7 @@ actor_addr middleman::remote_actor(std::set<std::string> ifs,
auto mm = actor_handle();
actor_addr result;
scoped_actor self{system(), true};
self->request(mm, indefinite, connect_atom::value,
self->request(mm, infinite, connect_atom::value,
std::move(host), port).receive(
[&](ok_atom, const node_id&, actor_addr res, std::set<std::string>& xs) {
CAF_LOG_TRACE(CAF_ARG(res) << CAF_ARG(xs));
......
......@@ -112,7 +112,7 @@ public:
}
std::vector<response_promise> tmp{std::move(rp)};
pending_.emplace(key, std::move(tmp));
request(broker_, indefinite, connect_atom::value, hdl, port).then(
request(broker_, infinite, connect_atom::value, hdl, port).then(
[=](ok_atom, node_id& nid, actor_addr& addr, mpi_set& sigs) {
auto i = pending_.find(key);
if (i == pending_.end())
......
......@@ -560,7 +560,7 @@ CAF_TEST(remote_actor_and_send) {
CAF_REQUIRE(mpx()->pending_scribes().count(make_pair(lo, 4242)) == 1);
auto mm1 = system.middleman().actor_handle();
actor result;
auto f = self()->request(mm1, indefinite,
auto f = self()->request(mm1, infinite,
connect_atom::value, lo, uint16_t{4242});
// wait until BASP broker has received and processed the connect message
while (! aut()->valid(remote_hdl(0)))
......
......@@ -180,7 +180,7 @@ void run_server(int argc, char** argv) {
auto serv = system.middleman().spawn_broker(peer_acceptor_fun,
system.spawn(pong));
std::thread child;
self->request(serv, indefinite, publish_atom::value).receive(
self->request(serv, infinite, publish_atom::value).receive(
[&](uint16_t port) {
CAF_MESSAGE("server is running on port " << port);
child = std::thread([=] { run_client(argc, argv, port); });
......
......@@ -87,7 +87,7 @@ void make_client_behavior(event_based_actor* self,
actor server, group grp) {
self->spawn_in_group(grp, make_reflector_behavior);
self->spawn_in_group(grp, make_reflector_behavior);
self->request(server, indefinite, spawn_atom::value, grp).then(
self->request(server, infinite, spawn_atom::value, grp).then(
[=](const std::vector<actor>& vec) {
auto is_remote = [=](actor actor) {
return actor->node() != self->node();
......@@ -140,7 +140,7 @@ CAF_TEST(server_side_group_comm) {
CAF_REQUIRE(server);
scoped_actor group_resolver(client_side, true);
group grp;
group_resolver->request(server, indefinite, get_group_atom::value).receive(
group_resolver->request(server, infinite, get_group_atom::value).receive(
[&](const group& x) {
grp = x;
}
......
......@@ -68,7 +68,7 @@ behavior server(stateful_actor<server_state>* self) {
CAF_REQUIRE(self->node() != s.node());
self->state.client = actor_cast<actor>(s);
auto mm = self->system().middleman().actor_handle();
self->request(mm, indefinite, spawn_atom::value,
self->request(mm, infinite, spawn_atom::value,
s.node(), "mirror", make_message()).then(
[=](ok_atom, const actor_addr& addr, const std::set<std::string>& ifs) {
CAF_LOG_TRACE(CAF_ARG(addr) << CAF_ARG(ifs));
......
......@@ -187,7 +187,7 @@ void run_server(int argc, char** argv) {
scoped_actor self{system};
auto serv = system.middleman().spawn_broker(acceptor_fun, system.spawn(pong));
std::thread child;
self->request(serv, indefinite, publish_atom::value).receive(
self->request(serv, infinite, publish_atom::value).receive(
[&](uint16_t port) {
CAF_MESSAGE("server is running on port " << port);
child = std::thread([=] {
......
......@@ -94,7 +94,7 @@ void run_client(int argc, char** argv, uint16_t port) {
port);
CAF_REQUIRE(serv);
scoped_actor self{system};
self->request(serv, indefinite, ping{42})
self->request(serv, infinite, ping{42})
.receive([](const pong& p) { CAF_CHECK_EQUAL(p.value, 42); });
anon_send_exit(serv, exit_reason::user_shutdown);
self->monitor(serv);
......
......@@ -72,7 +72,7 @@ struct fixture {
maybe<actor> remote_actor(const char* hostname, uint16_t port) {
maybe<actor> result;
scoped_actor self{system, true};
self->request(system.middleman().actor_handle(), indefinite,
self->request(system.middleman().actor_handle(), infinite,
connect_atom::value, hostname, port).receive(
[&](ok_atom, node_id&, actor_addr& res, std::set<std::string>& xs) {
CAF_REQUIRE(xs.empty());
......
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