Skip to content
/ server Public

wt_thd_will_wait_for: release locks #414

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

Closed
grooverdan wants to merge 1 commit into from
Closed

wt_thd_will_wait_for: release locks #414

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions mysys/waiting_threads.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1002,6 +1002,7 @@ int wt_thd_will_wait_for(WT_THD *thd, WT_THD *blocker,
if (thd->killed)
{
stop_waiting_locked(thd);
rc_unlock(rc);
DBUG_RETURN(WT_DEADLOCK);
}
}
Expand All @@ -1017,12 +1018,14 @@ int wt_thd_will_wait_for(WT_THD *thd, WT_THD *blocker,
if (push_dynamic(&blocker->my_resources, (void*)&rc))
{
stop_waiting_locked(thd);
rc_unlock(rc);
DBUG_RETURN(WT_DEADLOCK); /* deadlock and OOM use the same error code */
}
if (push_dynamic(&rc->owners, (void*)&blocker))
{
pop_dynamic(&blocker->my_resources);
stop_waiting_locked(thd);
rc_unlock(rc);
DBUG_RETURN(WT_DEADLOCK);
}
}
Expand Down