Move python threading stuff to own file in bf_python_ext
This way blender player can easily use BPY_thread_save/restore. Not so much important for master branch, but crucial to solve linking issues in threaded depsgraph branch.
This commit is contained in:
@@ -35,6 +35,7 @@ set(SRC
|
|||||||
bgl.c
|
bgl.c
|
||||||
blf_py_api.c
|
blf_py_api.c
|
||||||
bpy_internal_import.c
|
bpy_internal_import.c
|
||||||
|
bpy_threads.c
|
||||||
idprop_py_api.c
|
idprop_py_api.c
|
||||||
py_capi_utils.c
|
py_capi_utils.c
|
||||||
|
|
||||||
|
67
source/blender/python/generic/bpy_threads.c
Normal file
67
source/blender/python/generic/bpy_threads.c
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
/*
|
||||||
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
||||||
|
*
|
||||||
|
* 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.
|
||||||
|
*
|
||||||
|
* Contributor(s): None yet
|
||||||
|
*
|
||||||
|
* ***** END GPL LICENSE BLOCK *****
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** \file blender/python/generic/bpy_threads.c
|
||||||
|
* \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. */
|
||||||
|
|
||||||
|
/** \file blender/python/intern/bpy_interface.c
|
||||||
|
* \ingroup pythonintern
|
||||||
|
*
|
||||||
|
* This file deals with embedding the python interpreter within blender,
|
||||||
|
* starting and stopping python and exposing blender/python modules so they can
|
||||||
|
* be accesses from scripts.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* grr, python redefines */
|
||||||
|
#ifdef _POSIX_C_SOURCE
|
||||||
|
# undef _POSIX_C_SOURCE
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <Python.h>
|
||||||
|
|
||||||
|
#include "BLI_utildefines.h"
|
||||||
|
#include "../BPY_extern.h"
|
||||||
|
|
||||||
|
/* analogue of PyEval_SaveThread() */
|
||||||
|
BPy_ThreadStatePtr BPY_thread_save(void)
|
||||||
|
{
|
||||||
|
PyThreadState *tstate = PyThreadState_Swap(NULL);
|
||||||
|
/* note: tstate can be NULL when quitting Blender */
|
||||||
|
|
||||||
|
if (tstate && PyEval_ThreadsInitialized()) {
|
||||||
|
PyEval_ReleaseLock();
|
||||||
|
}
|
||||||
|
|
||||||
|
return (BPy_ThreadStatePtr)tstate;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* analogue of PyEval_RestoreThread() */
|
||||||
|
void BPY_thread_restore(BPy_ThreadStatePtr tstate)
|
||||||
|
{
|
||||||
|
if (tstate) {
|
||||||
|
PyEval_RestoreThread((PyThreadState *)tstate);
|
||||||
|
}
|
||||||
|
}
|
@@ -408,31 +408,6 @@ void BPY_python_reset(bContext *C)
|
|||||||
BPY_modules_load_user(C);
|
BPY_modules_load_user(C);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 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. */
|
|
||||||
|
|
||||||
/* analogue of PyEval_SaveThread() */
|
|
||||||
BPy_ThreadStatePtr BPY_thread_save(void)
|
|
||||||
{
|
|
||||||
PyThreadState *tstate = PyThreadState_Swap(NULL);
|
|
||||||
/* note: tstate can be NULL when quitting Blender */
|
|
||||||
|
|
||||||
if (tstate && PyEval_ThreadsInitialized()) {
|
|
||||||
PyEval_ReleaseLock();
|
|
||||||
}
|
|
||||||
|
|
||||||
return (BPy_ThreadStatePtr)tstate;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* analogue of PyEval_RestoreThread() */
|
|
||||||
void BPY_thread_restore(BPy_ThreadStatePtr tstate)
|
|
||||||
{
|
|
||||||
if (tstate) {
|
|
||||||
PyEval_RestoreThread((PyThreadState *)tstate);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void python_script_error_jump_text(struct Text *text)
|
static void python_script_error_jump_text(struct Text *text)
|
||||||
{
|
{
|
||||||
int lineno;
|
int lineno;
|
||||||
|
Reference in New Issue
Block a user