Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
actor-incubator
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
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-incubator
Commits
1f0eeec0
Commit
1f0eeec0
authored
Oct 09, 2019
by
Dominik Charousset
Committed by
Dominik Charousset
Oct 09, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Integrate review feedback
parent
f4de15a9
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
20 additions
and
21 deletions
+20
-21
libcaf_net/caf/net/basp/application.hpp
libcaf_net/caf/net/basp/application.hpp
+0
-3
libcaf_net/caf/net/pollset_updater.hpp
libcaf_net/caf/net/pollset_updater.hpp
+1
-2
libcaf_net/src/application.cpp
libcaf_net/src/application.cpp
+2
-2
libcaf_net/src/endpoint_manager.cpp
libcaf_net/src/endpoint_manager.cpp
+1
-1
libcaf_net/src/net/backend/test.cpp
libcaf_net/src/net/backend/test.cpp
+7
-4
libcaf_net/src/net/middleman.cpp
libcaf_net/src/net/middleman.cpp
+6
-2
libcaf_net/src/pollset_updater.cpp
libcaf_net/src/pollset_updater.cpp
+2
-2
libcaf_net/test/stream_application.cpp
libcaf_net/test/stream_application.cpp
+0
-4
libcaf_net/test/stream_transport.cpp
libcaf_net/test/stream_transport.cpp
+1
-1
No files found.
libcaf_net/caf/net/basp/application.hpp
View file @
1f0eeec0
...
...
@@ -215,9 +215,6 @@ private:
/// Re-usable buffer for storing payloads.
buffer_type
buf_
;
/// Stores our own ID.
node_id
id_
;
/// Stores the ID of our peer.
node_id
peer_id_
;
...
...
libcaf_net/caf/net/pollset_updater.hpp
View file @
1f0eeec0
...
...
@@ -39,7 +39,7 @@ public:
// -- constructors, destructors, and assignment operators --------------------
pollset_updater
(
pipe_socket
read_handle
,
multiplexer_ptr
parent
);
pollset_updater
(
pipe_socket
read_handle
,
const
multiplexer_ptr
&
parent
);
~
pollset_updater
()
override
;
...
...
@@ -61,7 +61,6 @@ public:
private:
msg_buf
buf_
;
size_t
buf_size_
;
std
::
mutex
write_lock_
;
};
}
// namespace net
...
...
libcaf_net/src/application.cpp
View file @
1f0eeec0
...
...
@@ -228,9 +228,9 @@ error application::handle_actor_message(write_packet_callback&, header hdr,
byte_span
payload
)
{
CAF_LOG_TRACE
(
CAF_ARG
(
hdr
)
<<
CAF_ARG2
(
"payload.size"
,
payload
.
size
()));
// Deserialize payload.
actor_id
src_id
;
actor_id
src_id
=
0
;
node_id
src_node
;
actor_id
dst_id
;
actor_id
dst_id
=
0
;
std
::
vector
<
strong_actor_ptr
>
fwd_stack
;
message
content
;
binary_deserializer
source
{
&
executor_
,
payload
};
...
...
libcaf_net/src/endpoint_manager.cpp
View file @
1f0eeec0
...
...
@@ -55,7 +55,7 @@ endpoint_manager_queue::message_ptr endpoint_manager::next_message() {
void
endpoint_manager
::
resolve
(
uri
locator
,
actor
listener
)
{
using
intrusive
::
inbox_result
;
using
event_type
=
endpoint_manager_queue
::
event
;
auto
ptr
=
new
event_type
(
std
::
move
(
locator
),
std
::
move
(
listener
)
);
auto
ptr
=
new
event_type
(
std
::
move
(
locator
),
listener
);
if
(
!
enqueue
(
ptr
))
anon_send
(
listener
,
resolve_atom
::
value
,
make_error
(
sec
::
request_receiver_down
));
...
...
libcaf_net/src/net/backend/test.cpp
View file @
1f0eeec0
...
...
@@ -33,8 +33,6 @@ namespace caf {
namespace
net
{
namespace
backend
{
using
transport_type
=
stream_transport
<
basp
::
application
>
;
test
::
test
(
middleman
&
mm
)
:
middleman_backend
(
"test"
),
mm_
(
mm
),
proxies_
(
mm
.
system
(),
*
this
)
{
// nop
...
...
@@ -80,8 +78,10 @@ test::peer_entry& test::emplace(const node_id& peer_id, stream_socket first,
auto
mgr
=
make_endpoint_manager
(
mpx
,
mm_
.
system
(),
transport_type
{
second
,
basp
::
application
{
proxies_
}});
if
(
auto
err
=
mgr
->
init
())
if
(
auto
err
=
mgr
->
init
())
{
CAF_LOG_ERROR
(
"mgr->init() failed: "
<<
mm_
.
system
().
render
(
err
));
CAF_RAISE_ERROR
(
"mgr->init() failed"
);
}
mpx
->
register_reading
(
mgr
);
auto
&
result
=
peers_
[
peer_id
];
result
=
std
::
make_pair
(
first
,
std
::
move
(
mgr
));
...
...
@@ -93,8 +93,11 @@ test::peer_entry& test::get_peer(const node_id& id) {
if
(
i
!=
peers_
.
end
())
return
i
->
second
;
auto
sockets
=
make_stream_socket_pair
();
if
(
!
sockets
)
if
(
!
sockets
)
{
CAF_LOG_ERROR
(
"make_stream_socket_pair failed: "
<<
mm_
.
system
().
render
(
sockets
.
error
()));
CAF_RAISE_ERROR
(
"make_stream_socket_pair failed"
);
}
return
emplace
(
id
,
sockets
->
first
,
sockets
->
second
);
}
...
...
libcaf_net/src/net/middleman.cpp
View file @
1f0eeec0
...
...
@@ -60,8 +60,10 @@ void middleman::stop() {
}
void
middleman
::
init
(
actor_system_config
&
cfg
)
{
if
(
auto
err
=
mpx_
->
init
())
if
(
auto
err
=
mpx_
->
init
())
{
CAF_LOG_ERROR
(
"mgr->init() failed: "
<<
system
().
render
(
err
));
CAF_RAISE_ERROR
(
"mpx->init failed"
);
}
if
(
auto
node_uri
=
get_if
<
uri
>
(
&
cfg
,
"middleman.this-node"
))
{
auto
this_node
=
make_node_id
(
std
::
move
(
*
node_uri
));
sys_
.
node_
.
swap
(
this_node
);
...
...
@@ -69,8 +71,10 @@ void middleman::init(actor_system_config& cfg) {
CAF_RAISE_ERROR
(
"no valid entry for middleman.this-node found"
);
}
for
(
auto
&
backend
:
backends_
)
if
(
auto
err
=
backend
->
init
())
if
(
auto
err
=
backend
->
init
())
{
CAF_LOG_ERROR
(
"failed to initialize backend: "
<<
system
().
render
(
err
));
CAF_RAISE_ERROR
(
"failed to initialize backend"
);
}
}
middleman
::
module
::
id_t
middleman
::
id
()
const
{
...
...
libcaf_net/src/pollset_updater.cpp
View file @
1f0eeec0
...
...
@@ -27,8 +27,8 @@ namespace caf {
namespace
net
{
pollset_updater
::
pollset_updater
(
pipe_socket
read_handle
,
multiplexer_ptr
parent
)
:
super
(
read_handle
,
std
::
move
(
parent
)
),
buf_size_
(
0
)
{
const
multiplexer_ptr
&
parent
)
:
super
(
read_handle
,
parent
),
buf_size_
(
0
)
{
mask_
=
operation
::
read
;
nonblocking
(
read_handle
,
true
);
}
...
...
libcaf_net/test/stream_application.cpp
View file @
1f0eeec0
...
...
@@ -26,19 +26,15 @@
#include <vector>
#include "caf/byte.hpp"
#include "caf/forwarding_actor_proxy.hpp"
#include "caf/net/actor_proxy_impl.hpp"
#include "caf/net/backend/test.hpp"
#include "caf/net/basp/connection_state.hpp"
#include "caf/net/basp/constants.hpp"
#include "caf/net/basp/ec.hpp"
#include "caf/net/make_endpoint_manager.hpp"
#include "caf/net/middleman.hpp"
#include "caf/net/middleman_backend.hpp"
#include "caf/net/multiplexer.hpp"
#include "caf/net/stream_socket.hpp"
#include "caf/net/stream_transport.hpp"
#include "caf/none.hpp"
#include "caf/uri.hpp"
using
namespace
caf
;
...
...
libcaf_net/test/stream_transport.cpp
View file @
1f0eeec0
...
...
@@ -85,7 +85,7 @@ public:
}
template
<
class
Parent
>
void
resolve
(
Parent
&
parent
,
string_view
path
,
actor
listener
)
{
void
resolve
(
Parent
&
parent
,
string_view
path
,
const
actor
&
listener
)
{
actor_id
aid
=
42
;
auto
hid
=
"0011223344556677889900112233445566778899"
;
auto
nid
=
unbox
(
make_node_id
(
42
,
hid
));
...
...
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