Changeset 20598 in vbox

Timestamp:

Jun 15, 2009 6:08:09 PM (16 years ago)

Author:

vboxsync

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

48645

Message:

Main: implmented waitForEvents(aTimeout) API for XPCOM targets, added command to VBox shell using this API

Location:

trunk/src/VBox

Files:

• Frontends/VBoxShell/vboxshell.py (modified) (6 diffs)
• Main/VirtualBoxImpl.cpp (modified) (1 diff)
• Main/glue/vboxapi.py (modified) (5 diffs)
• Main/idl/VirtualBox.xidl (modified) (1 diff)
• Main/include/VirtualBoxImpl.h (modified) (1 diff)
• Main/xpcom/server.cpp (modified) (1 diff)

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

@@ -96 +96 @@
             })
         return out
+
+# Simple implementation of IConsoleCallback, one can use it as skeleton 
+# for custom implementations
+class GuestMonitor:
+    def __init__(self, mach):
+        self.mach = mach
+
+    def onMousePointerShapeChange(self, visible, alpha, xHot, yHot, width, height, shape):
+        print  "%s: onMousePointerShapeChange: visible=%d" %(self.mach.name, visible) 
+    def onMouseCapabilityChange(self, supportsAbsolute, needsHostCursor):
+        print  "%s: onMouseCapabilityChange: needsHostCursor=%d" %(self.mach.name, needsHostCursor)
+
+    def onKeyboardLedsChange(self, numLock, capsLock, scrollLock):
+        print  "%s: onKeyboardLedsChange capsLock=%d"  %(self.mach.name, capsLock)
+
+    def onStateChange(self, state):
+        print  "%s: onStateChange state=%d" %(self.mach.name, state)
+
+    def onAdditionsStateChange(self):
+        print  "%s: onAdditionsStateChange" %(self.mach.name)
+
+    def onDVDDriveChange(self):
+        print  "%s: onDVDDriveChange" %(self.mach.name)
+
+    def onFloppyDriveChange(self):
+        print  "%s: onFloppyDriveChange" %(self.mach.name)
+
+    def onNetworkAdapterChange(self, adapter):
+        print  "%s: onNetworkAdapterChange" %(self.mach.name)
+
+    def onSerialPortChange(self, port):
+        print  "%s: onSerialPortChange" %(self.mach.name)
+
+    def onParallelPortChange(self, port):
+        print  "%s: onParallelPortChange" %(self.mach.name)
+
+    def onStorageControllerChange(self):
+        print  "%s: onStorageControllerChange" %(self.mach.name)
+
+    def onVRDPServerChange(self):
+        print  "%s: onVRDPServerChange" %(self.mach.name)
+
+    def onUSBControllerChange(self):
+        print  "%s: onUSBControllerChange" %(self.mach.name)
+
+    def onUSBDeviceStateChange(self, device, attached, error):
+        print  "%s: onUSBDeviceStateChange" %(self.mach.name)
+
+    def onSharedFolderChange(self, scope):
+        print  "%s: onSharedFolderChange" %(self.mach.name)
+
+    def onRuntimeError(self, fatal, id, message):
+        print  "%s: onRuntimeError fatal=%d message=%s" %(self.mach.name, fatal, message)
+
+    def onCanShowWindow(self):
+        print  "%s: onCanShowWindow" %(self.mach.name)
+        return true
+
+    def onShowWindow(self, winId):
+        print  "%s: onShowWindow: %d" %(self.mach.name, winId)
 
 g_hasreadline = 1
@@ -242 +302 @@
     exec cmds
 
+def monitorGuest(ctx, machine, console, dur):
+    import time
+    cb = ctx['global'].createCallback('IConsoleCallback', GuestMonitor, machine)
+    console.registerCallback(cb)
+    if dur == -1:
+        # not infinity, but close enough
+        dur = 100000
+    end = time.clock() + dur
+    while  time.clock() < end:
+        ctx['vb'].waitForEvents(100)
+    console.unregisterCallback(cb)
+
 def cmdExistingVm(ctx,mach,cmd,args):
     mgr=ctx['mgr']
@@ -267 +339 @@
          'powerdown':  lambda: console.powerDown(),
          'stats':      lambda: guestStats(ctx, mach),
-         'guest':      lambda: guestExec(ctx, mach, console, args)
+         'guest':      lambda: guestExec(ctx, mach, console, args),
+         'monitorGuest': lambda: monitorGuest(ctx, mach, console, args)
          }
     try:
@@ -467 +540 @@
    return 0
 
+
+def monitorGuestCmd(ctx, args):
+    if (len(args) < 2):
+        print "usage: monitorGuest name (duration)"
+        return 0
+    mach = argsToMach(ctx,args)
+    if mach == None:
+        return 0
+    dur = 5
+    if len(args) > 2:
+        dur = float(args[2])
+    cmdExistingVm(ctx, mach, 'monitorGuest', dur)
+    return 0
 
 def evalCmd(ctx, args):
@@ -503 +589 @@
             'host':['Show host information', hostCmd],
             'guest':['Execute command for guest: guest Win32 console.mouse.putMouseEvent(20, 20, 0, 0)', guestCmd],
+            'monitorGuest':['Monitor what happens with the guest for some time: monitorGuest Win32 10', monitorGuestCmd],
             }
 
@@ -537 +624 @@
         try:
             cmd = raw_input("vbox> ")
+            vbox.waitForEvents(0)
             done = runCommand(ctx, cmd)
             if done != 0: break

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -1889 +1889 @@
     LogFlowThisFunc (("aCallback=%p, rc=%08X\n", aCallback, rc));
     return rc;
+}
+
+
+STDMETHODIMP VirtualBox::WaitForEvents(LONG aTimeout)
+{
+#ifdef RT_OS_WINDOWS
+    ReturnComNotImplemented();
+#else
+    extern nsresult XPCOM_waitForEvents(PRInt32 aTimeout);
+
+    return XPCOM_waitForEvents(aTimeout);
+#endif
 }
 

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

@@ -131 +131 @@
         pythoncom.CoUninitialize()
 
-    def createCallback(self, iface, impl):        
+    def createCallback(self, iface, impl, arg):        
         d = {}
         d['BaseClass'] = impl
+        d['arg'] = arg
         str = ""
         str += "import win32com.server.util"
@@ -139 +140 @@
         str += "   _com_interfaces_ = ['"+iface+"']\n"
         str += "   _typelib_guid_ = '{46137EEC-703B-4FE5-AFD4-7C9BBBBA0259}'\n"
-        str += "   def __init__(self): pass\n"
+        str += "   def __init__(self): BaseClass.__init__(self, arg)\n"
         str += "result = win32com.server.util.wrap("+iface+"Impl())\n"        
         exec (str,d,d)
@@ -178 +179 @@
         pass
 
-    def createCallback(self, iface, impl):        
+    def createCallback(self, iface, impl, arg):
         d = {}
         d['BaseClass'] = impl
+        d['arg'] = arg
         str = ""
         str += "import xpcom.components\n"
         str += "class "+iface+"Impl(BaseClass):\n"
         str += "   _com_interfaces_ = xpcom.components.interfaces."+iface+"\n"
-        str += "   def __init__(self): pass\n"
+        str += "   def __init__(self): BaseClass.__init__(self, arg)\n"
         str += "result = "+iface+"Impl()\n"
         exec (str,d,d)
@@ -231 +233 @@
         pass
 
-    def createCallback(self, iface, impl):
+    def createCallback(self, iface, impl, arg):
         raise Exception("no callbacks for webservices")
 
@@ -284 +286 @@
         self.platform.deinitPerThread()
 
-    def createCallback(self, iface, impl):
-        return self.platform.createCallback(iface, impl)
+    def createCallback(self, iface, impl, arg):
+        return self.platform.createCallback(iface, impl, arg)

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;
+}
+
 /////////////////////////////////////////////////////////////////////////////