Changeset 22357 in vbox for trunk/src/libs

Timestamp:

Aug 19, 2009 9:32:54 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

51285

Message:

COM, Python: wrappers cleanup, some generic improvments

Location:

trunk/src/libs/xpcom18a4

Files:

• ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp (modified) (1 diff)
• python/src/module/_xpcom.cpp (modified) (3 diffs)

trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp

@@ -1604 +1604 @@
       // send address of the instance wrapper, and set the low bit to indicate
       // to the remote party that this is a remote instance wrapper.
-      PtrBits bits = ((PtrBits)(uintptr_t) wrapper) | PTRBITS_REMOTE_BIT;
+      PtrBits bits = ((PtrBits)(uintptr_t) wrapper);
+      NS_ASSERTION((bits & PTRBITS_REMOTE_BIT) == 0, "remote bit wrong)");
+      bits |= PTRBITS_REMOTE_BIT;
       writer.PutBytes(&bits, sizeof(bits));
     }

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

@@ -493 +493 @@
 
 #ifdef VBOX
+
 static nsIEventQueue* g_mainEventQ = nsnull;
 
@@ -575 +576 @@
 PyXPCOMMethod_DeinitCOM(PyObject *self, PyObject *args)
 {
-  Py_BEGIN_ALLOW_THREADS;
-  deinitVBoxPython();
-  Py_END_ALLOW_THREADS;
-  return PyInt_FromLong(0);
+    Py_BEGIN_ALLOW_THREADS;
+    deinitVBoxPython();
+    Py_END_ALLOW_THREADS;
+    return PyInt_FromLong(0);
+}
+
+static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
+
+static PyObject* 
+PyXPCOMMethod_AttachThread(PyObject *self, PyObject *args)
+{
+    nsresult rv;
+    PRInt32  result = 0;
+    nsCOMPtr<nsIEventQueueService> eqs;
+
+    // Create the Event Queue for this thread...
+    Py_BEGIN_ALLOW_THREADS;
+    eqs =
+      do_GetService(kEventQueueServiceCID, &rv);
+    Py_END_ALLOW_THREADS;
+    if (NS_FAILED(rv))
+    {
+      result = 1;
+      goto done;
+    }
+
+    Py_BEGIN_ALLOW_THREADS;
+    rv = eqs->CreateThreadEventQueue();
+    Py_END_ALLOW_THREADS;
+    if (NS_FAILED(rv))
+    {
+      result = 2;
+      goto done;
+    }
+
+ done:
+    /** @todo: better throw an exception on error */
+    return PyInt_FromLong(result);
+}
+
+static PyObject* 
+PyXPCOMMethod_DetachThread(PyObject *self, PyObject *args)
+{
+    nsresult rv;
+    PRInt32  result = 0;
+    nsCOMPtr<nsIEventQueueService> eqs;
+
+    // Destroy the Event Queue for this thread...
+    Py_BEGIN_ALLOW_THREADS;
+    eqs =
+      do_GetService(kEventQueueServiceCID, &rv);
+    Py_END_ALLOW_THREADS;
+    if (NS_FAILED(rv))
+    {
+      result = 1;
+      goto done;
+    }
+
+    Py_BEGIN_ALLOW_THREADS;
+    rv = eqs->DestroyThreadEventQueue();
+    Py_END_ALLOW_THREADS;
+    if (NS_FAILED(rv))
+    {
+      result = 2;
+      goto done;
+    }
+
+ done:
+    /** @todo: better throw an exception on error */
+    return PyInt_FromLong(result);
 }
 #endif
@@ -609 +676 @@
 #ifdef VBOX
         {"WaitForEvents", PyXPCOMMethod_WaitForEvents, 1},
-        {"DeinitCOM", PyXPCOMMethod_DeinitCOM, 1},
+        {"DeinitCOM",     PyXPCOMMethod_DeinitCOM, 1},
+        {"AttachThread",  PyXPCOMMethod_AttachThread, 1},
+        {"DetachThread",  PyXPCOMMethod_DetachThread, 1},
 #endif
         // These should no longer be used - just use the logging.getLogger('pyxpcom')...