Commit 4d2ac56c authored by Joseph Noir's avatar Joseph Noir

Bit of cleanup

parent dd74bb94
......@@ -136,10 +136,6 @@ public:
abstract_broker* parent_;
std::unordered_map<endpoint_handle, node_id> nid_by_hdl_;
// TODO: Do we need a list as a second argument as there could be
// multiple handles for different technologies?
//std::unordered_map<node_id, endpoint_handle> hdl_by_nid_;
std::unordered_map<node_id, node_info> node_information_base_;
};
......
......@@ -95,12 +95,13 @@ strong_actor_ptr basp_broker_state::make_proxy(node_id nid, actor_id aid) {
return nullptr;
// This member function is being called whenever we deserialize a
// payload received from a remote node; if a remote node A sends
// us a handle to a third node B, then we assume that A offers a route to B.
// us a handle to a third node B, then we assume that A can tell us
// how to contact B.
auto lr = instance.tbl().lookup(nid);
// TODO: make sure the lr is addressed as intended, seems wrong atm.
if (nid != this_context->id && !lr.known)
if (nid != this_context->id && !lr.known) {
// TODO: Try to establish communication with the new node.
CAF_CRITICAL("Not implemented.");
}
// TODO: Everything below has to happen once we establish communication?
// I'm not sure yet, the functors can be attached earlier and we could
// send trigger an error message if we cannot contact the remote node.
......
......@@ -274,7 +274,7 @@ bool instance::dispatch(execution_unit* ctx, const strong_actor_ptr& sender,
return true;
} else {
write(ctx, callee_.get_buffer(receiver->node()), hdr, &writer);
// TODO: should the hook really be called here, or should we delay this
// TODO: Should the hook really be called here, or should we delay this
// until communication is established?
notify<hook::message_sent>(sender, receiver->node(), receiver, mid, msg);
return true;
......
......@@ -52,6 +52,7 @@ constexpr uint64_t no_operation_data = 0;
constexpr auto basp_atom = caf::atom("BASP");
constexpr auto spawn_serv_atom = caf::atom("SpawnServ");
// TODO: Will probably be removed when the new default autoconnect works.
// constexpr auto config_serv_atom = caf::atom("ConfigServ");
} // namespace <anonymous>
......@@ -704,6 +705,7 @@ CAF_TEST(actor_serialize_and_deserialize) {
std::vector<actor_id>{}, msg);
}
// TODO: Will be reactivated and adjusted when new conenction feature works.
/*
CAF_TEST(indirect_connections) {
// this node receives a message from jupiter via mars and responds via mars
......@@ -760,6 +762,7 @@ CAF_TEST_FIXTURE_SCOPE_END()
CAF_TEST_FIXTURE_SCOPE(basp_tests_with_autoconn, autoconn_enabled_fixture)
// TODO: Will probably be removed when the new default autoconnect works.
/*
CAF_TEST(automatic_connection) {
// this tells our BASP broker to enable the automatic connection feature
......
......@@ -56,6 +56,7 @@ constexpr uint64_t no_operation_data = 0;
constexpr auto basp_atom = caf::atom("BASP");
constexpr auto spawn_serv_atom = caf::atom("SpawnServ");
// TODO: Will probably be removed when the new default autoconnect works.
// constexpr auto config_serv_atom = caf::atom("ConfigServ");
} // namespace <anonymous>
......@@ -806,6 +807,7 @@ CAF_TEST(actor_serialize_and_deserialize_udp) {
std::vector<actor_id>{}, msg);
}
// TODO: Will be reactivated and adjusted when new conenction feature works.
/*
CAF_TEST(indirect_connections_udp) {
// this node receives a message from jupiter via mars and responds via mars
......@@ -1002,6 +1004,7 @@ CAF_TEST_FIXTURE_SCOPE_END()
CAF_TEST_FIXTURE_SCOPE(basp_udp_tests_with_autoconn, autoconn_enabled_fixture)
// TODO: Will probably be removed when the new default autoconnect works.
/*
CAF_TEST(automatic_connection_udp) {
// this tells our BASP broker to enable the automatic connection feature
......
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