Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
4d2ac56c
Commit
4d2ac56c
authored
Apr 12, 2018
by
Joseph Noir
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bit of cleanup
parent
dd74bb94
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
8 deletions
+11
-8
libcaf_io/caf/io/basp/routing_table.hpp
libcaf_io/caf/io/basp/routing_table.hpp
+0
-4
libcaf_io/src/basp_broker.cpp
libcaf_io/src/basp_broker.cpp
+4
-3
libcaf_io/src/instance.cpp
libcaf_io/src/instance.cpp
+1
-1
libcaf_io/test/basp.cpp
libcaf_io/test/basp.cpp
+3
-0
libcaf_io/test/basp_udp.cpp
libcaf_io/test/basp_udp.cpp
+3
-0
No files found.
libcaf_io/caf/io/basp/routing_table.hpp
View file @
4d2ac56c
...
...
@@ -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_
;
};
...
...
libcaf_io/src/basp_broker.cpp
View file @
4d2ac56c
...
...
@@ -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.
...
...
libcaf_io/src/instance.cpp
View file @
4d2ac56c
...
...
@@ -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:
s
hould the hook really be called here, or should we delay this
// TODO:
S
hould 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
;
...
...
libcaf_io/test/basp.cpp
View file @
4d2ac56c
...
...
@@ -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
...
...
libcaf_io/test/basp_udp.cpp
View file @
4d2ac56c
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment