Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix broken shutdown if scheduling from event loop context #550

Merged
merged 2 commits into from
Jul 17, 2018
Merged

Fix broken shutdown if scheduling from event loop context #550

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce832e9
Ignore tasks scheduled during shutdown
Jul 12, 2018
75b4da2
Add comment explaining shutdown logic
Jul 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/ocean/task/Scheduler.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,9 +331,15 @@ final class Scheduler : IScheduler
{
if (this.state == State.Shutdown)
{
// Simply returning here would be generally sufficient to make sure
// no new tasks get added after shutdown. However, it is of some
// merit to try to kill everything as soon as possible thus
// scheduler kills the caller tasks on any attempt to schedule a new
// one.
auto caller_task = Task.getThis();
if (caller_task !is null)
caller_task.kill();
return;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated to this PR, but it might be worth adding a comment as to why the calling task is killed if schedule is called during shutdown.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will add

}

try
Expand Down