Created PySide cleanup functions used to register functions to be called before the python die.

Reviewer: Hugo Parente Lima <hugo.pl@gmail.com>
          Luciano Wolf <luciano.wolf@openbossa.org>

PySide/QtCore/glue/qcoreapplication_init.cpp

@@ -1,21 +1,20 @@
 // Global variables used to store argc and argv values
 static int QCoreApplicationArgCount;
 static char** QCoreApplicationArgValues;
-static bool leavingPython = false;
 
 /**
  * Called at QtCore module exit
  */
 void DeleteQCoreApplicationAtExit()
 {
-    leavingPython = true;
     QCoreApplication *cpp = QCoreApplication::instance();
     if (cpp) {
         Shiboken::BindingManager &bmngr = Shiboken::BindingManager::instance();
         PyObject* pySelf = bmngr.retrieveWrapper(cpp);
-        if (pySelf)
+        cpp->flush();
-            bmngr.invalidateWrapper(pySelf);
+        QCoreApplication::processEvents();
-        cpp->deleteLater();
+        bmngr.invalidateWrapper(pySelf);
+        delete cpp;
     }
 }
 
@@ -54,7 +53,7 @@ int SbkQCoreApplication_Init(PyObject* self, PyObject* args, PyObject*)
     PySide::signalUpdateSource(self);
     cptr->metaObject();
 
-    Py_AtExit(DeleteQCoreApplicationAtExit);
+    PySide::registerCleanupFunction(DeleteQCoreApplicationAtExit);
     Py_INCREF(self);
     return 1;
 }

PySide/QtCore/typesystem_core.xml

@@ -552,8 +552,8 @@
   </inject-code>
 
   <add-function signature="__moduleShutdown()">
-    <inject-code class="target" position="beginning">
+      <inject-code class="target" position="beginning">
-        PySide::SignalManager::instance().clear();
+        PySide::runCleanupFunctions();
     </inject-code>
   </add-function>
 
@@ -1875,12 +1875,7 @@
     <!-- Obsolete -->
     <modify-function signature="argc()" remove="all"/>
     <!-- Obsolete -->
-    <modify-function signature="notify(QObject*,QEvent*)">
+    <modify-function signature="notify(QObject*,QEvent*)" allow-thread="yes">
-      <inject-code class="shell" position="beginning">
-        Shiboken::ThreadStateSaver threadStateSaver;
-        if (!leavingPython)
-          threadStateSaver.save();
-      </inject-code>
       <modify-argument index="2" invalidate-after-use="yes"/>
     </modify-function>
     <modify-function signature="QCoreApplication(int &amp;, char  **)" access="private"/>

PySide/QtGui/glue/qapplication_init.cpp

@@ -4,19 +4,29 @@ extern PyObject* moduleQtGui;
 static int QApplicationArgCount;
 static char** QApplicationArgValues;
 static const char QAPP_MACRO[] = "qApp";
-static bool leavingPython = false;
 
 void DeleteQApplicationAtExit()
 {
-    leavingPython = true;    
     PySide::SignalManager::instance().clear();
     QCoreApplication* cpp = QApplication::instance();
     if (cpp) {
         Shiboken::BindingManager &bmngr = Shiboken::BindingManager::instance();
-        PyObject* pySelf = bmngr.retrieveWrapper(cpp);
+        cpp->flush();
-        if (pySelf)
+
+        // Delete all widgets, this is slow but is necessary to avoid problems with python object
+        foreach(QWidget* w, QApplication::allWidgets()) {
+            PyObject* pySelf = bmngr.retrieveWrapper(w);
+
+            w->deleteLater();
+            //Make sure all events will send before invalidated the python object
+            QApplication::processEvents();
             bmngr.invalidateWrapper(pySelf);
+        }
+
+        PyObject* pySelf = bmngr.retrieveWrapper(cpp);
         cpp->deleteLater();
+        QApplication::processEvents();
+        bmngr.invalidateWrapper(pySelf);
     }
 }
 
@@ -62,7 +72,7 @@ int SbkQApplication_Init(PyObject* self, PyObject* args, PyObject*)
     }
 
     PyObject_SetAttrString(moduleQtGui, QAPP_MACRO, self);
-    Py_AtExit(DeleteQApplicationAtExit);
+    PySide::registerCleanupFunction(DeleteQApplicationAtExit);
     Py_INCREF(self);
     return 1;
 }

libpyside/pyside.cpp

@@ -24,18 +24,22 @@
 #include "pyside.h"
 #include "signalmanager.h"
 #include "qproperty.h"
+#include "qsignal.h"
 #include <basewrapper.h>
 #include <conversions.h>
 #include <algorithm>
-#include "qsignal.h"
+#include <QStack>
 
 extern "C" void init_signal(PyObject* module);
 extern "C" void init_slot(PyObject* module);
 extern "C" void init_qproperty(PyObject* module);
 
+static QStack<PySide::CleanupFunction> cleanupFunctionList;
+
 namespace PySide
 {
 
+
 void init(PyObject *module)
 {
     init_signal(module);
@@ -82,5 +86,20 @@ bool fillQtProperties(PyObject* qObj, const QMetaObject* metaObj, PyObject* kwds
     return true;
 }
 
+void registerCleanupFunction(CleanupFunction func)
+{
+    cleanupFunctionList.push(func);
+}
+
+void runCleanupFunctions()
+{
+    while (!cleanupFunctionList.isEmpty()) {
+        CleanupFunction f = cleanupFunctionList.pop();
+        f();
+    }
+}
+
+
+
 } //namespace PySide
 

libpyside/pyside.h

@@ -75,6 +75,15 @@ template<typename T>
 struct initQtMetaType<T, false> {
 };
 
+
+typedef void (*CleanupFunction)(void);
+
+/**
+ * Register a function to be called before python die
+ */
+PYSIDE_API void registerCleanupFunction(CleanupFunction func);
+PYSIDE_API void runCleanupFunctions();
+
 } //namespace PySide
 
 

libpyside/signalmanager.cpp

@@ -22,6 +22,7 @@
 
 #include "signalmanager.h"
 #include "qproperty.h"
+#include "pyside.h"
 
 #include <QHash>
 #include <QStringList>
@@ -223,6 +224,11 @@ struct SignalManager::SignalManagerPrivate
     GlobalReceiver m_globalReceiver;
 };
 
+static void clearSignalManager()
+{
+    PySide::SignalManager::instance().clear();
+}
+
 SignalManager::SignalManager() : m_d(new SignalManagerPrivate)
 {
     // Register Qt primitive typedefs used on signals.
@@ -234,6 +240,7 @@ SignalManager::SignalManager() : m_d(new SignalManagerPrivate)
     TypeResolver::createValueTypeResolver<PyObjectWrapper>(PYTHON_TYPE);
     TypeResolver::createValueTypeResolver<PyObjectWrapper>("object");
     TypeResolver::createValueTypeResolver<PyObjectWrapper>("PySide::PyObjectWrapper");
+    PySide::registerCleanupFunction(clearSignalManager);
 }
 
 void SignalManager::clear()