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
b055e589
Unverified
Commit
b055e589
authored
Sep 17, 2018
by
Dominik Charousset
Committed by
GitHub
Sep 17, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #759
Fix potential deadlock in the thread-safe clock. Close #755.
parents
902ad7e9
e2821a42
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
84 additions
and
29 deletions
+84
-29
libcaf_core/caf/actor_system.hpp
libcaf_core/caf/actor_system.hpp
+8
-4
libcaf_core/caf/detail/thread_safe_actor_clock.hpp
libcaf_core/caf/detail/thread_safe_actor_clock.hpp
+2
-2
libcaf_core/caf/variant.hpp
libcaf_core/caf/variant.hpp
+48
-19
libcaf_core/src/actor_system.cpp
libcaf_core/src/actor_system.cpp
+22
-3
libcaf_core/src/thread_safe_actor_clock.cpp
libcaf_core/src/thread_safe_actor_clock.cpp
+4
-1
No files found.
libcaf_core/caf/actor_system.hpp
View file @
b055e589
...
@@ -19,13 +19,14 @@
...
@@ -19,13 +19,14 @@
#pragma once
#pragma once
#include <array>
#include <array>
#include <mutex>
#include <atomic>
#include <atomic>
#include <string>
#include <condition_variable>
#include <memory>
#include <cstddef>
#include <cstddef>
#include <functional>
#include <functional>
#include <condition_variable>
#include <memory>
#include <mutex>
#include <string>
#include <typeinfo>
#include "caf/abstract_actor.hpp"
#include "caf/abstract_actor.hpp"
#include "caf/actor_cast.hpp"
#include "caf/actor_cast.hpp"
...
@@ -164,6 +165,9 @@ public:
...
@@ -164,6 +165,9 @@ public:
virtual
~
module
();
virtual
~
module
();
/// Returns the human-redable name of the module.
const
char
*
name
()
const
noexcept
;
/// Starts any background threads needed by the module.
/// Starts any background threads needed by the module.
virtual
void
start
()
=
0
;
virtual
void
start
()
=
0
;
...
...
libcaf_core/caf/detail/thread_safe_actor_clock.hpp
View file @
b055e589
...
@@ -58,8 +58,8 @@ public:
...
@@ -58,8 +58,8 @@ public:
void
cancel_dispatch_loop
();
void
cancel_dispatch_loop
();
private:
private:
std
::
mutex
mx_
;
std
::
recursive_
mutex
mx_
;
std
::
condition_variable
cv_
;
std
::
condition_variable
_any
cv_
;
std
::
atomic
<
bool
>
done_
;
std
::
atomic
<
bool
>
done_
;
};
};
...
...
libcaf_core/caf/variant.hpp
View file @
b055e589
...
@@ -118,10 +118,34 @@ using variant_visit_result_t =
...
@@ -118,10 +118,34 @@ using variant_visit_result_t =
template
<
class
...
Ts
>
template
<
class
...
Ts
>
class
variant
{
class
variant
{
public:
public:
// -- member types -----------------------------------------------------------
using
types
=
detail
::
type_list
<
Ts
...
>
;
using
types
=
detail
::
type_list
<
Ts
...
>
;
using
type0
=
typename
detail
::
tl_at
<
types
,
0
>::
type
;
// -- constants --------------------------------------------------------------
/// Stores the ID for the last type.
static
constexpr
int
max_type_id
=
sizeof
...(
Ts
)
-
1
;
static
constexpr
int
max_type_id
=
sizeof
...(
Ts
)
-
1
;
/// Stores whether all types are nothrow constructible.
static
constexpr
bool
nothrow_move_construct
=
detail
::
conjunction
<
std
::
is_nothrow_move_constructible
<
Ts
>::
value
...
>::
value
;
/// Stores whether all types are nothrow assignable *and* constructible. We
/// need to check both, since assigning to a variant results in a
/// move-contruct unless the before and after types are the same.
static
constexpr
bool
nothrow_move_assign
=
nothrow_move_construct
&&
detail
::
conjunction
<
std
::
is_nothrow_move_assignable
<
Ts
>::
value
...
>::
value
;
// -- sanity checks ----------------------------------------------------------
static_assert
(
sizeof
...(
Ts
)
<=
20
,
"Too many template arguments given."
);
static_assert
(
sizeof
...(
Ts
)
<=
20
,
"Too many template arguments given."
);
static_assert
(
sizeof
...(
Ts
)
>
0
,
"No template argument given."
);
static_assert
(
sizeof
...(
Ts
)
>
0
,
"No template argument given."
);
...
@@ -129,19 +153,7 @@ public:
...
@@ -129,19 +153,7 @@ public:
static_assert
(
!
detail
::
tl_exists
<
types
,
std
::
is_reference
>::
value
,
static_assert
(
!
detail
::
tl_exists
<
types
,
std
::
is_reference
>::
value
,
"Cannot create a variant of references"
);
"Cannot create a variant of references"
);
using
type0
=
typename
detail
::
tl_at
<
types
,
0
>::
type
;
// -- constructors, destructors, and assignment operators --------------------
variant
&
operator
=
(
const
variant
&
other
)
{
variant_assign_helper
<
variant
>
helper
{
*
this
};
other
.
template
apply
<
void
>(
helper
);
return
*
this
;
}
variant
&
operator
=
(
variant
&&
other
)
{
variant_move_helper
<
variant
>
helper
{
*
this
};
other
.
template
apply
<
void
>(
helper
);
return
*
this
;
}
variant
()
:
type_
(
variant_npos
)
{
variant
()
:
type_
(
variant_npos
)
{
// Never empty ...
// Never empty ...
...
@@ -151,14 +163,16 @@ public:
...
@@ -151,14 +163,16 @@ public:
}
}
template
<
class
U
>
template
<
class
U
>
variant
(
U
&&
arg
)
:
type_
(
variant_npos
)
{
variant
(
U
&&
arg
)
noexcept
(
std
::
is_rvalue_reference
<
U
&&>::
value
&&
nothrow_move_assign
)
:
type_
(
variant_npos
)
{
set
(
std
::
forward
<
U
>
(
arg
));
set
(
std
::
forward
<
U
>
(
arg
));
}
}
template
<
class
U
>
variant
(
variant
&&
other
)
noexcept
(
nothrow_move_construct
)
variant
&
operator
=
(
U
&&
arg
)
{
:
type_
(
variant_npos
)
{
set
(
std
::
forward
<
U
>
(
arg
))
;
variant_move_helper
<
variant
>
helper
{
*
this
}
;
return
*
this
;
other
.
template
apply
<
void
>(
helper
)
;
}
}
variant
(
const
variant
&
other
)
:
type_
(
variant_npos
)
{
variant
(
const
variant
&
other
)
:
type_
(
variant_npos
)
{
...
@@ -166,15 +180,30 @@ public:
...
@@ -166,15 +180,30 @@ public:
other
.
template
apply
<
void
>(
helper
);
other
.
template
apply
<
void
>(
helper
);
}
}
variant
(
variant
&&
other
)
:
type_
(
variant_npos
)
{
variant
&
operator
=
(
const
variant
&
other
)
{
variant_assign_helper
<
variant
>
helper
{
*
this
};
other
.
template
apply
<
void
>(
helper
);
return
*
this
;
}
variant
&
operator
=
(
variant
&&
other
)
noexcept
(
nothrow_move_assign
)
{
variant_move_helper
<
variant
>
helper
{
*
this
};
variant_move_helper
<
variant
>
helper
{
*
this
};
other
.
template
apply
<
void
>(
helper
);
other
.
template
apply
<
void
>(
helper
);
return
*
this
;
}
template
<
class
U
>
variant
&
operator
=
(
U
&&
arg
)
noexcept
(
nothrow_move_assign
)
{
set
(
std
::
forward
<
U
>
(
arg
));
return
*
this
;
}
}
~
variant
()
{
~
variant
()
{
destroy_data
();
destroy_data
();
}
}
// -- properties -------------------------------------------------------------
constexpr
size_t
index
()
const
{
constexpr
size_t
index
()
const
{
return
static_cast
<
size_t
>
(
type_
);
return
static_cast
<
size_t
>
(
type_
);
}
}
...
...
libcaf_core/src/actor_system.cpp
View file @
b055e589
...
@@ -203,6 +203,21 @@ actor_system::module::~module() {
...
@@ -203,6 +203,21 @@ actor_system::module::~module() {
// nop
// nop
}
}
const
char
*
actor_system
::
module
::
name
()
const
noexcept
{
switch
(
id
())
{
case
scheduler
:
return
"Scheduler"
;
case
middleman
:
return
"Middleman"
;
case
opencl_manager
:
return
"OpenCL Manager"
;
case
openssl_manager
:
return
"OpenSSL Manager"
;
default:
return
"???"
;
}
}
actor_system
::
actor_system
(
actor_system_config
&
cfg
)
actor_system
::
actor_system
(
actor_system_config
&
cfg
)
:
ids_
(
0
),
:
ids_
(
0
),
types_
(
*
this
),
types_
(
*
this
),
...
@@ -310,9 +325,13 @@ actor_system::~actor_system() {
...
@@ -310,9 +325,13 @@ actor_system::~actor_system() {
// group module is the first one, relies on MM
// group module is the first one, relies on MM
groups_
.
stop
();
groups_
.
stop
();
// stop modules in reverse order
// stop modules in reverse order
for
(
auto
i
=
modules_
.
rbegin
();
i
!=
modules_
.
rend
();
++
i
)
for
(
auto
i
=
modules_
.
rbegin
();
i
!=
modules_
.
rend
();
++
i
)
{
if
(
*
i
)
auto
&
ptr
=
*
i
;
(
*
i
)
->
stop
();
if
(
ptr
!=
nullptr
)
{
CAF_LOG_DEBUG
(
"stop module"
<<
ptr
->
name
());
ptr
->
stop
();
}
}
await_detached_threads
();
await_detached_threads
();
registry_
.
stop
();
registry_
.
stop
();
}
}
...
...
libcaf_core/src/thread_safe_actor_clock.cpp
View file @
b055e589
...
@@ -23,7 +23,7 @@ namespace detail {
...
@@ -23,7 +23,7 @@ namespace detail {
namespace
{
namespace
{
using
guard_type
=
std
::
unique_lock
<
std
::
mutex
>
;
using
guard_type
=
std
::
unique_lock
<
std
::
recursive_
mutex
>
;
}
// namespace <anonymous>
}
// namespace <anonymous>
...
@@ -110,6 +110,9 @@ void thread_safe_actor_clock::run_dispatch_loop() {
...
@@ -110,6 +110,9 @@ void thread_safe_actor_clock::run_dispatch_loop() {
guard_type
guard
{
mx_
};
guard_type
guard
{
mx_
};
while
(
done_
==
false
)
{
while
(
done_
==
false
)
{
// Wait for non-empty schedule.
// Wait for non-empty schedule.
// Note: The thread calling run_dispatch_loop() is guaranteed not to lock
// the mutex recursively. Otherwise, cv_.wait() or cv_.wait_until()
// would be unsafe, because wait operations call unlock() only once.
if
(
schedule_
.
empty
())
{
if
(
schedule_
.
empty
())
{
cv_
.
wait
(
guard
);
cv_
.
wait
(
guard
);
}
else
{
}
else
{
...
...
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