Changeset 20630 in vbox

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

Location:

trunk/src

Files:

• VBox/Frontends/VBoxShell/vboxshell.py (modified) (4 diffs)
• VBox/Main/VirtualBoxImpl.cpp (modified) (1 diff)
• VBox/Main/glue/vboxapi.py (modified) (5 diffs)
• VBox/Main/idl/VirtualBox.xidl (modified) (1 diff)
• VBox/Main/include/VirtualBoxImpl.h (modified) (1 diff)
• VBox/Main/xpcom/server.cpp (modified) (2 diffs)
• libs/xpcom18a4/python/src/module/_xpcom.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VBoxShell/vboxshell.py

@@ -304 +304 @@
 def monitorGuest(ctx, machine, console, dur):
     import time
+    import xpcom
     cb = ctx['global'].createCallback('IConsoleCallback', GuestMonitor, machine)
     console.registerCallback(cb)
@@ -309 +310 @@
         # not infinity, but close enough
         dur = 100000
-    end = time.clock() + dur
-    while  time.clock() < end:
-        ctx['vb'].waitForEvents(100)
+    try:
+        end = time.time() + dur
+        while  time.time() < end:
+            ctx['global'].waitForEvents(500)
+    # We need to catch all exceptions here, otherwise callback will never be unregistered
+    except:
+        pass    
     console.unregisterCallback(cb)
+
+    
 
 def cmdExistingVm(ctx,mach,cmd,args):
@@ -624 +631 @@
         try:
             cmd = raw_input("vbox> ")
-            vbox.waitForEvents(0)
             done = runCommand(ctx, cmd)
             if done != 0: break
@@ -662 +668 @@
            }
     interpret(ctx)
+    g_virtualBoxManager.deinit()
     del g_virtualBoxManager
 

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -1891 +1891 @@
 }
 
-
-STDMETHODIMP VirtualBox::WaitForEvents(LONG aTimeout)
-{
-#ifdef RT_OS_WINDOWS
-    ReturnComNotImplemented();
-#else
-    extern nsresult XPCOM_waitForEvents(PRInt32 aTimeout);
-
-    return XPCOM_waitForEvents(aTimeout);
-#endif
-}
 
 STDMETHODIMP VirtualBox::WaitForPropertyChange (IN_BSTR /* aWhat */, ULONG /* aTimeout */,

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

@@ -145 +145 @@
         return d['result']
 
+    def waitForEvents(self, timeout):
+        # not really supported yet
+        pass
+
+    def deinit(self):
+        import pythoncom
+        pythoncom.CoUninitialize()
+        pass
+
 class PlatformXPCOM:
     def __init__(self, params):
@@ -192 +201 @@
         return d['result']
 
+    def waitForEvents(self, timeout):
+        import xpcom
+        xpcom._xpcom.WaitForEvents(timeout)
+
+    def deinit(self):
+        import xpcom
+        xpcom._xpcom.DeinitCOM()
 
 class PlatformWEBSERVICE:
@@ -235 +251 @@
     def createCallback(self, iface, impl, arg):
         raise Exception("no callbacks for webservices")
+
+    def waitForEvents(self, timeout):
+        # Webservices cannot do that
+        pass
+
+    def deinit(self):
+        # should we do something about it?
+        pass
 
 class SessionManager:
@@ -269 +293 @@
 
     def __del__(self):
+        deinit(self)
+
+    def deinit(self):
         if hasattr(self, "vbox"):
             del self.vbox
+        if hasattr(self, "platform"):
+            self.platform.deinit()
 
     def initPerThread(self):
@@ -288 +317 @@
     def createCallback(self, iface, impl, arg):
         return self.platform.createCallback(iface, impl, arg)
+
+    def waitForEvents(self, timeout):
+        return self.platform.waitForEvents(timeout)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -2644 +2644 @@
       <param name="callback" type="IVirtualBoxCallback" dir="in">
         <desc>Callback object to unregister.</desc>
-      </param>
-    </method>
-
-    <method name="waitForEvents">
-      <desc>
-        Blocking wait for events to happen and process them, if any.
-        One may wish to call this method from the main even loop 
-        to wait for acitivity from VirtualBox, such as callback calling.
-      </desc>
-      <param name="timeout" type="long" dir="in">
-        <desc>
-          Wait timeout in milliseconds.
-          Specify -1 for an indefinite wait.
-          Specify 0 for immediate return if no events to process.
-        </desc>
       </param>
     </method>

trunk/src/VBox/Main/include/VirtualBoxImpl.h

@@ -180 +180 @@
     STDMETHOD(UnregisterCallback) (IVirtualBoxCallback *aCallback);
 
-    STDMETHOD(WaitForEvents) (LONG aTimeout);    
     STDMETHOD(WaitForPropertyChange) (IN_BSTR aWhat, ULONG aTimeout,
                                       BSTR *aChanged, BSTR *aValues);

trunk/src/VBox/Main/xpcom/server.cpp

@@ -244 +244 @@
 static PRBool volatile gKeepRunning = PR_TRUE;
 
-nsresult XPCOM_waitForEvents(PRInt32 aTimeout)
-{
-  nsIEventQueue* q = gEventQ;
-  PRBool hasEvents = false;
-  nsresult rc;
-
-  if (!gKeepRunning || !q)
-    return NS_OK;
-
-  rc = q->PendingEvents(&hasEvents);
-  if (NS_FAILED (rc))
-    return NS_ERROR_FAILURE;
-
-  if (hasEvents)
-  {
-    q->ProcessPendingEvents();
-    return NS_OK;
-  }
-  
-  if (aTimeout == 0)
-     return NS_OK;
-
-  PRInt32 fd;
-  fd = q->GetEventQueueSelectFD();
-
-  if (fd < 0 && aTimeout == -1)
-  {
-    /* fallback */
-    PLEvent *pEvent = NULL;
-    rc = q->WaitForEvent(&pEvent);
-    if (NS_SUCCEEDED(rc))
-      q->HandleEvent(pEvent);
-
-    q->ProcessPendingEvents();
-    return NS_OK;
-  }
-
-  /* Cannot perform timed wait otherwise */
-  AssertReturn(fd >= 0, NS_ERROR_FAILURE);
-  
-  fd_set fdsetR, fdsetE;
-  struct timeval tv;
-
-  FD_ZERO(&fdsetR);
-  FD_SET(fd, &fdsetR);
-
-  fdsetE = fdsetR;
-  if (aTimeout > 0)
-  {
-    /* LogRel(("sleep %d\n", aTimeout)); */
-    tv.tv_sec = (PRInt64)aTimeout / 1000;
-    tv.tv_usec = ((PRInt64)aTimeout % 1000) * 1000;
-  }
-
-  /** @todo: What to do for XPCOM platforms w/o select() ? */
-  int n = select(fd + 1, &fdsetR, NULL, &fdsetE, aTimeout < 0 ? NULL : &tv);
-  rc = (n >= 0) ? NS_OK :  NS_ERROR_FAILURE;
-
-  /* process pending events, no matter what */
-  q->ProcessPendingEvents();
-
-  return rc;
-}
-
 /////////////////////////////////////////////////////////////////////////////
 
@@ -776 +712 @@
 
 /**
- * Hhelper function to register self components upon start-up
+ * Helper function to register self components upon start-up
  * of the out-of-proc server.
  */

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