Skip to content

avoid sleeping-relted deadlock (Issue #231) #232

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

Open
jasonzzzzzzz wants to merge 3 commits into
base: master
Choose a base branch
from
Open

avoid sleeping-relted deadlock (Issue #231) #232

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
098bdf4
avoid sleeping-relted deadlock (Issue #231)
jasonzzzzzzz Nov 7, 2019
78a200e
Update scheduler.h
jasonzzzzzzz Dec 13, 2019
6f616af
Update scheduler.h
jasonzzzzzzz Dec 13, 2019
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/scheduler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,12 @@ class Scheduler : public GlobAlloc, public Callee {
futex_lock(&schedLock);
}

// jz: wake up sleeping threads to avoid deadlock
if (th->state == SLEEPING) {
sleepQueue.remove(th);
th->state = BLOCKED;
}

//dsm: Added this check; the normal sequence is leave, finish, but with fastFwd you never know
if (th->state == RUNNING) {
warn("RUNNING thread %d (cid %d) called finish(), trying leave() first", tid, th->cid);
Expand Down