From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Thu, 23 Oct 2008 23:57:36 +0000 (+0000)
Subject: fix garbage collection (Modules/gcmodule.c:380: move_unreachable: Assertion
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=ec5a129c62b75f939830c0585780bdedf7c78460

fix garbage collection (Modules/gcmodule.c:380: move_unreachable: Assertion
`gc->gc.gc_refs > 0`)
---

diff --git a/lib/base/ebase.cpp b/lib/base/ebase.cpp
index 62746f4..bcfab61 100644
--- a/lib/base/ebase.cpp
+++ b/lib/base/ebase.cpp
@@ -368,16 +368,19 @@ struct eTimerPy
 static int
 eTimerPy_traverse(eTimerPy *self, visitproc visit, void *arg)
 {
-	PyObject *obj = self->tm->timeout.get();
-	Py_VISIT(obj);
+	PyObject *obj = self->tm->timeout.get(true);
+	if (obj) {
+		Py_VISIT(obj);
+	}
 	return 0;
 }
 
 static int
 eTimerPy_clear(eTimerPy *self)
 {
-	PyObject *obj = self->tm->timeout.get();
-	Py_CLEAR(obj);
+	PyObject *obj = self->tm->timeout.get(true);
+	if (obj)
+		Py_CLEAR(obj);
 	return 0;
 }
 
@@ -572,16 +575,18 @@ struct eSocketNotifierPy
 static int
 eSocketNotifierPy_traverse(eSocketNotifierPy *self, visitproc visit, void *arg)
 {
-	PyObject *obj = self->sn->activated.get();
-	Py_VISIT(obj);
+	PyObject *obj = self->sn->activated.get(true);
+	if (obj)
+		Py_VISIT(obj);
 	return 0;
 }
 
 static int
 eSocketNotifierPy_clear(eSocketNotifierPy *self)
 {
-	PyObject *obj = self->sn->activated.get();
-	Py_CLEAR(obj);
+	PyObject *obj = self->sn->activated.get(true);
+	if (obj)
+		Py_CLEAR(obj);
 	return 0;
 }
 
diff --git a/lib/python/connections.cpp b/lib/python/connections.cpp
index 00f33f7..864e552 100644
--- a/lib/python/connections.cpp
+++ b/lib/python/connections.cpp
@@ -20,10 +20,12 @@ void PSignal::callPython(ePyObject tuple)
 	}
 }
 
-PyObject *PSignal::get()
+PyObject *PSignal::get(bool steal)
 {
-	if (!m_list)
-		m_list = PyList_New(0);
-	Py_INCREF(m_list);
+	if (!steal) {
+		if (!m_list)
+			m_list = PyList_New(0);
+		Py_INCREF(m_list);
+	}
 	return m_list;
 }
diff --git a/lib/python/connections.h b/lib/python/connections.h
index 8ff3a62..76859e7 100644
--- a/lib/python/connections.h
+++ b/lib/python/connections.h
@@ -18,7 +18,7 @@ public:
 	PSignal();
 	~PSignal();
 	void callPython(SWIG_PYOBJECT(ePyObject) tuple);
-	PyObject *get();
+	PyObject *get(bool steal=false);
 };
 
 inline PyObject *PyFrom(int v)