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
47538648
Commit
47538648
authored
Feb 15, 2019
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switch to offset instead of using vector::iterator
parent
79081a84
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
23 deletions
+28
-23
libcaf_core/caf/binary_serializer.hpp
libcaf_core/caf/binary_serializer.hpp
+9
-1
libcaf_core/src/binary_serializer.cpp
libcaf_core/src/binary_serializer.cpp
+19
-22
No files found.
libcaf_core/caf/binary_serializer.hpp
View file @
47538648
...
...
@@ -41,6 +41,14 @@ public:
binary_serializer
(
execution_unit
*
ctx
,
buffer
&
buf
);
binary_serializer
(
binary_serializer
&&
)
=
default
;
binary_serializer
&
operator
=
(
binary_serializer
&&
)
=
default
;
binary_serializer
(
const
binary_serializer
&
)
=
delete
;
binary_serializer
&
operator
=
(
const
binary_serializer
&
)
=
delete
;
// -- position management ----------------------------------------------------
/// Sets the write position to given offset.
...
...
@@ -104,7 +112,7 @@ protected:
private:
buffer
&
buf_
;
buffer
::
iterator
write_pos_
;
size_t
write_pos_
;
};
}
// namespace caf
libcaf_core/src/binary_serializer.cpp
View file @
47538648
...
...
@@ -38,28 +38,24 @@ error apply_int(binary_serializer& bs, T x) {
}
// namespace <anonmyous>
binary_serializer
::
binary_serializer
(
actor_system
&
sys
,
buffer
&
buf
)
:
super
(
sys
),
buf_
(
buf
),
write_pos_
(
buf
.
end
())
{
:
super
(
sys
),
buf_
(
buf
),
write_pos_
(
buf
_
.
size
())
{
// nop
}
binary_serializer
::
binary_serializer
(
execution_unit
*
ctx
,
buffer
&
buf
)
:
super
(
ctx
),
buf_
(
buf
),
write_pos_
(
buf
.
end
())
{
:
super
(
ctx
),
buf_
(
buf
),
write_pos_
(
buf
_
.
size
())
{
// nop
}
void
binary_serializer
::
seek
(
size_t
offset
)
{
write_pos_
=
buf_
.
begin
()
+
offset
;
write_pos_
=
offset
;
}
void
binary_serializer
::
skip
(
size_t
num_bytes
)
{
auto
last
=
buf_
.
end
();
auto
remaining
=
static_cast
<
size_t
>
(
std
::
distance
(
write_pos_
,
last
));
if
(
remaining
>=
num_bytes
)
{
write_pos_
+=
num_bytes
;
}
else
{
buf_
.
insert
(
last
,
num_bytes
-
remaining
,
0
);
write_pos_
=
buf_
.
end
();
}
auto
remaining
=
buf_
.
size
()
-
write_pos_
;
if
(
remaining
<
num_bytes
)
buf_
.
insert
(
buf_
.
end
(),
num_bytes
-
remaining
,
0
);
write_pos_
+=
num_bytes
;
}
error
binary_serializer
::
begin_object
(
uint16_t
&
nr
,
std
::
string
&
name
)
{
...
...
@@ -84,20 +80,21 @@ error binary_serializer::end_sequence() {
}
error
binary_serializer
::
apply_raw
(
size_t
num_bytes
,
void
*
data
)
{
CAF_ASSERT
(
write_pos_
<=
buf_
.
size
());
auto
ptr
=
reinterpret_cast
<
char
*>
(
data
);
auto
last
=
buf_
.
end
();
if
(
write_pos_
==
last
)
{
buf_
.
insert
(
last
,
ptr
,
ptr
+
num_bytes
);
write_pos_
=
buf_
.
end
();
}
else
if
(
write_pos_
+
num_bytes
<
last
)
{
memcpy
(
&
(
*
write_pos_
),
ptr
,
num_bytes
);
write_pos_
+=
num_bytes
;
auto
buf_size
=
buf_
.
size
();
if
(
write_pos_
==
buf_size
)
{
buf_
.
insert
(
buf_
.
end
(),
ptr
,
ptr
+
num_bytes
);
}
else
if
(
write_pos_
+
num_bytes
<=
buf_size
)
{
memcpy
(
buf_
.
data
()
+
write_pos_
,
ptr
,
num_bytes
);
}
else
{
auto
remaining
=
static_cast
<
size_t
>
(
last
-
write_pos_
)
;
memcpy
(
&
(
*
write_pos_
),
ptr
,
remaining
);
buf_
.
insert
(
last
,
ptr
+
remaining
,
ptr
+
num_bytes
);
write_pos_
=
buf_
.
end
(
);
auto
remaining
=
buf_size
-
write_pos_
;
CAF_ASSERT
(
remaining
<
num_bytes
);
memcpy
(
buf_
.
data
()
+
write_pos_
,
ptr
,
remaining
);
buf_
.
insert
(
buf_
.
end
(),
ptr
+
remaining
,
ptr
+
num_bytes
);
}
write_pos_
+=
num_bytes
;
CAF_ASSERT
(
write_pos_
<=
buf_
.
size
());
return
none
;
}
...
...
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