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
37b08840
Commit
37b08840
authored
Jun 22, 2016
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make sure actors empty their mailbox on shutdown
parent
fa464bf5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
43 additions
and
6 deletions
+43
-6
libcaf_core/caf/scheduler/abstract_coordinator.hpp
libcaf_core/caf/scheduler/abstract_coordinator.hpp
+2
-0
libcaf_core/caf/scheduler/coordinator.hpp
libcaf_core/caf/scheduler/coordinator.hpp
+1
-3
libcaf_core/src/abstract_coordinator.cpp
libcaf_core/src/abstract_coordinator.cpp
+38
-0
libcaf_io/src/default_multiplexer.cpp
libcaf_io/src/default_multiplexer.cpp
+2
-3
No files found.
libcaf_core/caf/scheduler/abstract_coordinator.hpp
View file @
37b08840
...
@@ -78,6 +78,8 @@ public:
...
@@ -78,6 +78,8 @@ public:
void
*
subtype_ptr
()
override
;
void
*
subtype_ptr
()
override
;
static
void
cleanup_and_release
(
resumable
*
);
protected:
protected:
void
stop_actors
();
void
stop_actors
();
...
...
libcaf_core/caf/scheduler/coordinator.hpp
View file @
37b08840
...
@@ -123,9 +123,7 @@ protected:
...
@@ -123,9 +123,7 @@ protected:
w
->
get_thread
().
join
();
w
->
get_thread
().
join
();
}
}
// run cleanup code for each resumable
// run cleanup code for each resumable
auto
f
=
[](
resumable
*
job
)
{
auto
f
=
&
abstract_coordinator
::
cleanup_and_release
;
intrusive_ptr_release
(
job
);
};
for
(
auto
&
w
:
workers_
)
for
(
auto
&
w
:
workers_
)
policy_
.
foreach_resumable
(
w
.
get
(),
f
);
policy_
.
foreach_resumable
(
w
.
get
(),
f
);
policy_
.
foreach_central_resumable
(
this
,
f
);
policy_
.
foreach_central_resumable
(
this
,
f
);
...
...
libcaf_core/src/abstract_coordinator.cpp
View file @
37b08840
...
@@ -348,5 +348,43 @@ abstract_coordinator::abstract_coordinator(actor_system& sys)
...
@@ -348,5 +348,43 @@ abstract_coordinator::abstract_coordinator(actor_system& sys)
// nop
// nop
}
}
void
abstract_coordinator
::
cleanup_and_release
(
resumable
*
ptr
)
{
class
dummy_unit
:
public
execution_unit
{
public:
dummy_unit
(
local_actor
*
ptr
)
:
execution_unit
(
&
ptr
->
home_system
())
{
// nop
}
void
exec_later
(
resumable
*
ptr
)
override
{
resumables
.
push_back
(
ptr
);
}
std
::
vector
<
resumable
*>
resumables
;
};
switch
(
ptr
->
subtype
())
{
case
resumable
:
:
scheduled_actor
:
case
resumable
:
:
io_actor
:
{
auto
dptr
=
static_cast
<
local_actor
*>
(
ptr
);
dummy_unit
dummy
{
dptr
};
dptr
->
cleanup
(
make_error
(
exit_reason
::
user_shutdown
),
&
dummy
);
while
(
!
dummy
.
resumables
.
empty
())
{
auto
sub
=
dummy
.
resumables
.
back
();
dummy
.
resumables
.
pop_back
();
switch
(
sub
->
subtype
())
{
case
resumable
:
:
scheduled_actor
:
case
resumable
:
:
io_actor
:
{
auto
dsub
=
static_cast
<
local_actor
*>
(
sub
);
dsub
->
cleanup
(
make_error
(
exit_reason
::
user_shutdown
),
&
dummy
);
}
default:
break
;
}
}
break
;
}
default:
break
;
}
intrusive_ptr_release
(
ptr
);
}
}
// namespace scheduler
}
// namespace scheduler
}
// namespace caf
}
// namespace caf
libcaf_io/src/default_multiplexer.cpp
View file @
37b08840
...
@@ -695,18 +695,17 @@ default_multiplexer::~default_multiplexer() {
...
@@ -695,18 +695,17 @@ default_multiplexer::~default_multiplexer() {
nonblocking
(
pipe_
.
first
,
true
);
nonblocking
(
pipe_
.
first
,
true
);
auto
ptr
=
pipe_reader_
.
try_read_next
();
auto
ptr
=
pipe_reader_
.
try_read_next
();
while
(
ptr
)
{
while
(
ptr
)
{
intrusive_ptr
_release
(
ptr
);
scheduler
::
abstract_coordinator
::
cleanup_and
_release
(
ptr
);
ptr
=
pipe_reader_
.
try_read_next
();
ptr
=
pipe_reader_
.
try_read_next
();
}
}
// do cleanup for pipe reader manually, since WSACleanup needs to happen last
// do cleanup for pipe reader manually, since WSACleanup needs to happen last
closesocket
(
pipe_reader_
.
fd
());
closesocket
(
pipe_reader_
.
fd
());
pipe_reader_
.
init
(
invalid_native_socket
);
pipe_reader_
.
init
(
invalid_native_socket
);
# ifdef CAF_WINDOWS
# ifdef CAF_WINDOWS
WSACleanup
();
WSACleanup
();
# endif
# endif
}
}
void
default_multiplexer
::
exec_later
(
resumable
*
ptr
)
{
void
default_multiplexer
::
exec_later
(
resumable
*
ptr
)
{
CAF_ASSERT
(
ptr
);
CAF_ASSERT
(
ptr
);
switch
(
ptr
->
subtype
())
{
switch
(
ptr
->
subtype
())
{
...
...
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