TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 00:32:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix PythonThread crash (LP bug 1245818)

Browse Source
This commit is contained in:
rdb 2016-12-22 21:28:19 +01:00
parent 62d0d8292e
commit 056ea94765
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
panda/src/pipeline/pythonThread.cxx
View File

@ -50,6 +50,13 @@ PythonThread(PyObject *function, PyObject *args,
nassert_raise("Invalid args passed to PythonThread constructor"); nassert_raise("Invalid args passed to PythonThread constructor");
} }
} }
#ifndef SIMPLE_THREADS
// Ensure that the Python threading system is initialized and ready to go.
#ifdef WITH_THREAD // This symbol defined within Python.h
PyEval_InitThreads();
#endif
#endif
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -59,9 +66,20 @@ PythonThread(PyObject *function, PyObject *args,
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
PythonThread:: PythonThread::
~PythonThread() { ~PythonThread() {
// Unfortunately, we need to grab the GIL to release these things,
// since the destructor could be called from any thread.
#if defined(HAVE_THREADS) && !defined(SIMPLE_THREADS)
PyGILState_STATE gstate;
gstate = PyGILState_Ensure();
#endif
Py_DECREF(_function); Py_DECREF(_function);
Py_XDECREF(_args); Py_XDECREF(_args);
Py_XDECREF(_result); Py_XDECREF(_result);
#if defined(HAVE_THREADS) && !defined(SIMPLE_THREADS)
PyGILState_Release(gstate);
#endif
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////