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
6c8a6e48
Commit
6c8a6e48
authored
Dec 06, 2018
by
Joseph Noir
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix newb_tcp test
parent
de01b1e6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
36 deletions
+10
-36
libcaf_io/caf/io/newb.hpp
libcaf_io/caf/io/newb.hpp
+2
-5
libcaf_io/test/newb_tcp.cpp
libcaf_io/test/newb_tcp.cpp
+8
-31
No files found.
libcaf_io/caf/io/newb.hpp
View file @
6c8a6e48
...
@@ -595,9 +595,6 @@ struct newb_acceptor : network::newb_base {
...
@@ -595,9 +595,6 @@ struct newb_acceptor : network::newb_base {
virtual
behavior
make_behavior
()
override
{
virtual
behavior
make_behavior
()
override
{
return
{
return
{
[
=
](
quit_atom
)
{
stop
();
},
[
=
](
children_atom
)
{
[
=
](
children_atom
)
{
return
children_
;
return
children_
;
},
},
...
...
libcaf_io/test/newb_tcp.cpp
View file @
6c8a6e48
...
@@ -40,34 +40,6 @@ using shutdown_atom = atom_constant<atom("shutdown")>;
...
@@ -40,34 +40,6 @@ using shutdown_atom = atom_constant<atom("shutdown")>;
constexpr
auto
host
=
"127.0.0.1"
;
constexpr
auto
host
=
"127.0.0.1"
;
// behavior tcp_server(newb<new_raw_msg>* self, actor responder) {
// self->send(responder, alive_atom::value);
// self->configure_read(io::receive_policy::exactly(sizeof(uint32_t)));
// return {
// [=](new_raw_msg& msg) {
// // Read message.
// uint32_t data;
// binary_deserializer bd(self->system(), msg.payload, msg.payload_len);
// bd(data);
// // Write message.
// auto whdl = self->wr_buf(nullptr);
// binary_serializer bs(&self->backend(), *whdl.buf);
// bs(data + 1);
// },
// [=](io_error_msg& msg) {
// CAF_FAIL("server got io error: " << to_string(msg.op));
// self->quit();
// self->stop();
// },
// [=](caf::exit_msg&) {
// CAF_MESSAGE("parent shut down, doing the same");
// self->stop();
// self->quit();
// self->send(responder, shutdown_atom::value);
// }
// };
// }
behavior
tcp_server
(
newb
<
new_raw_msg
>*
self
,
actor
responder
)
{
behavior
tcp_server
(
newb
<
new_raw_msg
>*
self
,
actor
responder
)
{
self
->
configure_read
(
io
::
receive_policy
::
exactly
(
sizeof
(
uint32_t
)));
self
->
configure_read
(
io
::
receive_policy
::
exactly
(
sizeof
(
uint32_t
)));
return
{
return
{
...
@@ -89,7 +61,7 @@ behavior tcp_server(newb<new_raw_msg>* self, actor responder) {
...
@@ -89,7 +61,7 @@ behavior tcp_server(newb<new_raw_msg>* self, actor responder) {
self
->
send
(
responder
,
shutdown_atom
::
value
);
self
->
send
(
responder
,
shutdown_atom
::
value
);
},
},
[
=
](
caf
::
exit_msg
&
)
{
[
=
](
caf
::
exit_msg
&
)
{
CAF_
MESSAGE
(
"parent shut down, doing the same"
);
CAF_
FAIL
(
"parent shut down, doing the same"
);
self
->
stop
();
self
->
stop
();
self
->
quit
();
self
->
quit
();
}
}
...
@@ -112,8 +84,7 @@ behavior tcp_client(newb<new_raw_msg>* self, uint32_t value) {
...
@@ -112,8 +84,7 @@ behavior tcp_client(newb<new_raw_msg>* self, uint32_t value) {
self
->
quit
();
self
->
quit
();
},
},
[
=
](
io_error_msg
&
)
{
[
=
](
io_error_msg
&
)
{
CAF_MESSAGE
(
"client: connection lost"
);
CAF_FAIL
(
"client: connection lost"
);
// self->send(responder, quit_atom::value);
self
->
stop
();
self
->
stop
();
self
->
quit
();
self
->
quit
();
}
}
...
@@ -149,6 +120,12 @@ CAF_TEST(newb tcp communication) {
...
@@ -149,6 +120,12 @@ CAF_TEST(newb tcp communication) {
host
,
port
,
23
);
host
,
port
,
23
);
if
(
!
eclient
)
if
(
!
eclient
)
CAF_FAIL
(
"failed to start client: "
<<
system
.
render
(
eclient
.
error
()));
CAF_FAIL
(
"failed to start client: "
<<
system
.
render
(
eclient
.
error
()));
self
->
receive
(
[
&
](
shutdown_atom
)
{
CAF_MESSAGE
(
"server instance shut down, cleaning up."
);
self
->
send_exit
(
*
eserver
,
exit_reason
::
user_shutdown
);
}
);
}
}
system
.
await_all_actors_done
();
system
.
await_all_actors_done
();
}
}
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