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
4f70e957
Commit
4f70e957
authored
Sep 02, 2020
by
Joseph Noir
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add test for length prefix framing
parent
98dd5641
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
178 additions
and
3 deletions
+178
-3
libcaf_net/caf/net/length_prefix_framing.hpp
libcaf_net/caf/net/length_prefix_framing.hpp
+1
-1
libcaf_net/test/net/length_prefix_framing.cpp
libcaf_net/test/net/length_prefix_framing.cpp
+177
-2
No files found.
libcaf_net/caf/net/length_prefix_framing.hpp
View file @
4f70e957
...
@@ -141,7 +141,7 @@ public:
...
@@ -141,7 +141,7 @@ public:
using
detail
::
from_network_order
;
using
detail
::
from_network_order
;
if
(
buffer
.
size
()
<
4
)
if
(
buffer
.
size
()
<
4
)
return
0
;
return
0
;
auto
u32_size
=
0
;
uint32_t
u32_size
=
0
;
memcpy
(
&
u32_size
,
buffer
.
data
(),
4
);
memcpy
(
&
u32_size
,
buffer
.
data
(),
4
);
auto
msg_size
=
static_cast
<
size_t
>
(
from_network_order
(
u32_size
));
auto
msg_size
=
static_cast
<
size_t
>
(
from_network_order
(
u32_size
));
if
(
buffer
.
size
()
<
msg_size
+
4
)
if
(
buffer
.
size
()
<
msg_size
+
4
)
...
...
libcaf_net/test/net/length_prefix_framing.cpp
View file @
4f70e957
...
@@ -22,20 +22,195 @@
...
@@ -22,20 +22,195 @@
#include "caf/test/dsl.hpp"
#include "caf/test/dsl.hpp"
#include <deque>
#include <vector>
#include <numeric>
#include "caf/byte.hpp"
#include "caf/byte_buffer.hpp"
#include "caf/binary_serializer.hpp"
#include "caf/detail/network_order.hpp"
#include "caf/span.hpp"
#include "caf/tag/message_oriented.hpp"
using
namespace
caf
;
using
namespace
caf
;
namespace
{
namespace
{
/// upper layer: expect messages
/// Needs to be initilized by the layer two steps down.
struct
ul_expect_messages
{
using
byte_span
=
span
<
const
byte
>
;
using
input_tag
=
tag
::
message_oriented
;
void
set_expected_messages
(
std
::
vector
<
byte_buffer
>
messages
)
{
expected_messages
.
clear
();
for
(
auto
&
msg
:
messages
)
expected_messages
.
emplace_back
(
std
::
move
(
msg
));
}
void
add_expected_messages
(
std
::
vector
<
byte_buffer
>
messages
)
{
for
(
auto
&
msg
:
messages
)
expected_messages
.
emplace_back
(
std
::
move
(
msg
));
}
template
<
class
LowerLayer
>
ptrdiff_t
consume
(
LowerLayer
&
,
byte_span
buffer
)
{
CAF_REQUIRE
(
expected_messages
.
size
()
>
0
);
auto
&
next
=
expected_messages
.
front
();
CAF_CHECK_EQUAL
(
next
.
size
(),
buffer
.
size
());
CAF_CHECK
(
std
::
equal
(
next
.
begin
(),
next
.
end
(),
buffer
.
begin
()));
expected_messages
.
pop_front
();
return
buffer
.
size
();
}
std
::
deque
<
byte_buffer
>
expected_messages
;
};
/// lower layer: offer stream for message parsing
template
<
class
UpperLayer
>
struct
ll_provide_stream_for_messages
{
using
output_tag
=
tag
::
stream_oriented
;
void
set_expectations
(
std
::
vector
<
byte
>
data
,
std
::
vector
<
byte_buffer
>
messages
)
{
data_stream
=
std
::
move
(
data
);
auto
&
checking_layer
=
upper_layer
.
upper_layer
();
checking_layer
.
set_expected_messages
(
messages
);
}
void
add_expectations
(
const
std
::
vector
<
byte
>&
data
,
std
::
vector
<
byte_buffer
>
messages
)
{
data_stream
.
insert
(
data_stream
.
end
(),
data
.
begin
(),
data
.
end
());
auto
&
checking_layer
=
upper_layer
.
upper_layer
();
checking_layer
.
add_expect_messages
(
messages
);
}
void
run
()
{
CAF_CHECK
(
data_stream
.
size
()
!=
0
);
while
(
processed
!=
data_stream
.
size
())
{
auto
all_data
=
make_span
(
data_stream
.
data
()
+
processed
,
data_stream
.
size
()
-
processed
);
auto
new_data
=
make_span
(
data_stream
.
data
()
+
offered
,
data_stream
.
size
()
-
offered
);
auto
newly_offered
=
new_data
.
size
();
auto
consumed
=
upper_layer
.
consume
(
*
this
,
all_data
,
new_data
);
CAF_CHECK
(
consumed
>=
0
);
CAF_CHECK
(
static_cast
<
size_t
>
(
consumed
)
<=
data_stream
.
size
());
offered
+=
newly_offered
;
processed
+=
consumed
;
if
(
consumed
>
0
)
{
data_stream
.
erase
(
data_stream
.
begin
(),
data_stream
.
begin
()
+
consumed
);
offered
-=
processed
;
processed
=
0
;
}
if
(
consumed
==
0
||
data_stream
.
size
()
==
0
)
return
;
}
}
size_t
processed
=
0
;
size_t
offered
=
0
;
std
::
vector
<
byte
>
data_stream
;
UpperLayer
upper_layer
;
};
template
<
class
...
Ts
>
byte_buffer
to_buf
(
const
Ts
&
...
xs
)
{
byte_buffer
buf
;
binary_serializer
sink
{
nullptr
,
buf
};
if
(
auto
err
=
sink
(
xs
...))
CAF_FAIL
(
err
);
return
buf
;
}
void
encode_message
(
std
::
vector
<
byte
>&
data
,
const
byte_buffer
&
message
)
{
using
detail
::
to_network_order
;
auto
current_size
=
data
.
size
();
data
.
insert
(
data
.
end
(),
4
,
byte
{
0
});
auto
msg_begin
=
data
.
begin
()
+
current_size
;
auto
msg_size
=
message
.
size
();
auto
u32_size
=
to_network_order
(
static_cast
<
uint32_t
>
(
msg_size
));
memcpy
(
std
::
addressof
(
*
msg_begin
),
&
u32_size
,
4
);
data
.
insert
(
data
.
end
(),
message
.
begin
(),
message
.
end
());
}
struct
fixture
{
struct
fixture
{
using
test_layers
=
ll_provide_stream_for_messages
<
net
::
length_prefix_framing
<
ul_expect_messages
>>
;
void
generate_messages
(
size_t
num
,
size_t
factor
=
10
)
{
for
(
size_t
n
=
1
;
n
<=
num
;
n
+=
1
)
{
std
::
vector
<
int
>
buf
(
n
*
factor
);
std
::
iota
(
buf
.
begin
(),
buf
.
end
(),
n
);
messages
.
emplace_back
(
to_buf
(
buf
));
}
for
(
auto
&
msg
:
messages
)
encode_message
(
data
,
msg
);
}
void
set_expectations
()
{
layers
.
set_expectations
(
data
,
messages
);
}
void
test_receive_data
()
{
layers
.
run
();
}
void
clear
()
{
data
.
clear
();
messages
.
clear
();
}
test_layers
layers
;
std
::
vector
<
byte
>
data
;
std
::
vector
<
byte_buffer
>
messages
;
};
};
}
// namespace
}
// namespace
CAF_TEST_FIXTURE_SCOPE
(
length_prefix_framing_tests
,
fixture
)
CAF_TEST_FIXTURE_SCOPE
(
length_prefix_framing_tests
,
fixture
)
CAF_TEST
(
todo
)
{
CAF_TEST
(
process
messages
)
{
// implement me
// Single message.
generate_messages
(
1
);
set_expectations
();
test_receive_data
();
clear
();
// Multiple messages.
generate_messages
(
10
);
set_expectations
();
test_receive_data
();
}
CAF_TEST
(
incomplete
message
)
{
generate_messages
(
1
,
1000
);
CAF_MESSAGE
(
"data.size() = "
<<
data
.
size
());
auto
initial_size
=
data
.
size
();
auto
data_copy
=
data
;
auto
mid
=
data
.
size
()
/
2
;
data
.
resize
(
mid
);
CAF_MESSAGE
(
"data.size() = "
<<
data
.
size
());
data_copy
.
erase
(
data_copy
.
begin
(),
data_copy
.
begin
()
+
mid
);
CAF_MESSAGE
(
"data_copy.size() = "
<<
data_copy
.
size
());
CAF_REQUIRE
(
data
.
size
()
+
data_copy
.
size
()
==
initial_size
);
// Don't set expectations because there shouldn't be a complete message
// in the bytes.
auto
messages_copy
=
messages
;
messages
.
clear
();
CAF_REQUIRE
(
messages
.
empty
());
set_expectations
();
test_receive_data
();
data
.
insert
(
data
.
end
(),
data_copy
.
begin
(),
data_copy
.
end
());
messages
=
messages_copy
;
set_expectations
();
test_receive_data
();
}
}
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