Campbell Barton
5edba9b42f
Calling PyEval_ReleaseLock() was crashing with Python 3.9 because it accessed the NULL pointer set by PyThreadState_Swap(). This happened when calling ViewLayer.update() for example. While the existing logic could be fixed by swapping the thread-state back before calling PyEval_ReleaseLock(), this depends on functions which are tagged to be removed by v4.0. Replace use of deprecated functions by calling PyEval_SaveThread(), instead of inlining the logic, using _PyThreadState_UncheckedGet() to prevent Python aborting. The call to PyEval_ThreadsInitialized has been removed as threads are now initialized with Python. This could be replaced with Py_IsInitialized() however it doesn't look like this is necessary. This is compatible with Python 3.7 & 3.9.
46 lines
1.4 KiB
C
46 lines
1.4 KiB
C
/*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*/
|
|
|
|
/** \file
|
|
* \ingroup pygen
|
|
*
|
|
* This file contains wrapper functions related to global interpreter lock.
|
|
* these functions are slightly different from the original Python API,
|
|
* don't throw SIGABRT even if the thread state is NULL. */
|
|
|
|
#include <Python.h>
|
|
|
|
#include "../BPY_extern.h"
|
|
#include "BLI_utildefines.h"
|
|
|
|
/* analogue of PyEval_SaveThread() */
|
|
BPy_ThreadStatePtr BPY_thread_save(void)
|
|
{
|
|
/* The thread-state can be NULL when quitting Blender. */
|
|
if (_PyThreadState_UncheckedGet()) {
|
|
return (BPy_ThreadStatePtr)PyEval_SaveThread();
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
/* analogue of PyEval_RestoreThread() */
|
|
void BPY_thread_restore(BPy_ThreadStatePtr tstate)
|
|
{
|
|
if (tstate) {
|
|
PyEval_RestoreThread((PyThreadState *)tstate);
|
|
}
|
|
}
|