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
8b28db8d
Unverified
Commit
8b28db8d
authored
Jan 07, 2021
by
Dominik Charousset
Committed by
GitHub
Jan 07, 2021
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #89
Fix warnings
parents
5c319ff6
792fd127
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
28 additions
and
22 deletions
+28
-22
CMakeLists.txt
CMakeLists.txt
+2
-1
examples/net/web-socket-calculator.cpp
examples/net/web-socket-calculator.cpp
+1
-1
libcaf_net/caf/net/basp/remote_message_handler.hpp
libcaf_net/caf/net/basp/remote_message_handler.hpp
+2
-1
libcaf_net/caf/net/middleman.hpp
libcaf_net/caf/net/middleman.hpp
+1
-1
libcaf_net/test/header.cpp
libcaf_net/test/header.cpp
+2
-2
libcaf_net/test/net/actor_shell.cpp
libcaf_net/test/net/actor_shell.cpp
+1
-1
libcaf_net/test/net/length_prefix_framing.cpp
libcaf_net/test/net/length_prefix_framing.cpp
+3
-3
libcaf_net/test/net/typed_actor_shell.cpp
libcaf_net/test/net/typed_actor_shell.cpp
+1
-1
libcaf_net/test/net/web_socket_server.cpp
libcaf_net/test/net/web_socket_server.cpp
+2
-1
libcaf_net/test/pipe_socket.cpp
libcaf_net/test/pipe_socket.cpp
+4
-2
libcaf_net/test/stream_socket.cpp
libcaf_net/test/stream_socket.cpp
+7
-6
libcaf_net/test/udp_datagram_socket.cpp
libcaf_net/test/udp_datagram_socket.cpp
+2
-2
No files found.
CMakeLists.txt
View file @
8b28db8d
...
@@ -50,7 +50,7 @@ if(CAF_INC_ENABLE_STANDALONE_BUILD)
...
@@ -50,7 +50,7 @@ if(CAF_INC_ENABLE_STANDALONE_BUILD)
FetchContent_Declare
(
FetchContent_Declare
(
actor_framework
actor_framework
GIT_REPOSITORY https://github.com/actor-framework/actor-framework.git
GIT_REPOSITORY https://github.com/actor-framework/actor-framework.git
GIT_TAG
4f8609b
GIT_TAG
6b2cbd4
)
)
FetchContent_Populate
(
actor_framework
)
FetchContent_Populate
(
actor_framework
)
set
(
CAF_ENABLE_EXAMPLES OFF CACHE BOOL
""
FORCE
)
set
(
CAF_ENABLE_EXAMPLES OFF CACHE BOOL
""
FORCE
)
...
@@ -66,6 +66,7 @@ else()
...
@@ -66,6 +66,7 @@ else()
endif
()
endif
()
# -- set the library version for shared library targets ------------------------
# -- set the library version for shared library targets ------------------------
if
(
CMAKE_HOST_SYSTEM_NAME MATCHES
"OpenBSD"
)
if
(
CMAKE_HOST_SYSTEM_NAME MATCHES
"OpenBSD"
)
set
(
CAF_LIB_VERSION
"
${
CAF_VERSION_MAJOR
}
.
${
CAF_VERSION_MINOR
}
"
set
(
CAF_LIB_VERSION
"
${
CAF_VERSION_MAJOR
}
.
${
CAF_VERSION_MINOR
}
"
CACHE INTERNAL
"The version string used for shared library objects"
)
CACHE INTERNAL
"The version string used for shared library objects"
)
...
...
examples/net/web-socket-calculator.cpp
View file @
8b28db8d
...
@@ -194,7 +194,7 @@ public:
...
@@ -194,7 +194,7 @@ public:
}
}
caf
::
config_value_reader
reader
{
&
val
};
caf
::
config_value_reader
reader
{
&
val
};
caf
::
message
msg
;
caf
::
message
msg
;
if
(
!
reader
.
apply
_object
(
msg
))
{
if
(
!
reader
.
apply
(
msg
))
{
down
->
abort_reason
(
reader
.
get_error
());
down
->
abort_reason
(
reader
.
get_error
());
return
-
1
;
return
-
1
;
}
}
...
...
libcaf_net/caf/net/basp/remote_message_handler.hpp
View file @
8b28db8d
...
@@ -39,7 +39,8 @@ public:
...
@@ -39,7 +39,8 @@ public:
std
::
vector
<
strong_actor_ptr
>
fwd_stack
;
std
::
vector
<
strong_actor_ptr
>
fwd_stack
;
message
content
;
message
content
;
binary_deserializer
source
{
ctx
,
payload
};
binary_deserializer
source
{
ctx
,
payload
};
if
(
!
source
.
apply_objects
(
src_node
,
src_id
,
dst_id
,
fwd_stack
,
content
))
{
if
(
!
(
source
.
apply
(
src_node
)
&&
source
.
apply
(
src_id
)
&&
source
.
apply
(
dst_id
)
&&
source
.
apply
(
fwd_stack
)
&&
source
.
apply
(
content
)))
{
CAF_LOG_ERROR
(
CAF_LOG_ERROR
(
"failed to deserialize payload:"
<<
CAF_ARG
(
source
.
get_error
()));
"failed to deserialize payload:"
<<
CAF_ARG
(
source
.
get_error
()));
return
;
return
;
...
...
libcaf_net/caf/net/middleman.hpp
View file @
8b28db8d
...
@@ -47,7 +47,7 @@ public:
...
@@ -47,7 +47,7 @@ public:
///
///
/// @param sock An accept socket in listening mode. For a TCP socket, this
/// @param sock An accept socket in listening mode. For a TCP socket, this
/// socket must already listen to an address plus port.
/// socket must already listen to an address plus port.
/// @param factory
/// @param factory
An application stack factory.
template
<
class
Socket
,
class
Factory
>
template
<
class
Socket
,
class
Factory
>
auto
make_acceptor
(
Socket
sock
,
Factory
factory
)
{
auto
make_acceptor
(
Socket
sock
,
Factory
factory
)
{
using
connected_socket_type
=
typename
Socket
::
connected_socket_type
;
using
connected_socket_type
=
typename
Socket
::
connected_socket_type
;
...
...
libcaf_net/test/header.cpp
View file @
8b28db8d
...
@@ -21,7 +21,7 @@ CAF_TEST(serialization) {
...
@@ -21,7 +21,7 @@ CAF_TEST(serialization) {
byte_buffer
buf
;
byte_buffer
buf
;
{
{
binary_serializer
sink
{
nullptr
,
buf
};
binary_serializer
sink
{
nullptr
,
buf
};
CAF_CHECK
(
sink
.
apply
_object
(
x
));
CAF_CHECK
(
sink
.
apply
(
x
));
}
}
CAF_CHECK_EQUAL
(
buf
.
size
(),
basp
::
header_size
);
CAF_CHECK_EQUAL
(
buf
.
size
(),
basp
::
header_size
);
auto
buf2
=
to_bytes
(
x
);
auto
buf2
=
to_bytes
(
x
);
...
@@ -30,7 +30,7 @@ CAF_TEST(serialization) {
...
@@ -30,7 +30,7 @@ CAF_TEST(serialization) {
basp
::
header
y
;
basp
::
header
y
;
{
{
binary_deserializer
source
{
nullptr
,
buf
};
binary_deserializer
source
{
nullptr
,
buf
};
CAF_CHECK
(
source
.
apply
_object
(
y
));
CAF_CHECK
(
source
.
apply
(
y
));
}
}
CAF_CHECK_EQUAL
(
x
,
y
);
CAF_CHECK_EQUAL
(
x
,
y
);
auto
z
=
basp
::
header
::
from_bytes
(
buf
);
auto
z
=
basp
::
header
::
from_bytes
(
buf
);
...
...
libcaf_net/test/net/actor_shell.cpp
View file @
8b28db8d
...
@@ -100,7 +100,7 @@ struct app_t {
...
@@ -100,7 +100,7 @@ struct app_t {
// Deserialize message from received dictionary.
// Deserialize message from received dictionary.
config_value_reader
reader
{
&
val
};
config_value_reader
reader
{
&
val
};
caf
::
message
msg
;
caf
::
message
msg
;
if
(
!
reader
.
apply
_object
(
msg
))
{
if
(
!
reader
.
apply
(
msg
))
{
down
->
abort_reason
(
reader
.
get_error
());
down
->
abort_reason
(
reader
.
get_error
());
return
-
1
;
return
-
1
;
}
}
...
...
libcaf_net/test/net/length_prefix_framing.cpp
View file @
8b28db8d
...
@@ -73,7 +73,7 @@ struct ll_provide_stream_for_messages {
...
@@ -73,7 +73,7 @@ struct ll_provide_stream_for_messages {
}
}
void
run
()
{
void
run
()
{
CAF_CHECK
(
data_stream
.
size
()
!=
0
);
CAF_CHECK
(
!
data_stream
.
empty
()
);
while
(
processed
!=
data_stream
.
size
())
{
while
(
processed
!=
data_stream
.
size
())
{
auto
all_data
=
make_span
(
data_stream
.
data
()
+
processed
,
auto
all_data
=
make_span
(
data_stream
.
data
()
+
processed
,
data_stream
.
size
()
-
processed
);
data_stream
.
size
()
-
processed
);
...
@@ -90,7 +90,7 @@ struct ll_provide_stream_for_messages {
...
@@ -90,7 +90,7 @@ struct ll_provide_stream_for_messages {
offered
-=
processed
;
offered
-=
processed
;
processed
=
0
;
processed
=
0
;
}
}
if
(
consumed
==
0
||
data_stream
.
size
()
==
0
)
if
(
consumed
==
0
||
data_stream
.
empty
()
)
return
;
return
;
}
}
}
}
...
@@ -107,7 +107,7 @@ template <class... Ts>
...
@@ -107,7 +107,7 @@ template <class... Ts>
byte_buffer
to_buf
(
const
Ts
&
...
xs
)
{
byte_buffer
to_buf
(
const
Ts
&
...
xs
)
{
byte_buffer
buf
;
byte_buffer
buf
;
binary_serializer
sink
{
nullptr
,
buf
};
binary_serializer
sink
{
nullptr
,
buf
};
if
(
!
sink
.
apply_objects
(
xs
...))
if
(
!
(
sink
.
apply
(
xs
)
&&
...))
CAF_FAIL
(
"to_buf failed: "
<<
sink
.
get_error
());
CAF_FAIL
(
"to_buf failed: "
<<
sink
.
get_error
());
return
buf
;
return
buf
;
}
}
...
...
libcaf_net/test/net/typed_actor_shell.cpp
View file @
8b28db8d
...
@@ -103,7 +103,7 @@ struct app_t {
...
@@ -103,7 +103,7 @@ struct app_t {
// Deserialize message from received dictionary.
// Deserialize message from received dictionary.
config_value_reader
reader
{
&
val
};
config_value_reader
reader
{
&
val
};
caf
::
message
msg
;
caf
::
message
msg
;
if
(
!
reader
.
apply
_object
(
msg
))
{
if
(
!
reader
.
apply
(
msg
))
{
down
->
abort_reason
(
reader
.
get_error
());
down
->
abort_reason
(
reader
.
get_error
());
return
-
1
;
return
-
1
;
}
}
...
...
libcaf_net/test/net/web_socket_server.cpp
View file @
8b28db8d
...
@@ -183,7 +183,8 @@ CAF_TEST(handshakes may arrive in chunks) {
...
@@ -183,7 +183,8 @@ CAF_TEST(handshakes may arrive in chunks) {
CAF_CHECK_EQUAL
(
transport
.
handle_input
(),
0u
);
CAF_CHECK_EQUAL
(
transport
.
handle_input
(),
0u
);
CAF_CHECK
(
!
ws
->
handshake_complete
());
CAF_CHECK
(
!
ws
->
handshake_complete
());
transport
.
push
(
bufs
[
2
]);
transport
.
push
(
bufs
[
2
]);
CAF_CHECK_EQUAL
(
transport
.
handle_input
(),
opening_handshake
.
size
());
CAF_CHECK_EQUAL
(
static_cast
<
size_t
>
(
transport
.
handle_input
()),
opening_handshake
.
size
());
CAF_CHECK
(
ws
->
handshake_complete
());
CAF_CHECK
(
ws
->
handshake_complete
());
}
}
...
...
libcaf_net/test/pipe_socket.cpp
View file @
8b28db8d
...
@@ -25,8 +25,10 @@ CAF_TEST(send and receive) {
...
@@ -25,8 +25,10 @@ CAF_TEST(send and receive) {
pipe_socket
rd_sock
;
pipe_socket
rd_sock
;
pipe_socket
wr_sock
;
pipe_socket
wr_sock
;
std
::
tie
(
rd_sock
,
wr_sock
)
=
unbox
(
make_pipe
());
std
::
tie
(
rd_sock
,
wr_sock
)
=
unbox
(
make_pipe
());
CAF_CHECK_EQUAL
(
write
(
wr_sock
,
send_buf
),
send_buf
.
size
());
CAF_CHECK_EQUAL
(
static_cast
<
size_t
>
(
write
(
wr_sock
,
send_buf
)),
CAF_CHECK_EQUAL
(
read
(
rd_sock
,
receive_buf
),
send_buf
.
size
());
send_buf
.
size
());
CAF_CHECK_EQUAL
(
static_cast
<
size_t
>
(
read
(
rd_sock
,
receive_buf
)),
send_buf
.
size
());
CAF_CHECK
(
std
::
equal
(
send_buf
.
begin
(),
send_buf
.
end
(),
receive_buf
.
begin
()));
CAF_CHECK
(
std
::
equal
(
send_buf
.
begin
(),
send_buf
.
end
(),
receive_buf
.
begin
()));
}
}
...
...
libcaf_net/test/stream_socket.cpp
View file @
8b28db8d
...
@@ -70,16 +70,16 @@ CAF_TEST(read on empty sockets) {
...
@@ -70,16 +70,16 @@ CAF_TEST(read on empty sockets) {
CAF_TEST
(
transfer
data
from
first
to
second
socket
)
{
CAF_TEST
(
transfer
data
from
first
to
second
socket
)
{
byte_buffer
wr_buf
{
1
_b
,
2
_b
,
4
_b
,
8
_b
,
16
_b
,
32
_b
,
64
_b
};
byte_buffer
wr_buf
{
1
_b
,
2
_b
,
4
_b
,
8
_b
,
16
_b
,
32
_b
,
64
_b
};
CAF_MESSAGE
(
"transfer data from first to second socket"
);
CAF_MESSAGE
(
"transfer data from first to second socket"
);
CAF_CHECK_EQUAL
(
write
(
first
,
wr_buf
),
wr_buf
.
size
());
CAF_CHECK_EQUAL
(
static_cast
<
size_t
>
(
write
(
first
,
wr_buf
)
),
wr_buf
.
size
());
CAF_CHECK_EQUAL
(
read
(
second
,
rd_buf
),
wr_buf
.
size
());
CAF_CHECK_EQUAL
(
static_cast
<
size_t
>
(
read
(
second
,
rd_buf
)
),
wr_buf
.
size
());
CAF_CHECK
(
std
::
equal
(
wr_buf
.
begin
(),
wr_buf
.
end
(),
rd_buf
.
begin
()));
CAF_CHECK
(
std
::
equal
(
wr_buf
.
begin
(),
wr_buf
.
end
(),
rd_buf
.
begin
()));
rd_buf
.
assign
(
rd_buf
.
size
(),
byte
(
0
));
rd_buf
.
assign
(
rd_buf
.
size
(),
byte
(
0
));
}
}
CAF_TEST
(
transfer
data
from
second
to
first
socket
)
{
CAF_TEST
(
transfer
data
from
second
to
first
socket
)
{
byte_buffer
wr_buf
{
1
_b
,
2
_b
,
4
_b
,
8
_b
,
16
_b
,
32
_b
,
64
_b
};
byte_buffer
wr_buf
{
1
_b
,
2
_b
,
4
_b
,
8
_b
,
16
_b
,
32
_b
,
64
_b
};
CAF_CHECK_EQUAL
(
write
(
second
,
wr_buf
),
wr_buf
.
size
());
CAF_CHECK_EQUAL
(
static_cast
<
size_t
>
(
write
(
second
,
wr_buf
)
),
wr_buf
.
size
());
CAF_CHECK_EQUAL
(
read
(
first
,
rd_buf
),
wr_buf
.
size
());
CAF_CHECK_EQUAL
(
static_cast
<
size_t
>
(
read
(
first
,
rd_buf
)
),
wr_buf
.
size
());
CAF_CHECK
(
std
::
equal
(
wr_buf
.
begin
(),
wr_buf
.
end
(),
rd_buf
.
begin
()));
CAF_CHECK
(
std
::
equal
(
wr_buf
.
begin
(),
wr_buf
.
end
(),
rd_buf
.
begin
()));
}
}
...
@@ -95,9 +95,10 @@ CAF_TEST(transfer data using multiple buffers) {
...
@@ -95,9 +95,10 @@ CAF_TEST(transfer data using multiple buffers) {
byte_buffer
full_buf
;
byte_buffer
full_buf
;
full_buf
.
insert
(
full_buf
.
end
(),
wr_buf_1
.
begin
(),
wr_buf_1
.
end
());
full_buf
.
insert
(
full_buf
.
end
(),
wr_buf_1
.
begin
(),
wr_buf_1
.
end
());
full_buf
.
insert
(
full_buf
.
end
(),
wr_buf_2
.
begin
(),
wr_buf_2
.
end
());
full_buf
.
insert
(
full_buf
.
end
(),
wr_buf_2
.
begin
(),
wr_buf_2
.
end
());
CAF_CHECK_EQUAL
(
write
(
second
,
{
make_span
(
wr_buf_1
),
make_span
(
wr_buf_2
)}),
CAF_CHECK_EQUAL
(
static_cast
<
size_t
>
(
write
(
second
,
{
make_span
(
wr_buf_1
),
make_span
(
wr_buf_2
)})),
full_buf
.
size
());
full_buf
.
size
());
CAF_CHECK_EQUAL
(
read
(
first
,
rd_buf
),
full_buf
.
size
());
CAF_CHECK_EQUAL
(
static_cast
<
size_t
>
(
read
(
first
,
rd_buf
)
),
full_buf
.
size
());
CAF_CHECK
(
std
::
equal
(
full_buf
.
begin
(),
full_buf
.
end
(),
rd_buf
.
begin
()));
CAF_CHECK
(
std
::
equal
(
full_buf
.
begin
(),
full_buf
.
end
(),
rd_buf
.
begin
()));
}
}
...
...
libcaf_net/test/udp_datagram_socket.cpp
View file @
8b28db8d
...
@@ -119,7 +119,7 @@ CAF_TEST(read / write using span<byte_buffer*>) {
...
@@ -119,7 +119,7 @@ CAF_TEST(read / write using span<byte_buffer*>) {
header
hdr
{
hello_test
.
size
()};
header
hdr
{
hello_test
.
size
()};
byte_buffer
hdr_buf
;
byte_buffer
hdr_buf
;
binary_serializer
sink
(
sys
,
hdr_buf
);
binary_serializer
sink
(
sys
,
hdr_buf
);
if
(
!
sink
.
apply
_object
(
hdr
))
if
(
!
sink
.
apply
(
hdr
))
CAF_FAIL
(
"failed to serialize payload: "
<<
sink
.
get_error
());
CAF_FAIL
(
"failed to serialize payload: "
<<
sink
.
get_error
());
auto
bytes
=
as_bytes
(
make_span
(
hello_test
));
auto
bytes
=
as_bytes
(
make_span
(
hello_test
));
byte_buffer
payload_buf
(
bytes
.
begin
(),
bytes
.
end
());
byte_buffer
payload_buf
(
bytes
.
begin
(),
bytes
.
end
());
...
@@ -134,7 +134,7 @@ CAF_TEST(read / write using span<byte_buffer*>) {
...
@@ -134,7 +134,7 @@ CAF_TEST(read / write using span<byte_buffer*>) {
CAF_CHECK_EQUAL
(
buf
.
size
(),
packet_size
);
CAF_CHECK_EQUAL
(
buf
.
size
(),
packet_size
);
binary_deserializer
source
(
nullptr
,
buf
);
binary_deserializer
source
(
nullptr
,
buf
);
header
recv_hdr
;
header
recv_hdr
;
if
(
!
source
.
apply
_objects
(
recv_hdr
))
if
(
!
source
.
apply
(
recv_hdr
))
CAF_FAIL
(
"failed to deserialize header: "
<<
source
.
get_error
());
CAF_FAIL
(
"failed to deserialize header: "
<<
source
.
get_error
());
CAF_CHECK_EQUAL
(
hdr
.
payload_size
,
recv_hdr
.
payload_size
);
CAF_CHECK_EQUAL
(
hdr
.
payload_size
,
recv_hdr
.
payload_size
);
string_view
received
{
reinterpret_cast
<
const
char
*>
(
buf
.
data
())
string_view
received
{
reinterpret_cast
<
const
char
*>
(
buf
.
data
())
...
...
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