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
d408143f
Commit
d408143f
authored
Dec 11, 2018
by
Joseph Noir
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow accept polices to spawn servers for mpxing
parent
589c5a2d
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
94 additions
and
29 deletions
+94
-29
libcaf_io/CMakeLists.txt
libcaf_io/CMakeLists.txt
+1
-0
libcaf_io/caf/io/network/acceptor_base.hpp
libcaf_io/caf/io/network/acceptor_base.hpp
+38
-0
libcaf_io/caf/io/newb.hpp
libcaf_io/caf/io/newb.hpp
+8
-6
libcaf_io/caf/policy/accept.hpp
libcaf_io/caf/policy/accept.hpp
+6
-17
libcaf_io/caf/policy/newb_tcp.hpp
libcaf_io/caf/policy/newb_tcp.hpp
+4
-3
libcaf_io/caf/policy/newb_udp.hpp
libcaf_io/caf/policy/newb_udp.hpp
+4
-3
libcaf_io/src/acceptor_base.cpp
libcaf_io/src/acceptor_base.cpp
+33
-0
No files found.
libcaf_io/CMakeLists.txt
View file @
d408143f
...
...
@@ -8,6 +8,7 @@ file(GLOB_RECURSE LIBCAF_IO_HDRS "caf/*.hpp")
# list cpp files excluding platform-dependent files
set
(
LIBCAF_IO_SRCS
src/abstract_broker.cpp
src/acceptor_base.cpp
src/acceptor_manager.cpp
src/acceptor_manager.cpp
src/basp_broker.cpp
...
...
libcaf_io/caf/io/network/acceptor_base.hpp
0 → 100644
View file @
d408143f
/******************************************************************************
* ____ _ _____ *
* / ___| / \ | ___| C++ *
* | | / _ \ | |_ Actor *
* | |___ / ___ \| _| Framework *
* \____/_/ \_|_| *
* *
* Copyright 2011-2018 Dominik Charousset *
* *
* 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. *
******************************************************************************/
#pragma once
#include "caf/io/network/newb_base.hpp"
#include "caf/policy/transport.hpp"
namespace
caf
{
namespace
io
{
namespace
network
{
struct
acceptor_base
:
public
newb_base
{
acceptor_base
(
actor_config
&
cfg
,
default_multiplexer
&
dm
,
native_socket
sockfd
);
virtual
expected
<
actor
>
create_newb
(
network
::
native_socket
sockfd
,
policy
::
transport_ptr
pol
,
bool
add_children_to_loop
)
=
0
;
};
}
// namespace network
}
// namespace io
}
// namespace caf
libcaf_io/caf/io/newb.hpp
View file @
d408143f
...
...
@@ -31,6 +31,7 @@
#include "caf/detail/socket_guard.hpp"
#include "caf/io/broker.hpp"
#include "caf/io/middleman.hpp"
#include "caf/io/network/acceptor_base.hpp"
#include "caf/io/network/default_multiplexer.hpp"
#include "caf/io/network/event_handler.hpp"
#include "caf/io/network/interfaces.hpp"
...
...
@@ -421,7 +422,7 @@ spawn_client(actor_system& sys, F fun, policy::transport_ptr transport,
// -- new broker acceptor ------------------------------------------------------
template
<
class
Protocol
,
class
Fun
,
class
...
Ts
>
struct
newb_acceptor
:
network
::
newb
_base
{
struct
newb_acceptor
:
network
::
acceptor
_base
{
using
newb_type
=
typename
std
::
remove_pointer
<
first_argument_type
<
Fun
>>::
type
;
using
message_type
=
typename
newb_type
::
message_type
;
...
...
@@ -431,7 +432,7 @@ struct newb_acceptor : network::newb_base {
network
::
native_socket
sockfd
,
Fun
f
,
policy
::
accept_ptr
<
message_type
>
pol
,
std
::
tuple
<
Ts
...
>
args
)
:
newb
_base
(
cfg
,
dm
,
sockfd
),
:
acceptor
_base
(
cfg
,
dm
,
sockfd
),
accept_pol
(
std
::
move
(
pol
)),
fun_
(
std
::
move
(
f
)),
reading_
(
false
),
...
...
@@ -562,7 +563,7 @@ struct newb_acceptor : network::newb_base {
CAF_LOG_ERROR
(
"failed to create socket for new endpoint"
);
return
;
}
auto
en
=
create_newb
(
sock
,
std
::
move
(
transport
));
auto
en
=
create_newb
(
sock
,
std
::
move
(
transport
)
,
true
);
if
(
!
en
)
{
io_error
(
network
::
operation
::
read
,
std
::
move
(
en
.
error
()));
return
;
...
...
@@ -578,15 +579,16 @@ struct newb_acceptor : network::newb_base {
accept_pol
->
write_event
(
this
);
}
virtual
expected
<
actor
>
create_newb
(
network
::
native_socket
sockfd
,
policy
::
transport_ptr
pol
)
{
expected
<
actor
>
create_newb
(
network
::
native_socket
sockfd
,
policy
::
transport_ptr
pol
,
bool
add_children_to_loop
)
override
{
CAF_LOG_TRACE
(
CAF_ARG
(
sockfd
));
auto
n
=
detail
::
apply_args_prefixed
(
io
::
spawn_newb
<
Protocol
,
no_spawn_options
,
Fun
,
Ts
...
>
,
detail
::
get_indices
(
args_
),
args_
,
this
->
backend
().
system
(),
fun_
,
std
::
move
(
pol
),
sockfd
,
a
ccept_pol
->
add_children_to_loop
()
a
dd_children_to_loop
);
link_to
(
n
);
children_
.
push_back
(
n
);
...
...
libcaf_io/caf/policy/accept.hpp
View file @
d408143f
...
...
@@ -21,17 +21,10 @@
#include "caf/config.hpp"
#include "caf/expected.hpp"
#include "caf/io/network/native_socket.hpp"
#include "caf/io/network/
newb
_base.hpp"
#include "caf/io/network/
acceptor
_base.hpp"
#include "caf/policy/transport.hpp"
namespace
caf
{
namespace
io
{
template
<
class
Message
>
struct
newb
;
}
// namespace io
namespace
policy
{
template
<
class
Message
>
...
...
@@ -45,34 +38,30 @@ struct accept {
// nop
}
virtual
bool
add_children_to_loop
()
{
return
true
;
}
virtual
expected
<
io
::
network
::
native_socket
>
create_socket
(
uint16_t
port
,
const
char
*
host
,
bool
reuse
=
false
)
=
0
;
virtual
std
::
pair
<
io
::
network
::
native_socket
,
transport_ptr
>
accept_event
(
io
::
network
::
newb
_base
*
)
{
accept_event
(
io
::
network
::
acceptor
_base
*
)
{
return
{
0
,
nullptr
};
}
/// If `requires_raw_data` is set to true, the acceptor will only call
/// this function for new read event and let the policy handle everything
/// else.
virtual
void
read_event
(
io
::
network
::
newb
_base
*
)
{
virtual
void
read_event
(
io
::
network
::
acceptor
_base
*
)
{
// nop
}
virtual
error
write_event
(
io
::
network
::
newb
_base
*
)
{
virtual
error
write_event
(
io
::
network
::
acceptor
_base
*
)
{
return
none
;
}
virtual
void
init
(
io
::
network
::
newb
_base
*
,
io
::
newb
<
Message
>&
)
{
virtual
void
init
(
io
::
network
::
acceptor
_base
*
,
io
::
newb
<
Message
>&
)
{
// nop
}
virtual
void
shutdown
(
io
::
network
::
newb
_base
*
,
virtual
void
shutdown
(
io
::
network
::
acceptor
_base
*
,
io
::
network
::
native_socket
)
{
// nop
}
...
...
libcaf_io/caf/policy/newb_tcp.hpp
View file @
d408143f
...
...
@@ -18,6 +18,7 @@
#pragma once
#include "caf/io/network/acceptor_base.hpp"
#include "caf/io/network/default_multiplexer.hpp"
#include "caf/io/network/native_socket.hpp"
#include "caf/io/network/newb_base.hpp"
...
...
@@ -71,7 +72,7 @@ struct accept_tcp : public accept<Message> {
}
std
::
pair
<
io
::
network
::
native_socket
,
transport_ptr
>
accept_event
(
io
::
network
::
newb
_base
*
parent
)
override
{
accept_event
(
io
::
network
::
acceptor
_base
*
parent
)
override
{
auto
esock
=
io
::
network
::
accept_tcp_connection
(
get_newb_socket
(
parent
));
if
(
!
esock
)
{
return
{
io
::
network
::
invalid_native_socket
,
nullptr
};
...
...
@@ -80,11 +81,11 @@ struct accept_tcp : public accept<Message> {
return
{
*
esock
,
std
::
move
(
ptr
)};
}
void
init
(
io
::
network
::
newb
_base
*
,
io
::
newb
<
Message
>&
spawned
)
override
{
void
init
(
io
::
network
::
acceptor
_base
*
,
io
::
newb
<
Message
>&
spawned
)
override
{
spawned
.
start
();
}
void
shutdown
(
io
::
network
::
newb
_base
*
,
void
shutdown
(
io
::
network
::
acceptor
_base
*
,
io
::
network
::
native_socket
sockfd
)
override
{
io
::
network
::
shutdown_both
(
sockfd
);
}
...
...
libcaf_io/caf/policy/newb_udp.hpp
View file @
d408143f
...
...
@@ -18,6 +18,7 @@
#pragma once
#include "caf/io/network/acceptor_base.hpp"
#include "caf/io/network/default_multiplexer.hpp"
#include "caf/io/network/ip_endpoint.hpp"
#include "caf/io/network/native_socket.hpp"
...
...
@@ -85,7 +86,7 @@ struct accept_udp : public accept<Message> {
}
std
::
pair
<
io
::
network
::
native_socket
,
transport_ptr
>
accept_event
(
io
::
network
::
newb
_base
*
)
override
{
accept_event
(
io
::
network
::
acceptor
_base
*
)
override
{
std
::
cout
<<
"Accepting msg from UDP endpoint"
<<
std
::
endl
;
auto
res
=
io
::
network
::
new_local_udp_endpoint_impl
(
0
,
nullptr
,
true
);
if
(
!
res
)
{
...
...
@@ -97,14 +98,14 @@ struct accept_udp : public accept<Message> {
return
{
sock
,
std
::
move
(
ptr
)};
}
void
init
(
io
::
network
::
newb
_base
*
parent
,
void
init
(
io
::
network
::
acceptor
_base
*
parent
,
io
::
newb
<
Message
>&
spawned
)
override
{
spawned
.
trans
->
prepare_next_read
(
parent
);
spawned
.
trans
->
read_some
(
parent
,
*
spawned
.
proto
.
get
());
spawned
.
start
();
}
void
shutdown
(
io
::
network
::
newb
_base
*
parent
,
void
shutdown
(
io
::
network
::
acceptor
_base
*
parent
,
io
::
network
::
native_socket
)
override
{
parent
->
passivate
();
}
...
...
libcaf_io/src/acceptor_base.cpp
0 → 100644
View file @
d408143f
/******************************************************************************
* ____ _ _____ *
* / ___| / \ | ___| C++ *
* | | / _ \ | |_ Actor *
* | |___ / ___ \| _| Framework *
* \____/_/ \_|_| *
* *
* Copyright 2011-2018 Dominik Charousset *
* *
* 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/io/network/acceptor_base.hpp"
namespace
caf
{
namespace
io
{
namespace
network
{
acceptor_base
::
acceptor_base
(
actor_config
&
cfg
,
default_multiplexer
&
dm
,
native_socket
sockfd
)
:
newb_base
(
cfg
,
dm
,
sockfd
)
{
// nop
}
}
// namespace network
}
// namespace io
}
// namespace caf
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