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
a287eae8
Commit
a287eae8
authored
Sep 03, 2018
by
Joseph Noir
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add fun to spawn newb client from a functor
parent
a7e3a939
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
215 additions
and
7 deletions
+215
-7
libcaf_io/caf/io/network/newb.hpp
libcaf_io/caf/io/network/newb.hpp
+136
-6
libcaf_io/test/protocol_policy.cpp
libcaf_io/test/protocol_policy.cpp
+79
-1
No files found.
libcaf_io/caf/io/network/newb.hpp
View file @
a287eae8
...
@@ -118,7 +118,6 @@ struct transport_policy {
...
@@ -118,7 +118,6 @@ struct transport_policy {
auto
read_result
=
read_some
(
parent
);
auto
read_result
=
read_some
(
parent
);
switch
(
read_result
)
{
switch
(
read_result
)
{
case
rw_state
:
:
success
:
case
rw_state
:
:
success
:
// std::cout << "read success" << std::endl;
if
(
received_bytes
==
0
)
if
(
received_bytes
==
0
)
return
none
;
return
none
;
if
(
should_deliver
())
{
if
(
should_deliver
())
{
...
@@ -129,11 +128,9 @@ struct transport_policy {
...
@@ -129,11 +128,9 @@ struct transport_policy {
}
}
break
;
break
;
case
rw_state
:
:
indeterminate
:
case
rw_state
:
:
indeterminate
:
std
::
cout
<<
"read indeterminate"
<<
std
::
endl
;
// No error, but don't continue reading.
// No error, but don't continue reading.
return
none
;
return
none
;
case
rw_state
:
:
failure
:
case
rw_state
:
:
failure
:
std
::
cout
<<
"read failure"
<<
std
::
endl
;
// Reading failed.
// Reading failed.
return
sec
::
runtime_error
;
return
sec
::
runtime_error
;
}
}
...
@@ -198,6 +195,35 @@ struct protocol_policy : protocol_policy_base {
...
@@ -198,6 +195,35 @@ struct protocol_policy : protocol_policy_base {
template
<
class
T
>
template
<
class
T
>
using
protocol_policy_ptr
=
std
::
unique_ptr
<
protocol_policy
<
T
>>
;
using
protocol_policy_ptr
=
std
::
unique_ptr
<
protocol_policy
<
T
>>
;
template
<
class
T
>
struct
generic_protocol
:
public
io
::
network
::
protocol_policy
<
typename
T
::
message_type
>
{
T
impl
;
generic_protocol
(
io
::
network
::
newb
<
typename
T
::
message_type
>*
parent
)
:
impl
(
parent
)
{
// nop
}
error
read
(
char
*
bytes
,
size_t
count
)
override
{
return
impl
.
read
(
bytes
,
count
);
}
error
timeout
(
atom_value
atm
,
uint32_t
id
)
override
{
return
impl
.
timeout
(
atm
,
id
);
}
void
write_header
(
io
::
network
::
byte_buffer
&
buf
,
io
::
network
::
header_writer
*
hw
)
override
{
impl
.
write_header
(
buf
,
hw
);
}
void
prepare_for_sending
(
io
::
network
::
byte_buffer
&
buf
,
size_t
hstart
,
size_t
offset
,
size_t
plen
)
override
{
impl
.
prepare_for_sending
(
buf
,
hstart
,
offset
,
plen
);
}
};
// -- new broker classes -------------------------------------------------------
// -- new broker classes -------------------------------------------------------
/// @relates newb
/// @relates newb
...
@@ -229,6 +255,8 @@ struct newb : public extend<scheduled_actor, newb<Message>>::template
...
@@ -229,6 +255,8 @@ struct newb : public extend<scheduled_actor, newb<Message>>::template
using
signatures
=
none_t
;
using
signatures
=
none_t
;
using
message_type
=
Message
;
// -- constructors and destructors -------------------------------------------
// -- constructors and destructors -------------------------------------------
newb
(
actor_config
&
cfg
,
default_multiplexer
&
dm
,
native_socket
sockfd
)
newb
(
actor_config
&
cfg
,
default_multiplexer
&
dm
,
native_socket
sockfd
)
...
@@ -275,7 +303,7 @@ struct newb : public extend<scheduled_actor, newb<Message>>::template
...
@@ -275,7 +303,7 @@ struct newb : public extend<scheduled_actor, newb<Message>>::template
CAF_ASSERT
(
eu
!=
nullptr
);
CAF_ASSERT
(
eu
!=
nullptr
);
CAF_ASSERT
(
eu
==
&
backend
());
CAF_ASSERT
(
eu
==
&
backend
());
CAF_LOG_TRACE
(
CAF_ARG
(
lazy
)
<<
CAF_ARG
(
hide
));
CAF_LOG_TRACE
(
CAF_ARG
(
lazy
)
<<
CAF_ARG
(
hide
));
//
add implicit reference count held by middleman/multiplexer
//
Add implicit reference count held by middleman/multiplexer.
if
(
!
hide
)
if
(
!
hide
)
super
::
register_at_system
();
super
::
register_at_system
();
if
(
lazy
&&
super
::
mailbox
().
try_block
())
if
(
lazy
&&
super
::
mailbox
().
try_block
())
...
@@ -291,7 +319,7 @@ struct newb : public extend<scheduled_actor, newb<Message>>::template
...
@@ -291,7 +319,7 @@ struct newb : public extend<scheduled_actor, newb<Message>>::template
CAF_LOG_DEBUG_IF
(
!
bhvr
,
"make_behavior() did not return a behavior:"
CAF_LOG_DEBUG_IF
(
!
bhvr
,
"make_behavior() did not return a behavior:"
<<
CAF_ARG
(
this
->
has_behavior
()));
<<
CAF_ARG
(
this
->
has_behavior
()));
if
(
bhvr
)
{
if
(
bhvr
)
{
// make_behavior() did return a behavior instead of using become()
// make_behavior() did return a behavior instead of using become()
.
CAF_LOG_DEBUG
(
"make_behavior() did return a valid behavior"
);
CAF_LOG_DEBUG
(
"make_behavior() did return a valid behavior"
);
this
->
become
(
std
::
move
(
bhvr
));
this
->
become
(
std
::
move
(
bhvr
));
}
}
...
@@ -446,7 +474,14 @@ struct newb : public extend<scheduled_actor, newb<Message>>::template
...
@@ -446,7 +474,14 @@ struct newb : public extend<scheduled_actor, newb<Message>>::template
}
}
/// Override this to set the behavior of the broker.
/// Override this to set the behavior of the broker.
virtual
behavior
make_behavior
()
=
0
;
virtual
behavior
make_behavior
()
{
behavior
res
;
if
(
this
->
initial_behavior_fac_
)
{
res
=
this
->
initial_behavior_fac_
(
this
);
this
->
initial_behavior_fac_
=
nullptr
;
}
return
res
;
}
/// Configure the number of bytes read for the next packet. (Can be ignored by
/// Configure the number of bytes read for the next packet. (Can be ignored by
/// the transport policy if its protocol does not support this functionality.)
/// the transport policy if its protocol does not support this functionality.)
...
@@ -564,6 +599,97 @@ struct newb_acceptor : public newb_base {
...
@@ -564,6 +599,97 @@ struct newb_acceptor : public newb_base {
// -- factories ----------------------------------------------------------------
// -- factories ----------------------------------------------------------------
// Goal:
// spawn_newb<protocol>(behavior, transport, sockfd);
// spawn_client<protocol>(behavior, transport, host, port);
// spawn_server<protocol>(behavior, transport, port);
// TODO: Should the server be an actor as well? Would give us a place to handle
// its failures and the previously existing `new_endpoint_msg`.
// Primary template.
template
<
class
T
>
struct
function_traits
:
function_traits
<
decltype
(
&
T
::
operator
())
>
{
};
// Partial specialization for function type.
template
<
class
R
,
class
...
Args
>
struct
function_traits
<
R
(
Args
...)
>
{
using
result_type
=
R
;
using
argument_types
=
std
::
tuple
<
Args
...
>
;
};
// Partial specialization for function pointer.
template
<
class
R
,
class
...
Args
>
struct
function_traits
<
R
(
*
)(
Args
...)
>
{
using
result_type
=
R
;
using
argument_types
=
std
::
tuple
<
Args
...
>
;
};
// Partial specialization for std::function.
template
<
class
R
,
class
...
Args
>
struct
function_traits
<
std
::
function
<
R
(
Args
...)
>>
{
using
result_type
=
R
;
using
argument_types
=
std
::
tuple
<
Args
...
>
;
};
// Partial specialization for pointer-to-member-function (i.e., operator()'s).
template
<
class
T
,
class
R
,
class
...
Args
>
struct
function_traits
<
R
(
T
::*
)(
Args
...)
>
{
using
result_type
=
R
;
using
argument_types
=
std
::
tuple
<
Args
...
>
;
};
template
<
class
T
,
class
R
,
class
...
Args
>
struct
function_traits
<
R
(
T
::*
)(
Args
...)
const
>
{
using
result_type
=
R
;
using
argument_types
=
std
::
tuple
<
Args
...
>
;
};
template
<
class
T
>
using
first_argument_type
=
typename
std
::
tuple_element
<
0
,
typename
function_traits
<
T
>::
argument_types
>::
type
;
/// Spawns a new "newb" broker.
template
<
class
Protocol
,
spawn_options
Os
=
no_spawn_options
,
class
F
,
class
...
Ts
>
typename
infer_handle_from_fun
<
F
>::
type
spawn_newb
(
actor_system
&
sys
,
F
fun
,
transport_policy_ptr
transport
,
native_socket
sockfd
,
Ts
&&
...
xs
)
{
using
impl
=
typename
infer_handle_from_fun
<
F
>::
impl
;
using
first
=
first_argument_type
<
F
>
;
using
message
=
typename
std
::
remove_pointer
<
first
>::
type
::
message_type
;
auto
&
dm
=
dynamic_cast
<
default_multiplexer
&>
(
sys
.
middleman
().
backend
());
// Setup the config.
actor_config
cfg
{
&
dm
};
detail
::
init_fun_factory
<
impl
,
F
>
fac
;
auto
init_fun
=
fac
(
std
::
move
(
fun
),
std
::
forward
<
Ts
>
(
xs
)...);
cfg
.
init_fun
=
[
init_fun
](
local_actor
*
self
)
mutable
->
behavior
{
return
init_fun
(
self
);
};
auto
res
=
sys
.
spawn_class
<
impl
,
Os
>
(
cfg
,
dm
,
sockfd
);
// Get a reference to the newb type.
auto
ptr
=
caf
::
actor_cast
<
caf
::
abstract_actor
*>
(
res
);
CAF_ASSERT
(
ptr
!=
nullptr
);
auto
&
ref
=
dynamic_cast
<
newb
<
message
>&>
(
*
ptr
);
// Set the policies.
ref
.
transport
=
std
::
move
(
transport
);
ref
.
protocol
.
reset
(
new
Protocol
(
&
ref
));
// Start the event handler.
ref
.
start
();
return
res
;
}
/// Spawn a new "newb" broker client to connect to `host`:`port`.
template
<
class
Protocol
,
spawn_options
Os
=
no_spawn_options
,
class
F
,
class
...
Ts
>
typename
infer_handle_from_fun
<
F
>::
type
spawn_client
(
actor_system
&
sys
,
F
fun
,
transport_policy_ptr
transport
,
std
::
string
host
,
uint16_t
port
,
Ts
&&
...
xs
)
{
expected
<
native_socket
>
esock
=
transport
->
connect
(
host
,
port
);
if
(
!
esock
)
return
std
::
move
(
esock
.
error
());
return
spawn_newb
<
Protocol
>
(
sys
,
fun
,
std
::
move
(
transport
),
std
::
forward
<
Ts
>
(
xs
)...);
}
template
<
class
Newb
>
template
<
class
Newb
>
actor
make_newb
(
actor_system
&
sys
,
native_socket
sockfd
)
{
actor
make_newb
(
actor_system
&
sys
,
native_socket
sockfd
)
{
auto
&
mpx
=
dynamic_cast
<
default_multiplexer
&>
(
sys
.
middleman
().
backend
());
auto
&
mpx
=
dynamic_cast
<
default_multiplexer
&>
(
sys
.
middleman
().
backend
());
...
@@ -607,6 +733,10 @@ std::unique_ptr<NewbAcceptor> make_server_newb(actor_system& sys,
...
@@ -607,6 +733,10 @@ std::unique_ptr<NewbAcceptor> make_server_newb(actor_system& sys,
return
ptr
;
return
ptr
;
}
}
/// Convenience template alias for declaring state-based brokers.
template
<
class
Message
,
class
State
>
using
stateful_newb
=
stateful_actor
<
State
,
newb
<
Message
>>
;
}
// namespace network
}
// namespace network
}
// namespace io
}
// namespace io
}
// namespace caf
}
// namespace caf
...
...
libcaf_io/test/protocol_policy.cpp
View file @
a287eae8
...
@@ -27,6 +27,7 @@
...
@@ -27,6 +27,7 @@
#include "caf/test/dsl.hpp"
#include "caf/test/dsl.hpp"
#include "caf/io/network/newb.hpp"
#include "caf/io/network/newb.hpp"
#include "caf/policy/newb_raw.hpp"
using
namespace
caf
;
using
namespace
caf
;
using
namespace
caf
::
io
;
using
namespace
caf
::
io
;
...
@@ -48,6 +49,9 @@ using send_atom = atom_constant<atom("send")>;
...
@@ -48,6 +49,9 @@ using send_atom = atom_constant<atom("send")>;
using
shutdown_atom
=
atom_constant
<
atom
(
"shutdown"
)
>
;
using
shutdown_atom
=
atom_constant
<
atom
(
"shutdown"
)
>
;
using
quit_atom
=
atom_constant
<
atom
(
"quit"
)
>
;
using
quit_atom
=
atom_constant
<
atom
(
"quit"
)
>
;
using
set_atom
=
atom_constant
<
atom
(
"set"
)
>
;
using
get_atom
=
atom_constant
<
atom
(
"get"
)
>
;
// -- dummy headers ------------------------------------------------------------
// -- dummy headers ------------------------------------------------------------
struct
basp_header
{
struct
basp_header
{
...
@@ -349,6 +353,10 @@ struct dummy_basp_newb_acceptor
...
@@ -349,6 +353,10 @@ struct dummy_basp_newb_acceptor
std
::
vector
<
actor
>
spawned
;
std
::
vector
<
actor
>
spawned
;
};
};
struct
test_state
{
int
i
;
};
class
config
:
public
actor_system_config
{
class
config
:
public
actor_system_config
{
public:
public:
config
()
{
config
()
{
...
@@ -376,7 +384,7 @@ struct fixture {
...
@@ -376,7 +384,7 @@ struct fixture {
sched
(
dynamic_cast
<
caf
::
scheduler
::
test_coordinator
&>
(
sys
.
scheduler
()))
{
sched
(
dynamic_cast
<
caf
::
scheduler
::
test_coordinator
&>
(
sys
.
scheduler
()))
{
// Create newb.
// Create newb.
self
=
network
::
make_newb
<
dummy_basp_newb
>
(
sys
,
self
=
network
::
make_newb
<
dummy_basp_newb
>
(
sys
,
network
::
invalid_native_socket
);
network
::
invalid_native_socket
);
auto
&
ref
=
deref
<
network
::
newb
<
new_basp_message
>>
(
self
);
auto
&
ref
=
deref
<
network
::
newb
<
new_basp_message
>>
(
self
);
network
::
newb
<
new_basp_message
>*
self_ptr
=
&
ref
;
network
::
newb
<
new_basp_message
>*
self_ptr
=
&
ref
;
ref
.
transport
.
reset
(
new
network
::
transport_policy
);
ref
.
transport
.
reset
(
new
network
::
transport_policy
);
...
@@ -546,4 +554,74 @@ CAF_TEST(newb acceptor) {
...
@@ -546,4 +554,74 @@ CAF_TEST(newb acceptor) {
CAF_CHECK
(
!
dummy
.
spawned
.
empty
());
CAF_CHECK
(
!
dummy
.
spawned
.
empty
());
}
}
CAF_TEST
(
spawn
newb
)
{
using
newb_t
=
io
::
network
::
newb
<
policy
::
raw_data_message
>
;
scoped_actor
self
{
sys
};
auto
rcvd
=
false
;
auto
server
=
[
&
rcvd
]
(
newb_t
*
)
->
behavior
{
return
{
[
&
rcvd
](
int
)
{
rcvd
=
true
;
},
};
};
CAF_MESSAGE
(
"create newb"
);
network
::
transport_policy_ptr
transport
{
new
network
::
transport_policy
};
auto
esock
=
io
::
network
::
new_tcp_acceptor_impl
(
0
,
nullptr
,
true
);
CAF_REQUIRE
(
esock
);
using
proto
=
io
::
network
::
generic_protocol
<
policy
::
raw
>
;
auto
n
=
io
::
network
::
spawn_newb
<
proto
>
(
sys
,
server
,
std
::
move
(
transport
),
*
esock
);
exec_all
();
CAF_MESSAGE
(
"send test message"
);
self
->
send
(
n
,
3
);
exec_all
();
CAF_CHECK
(
rcvd
);
CAF_MESSAGE
(
"shutdown newb"
);
self
->
send_exit
(
n
,
exit_reason
::
user_shutdown
);
exec_all
();
CAF_MESSAGE
(
"done"
);
}
CAF_TEST
(
spawn
stateful
newb
)
{
scoped_actor
self
{
sys
};
using
newb_t
=
io
::
network
::
stateful_newb
<
policy
::
raw_data_message
,
test_state
>
;
auto
server
=
[]
(
newb_t
*
self
)
->
behavior
{
self
->
state
.
i
=
0
;
return
{
[
=
](
set_atom
,
int
i
)
{
self
->
state
.
i
=
i
;
},
[
=
](
get_atom
)
{
return
self
->
state
.
i
;
},
};
};
CAF_MESSAGE
(
"create newb"
);
network
::
transport_policy_ptr
transport
{
new
network
::
transport_policy
};
auto
esock
=
io
::
network
::
new_tcp_acceptor_impl
(
0
,
nullptr
,
true
);
CAF_REQUIRE
(
esock
);
using
proto
=
io
::
network
::
generic_protocol
<
policy
::
raw
>
;
auto
n
=
io
::
network
::
spawn_newb
<
proto
>
(
sys
,
server
,
std
::
move
(
transport
),
*
esock
);
exec_all
();
CAF_MESSAGE
(
"set value in state"
);
self
->
send
(
n
,
set_atom
::
value
,
3
);
exec_all
();
CAF_MESSAGE
(
"get value back"
);
self
->
send
(
n
,
get_atom
::
value
);
exec_all
();
self
->
receive
(
[
&
](
int
r
)
{
CAF_CHECK_EQUAL
(
r
,
3
);
CAF_MESSAGE
(
"matches expected value"
);
},
[
&
](
const
error
&
err
)
{
CAF_FAIL
(
sys
.
render
(
err
));
}
);
CAF_MESSAGE
(
"shutdown newb"
);
anon_send_exit
(
n
,
exit_reason
::
user_shutdown
);
exec_all
();
CAF_MESSAGE
(
"done"
);
}
CAF_TEST_FIXTURE_SCOPE_END
()
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