Changeset 20630 in vbox for trunk/src/libs/xpcom18a4

Timestamp:

Jun 16, 2009 1:55:38 PM (16 years ago)

Author:

vboxsync

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

48707

Message:

Python: moved waiting on client side, removed main API for event waiting, as making no sense

File:

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

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

@@ -54 +54 @@
 #include "nsIConsoleService.h"
 #include "nspr.h" // PR_fprintf
+#ifdef VBOX
+#include "nsEventQueueUtils.h"
+#endif
 
 #ifdef XP_WIN
@@ -489 +492 @@
 }
 
+#ifdef VBOX
+static nsIEventQueue* g_mainEventQ = nsnull;
+
+static PyObject* 
+PyXPCOMMethod_WaitForEvents(PyObject *self, PyObject *args)
+{
+  PRInt32 aTimeout;
+
+  if (!PyArg_ParseTuple(args, "i", &aTimeout))
+    return NULL;
+
+  nsIEventQueue* q = g_mainEventQ;
+  PRBool hasEvents = PR_FALSE;
+  nsresult rc;
+  PRInt32 fd, result = 0;
+
+  if (q == nsnull) 
+    return NULL;
+
+  if (aTimeout == 0)
+    goto ok;
+
+  rc = q->PendingEvents(&hasEvents);
+  if (NS_FAILED (rc))
+    return NULL;
+
+  if (hasEvents)
+    goto ok;
+  
+  fd = q->GetEventQueueSelectFD();
+  if (fd < 0 && aTimeout < 0)
+  {
+    /* fallback */
+    PLEvent *pEvent = NULL;
+    rc = q->WaitForEvent(&pEvent);
+    if (NS_SUCCEEDED(rc))
+      q->HandleEvent(pEvent);
+    goto ok;
+  }
+
+  /* Cannot perform timed wait otherwise */
+  if (fd < 0)
+    return NULL;
+  
+  
+  {
+    fd_set fdsetR, fdsetE;
+    struct timeval tv;
+    
+    FD_ZERO(&fdsetR);
+    FD_SET(fd, &fdsetR);
+
+    fdsetE = fdsetR;
+    if (aTimeout > 0)
+      {
+        tv.tv_sec = (PRInt64)aTimeout / 1000;
+        tv.tv_usec = ((PRInt64)aTimeout % 1000) * 1000;
+      }
+    
+    /** @todo: What to do for XPCOM platforms w/o select() ? */
+    Py_BEGIN_ALLOW_THREADS;
+    int n = select(fd + 1, &fdsetR, NULL, &fdsetE, aTimeout < 0 ? NULL : &tv);
+    result = (n == 0) ?  1 :  0;
+    Py_END_ALLOW_THREADS;
+  }
+ ok:
+  q->ProcessPendingEvents();
+
+  return PyInt_FromLong(result);
+}
+
+static void deinitVBoxPython();
+
+static PyObject* 
+PyXPCOMMethod_DeinitCOM(PyObject *self, PyObject *args)
+{
+  deinitVBoxPython();
+  return PyInt_FromLong(0);
+}
+#endif
+
 extern PYXPCOM_EXPORT PyObject *PyXPCOMMethod_IID(PyObject *self, PyObject *args);
 
@@ -514 +598 @@
         {"MakeVariant", PyXPCOMMethod_MakeVariant, 1},
         {"GetVariantValue", PyXPCOMMethod_GetVariantValue, 1},
+#ifdef VBOX
+        {"WaitForEvents", PyXPCOMMethod_WaitForEvents, 1},
+        {"DeinitCOM", PyXPCOMMethod_DeinitCOM, 1},
+#endif
         // These should no longer be used - just use the logging.getLogger('pyxpcom')...
         { NULL }
@@ -650 +738 @@
     rc = com::Initialize();
 
+    if (NS_SUCCEEDED(rc))
+    {
+      NS_GetMainEventQ (&g_mainEventQ);
+    }
+
     init_xpcom();
   }
 }
-#endif
+
+static 
+void deinitVBoxPython()
+{
+
+  if (g_mainEventQ)
+    NS_RELEASE(g_mainEventQ); 
+  
+  com::Shutdown();
+}
+#endif