Changeset 31604 in vbox

Timestamp:

Aug 12, 2010 3:17:54 PM (15 years ago)

Author:

vboxsync

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

64728

Message:

waitForEvents: Don't return None, another test.

Location:

trunk/src

Files:

• VBox/Main/glue/vboxapi.py (modified) (3 diffs)
• libs/xpcom18a4/python/src/module/_xpcom.cpp (modified) (1 diff)

trunk/src/VBox/Main/glue/vboxapi.py

@@ -271 +271 @@
     def waitForEvents(self, timeout):
         from win32api import GetCurrentThreadId
+        from win32con import INFINITE
         from win32event import MsgWaitForMultipleObjects, \
                                QS_ALLINPUT, WAIT_TIMEOUT, WAIT_OBJECT_0
         from pythoncom import PumpWaitingMessages
-
+        import types
+
+        if not isinstance(timeout, types.IntType):
+            raise TypeError("The timeout argument is not an integer")
         if (self.tid != GetCurrentThreadId()):
             raise Exception("wait for events from the same thread you inited!")
 
-        rc = MsgWaitForMultipleObjects(self.handles, 0, timeout, QS_ALLINPUT)
+        if timeout < 0:     cMsTimeout = INFINITE
+        else:               cMsTimeout = timeout
+        rc = MsgWaitForMultipleObjects(self.handles, 0, cMsTimeout, QS_ALLINPUT)
         if rc >= WAIT_OBJECT_0 and rc < WAIT_OBJECT_0+len(self.handles):
             # is it possible?
@@ -559 +565 @@
         Returns 1 if timed out or interrupted in some way.
         Returns 2 on error (like not supported for web services).
-        Returns None or raises an exception if called on the wrong thread or if
-        the timeout is not an integer value.
+
+        Raises an exception if the calling thread is not the main thread (the one
+        that initialized VirtualBoxManager) or if the time isn't an integer.
         """
         return self.platform.waitForEvents(timeout)
@@ -566 +573 @@
     def interruptWaitEvents(self):
         """
-
-
+        Interrupt a waitForEvents call.
+        This is normally called from a worker thread.
+
+        Returns True on success, False on failure.
         """
         return self.platform.interruptWaitEvents()

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

@@ -502 +502 @@
 PyXPCOMMethod_WaitForEvents(PyObject *self, PyObject *args)
 {
-  PRInt32 aTimeout;
-
-  if (!PyArg_ParseTuple(args, "i", &aTimeout))
-    return NULL; /** @todo throw exception */
-
-  int rc;
-  com::EventQueue* aEventQ = com::EventQueue::getMainEventQueue();
-  NS_WARN_IF_FALSE(aEventQ != nsnull, "Null main event queue");
-  if (!aEventQ)
-      return NULL;
-
-  Py_BEGIN_ALLOW_THREADS
-  rc = aEventQ->processEventQueue(aTimeout < 0 ? RT_INDEFINITE_WAIT : (uint32_t)aTimeout);
-  Py_END_ALLOW_THREADS
-  if (RT_SUCCESS(rc))
-      return PyInt_FromLong(0);
-
-  if (   rc == VERR_TIMEOUT
-      || rc == VERR_INTERRUPTED)
-      return PyInt_FromLong(1);
-
-  return PyInt_FromLong(2);
+    PRInt32 aTimeout;
+
+    if (!PyArg_ParseTuple(args, "i", &aTimeout))
+    {
+        PyErr_SetString(PyExc_TypeError, "the timeout argument is not an integer");
+        return NULL;
+    }
+
+    int rc;
+    com::EventQueue* aEventQ = com::EventQueue::getMainEventQueue();
+    NS_WARN_IF_FALSE(aEventQ != nsnull, "Null main event queue");
+    if (!aEventQ)
+        {
+        PyErr_SetString(PyExc_TypeError, "the main event queue is NULL");
+        return NULL;
+        }
+
+    Py_BEGIN_ALLOW_THREADS
+    rc = aEventQ->processEventQueue(aTimeout < 0 ? RT_INDEFINITE_WAIT : (uint32_t)aTimeout);
+    Py_END_ALLOW_THREADS
+    if (RT_SUCCESS(rc))
+        return PyInt_FromLong(0);
+
+    if (   rc == VERR_TIMEOUT
+        || rc == VERR_INTERRUPTED)
+        return PyInt_FromLong(1);
+
+    if (rc == VERR_INVALID_CONTEXT)
+        {
+        PyErr_SetString(PyExc_Exception, "wrong thread, use the main thread");
+                return NULL;
+        }
+
+    return PyInt_FromLong(2);
 }