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

Jump to bottom

Removing wrong call to cleanup_terminated_locked #2952

Closed
wants to merge 2 commits into from
Closed

Removing wrong call to cleanup_terminated_locked #2952

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d83c949
Removing wrong call to cleanup_terminated_locked
Oct 16, 2017
10d0dd1
Partially reverting background thread handling during shutdown
Oct 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 20 additions & 23 deletions hpx/runtime/threads/policies/thread_queue.hpp
View file
Open in desktop
Expand Up @@ -1042,31 +1042,28 @@ namespace hpx { namespace threads { namespace policies
// just falls through to the cleanup work below (no work is available)
// in which case the current thread (which failed to acquire
// the lock) will just retry to enter this loop.
std::unique_lock<mutex_type> lk(mtx_, std::try_to_lock);
if (!lk.owns_lock())
return false; // avoid long wait on lock

// stop running after all HPX threads have been terminated
bool added_new = add_new_always(added, addfrom, lk, steal);
if (!added_new) {
// Before exiting each of the OS threads deletes the
// remaining terminated HPX threads
// REVIEW: Should we be doing this if we are stealing?
bool canexit = cleanup_terminated_locked(true);
if (!running && canexit) {
// we don't have any registered work items anymore
//do_some_work(); // notify possibly waiting threads
return true; // terminate scheduling loop
{
std::unique_lock<mutex_type> lk(mtx_, std::try_to_lock);
if (!lk.owns_lock())
return false; // avoid long wait on lock

// stop running after all HPX threads have been terminated
bool added_new = add_new_always(added, addfrom, lk, steal);
if (!added_new) {
// Before exiting each of the OS threads deletes the
// remaining terminated HPX threads
// REVIEW: Should we be doing this if we are stealing?
bool canexit = cleanup_terminated_locked(true);
if (!running && canexit) {
// we don't have any registered work items anymore
//do_some_work(); // notify possibly waiting threads
return true; // terminate scheduling loop
}
return false;
}
return false;
}

cleanup_terminated_locked();
}
bool canexit = cleanup_terminated_locked(true);
if (!running && canexit) {
// we don't have any registered work items anymore
return true; // terminate scheduling loop
cleanup_terminated_locked();
}
}
return false;
}
Expand Down