Kaydet (Commit) e83990a8 authored tarafından Michael Stahl's avatar Michael Stahl Kaydeden (comit) David Ostrovsky

python3: disable check in PyThreadState_Swap

This check is triggered by nested pyuno PyThreadAttach instances.
The assertion is basically about having multiple PyThreadState instances
per OS thread.  Hopefully this is not a "real" problem and the other
checks in PyEval_ReleaseThread/PyEval_AcquireThread will find all "real"
problems.

http://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg62195.html

Change-Id: Ia82135f37f55ea69b545a83098619939869cb7c5
Reviewed-on: https://gerrit.libreoffice.org/3453Reviewed-by: 's avatarDavid Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: 's avatarDavid Ostrovsky <David.Ostrovsky@gmx.de>
üst 1fb53a63
...@@ -31,6 +31,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\ ...@@ -31,6 +31,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
python3/python-3.3.0-implicit-int.patch.1 \ python3/python-3.3.0-implicit-int.patch.1 \
python3/python-3.3.0-ffi-clang.patch.1 \ python3/python-3.3.0-ffi-clang.patch.1 \
python3/python-3.3.0-gcc-4.8.patch.1 \ python3/python-3.3.0-gcc-4.8.patch.1 \
python3/python-3.3.0-pythreadstate.patch.1 \
)) ))
ifneq ($(OS),WNT) ifneq ($(OS),WNT)
......
disable a check in PyThreadState_Swap that is hopefully not a "real" problem
--- python3/Python/pystate.c 2013-04-17 22:45:00.799800000 +0200
+++ python3/Python/pystate.c 2013-04-17 22:46:53.743800000 +0200
@@ -437,7 +437,9 @@
to be used for a thread. Check this the best we can in debug
builds.
*/
-#if defined(Py_DEBUG) && defined(WITH_THREAD)
+#if defined(Py_DEBUG) && defined(WITH_THREAD) && 0
+ /* disable this for LO - it is triggered by nested PyThreadAttach
+ which do not appear to be a real problem */
if (newts) {
/* This can be called from PyEval_RestoreThread(). Similar
to it, we need to ensure errno doesn't change.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment