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
ee068c64
Commit
ee068c64
authored
Mar 17, 2022
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix memory leak in the message builder
parent
30ce7372
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
13 deletions
+27
-13
libcaf_core/caf/detail/message_builder_element.hpp
libcaf_core/caf/detail/message_builder_element.hpp
+19
-7
libcaf_core/caf/message_builder.hpp
libcaf_core/caf/message_builder.hpp
+5
-5
libcaf_core/src/message_builder.cpp
libcaf_core/src/message_builder.cpp
+3
-1
No files found.
libcaf_core/caf/detail/message_builder_element.hpp
View file @
ee068c64
...
@@ -17,6 +17,10 @@ namespace caf::detail {
...
@@ -17,6 +17,10 @@ namespace caf::detail {
/// later.
/// later.
class
CAF_CORE_EXPORT
message_builder_element
{
class
CAF_CORE_EXPORT
message_builder_element
{
public:
public:
message_builder_element
()
=
default
;
message_builder_element
(
const
message_builder_element
&
)
=
delete
;
message_builder_element
&
operator
=
(
const
message_builder_element
&
)
=
delete
;
virtual
~
message_builder_element
();
virtual
~
message_builder_element
();
/// Uses placement new to create a copy of the wrapped value at given memory
/// Uses placement new to create a copy of the wrapped value at given memory
...
@@ -34,10 +38,24 @@ public:
...
@@ -34,10 +38,24 @@ public:
template
<
class
T
>
template
<
class
T
>
class
message_builder_element_impl
:
public
message_builder_element
{
class
message_builder_element_impl
:
public
message_builder_element
{
public:
public:
message_builder_element_impl
(
T
value
)
:
value_
(
std
::
move
(
value
))
{
template
<
class
Value
>
explicit
message_builder_element_impl
(
Value
&&
value
)
:
value_
(
std
::
forward
<
Value
>
(
value
))
{
// nop
// nop
}
}
message_builder_element_impl
()
=
delete
;
message_builder_element_impl
(
message_builder_element_impl
&&
)
=
delete
;
message_builder_element_impl
(
const
message_builder_element_impl
&
)
=
delete
;
message_builder_element_impl
&
operator
=
(
message_builder_element_impl
&&
)
=
delete
;
message_builder_element_impl
&
operator
=
(
const
message_builder_element_impl
&
)
=
delete
;
byte
*
copy_init
(
byte
*
storage
)
const
override
{
byte
*
copy_init
(
byte
*
storage
)
const
override
{
new
(
storage
)
T
(
value_
);
new
(
storage
)
T
(
value_
);
return
storage
+
padded_size_v
<
T
>
;
return
storage
+
padded_size_v
<
T
>
;
...
@@ -54,10 +72,4 @@ private:
...
@@ -54,10 +72,4 @@ private:
using
message_builder_element_ptr
=
std
::
unique_ptr
<
message_builder_element
>
;
using
message_builder_element_ptr
=
std
::
unique_ptr
<
message_builder_element
>
;
template
<
class
T
>
auto
make_message_builder_element
(
T
&&
x
)
{
using
impl
=
message_builder_element_impl
<
std
::
decay_t
<
T
>>
;
return
message_builder_element_ptr
{
new
impl
(
std
::
forward
<
T
>
(
x
))};
}
}
// namespace caf::detail
}
// namespace caf::detail
libcaf_core/caf/message_builder.hpp
View file @
ee068c64
...
@@ -45,12 +45,12 @@ public:
...
@@ -45,12 +45,12 @@ public:
/// Adds `x` to the elements of the buffer.
/// Adds `x` to the elements of the buffer.
template
<
class
T
>
template
<
class
T
>
message_builder
&
append
(
T
&&
x
)
{
message_builder
&
append
(
T
&&
x
)
{
using
namespace
detail
;
using
value_type
=
detail
::
strip_and_convert_t
<
T
>
;
using
value_type
=
strip_and_convert_t
<
T
>
;
static_assert
(
detail
::
sendable
<
value_type
>
)
;
static_assert
(
sendable
<
value_type
>
)
;
using
wrapper_type
=
detail
::
message_builder_element_impl
<
value_type
>
;
storage_size_
+=
padded_size_v
<
value_type
>
;
storage_size_
+=
detail
::
padded_size_v
<
value_type
>
;
types_
.
push_back
(
type_id_v
<
value_type
>
);
types_
.
push_back
(
type_id_v
<
value_type
>
);
elements_
.
emplace_back
(
make_message_builder_element
(
std
::
forward
<
T
>
(
x
)));
elements_
.
emplace_back
(
std
::
make_unique
<
wrapper_type
>
(
std
::
forward
<
T
>
(
x
)));
return
*
this
;
return
*
this
;
}
}
...
...
libcaf_core/src/message_builder.cpp
View file @
ee068c64
...
@@ -33,11 +33,13 @@ message to_message_impl(size_t storage_size, TypeListBuilder& types,
...
@@ -33,11 +33,13 @@ message to_message_impl(size_t storage_size, TypeListBuilder& types,
raw_ptr
=
new
(
vptr
)
message_data
(
types
.
copy_to_list
());
raw_ptr
=
new
(
vptr
)
message_data
(
types
.
copy_to_list
());
intrusive_cow_ptr
<
message_data
>
ptr
{
raw_ptr
,
false
};
intrusive_cow_ptr
<
message_data
>
ptr
{
raw_ptr
,
false
};
auto
storage
=
raw_ptr
->
storage
();
auto
storage
=
raw_ptr
->
storage
();
for
(
auto
&
element
:
elements
)
for
(
auto
&
element
:
elements
)
{
if
constexpr
(
Policy
==
move_msg
)
if
constexpr
(
Policy
==
move_msg
)
storage
=
element
->
move_init
(
storage
);
storage
=
element
->
move_init
(
storage
);
else
else
storage
=
element
->
copy_init
(
storage
);
storage
=
element
->
copy_init
(
storage
);
raw_ptr
->
inc_constructed_elements
();
}
return
message
{
std
::
move
(
ptr
)};
return
message
{
std
::
move
(
ptr
)};
}
}
...
...
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