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
9dbcc11d
Unverified
Commit
9dbcc11d
authored
Dec 24, 2017
by
Dominik Charousset
Committed by
GitHub
Dec 24, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #639
Fix asio multiplexer compilation with UDP
parents
4c48dc4d
b4f8a30e
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
281 additions
and
111 deletions
+281
-111
CMakeLists.txt
CMakeLists.txt
+1
-1
libcaf_io/caf/io/network/asio_multiplexer.hpp
libcaf_io/caf/io/network/asio_multiplexer.hpp
+13
-0
libcaf_io/caf/io/network/asio_multiplexer_impl.hpp
libcaf_io/caf/io/network/asio_multiplexer_impl.hpp
+24
-0
libcaf_io/test/remote_actor.cpp
libcaf_io/test/remote_actor.cpp
+1
-110
libcaf_io/test/remote_actor_udp.cpp
libcaf_io/test/remote_actor_udp.cpp
+242
-0
No files found.
CMakeLists.txt
View file @
9dbcc11d
...
...
@@ -632,7 +632,7 @@ if(NOT CAF_NO_UNIT_TESTS)
set
(
caf_test
${
EXECUTABLE_OUTPUT_PATH
}
/caf-test
)
add_test
(
${
test_name
}
${
caf_test
}
-n -v 5 -s
"
${
suite
}
"
${
ARGN
}
)
# add some extra unit testing options when testing ASIO as well
if
(
CAF_USE_ASIO AND
"
${
suite
}
"
MATCHES
"^io_.+$"
)
if
(
CAF_USE_ASIO AND
"
${
suite
}
"
MATCHES
"^io_.+$"
AND NOT
"
${
suite
}
"
MATCHES
".+_udp$"
)
add_test
(
${
test_name
}
_asio
${
caf_test
}
-n -v 5 -s
"
${
suite
}
"
${
ARGN
}
--
"--caf#middleman.network-backend=asio"
)
endif
()
...
...
libcaf_io/caf/io/network/asio_multiplexer.hpp
View file @
9dbcc11d
...
...
@@ -76,6 +76,19 @@ public:
expected
<
doorman_ptr
>
new_tcp_doorman
(
uint16_t
port
,
const
char
*
in
,
bool
reuse_addr
)
override
;
datagram_servant_ptr
new_datagram_servant
(
native_socket
fd
)
override
;
datagram_servant_ptr
new_datagram_servant_for_endpoint
(
native_socket
fd
,
const
ip_endpoint
&
ep
)
override
;
expected
<
datagram_servant_ptr
>
new_remote_udp_endpoint
(
const
std
::
string
&
host
,
uint16_t
port
)
override
;
expected
<
datagram_servant_ptr
>
new_local_udp_endpoint
(
uint16_t
port
,
const
char
*
in
=
nullptr
,
bool
reuse_addr
=
false
)
override
;
void
exec_later
(
resumable
*
ptr
)
override
;
asio_multiplexer
(
actor_system
*
sys
);
...
...
libcaf_io/caf/io/network/asio_multiplexer_impl.hpp
View file @
9dbcc11d
...
...
@@ -248,6 +248,30 @@ asio_multiplexer::new_tcp_doorman(uint16_t port, const char* in, bool rflag) {
return
new_doorman
(
std
::
move
(
fd
));
}
datagram_servant_ptr
asio_multiplexer
::
new_datagram_servant
(
native_socket
)
{
CAF_RAISE_ERROR
(
"UDP is not implemented for asio"
);
return
nullptr
;
}
datagram_servant_ptr
asio_multiplexer
::
new_datagram_servant_for_endpoint
(
native_socket
,
const
ip_endpoint
&
)
{
CAF_RAISE_ERROR
(
"UDP is not implemented for asio"
);
return
nullptr
;
}
expected
<
datagram_servant_ptr
>
asio_multiplexer
::
new_remote_udp_endpoint
(
const
std
::
string
&
,
uint16_t
)
{
CAF_RAISE_ERROR
(
"UDP is not implemented for asio"
);
return
sec
::
bad_function_call
;
}
expected
<
datagram_servant_ptr
>
asio_multiplexer
::
new_local_udp_endpoint
(
uint16_t
,
const
char
*
,
bool
)
{
CAF_RAISE_ERROR
(
"UDP is not implemented for asio"
);
return
sec
::
bad_function_call
;
}
void
asio_multiplexer
::
exec_later
(
resumable
*
rptr
)
{
auto
mt
=
system
().
config
().
scheduler_max_throughput
;
switch
(
rptr
->
subtype
())
{
...
...
libcaf_io/test/remote_actor.cpp
View file @
9dbcc11d
...
...
@@ -19,7 +19,7 @@
#include "caf/config.hpp"
#define CAF_SUITE io_dynamic_remote_actor
#define CAF_SUITE io_dynamic_remote_actor
_tcp
#include "caf/test/unit_test.hpp"
#include <vector>
...
...
@@ -40,7 +40,6 @@ class config : public actor_system_config {
public:
config
()
{
load
<
io
::
middleman
>
();
set
(
"middleman.enable-udp"
,
true
);
add_message_type
<
std
::
vector
<
int
>>
(
"std::vector<int>"
);
actor_system_config
::
parse
(
test
::
engine
::
argc
(),
test
::
engine
::
argv
());
...
...
@@ -182,112 +181,4 @@ CAF_TEST(remote_link_tcp) {
CAF_MESSAGE
(
"mirror exited"
);
}
// same tests using UDP instead of TCP
CAF_TEST
(
identity_semantics_udp
)
{
// server side
auto
server
=
server_side
.
spawn
(
make_pong_behavior
);
CAF_EXP_THROW
(
port1
,
server_side_mm
.
publish_udp
(
server
,
0
,
local_host
));
CAF_EXP_THROW
(
port2
,
server_side_mm
.
publish_udp
(
server
,
0
,
local_host
));
CAF_REQUIRE_NOT_EQUAL
(
port1
,
port2
);
CAF_EXP_THROW
(
same_server
,
server_side_mm
.
remote_actor_udp
(
local_host
,
port2
));
CAF_REQUIRE_EQUAL
(
same_server
,
server
);
CAF_CHECK_EQUAL
(
same_server
->
node
(),
server_side
.
node
());
CAF_EXP_THROW
(
server1
,
client_side_mm
.
remote_actor_udp
(
local_host
,
port1
));
CAF_EXP_THROW
(
server2
,
client_side_mm
.
remote_actor_udp
(
local_host
,
port2
));
CAF_CHECK_EQUAL
(
server1
,
client_side_mm
.
remote_actor_udp
(
local_host
,
port1
));
CAF_CHECK_EQUAL
(
server2
,
client_side_mm
.
remote_actor_udp
(
local_host
,
port2
));
anon_send_exit
(
server
,
exit_reason
::
user_shutdown
);
}
CAF_TEST
(
ping_pong_udp
)
{
// server side
CAF_EXP_THROW
(
port
,
server_side_mm
.
publish_udp
(
server_side
.
spawn
(
make_pong_behavior
),
0
,
local_host
));
// client side
CAF_EXP_THROW
(
pong
,
client_side_mm
.
remote_actor_udp
(
local_host
,
port
));
client_side
.
spawn
(
make_ping_behavior
,
pong
);
}
CAF_TEST
(
custom_message_type_udp
)
{
// server side
CAF_EXP_THROW
(
port
,
server_side_mm
.
publish_udp
(
server_side
.
spawn
(
make_sort_behavior
),
0
,
local_host
));
// client side
CAF_EXP_THROW
(
sorter
,
client_side_mm
.
remote_actor_udp
(
local_host
,
port
));
client_side
.
spawn
(
make_sort_requester_behavior
,
sorter
);
}
CAF_TEST
(
remote_link_udp
)
{
// server side
CAF_EXP_THROW
(
port
,
server_side_mm
.
publish_udp
(
server_side
.
spawn
(
fragile_mirror
),
0
,
local_host
));
// client side
CAF_EXP_THROW
(
mirror
,
client_side_mm
.
remote_actor_udp
(
local_host
,
port
));
auto
linker
=
client_side
.
spawn
(
linking_actor
,
mirror
);
scoped_actor
self
{
client_side
};
self
->
wait_for
(
linker
);
CAF_MESSAGE
(
"linker exited"
);
self
->
wait_for
(
mirror
);
CAF_MESSAGE
(
"mirror exited"
);
}
CAF_TEST
(
multiple_endpoints_udp
)
{
config
cfg
;
// setup server
CAF_MESSAGE
(
"creating server"
);
actor_system
server_sys
{
cfg
};
auto
mirror
=
server_sys
.
spawn
([]()
->
behavior
{
return
{
[]
(
std
::
string
str
)
{
std
::
reverse
(
begin
(
str
),
end
(
str
));
return
str
;
}
};
});
server_sys
.
middleman
().
publish_udp
(
mirror
,
12345
);
auto
client_fun
=
[](
event_based_actor
*
self
)
->
behavior
{
return
{
[
=
](
actor
s
)
{
self
->
send
(
s
,
"hellow, world"
);
},
[
=
](
const
std
::
string
&
str
)
{
CAF_CHECK_EQUAL
(
str
,
"dlrow ,wolleh"
);
self
->
quit
();
CAF_MESSAGE
(
"done"
);
}
};
};
// setup client a
CAF_MESSAGE
(
"creating first client"
);
config
client_cfg
;
actor_system
client_sys
{
client_cfg
};
auto
client
=
client_sys
.
spawn
(
client_fun
);
// acquire remote actor from the server
auto
client_srv
=
client_sys
.
middleman
().
remote_actor_udp
(
"localhost"
,
12345
);
CAF_REQUIRE
(
client_srv
);
// setup other clients
for
(
int
i
=
0
;
i
<
5
;
++
i
)
{
config
other_cfg
;
actor_system
other_sys
{
other_cfg
};
CAF_MESSAGE
(
"creating new client"
);
auto
other
=
other_sys
.
spawn
(
client_fun
);
// acquire remote actor from the server
auto
other_srv
=
other_sys
.
middleman
().
remote_actor_udp
(
"localhost"
,
12345
);
CAF_REQUIRE
(
other_srv
);
// establish communication and exit
CAF_MESSAGE
(
"client contacts server and exits"
);
anon_send
(
other
,
*
other_srv
);
other_sys
.
await_all_actors_done
();
}
// establish communication and exit
CAF_MESSAGE
(
"first client contacts server and exits"
);
anon_send
(
client
,
*
client_srv
);
client_sys
.
await_all_actors_done
();
anon_send_exit
(
mirror
,
exit_reason
::
user_shutdown
);
}
CAF_TEST_FIXTURE_SCOPE_END
()
libcaf_io/test/remote_actor_udp.cpp
0 → 100644
View file @
9dbcc11d
/******************************************************************************
* ____ _ _____ *
* / ___| / \ | ___| C++ *
* | | / _ \ | |_ Actor *
* | |___ / ___ \| _| Framework *
* \____/_/ \_|_| *
* *
* Copyright (C) 2011 - 2017 *
* Dominik Charousset <dominik.charousset (at) haw-hamburg.de> *
* *
* Distributed under the terms and conditions of the BSD 3-Clause License or *
* (at your option) under the terms and conditions of the Boost Software *
* License 1.0. See accompanying files LICENSE and LICENSE_ALTERNATIVE. *
* *
* If you did not receive a copy of the license files, see *
* http://opensource.org/licenses/BSD-3-Clause and *
* http://www.boost.org/LICENSE_1_0.txt. *
******************************************************************************/
#include "caf/config.hpp"
#define CAF_SUITE io_dynamic_remote_actor_udp
#include "caf/test/unit_test.hpp"
#include <vector>
#include <sstream>
#include <utility>
#include <algorithm>
#include "caf/all.hpp"
#include "caf/io/all.hpp"
using
namespace
caf
;
namespace
{
constexpr
char
local_host
[]
=
"127.0.0.1"
;
class
config
:
public
actor_system_config
{
public:
config
()
{
load
<
io
::
middleman
>
();
set
(
"middleman.enable-udp"
,
true
);
add_message_type
<
std
::
vector
<
int
>>
(
"std::vector<int>"
);
actor_system_config
::
parse
(
test
::
engine
::
argc
(),
test
::
engine
::
argv
());
}
};
struct
fixture
{
config
server_side_config
;
actor_system
server_side
{
server_side_config
};
config
client_side_config
;
actor_system
client_side
{
client_side_config
};
io
::
middleman
&
server_side_mm
=
server_side
.
middleman
();
io
::
middleman
&
client_side_mm
=
client_side
.
middleman
();
};
behavior
make_pong_behavior
()
{
return
{
[](
int
val
)
->
int
{
++
val
;
CAF_MESSAGE
(
"pong with "
<<
val
);
return
val
;
}
};
}
behavior
make_ping_behavior
(
event_based_actor
*
self
,
const
actor
&
pong
)
{
CAF_MESSAGE
(
"ping with "
<<
0
);
self
->
send
(
pong
,
0
);
return
{
[
=
](
int
val
)
->
int
{
if
(
val
==
3
)
{
CAF_MESSAGE
(
"ping with exit"
);
self
->
send_exit
(
self
->
current_sender
(),
exit_reason
::
user_shutdown
);
CAF_MESSAGE
(
"ping quits"
);
self
->
quit
();
}
CAF_MESSAGE
(
"ping with "
<<
val
);
return
val
;
}
};
}
behavior
make_sort_behavior
()
{
return
{
[](
std
::
vector
<
int
>&
vec
)
->
std
::
vector
<
int
>
{
CAF_MESSAGE
(
"sorter received: "
<<
deep_to_string
(
vec
));
std
::
sort
(
vec
.
begin
(),
vec
.
end
());
CAF_MESSAGE
(
"sorter sent: "
<<
deep_to_string
(
vec
));
return
std
::
move
(
vec
);
}
};
}
behavior
make_sort_requester_behavior
(
event_based_actor
*
self
,
const
actor
&
sorter
)
{
self
->
send
(
sorter
,
std
::
vector
<
int
>
{
5
,
4
,
3
,
2
,
1
});
return
{
[
=
](
const
std
::
vector
<
int
>&
vec
)
{
CAF_MESSAGE
(
"sort requester received: "
<<
deep_to_string
(
vec
));
std
::
vector
<
int
>
expected_vec
{
1
,
2
,
3
,
4
,
5
};
CAF_CHECK_EQUAL
(
vec
,
expected_vec
);
self
->
send_exit
(
sorter
,
exit_reason
::
user_shutdown
);
self
->
quit
();
}
};
}
behavior
fragile_mirror
(
event_based_actor
*
self
)
{
return
{
[
=
](
int
i
)
{
self
->
quit
(
exit_reason
::
user_shutdown
);
return
i
;
}
};
}
behavior
linking_actor
(
event_based_actor
*
self
,
const
actor
&
buddy
)
{
CAF_MESSAGE
(
"link to mirror and send dummy message"
);
self
->
link_to
(
buddy
);
self
->
send
(
buddy
,
42
);
return
{
[](
int
i
)
{
CAF_CHECK_EQUAL
(
i
,
42
);
}
};
}
}
// namespace <anonymous>
CAF_TEST_FIXTURE_SCOPE
(
dynamic_remote_actor_tests_udp
,
fixture
)
CAF_TEST
(
identity_semantics_udp
)
{
// server side
auto
server
=
server_side
.
spawn
(
make_pong_behavior
);
CAF_EXP_THROW
(
port1
,
server_side_mm
.
publish_udp
(
server
,
0
,
local_host
));
CAF_EXP_THROW
(
port2
,
server_side_mm
.
publish_udp
(
server
,
0
,
local_host
));
CAF_REQUIRE_NOT_EQUAL
(
port1
,
port2
);
CAF_EXP_THROW
(
same_server
,
server_side_mm
.
remote_actor_udp
(
local_host
,
port2
));
CAF_REQUIRE_EQUAL
(
same_server
,
server
);
CAF_CHECK_EQUAL
(
same_server
->
node
(),
server_side
.
node
());
CAF_EXP_THROW
(
server1
,
client_side_mm
.
remote_actor_udp
(
local_host
,
port1
));
CAF_EXP_THROW
(
server2
,
client_side_mm
.
remote_actor_udp
(
local_host
,
port2
));
CAF_CHECK_EQUAL
(
server1
,
client_side_mm
.
remote_actor_udp
(
local_host
,
port1
));
CAF_CHECK_EQUAL
(
server2
,
client_side_mm
.
remote_actor_udp
(
local_host
,
port2
));
anon_send_exit
(
server
,
exit_reason
::
user_shutdown
);
}
CAF_TEST
(
ping_pong_udp
)
{
// server side
CAF_EXP_THROW
(
port
,
server_side_mm
.
publish_udp
(
server_side
.
spawn
(
make_pong_behavior
),
0
,
local_host
));
// client side
CAF_EXP_THROW
(
pong
,
client_side_mm
.
remote_actor_udp
(
local_host
,
port
));
client_side
.
spawn
(
make_ping_behavior
,
pong
);
}
CAF_TEST
(
custom_message_type_udp
)
{
// server side
CAF_EXP_THROW
(
port
,
server_side_mm
.
publish_udp
(
server_side
.
spawn
(
make_sort_behavior
),
0
,
local_host
));
// client side
CAF_EXP_THROW
(
sorter
,
client_side_mm
.
remote_actor_udp
(
local_host
,
port
));
client_side
.
spawn
(
make_sort_requester_behavior
,
sorter
);
}
CAF_TEST
(
remote_link_udp
)
{
// server side
CAF_EXP_THROW
(
port
,
server_side_mm
.
publish_udp
(
server_side
.
spawn
(
fragile_mirror
),
0
,
local_host
));
// client side
CAF_EXP_THROW
(
mirror
,
client_side_mm
.
remote_actor_udp
(
local_host
,
port
));
auto
linker
=
client_side
.
spawn
(
linking_actor
,
mirror
);
scoped_actor
self
{
client_side
};
self
->
wait_for
(
linker
);
CAF_MESSAGE
(
"linker exited"
);
self
->
wait_for
(
mirror
);
CAF_MESSAGE
(
"mirror exited"
);
}
CAF_TEST
(
multiple_endpoints_udp
)
{
config
cfg
;
// setup server
CAF_MESSAGE
(
"creating server"
);
actor_system
server_sys
{
cfg
};
auto
mirror
=
server_sys
.
spawn
([]()
->
behavior
{
return
{
[]
(
std
::
string
str
)
{
std
::
reverse
(
begin
(
str
),
end
(
str
));
return
str
;
}
};
});
server_sys
.
middleman
().
publish_udp
(
mirror
,
12345
);
auto
client_fun
=
[](
event_based_actor
*
self
)
->
behavior
{
return
{
[
=
](
actor
s
)
{
self
->
send
(
s
,
"hellow, world"
);
},
[
=
](
const
std
::
string
&
str
)
{
CAF_CHECK_EQUAL
(
str
,
"dlrow ,wolleh"
);
self
->
quit
();
CAF_MESSAGE
(
"done"
);
}
};
};
// setup client a
CAF_MESSAGE
(
"creating first client"
);
config
client_cfg
;
actor_system
client_sys
{
client_cfg
};
auto
client
=
client_sys
.
spawn
(
client_fun
);
// acquire remote actor from the server
auto
client_srv
=
client_sys
.
middleman
().
remote_actor_udp
(
"localhost"
,
12345
);
CAF_REQUIRE
(
client_srv
);
// setup other clients
for
(
int
i
=
0
;
i
<
5
;
++
i
)
{
config
other_cfg
;
actor_system
other_sys
{
other_cfg
};
CAF_MESSAGE
(
"creating new client"
);
auto
other
=
other_sys
.
spawn
(
client_fun
);
// acquire remote actor from the server
auto
other_srv
=
other_sys
.
middleman
().
remote_actor_udp
(
"localhost"
,
12345
);
CAF_REQUIRE
(
other_srv
);
// establish communication and exit
CAF_MESSAGE
(
"client contacts server and exits"
);
anon_send
(
other
,
*
other_srv
);
other_sys
.
await_all_actors_done
();
}
// establish communication and exit
CAF_MESSAGE
(
"first client contacts server and exits"
);
anon_send
(
client
,
*
client_srv
);
client_sys
.
await_all_actors_done
();
anon_send_exit
(
mirror
,
exit_reason
::
user_shutdown
);
}
CAF_TEST_FIXTURE_SCOPE_END
()
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