diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-18 09:53:06 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-26 15:14:14 +0200 |
| commit | 52f29458d7d6cb379d28d84021819516723d9169 (patch) | |
| tree | afad9317cbf204ff6716c24ec4041b4495bfd36d /sources/shiboken2/libshiboken/gilstate.h | |
| parent | b7e8b5e4114c034a750433d661b20944ce8b303c (diff) | |
pthreads: Try to abandon the GIL in case a thread was terminated
When terminating a thread using QThread::terminate() via
(pthread_cancel(), QThread::run() is aborted and the lock is released,
but ~GilState() is still executed for some reason.
Add a cancel handler to the thread which tells GilState to abandon
the lock.
Fixes: PYSIDE-1282
Change-Id: I70abd42b5a2afd49aaa8cc5e8be0a92ed63f49d3
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/shiboken2/libshiboken/gilstate.h')
| -rw-r--r-- | sources/shiboken2/libshiboken/gilstate.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sources/shiboken2/libshiboken/gilstate.h b/sources/shiboken2/libshiboken/gilstate.h index d22f688ba..fbf39ead0 100644 --- a/sources/shiboken2/libshiboken/gilstate.h +++ b/sources/shiboken2/libshiboken/gilstate.h @@ -57,6 +57,7 @@ public: GilState(); ~GilState(); void release(); + void abandon(); private: PyGILState_STATE m_gstate; bool m_locked = false; |