Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
actor-incubator
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
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-incubator
Commits
1906791e
Commit
1906791e
authored
Aug 31, 2019
by
Jakob Otto
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into topic/transport-worker-dispatcher
parents
6ccd5d8c
b759768a
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
17 additions
and
17 deletions
+17
-17
libcaf_net/caf/net/fwd.hpp
libcaf_net/caf/net/fwd.hpp
+2
-0
libcaf_net/caf/net/stream_transport.hpp
libcaf_net/caf/net/stream_transport.hpp
+2
-1
libcaf_net/caf/net/transport_worker.hpp
libcaf_net/caf/net/transport_worker.hpp
+3
-3
libcaf_net/caf/net/write_packet_decorator.hpp
libcaf_net/caf/net/write_packet_decorator.hpp
+2
-2
libcaf_net/test/socket_guard.cpp
libcaf_net/test/socket_guard.cpp
+2
-0
libcaf_net/test/string_application.cpp
libcaf_net/test/string_application.cpp
+1
-3
libcaf_net/test/transport_worker.cpp
libcaf_net/test/transport_worker.cpp
+5
-8
No files found.
libcaf_net/caf/net/fwd.hpp
View file @
1906791e
...
...
@@ -27,6 +27,8 @@ namespace net {
class
multiplexer
;
class
socket_manager
;
template
<
class
Application
,
class
IdType
=
unit_t
>
class
transport_worker
;
struct
network_socket
;
struct
pipe_socket
;
...
...
libcaf_net/caf/net/stream_transport.hpp
View file @
1906791e
...
...
@@ -65,7 +65,8 @@ public:
template
<
class
Parent
>
error
init
(
Parent
&
parent
)
{
worker_
.
init
(
parent
);
if
(
auto
err
=
worker_
.
init
(
parent
))
return
err
;
parent
.
mask_add
(
operation
::
read
);
return
none
;
}
...
...
libcaf_net/caf/net/transport_worker.hpp
View file @
1906791e
...
...
@@ -29,8 +29,8 @@
namespace
caf
{
namespace
net
{
///
implements a worker for the udp_transport policy
template
<
class
Application
,
class
IdType
=
unit_t
>
///
Implements a worker for transport protocols.
template
<
class
Application
,
class
IdType
>
class
transport_worker
{
public:
// -- member types -----------------------------------------------------------
...
...
@@ -54,7 +54,7 @@ public:
}
template
<
class
Parent
>
void
handle_data
(
Parent
&
parent
,
span
<
byte
>
data
)
{
void
handle_data
(
Parent
&
parent
,
span
<
const
byte
>
data
)
{
application_
.
handle_data
(
parent
,
data
);
}
...
...
libcaf_net/caf/net/write_packet_decorator.hpp
View file @
1906791e
...
...
@@ -54,8 +54,8 @@ public:
// -- member functions -------------------------------------------------------
template
<
class
Header
,
class
...
Ts
>
void
write_packet
(
const
Header
&
header
,
span
<
const
byte
>
payload
,
template
<
class
...
Ts
>
void
write_packet
(
span
<
const
byte
>
header
,
span
<
const
byte
>
payload
,
Ts
&&
...
xs
)
{
object_
.
write_packet
(
parent_
,
header
,
payload
,
std
::
forward
<
Ts
>
(
xs
)...);
}
...
...
libcaf_net/test/socket_guard.cpp
View file @
1906791e
...
...
@@ -37,6 +37,8 @@ struct dummy_socket {
// nop
}
dummy_socket
(
const
dummy_socket
&
)
=
default
;
dummy_socket
&
operator
=
(
const
dummy_socket
&
other
)
{
id
=
other
.
id
;
closed
=
other
.
closed
;
...
...
libcaf_net/test/string_application.cpp
View file @
1906791e
...
...
@@ -101,10 +101,8 @@ public:
void
write_message
(
Parent
&
parent
,
std
::
unique_ptr
<
net
::
endpoint_manager
::
message
>
msg
)
{
header_type
header
{
static_cast
<
uint32_t
>
(
msg
->
payload
.
size
())};
std
::
vector
<
byte
>
header_buf
(
sizeof
(
header_type
));
std
::
vector
<
byte
>
payload
(
msg
->
payload
.
begin
(),
msg
->
payload
.
end
());
memcpy
(
header_buf
.
data
(),
&
header
,
header_buf
.
size
());
parent
.
write_packet
(
make_span
(
header_buf
),
make_span
(
payload
));
parent
.
write_packet
(
as_bytes
(
make_span
(
&
header
,
1
)),
make_span
(
payload
));
}
static
expected
<
std
::
vector
<
byte
>>
serialize
(
actor_system
&
sys
,
...
...
libcaf_net/test/transport_worker.cpp
View file @
1906791e
...
...
@@ -122,8 +122,8 @@ public:
// nop
}
template
<
class
Header
>
void
write_packet
(
Header
header
,
span
<
const
byte
>
payload
,
ip_endpoint
ep
)
{
void
write_packet
(
span
<
const
byte
>
header
,
span
<
const
byte
>
payload
,
ip_endpoint
ep
)
{
auto
&
buf
=
res_
->
packet_buffer
;
buf
.
insert
(
buf
.
begin
(),
header
.
begin
(),
header
.
end
());
buf
.
insert
(
buf
.
begin
(),
payload
.
begin
(),
payload
.
end
());
...
...
@@ -173,9 +173,7 @@ CAF_TEST(construction and initialization) {
}
CAF_TEST
(
handle_data
)
{
auto
test_span
=
make_span
(
reinterpret_cast
<
byte
*>
(
const_cast
<
char
*>
(
hello_test
.
data
())),
hello_test
.
size
());
auto
test_span
=
as_bytes
(
make_span
(
hello_test
));
worker
.
handle_data
(
transport
,
test_span
);
auto
&
buf
=
application_results
->
data_buffer
;
string_view
result
{
reinterpret_cast
<
char
*>
(
buf
.
data
()),
buf
.
size
()};
...
...
@@ -193,9 +191,8 @@ CAF_TEST(write_message) {
const_cast
<
char
*>
(
hello_test
.
data
())),
hello_test
.
size
());
std
::
vector
<
byte
>
payload
(
test_span
.
begin
(),
test_span
.
end
());
auto
message
=
caf
::
detail
::
make_unique
<
endpoint_manager
::
message
>
(
std
::
move
(
elem
),
payload
);
auto
message
=
detail
::
make_unique
<
endpoint_manager
::
message
>
(
std
::
move
(
elem
),
payload
);
worker
.
write_message
(
transport
,
std
::
move
(
message
));
auto
&
buf
=
transport_results
->
packet_buffer
;
string_view
result
{
reinterpret_cast
<
char
*>
(
buf
.
data
()),
buf
.
size
()};
...
...
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