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
ebcddbb6
Commit
ebcddbb6
authored
Mar 17, 2023
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove redundant template parameters
parent
39657215
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
27 additions
and
23 deletions
+27
-23
libcaf_net/caf/detail/accept_handler.hpp
libcaf_net/caf/detail/accept_handler.hpp
+4
-3
libcaf_net/caf/net/length_prefix_framing.hpp
libcaf_net/caf/net/length_prefix_framing.hpp
+1
-2
libcaf_net/caf/net/lp/server_factory.hpp
libcaf_net/caf/net/lp/server_factory.hpp
+7
-5
libcaf_net/caf/net/prometheus/server_factory.hpp
libcaf_net/caf/net/prometheus/server_factory.hpp
+7
-5
libcaf_net/caf/net/web_socket/server_factory.hpp
libcaf_net/caf/net/web_socket/server_factory.hpp
+7
-6
libcaf_net/src/net/http/serve.cpp
libcaf_net/src/net/http/serve.cpp
+1
-2
No files found.
libcaf_net/caf/detail/accept_handler.hpp
View file @
ebcddbb6
...
...
@@ -13,15 +13,16 @@ namespace caf::detail {
/// Accepts incoming clients with an Acceptor and handles them via a connection
/// factory.
template
<
class
Acceptor
,
class
ConnHandle
=
typename
Acceptor
::
accept_result_type
>
template
<
class
Acceptor
>
class
accept_handler
:
public
net
::
socket_event_layer
{
public:
// -- member types -----------------------------------------------------------
using
socket_type
=
net
::
socket
;
using
connection_handle
=
ConnHandle
;
using
transport_type
=
typename
Acceptor
::
transport_type
;
using
connection_handle
=
typename
transport_type
::
connection_handle
;
using
factory_type
=
connection_factory
<
connection_handle
>
;
...
...
libcaf_net/caf/net/length_prefix_framing.hpp
View file @
ebcddbb6
...
...
@@ -142,8 +142,7 @@ public:
using
transport_t
=
typename
Acceptor
::
transport_type
;
using
trait_t
=
binary
::
default_trait
;
using
factory_t
=
cf_impl
<
transport_t
>
;
using
conn_t
=
typename
transport_t
::
connection_handle
;
using
impl_t
=
detail
::
accept_handler
<
Acceptor
,
conn_t
>
;
using
impl_t
=
detail
::
accept_handler
<
Acceptor
>
;
auto
max_connections
=
get_or
(
cfg
,
defaults
::
net
::
max_connections
);
if
(
auto
buf
=
out
.
try_open
())
{
auto
&
mpx
=
sys
.
network_manager
().
mpx
();
...
...
libcaf_net/caf/net/lp/server_factory.hpp
View file @
ebcddbb6
...
...
@@ -75,8 +75,9 @@ private:
};
/// Specializes @ref connection_factory for the length-prefixing protocol.
template
<
class
Transport
,
class
ConnHandle
,
class
Trait
>
class
lp_connection_factory
:
public
connection_factory
<
ConnHandle
>
{
template
<
class
Transport
,
class
Trait
>
class
lp_connection_factory
:
public
connection_factory
<
typename
Transport
::
connection_handle
>
{
public:
using
accept_event
=
typename
Trait
::
accept_event
;
...
...
@@ -84,6 +85,8 @@ public:
using
shared_producer_type
=
std
::
shared_ptr
<
producer_type
>
;
using
connection_handle
=
typename
Transport
::
connection_handle
;
lp_connection_factory
(
producer_type
producer
,
size_t
max_consecutive_reads
)
:
producer_
(
std
::
make_shared
<
producer_type
>
(
std
::
move
(
producer
))),
max_consecutive_reads_
(
max_consecutive_reads
)
{
...
...
@@ -91,7 +94,7 @@ public:
}
net
::
socket_manager_ptr
make
(
net
::
multiplexer
*
mpx
,
ConnH
andle
conn
)
override
{
connection_h
andle
conn
)
override
{
using
bridge_t
=
lp_server_flow_bridge
<
Trait
>
;
auto
bridge
=
bridge_t
::
make
(
mpx
,
producer_
);
auto
bridge_ptr
=
bridge
.
get
();
...
...
@@ -144,9 +147,8 @@ private:
template
<
class
Acceptor
,
class
OnStart
>
expected
<
disposable
>
do_start_impl
(
config_type
&
cfg
,
Acceptor
acc
,
OnStart
&
on_start
)
{
using
conn_t
=
typename
Acceptor
::
accept_result_type
;
using
transport_t
=
typename
Acceptor
::
transport_type
;
using
factory_t
=
detail
::
lp_connection_factory
<
transport_t
,
conn_t
,
Trait
>
;
using
factory_t
=
detail
::
lp_connection_factory
<
transport_t
,
Trait
>
;
using
impl_t
=
detail
::
accept_handler
<
Acceptor
>
;
using
accept_event
=
typename
Trait
::
accept_event
;
auto
[
pull
,
push
]
=
async
::
make_spsc_buffer_resource
<
accept_event
>
();
...
...
libcaf_net/caf/net/prometheus/server_factory.hpp
View file @
ebcddbb6
...
...
@@ -27,9 +27,12 @@
namespace
caf
::
detail
{
template
<
class
Transport
,
class
ConnHandle
>
class
prom_conn_factory
:
public
connection_factory
<
ConnHandle
>
{
template
<
class
Transport
>
class
prom_conn_factory
:
public
connection_factory
<
typename
Transport
::
connection_handle
>
{
public:
using
connection_handle
=
typename
Transport
::
connection_handle
;
using
state_ptr
=
net
::
prometheus
::
server
::
scrape_state_ptr
;
explicit
prom_conn_factory
(
state_ptr
ptr
)
:
ptr_
(
std
::
move
(
ptr
))
{
...
...
@@ -37,7 +40,7 @@ public:
}
net
::
socket_manager_ptr
make
(
net
::
multiplexer
*
mpx
,
ConnH
andle
conn
)
override
{
connection_h
andle
conn
)
override
{
auto
prom_serv
=
net
::
prometheus
::
server
::
make
(
ptr_
);
auto
http_serv
=
net
::
http
::
server
::
make
(
std
::
move
(
prom_serv
));
auto
transport
=
Transport
::
make
(
std
::
move
(
conn
),
std
::
move
(
http_serv
));
...
...
@@ -75,9 +78,8 @@ public:
private:
template
<
class
Acceptor
>
expected
<
disposable
>
do_start_impl
(
config_type
&
cfg
,
Acceptor
acc
)
{
using
conn_t
=
typename
Acceptor
::
accept_result_type
;
using
transport_t
=
typename
Acceptor
::
transport_type
;
using
factory_t
=
detail
::
prom_conn_factory
<
transport_t
,
conn_t
>
;
using
factory_t
=
detail
::
prom_conn_factory
<
transport_t
>
;
using
impl_t
=
detail
::
accept_handler
<
Acceptor
>
;
auto
*
mpx
=
cfg
.
mpx
;
auto
*
registry
=
&
mpx
->
system
().
metrics
();
...
...
libcaf_net/caf/net/web_socket/server_factory.hpp
View file @
ebcddbb6
...
...
@@ -90,8 +90,9 @@ private:
};
/// Specializes @ref connection_factory for the WebSocket protocol.
template
<
class
Transport
,
class
ConnHandle
,
class
Trait
,
class
...
Ts
>
class
ws_connection_factory
:
public
connection_factory
<
ConnHandle
>
{
template
<
class
Transport
,
class
Trait
,
class
...
Ts
>
class
ws_connection_factory
:
public
connection_factory
<
typename
Transport
::
connection_handle
>
{
public:
using
ws_acceptor_t
=
net
::
web_socket
::
acceptor
<
Ts
...
>
;
...
...
@@ -104,6 +105,8 @@ public:
using
shared_producer_type
=
std
::
shared_ptr
<
producer_type
>
;
using
connection_handle
=
typename
Transport
::
connection_handle
;
ws_connection_factory
(
on_request_cb_type
on_request
,
shared_producer_type
producer
,
size_t
max_consecutive_reads
)
...
...
@@ -114,7 +117,7 @@ public:
}
net
::
socket_manager_ptr
make
(
net
::
multiplexer
*
mpx
,
ConnH
andle
conn
)
override
{
connection_h
andle
conn
)
override
{
if
(
producer_
->
canceled
())
{
// TODO: stop the caller?
return
nullptr
;
...
...
@@ -197,10 +200,8 @@ private:
template
<
class
Acceptor
,
class
OnStart
>
expected
<
disposable
>
do_start_impl
(
config_type
&
cfg
,
Acceptor
acc
,
OnStart
&
on_start
)
{
using
conn_t
=
typename
Acceptor
::
accept_result_type
;
using
transport_t
=
typename
Acceptor
::
transport_type
;
using
factory_t
=
detail
::
ws_connection_factory
<
transport_t
,
conn_t
,
Trait
,
Ts
...
>
;
using
factory_t
=
detail
::
ws_connection_factory
<
transport_t
,
Trait
,
Ts
...
>
;
using
impl_t
=
detail
::
accept_handler
<
Acceptor
>
;
using
producer_t
=
async
::
blocking_producer
<
accept_event
>
;
auto
[
pull
,
push
]
=
async
::
make_spsc_buffer_resource
<
accept_event
>
();
...
...
libcaf_net/src/net/http/serve.cpp
View file @
ebcddbb6
...
...
@@ -177,8 +177,7 @@ disposable http_serve_impl(actor_system& sys, Acceptor acc,
async
::
producer_resource
<
net
::
http
::
request
>
out
,
const
settings
&
cfg
=
{})
{
using
factory_t
=
http_conn_factory
<
Transport
>
;
using
conn_t
=
typename
Transport
::
connection_handle
;
using
impl_t
=
accept_handler
<
Acceptor
,
conn_t
>
;
using
impl_t
=
accept_handler
<
Acceptor
>
;
auto
max_conn
=
get_or
(
cfg
,
defaults
::
net
::
max_connections
);
if
(
auto
buf
=
out
.
try_open
())
{
auto
&
mpx
=
sys
.
network_manager
().
mpx
();
...
...
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