From 7d7ca8ee2eaae704989a1552ad429794d402f550 Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Thu, 23 Nov 2006 16:31:19 +0000 Subject: [PATCH] add PyObject refcount debugging code --- lib/actions/action.h | 1 - lib/base/nconfig.cpp | 2 +- lib/dvb/epgcache.cpp | 2 +- lib/dvb_ci/dvbci_ui.h | 2 +- lib/gui/elistboxcontent.cpp | 2 +- lib/nav/core.cpp | 2 +- lib/python/Makefile.am | 3 +++ lib/python/connections.h | 1 - lib/python/python.cpp | 39 ++++++++++++++++++++++++++++++++++++++- lib/python/python.h | 27 +++++++++++++++++++++++++-- lib/service/service.cpp | 2 +- 11 files changed, 72 insertions(+), 11 deletions(-) diff --git a/lib/actions/action.h b/lib/actions/action.h index 560fdbb..79c2dd2 100644 --- a/lib/actions/action.h +++ b/lib/actions/action.h @@ -7,7 +7,6 @@ #include #undef _POSIX_C_SOURCE #define _POSIX_C_SOURCE 200112L -#include #include #include #include diff --git a/lib/base/nconfig.cpp b/lib/base/nconfig.cpp index 562b350..878f483 100644 --- a/lib/base/nconfig.cpp +++ b/lib/base/nconfig.cpp @@ -1,5 +1,5 @@ #include -#include +#include PyObject *ePythonConfigQuery::m_queryFunc; diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp index e8394c4..9c2849b 100644 --- a/lib/dvb/epgcache.cpp +++ b/lib/dvb/epgcache.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include int eventData::CacheSize=0; descriptorMap eventData::descriptors; diff --git a/lib/dvb_ci/dvbci_ui.h b/lib/dvb_ci/dvbci_ui.h index b06eb45..5237e2f 100644 --- a/lib/dvb_ci/dvbci_ui.h +++ b/lib/dvb_ci/dvbci_ui.h @@ -5,7 +5,7 @@ /* avoid warnigs :) */ #undef _POSIX_C_SOURCE #define _POSIX_C_SOURCE 200112L -#include +#include #include #define MAX_SLOTS 4 diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp index 261c548..fd2091a 100644 --- a/lib/gui/elistboxcontent.cpp +++ b/lib/gui/elistboxcontent.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include /* The basic idea is to have an interface which gives all relevant list diff --git a/lib/nav/core.cpp b/lib/nav/core.cpp index 7f76fa3..0b4270d 100644 --- a/lib/nav/core.cpp +++ b/lib/nav/core.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include void eNavigation::serviceEvent(iPlayableService* service, int event) { diff --git a/lib/python/Makefile.am b/lib/python/Makefile.am index 1cc0154..e0d5f0c 100644 --- a/lib/python/Makefile.am +++ b/lib/python/Makefile.am @@ -11,6 +11,9 @@ libenigma_python_a_SOURCES = \ enigma_python_wrap.cxx: enigma_python.i swig -I$(top_srcdir)/ -c++ -python enigma_python.i + echo "#include " > bla.cxx + cat enigma_python_wrap.cxx >> bla.cxx + mv bla.cxx enigma_python_wrap.cxx installdir = $(LIBDIR)/enigma2/python diff --git a/lib/python/connections.h b/lib/python/connections.h index 8a06f7f..9da6a00 100644 --- a/lib/python/connections.h +++ b/lib/python/connections.h @@ -7,7 +7,6 @@ #include #undef _POSIX_C_SOURCE #define _POSIX_C_SOURCE 200112L -#include #include class PSignal diff --git a/lib/python/python.cpp b/lib/python/python.cpp index 119bff1..2636a3d 100644 --- a/lib/python/python.cpp +++ b/lib/python/python.cpp @@ -1,4 +1,3 @@ -#include #include /* avoid warnigs :) */ #undef _POSIX_C_SOURCE @@ -8,6 +7,44 @@ extern "C" void init_enigma(); extern void bsodFatal(); +void Impl_Py_DECREF(const char* file, int line, PyObject *obj) +{ + if (!obj) + { + eDebug("decref python object null pointer %s %d!!!", + file, line); + bsodFatal(); + } + if (obj->ob_refcnt <= 0) + { + eDebug("decref python object with refcounting value %d (%s %d)!!!", obj->ob_refcnt, file, line); + bsodFatal(); + } + Py_DECREF(obj); +} + +void Impl_Py_INCREF(const char* file, int line, PyObject *obj) +{ + if (!obj) + { + eDebug("incref python object null pointer %s %d!!!", file, line); + bsodFatal(); + } + if (obj->ob_refcnt <= 0) + { + eDebug("incref python object with refcounting value %d (%s %d)!!!", obj->ob_refcnt, file, line); + bsodFatal(); + } + if (obj->ob_refcnt == 0x7FFFFFFF) + { + eDebug("incref python object with refcounting value %d (MAX_INT!!!) (%s %d)!!!", obj->ob_refcnt, file, line); + bsodFatal(); + } + Py_INCREF(obj); +} + +#include + DEFINE_REF(TestObj); TestObj::TestObj() diff --git a/lib/python/python.h b/lib/python/python.h index 46e1a03..27d2a9b 100644 --- a/lib/python/python.h +++ b/lib/python/python.h @@ -3,10 +3,33 @@ #include #include - -typedef struct _object PyObject; +#include // useable for debugging python refcounting +#undef Py_DECREF +#undef Py_XDECREF +#undef Py_INCREF +#undef Py_XINCREF +#define Py_XDECREF(obj) Impl_Py_XDECREF(__FILE__, __LINE__, obj) +#define Py_DECREF(obj) Impl_Py_DECREF(__FILE__, __LINE__, obj) +#define Py_XINCREF(obj) Impl_Py_XINCREF(__FILE__, __LINE__, obj) +#define Py_INCREF(obj) Impl_Py_INCREF(__FILE__, __LINE__, obj) + +void Impl_Py_DECREF(const char* file, int line, PyObject *obj); + +inline void Impl_Py_XDECREF(const char* file, int line, PyObject *obj) +{ + if (obj) + Impl_Py_DECREF(file, line, obj); +} + +void Impl_Py_INCREF(const char* file, int line, PyObject *obj); + +inline void Impl_Py_XINCREF(const char* file, int line, PyObject *obj) +{ + if (obj) + Impl_Py_INCREF(file, line, obj); +} extern PyObject *New_TestObj(); diff --git a/lib/service/service.cpp b/lib/service/service.cpp index 8ac7ebd..181ec22 100644 --- a/lib/service/service.cpp +++ b/lib/service/service.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include eServiceReference::eServiceReference(const std::string &string) { -- 2.7.4