Changeset 69588 in vbox for trunk/src/libs/xpcom18a4/python

Timestamp:

Nov 5, 2017 10:45:32 AM (7 years ago)

Author:

vboxsync

Message:

python/src/modules/_xpcom.cpp: Keep track of whether we've calle com::Shutdown already to avoid assertions.

File:

• trunk/src/libs/xpcom18a4/python/src/module/_xpcom.cpp (modified) (5 diffs)

trunk/src/libs/xpcom18a4/python/src/module/_xpcom.cpp

@@ -76 +76 @@
 #ifdef VBOX_PYXPCOM
 # include <iprt/cdefs.h>
+# include <VBox/com/com.h>
 # ifndef MODULE_NAME_SUFFIX
 #  define MANGLE_MODULE_NAME(a_szName)  a_szName
@@ -618 +619 @@
 }
 
-static void deinitVBoxPython();
+static nsresult deinitVBoxPython();
 
 static PyObject*
 PyXPCOMMethod_DeinitCOM(PyObject *self, PyObject *args)
 {
+    nsresult nr;
     Py_BEGIN_ALLOW_THREADS;
-    deinitVBoxPython();
+    nr = deinitVBoxPython();
     Py_END_ALLOW_THREADS;
-    return PyInt_FromLong(0);
+    return PyInt_FromLong(nr);
 }
 
@@ -727 +729 @@
         {"GetVariantValue", PyXPCOMMethod_GetVariantValue, 1},
 #ifdef VBOX
-    {"WaitForEvents", PyXPCOMMethod_WaitForEvents, 1},
-    {"InterruptWait", PyXPCOMMethod_InterruptWait, 1},
-    {"DeinitCOM",     PyXPCOMMethod_DeinitCOM, 1},
-    {"AttachThread",  PyXPCOMMethod_AttachThread, 1},
-    {"DetachThread",  PyXPCOMMethod_DetachThread, 1},
+        {"WaitForEvents", PyXPCOMMethod_WaitForEvents, 1},
+        {"InterruptWait", PyXPCOMMethod_InterruptWait, 1},
+        {"DeinitCOM",     PyXPCOMMethod_DeinitCOM, 1},
+        {"AttachThread",  PyXPCOMMethod_AttachThread, 1},
+        {"DetachThread",  PyXPCOMMethod_DetachThread, 1},
 #endif
 #ifdef VBOX_DEBUG_LIFETIMES
@@ -854 +856 @@
 
 #ifdef VBOX_PYXPCOM
-#include <VBox/com/com.h>
+# include <VBox/com/com.h>
 using namespace com;
 
-#include <iprt/initterm.h>
-#include <iprt/string.h>
-#include <iprt/alloca.h>
-#include <iprt/stream.h>
-
-#if PY_MAJOR_VERSION <= 2
+# include <iprt/initterm.h>
+# include <iprt/string.h>
+# include <iprt/alloca.h>
+# include <iprt/stream.h>
+
+/** Set if NS_ShutdownXPCOM has been called successfully already and we don't 
+ * need to do it again during module termination.  This avoids assertion in the 
+ * VBoxCOM glue code. */
+static bool g_fComShutdownAlready = true;
+
+# if PY_MAJOR_VERSION <= 2
 extern "C" NS_EXPORT
 void
-#else
+# else
 /** @todo r=klaus this is hacky, but as Python3 doesn't deal with ELF
  * visibility, assuming that all globals are visible (which is ugly and not
  * true in our case). */
-#undef PyMODINIT_FUNC
-#define PyMODINIT_FUNC extern "C" NS_EXPORT PyObject*
+#  undef PyMODINIT_FUNC
+#  define PyMODINIT_FUNC extern "C" NS_EXPORT PyObject*
 PyMODINIT_FUNC
-#endif
+# endif
 initVBoxPython() { /* NOTE! This name is redefined at the top of the file! */
   static bool s_vboxInited = false;
   if (!s_vboxInited) {
-    int rc = 0;
-
-#if defined(VBOX_PATH_APP_PRIVATE_ARCH) && defined(VBOX_PATH_SHARED_LIBS)
+    int rc = 0; /* Error handling in this code is NON-EXISTING. Sigh. */
+
+# if defined(VBOX_PATH_APP_PRIVATE_ARCH) && defined(VBOX_PATH_SHARED_LIBS)
     rc = RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE);
-#else
+# else
     const char *home = getenv("VBOX_PROGRAM_PATH");
     if (home) {
@@ -891 +898 @@
       rc = RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE);
     }
-#endif
+# endif
 
     rc = com::Initialize();
-
-#if PY_MAJOR_VERSION <= 2
+    g_fComShutdownAlready = false;
+
+# if PY_MAJOR_VERSION <= 2
     init_xpcom();
-#else
+# else
     return init_xpcom();
-#endif
+# endif
   }
-#if PY_MAJOR_VERSION >= 3
+# if PY_MAJOR_VERSION >= 3
   return NULL;
-#endif
+# endif
 }
 
 static
-void deinitVBoxPython()
-{
-  com::Shutdown();
+nsresult deinitVBoxPython()
+{
+  nsresult nr;
+  if (!g_fComShutdownAlready)
+  {
+    nr = com::Shutdown();
+    if (!NS_FAILED(nr))
+      g_fComShutdownAlready = true;
+  }
+  else
+    nr = NS_ERROR_NOT_INITIALIZED;
+  return nr;
 }