Skip to content

gh-74953: Fix PyThread_acquire_lock_timed() code recomputing the timeout #93941

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

Merged
vstinner merged 1 commit into from
Jun 17, 2022
Merged

gh-74953: Fix PyThread_acquire_lock_timed() code recomputing the timeout #93941

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
gh-74953: Fix PyThread_acquire_lock_timed() code recomputing the timeout 
Set timeout, don't create a local variable with the same name.
  • Loading branch information
@vstinner
vstinner committed Jun 17, 2022
commit a18aa2cd73d7564e28591908c30234c317cc094c
2 changes: 1 addition & 1 deletion Python/thread_pthread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ PyThread_acquire_lock_timed(PyThread_type_lock lock, PY_TIMEOUT_T microseconds,
#ifndef HAVE_SEM_CLOCKWAIT
if (timeout > 0) {
/* wait interrupted by a signal (EINTR): recompute the timeout */
_PyTime_t timeout = _PyDeadline_Get(deadline);
timeout = _PyDeadline_Get(deadline);
if (timeout < 0) {
status = ETIMEDOUT;
break;
Expand Down