Commite29ce9a

miss-islington

and

serhiy-storchaka

authored

gh-92530: Fix an issue that occurred after interrupting threading.Condition.notify (GH-92534) (GH-92830)

If Condition.notify() was interrupted just after it released the waiter lock,but before removing it from the queue, the following calls of notify() failedwith RuntimeError: cannot release un-acquired lock.(cherry picked from commit70af994)Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

1 parentcfb9248 commite29ce9aCopy full SHA for e29ce9a

File tree

2 files changed

+16

-7

lines changed

Lib
- threading.py
Misc/NEWS.d/next/Library
- 2022-05-09-09-28-02.gh-issue-92530.M4Q1RS.rst

2 files changed

+16

-7

lines changed

`‎Lib/threading.py‎`

Lines changed: 14 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -368,14 +368,21 @@ def notify(self, n=1):`
`368`	`368`	`"""`
`369`	`369`	`ifnotself._is_owned():`
`370`	`370`	`raiseRuntimeError("cannot notify on un-acquired lock")`
`371`		`-all_waiters=self._waiters`
`372`		`-waiters_to_notify=_deque(_islice(all_waiters,n))`
`373`		`-ifnotwaiters_to_notify:`
`374`		`-return`
`375`		`-forwaiterinwaiters_to_notify:`
`376`		`-waiter.release()`
	`371`	`+waiters=self._waiters`
	`372`	`+whilewaitersandn>0:`
	`373`	`+waiter=waiters[0]`
	`374`	`+try:`
	`375`	`+waiter.release()`
	`376`	`+exceptRuntimeError:`
	`377`	`+# gh-92530: The previous call of notify() released the lock,`
	`378`	`+# but was interrupted before removing it from the queue.`
	`379`	`+# It can happen if a signal handler raises an exception,`
	`380`	`+# like CTRL+C which raises KeyboardInterrupt.`
	`381`	`+pass`
	`382`	`+else:`
	`383`	`+n-=1`
`377`	`384`	`try:`
`378`		`-all_waiters.remove(waiter)`
	`385`	`+waiters.remove(waiter)`
`379`	`386`	`exceptValueError:`
`380`	`387`	`pass`
`381`	`388`

`‎Misc/NEWS.d/next/Library/2022-05-09-09-28-02.gh-issue-92530.M4Q1RS.rst‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix an issue that occurred after interrupting`
	`2`	+:func:`threading.Condition.notify`.

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commite29ce9a

File tree

2 files changed

2 files changed

`‎Lib/threading.py‎`

`‎Misc/NEWS.d/next/Library/2022-05-09-09-28-02.gh-issue-92530.M4Q1RS.rst‎`

0 commit comments