TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

make sure DirectObject._addTask and ._clearTask are called only once per task create/destroy

Browse Source
This commit is contained in:
Darren Ranalli 2010-01-13 23:37:56 +00:00
parent 01ac73fc87
commit 0955e0aabc
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
panda/src/event/pythonTask.cxx
View File

@ -37,6 +37,7 @@ PythonTask(PyObject *function, const string &name) :
_args = NULL;
_upon_death = NULL;
_owner = NULL;
_registered_to_owner = false;
_generator = NULL;
set_function(function);
@ -528,13 +529,14 @@ upon_death(AsyncTaskManager *manager, bool clean_exit) {
////////////////////////////////////////////////////////////////////
void PythonTask::
register_to_owner() {
if (_owner != Py_None) {
if (_owner != Py_None && !_registered_to_owner) {
#if defined(HAVE_THREADS) && !defined(SIMPLE_THREADS)
// Use PyGILState to protect this asynchronous call.
PyGILState_STATE gstate;
gstate = PyGILState_Ensure();
#endif
_registered_to_owner = true;
call_owner_method("_addTask");
#if defined(HAVE_THREADS) && !defined(SIMPLE_THREADS)
@ -550,13 +552,15 @@ register_to_owner() {
////////////////////////////////////////////////////////////////////
void PythonTask::
unregister_from_owner() {
if (_owner != Py_None) {
// make sure every call to _clearTask corresponds to a call to _addTask
if (_owner != Py_None && _registered_to_owner) {
#if defined(HAVE_THREADS) && !defined(SIMPLE_THREADS)
// Use PyGILState to protect this asynchronous call.
PyGILState_STATE gstate;
gstate = PyGILState_Ensure();
#endif
_registered_to_owner = false;
call_owner_method("_clearTask");
#if defined(HAVE_THREADS) && !defined(SIMPLE_THREADS)

1
panda/src/event/pythonTask.h
View File

@ -66,6 +66,7 @@ private:
bool _append_task;
PyObject *_upon_death;
PyObject *_owner;
bool _registered_to_owner;
PyObject *_dict;
PyObject *_generator;