Changeset 26583 in vbox

Timestamp:

Feb 16, 2010 3:11:22 PM (15 years ago)

Author:

vboxsync

Message:

Python: gueststats command, API to get enums values list

Location:

trunk/src/VBox

Files:

• Frontends/VBoxShell/vboxshell.py (modified) (7 diffs)
• Main/glue/constants-python.xsl (modified) (2 diffs)

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

@@ -295 +295 @@
         return 'off'
 
-def guestStats(ctx,mach):
+def perfStats(ctx,mach):
     if not ctx['perf']:
         return
@@ -381 +381 @@
     else:
         reportError(ctx,session,rc)
+
+
+def guestStats(ctx,session,console,args):
+    guest = console.guest
+    # we need to set up guest statistics
+    if len(args) > 0 :
+        update = args[0]
+    else:
+        update = 1
+    if guest.statisticsUpdateInterval != update:
+        guest.statisticsUpdateInterval = update
+        try:
+            time.sleep(float(update)+0.1)
+        except:
+            # to allow sleep interruption
+            pass
+    all_stats = ctx['ifaces'].all_values('GuestStatisticType')
+    cpu = 0
+    for s in all_stats.keys():
+        try:
+            val = guest.getStatistic( cpu, all_stats[s])
+            print "%s: %d" %(s, val)
+        except:
+            # likely not implemented
+            pass
 
 def cmdExistingVm(ctx,mach,cmd,args):
@@ -397 +422 @@
         print "Session to '%s' in wrong state: %s" %(mach.name, session.state)
         return
-    # unfortunately IGuest is suppressed, thus WebServices knows not about it
-    # this is an example how to handle local only functionality
-    if ctx['remote'] and cmd == 'stats2':
+    # this could be an example how to handle local only (i.e. unavailable
+    # in Webservices) functionality
+    if ctx['remote'] and cmd == 'some_local_only_command':
         print 'Trying to use local only functionality, ignored'
         return
@@ -407 +432 @@
          'powerdown':       lambda: console.powerDown(),
          'powerbutton':     lambda: console.powerButton(),
-         'stats':           lambda: guestStats(ctx, mach),
+         'stats':           lambda: perfStats(ctx, mach),
          'guest':           lambda: guestExec(ctx, mach, console, args),
          'monitorGuest':    lambda: monitorGuest(ctx, mach, console, args),
          'save':            lambda: progressBar(ctx,console.saveState()),
          'screenshot':      lambda: takeScreenshot(ctx,console,args),
-         'teleport':        lambda: teleport(ctx,session,console,args)
+         'teleport':        lambda: teleport(ctx,session,console,args),
+         'gueststats':      lambda: guestStats(ctx, mach, console, args),
          }
     try:
@@ -747 +773 @@
     return 0
 
+def gueststatsCmd(ctx, args):
+    if (len(args) < 2):
+        print "usage: gueststats name <check interval>"
+        return 0
+    mach = argsToMach(ctx,args)
+    if mach == None:
+        return 0
+    cmdExistingVm(ctx, mach, 'gueststats', args[2:])
+    return 0
+
 
 def setvarCmd(ctx, args):
@@ -1129 +1165 @@
 
 commands = {'help':['Prints help information', helpCmd, 0],
-            'start':['Start virtual machine by name or uuid', startCmd, 0],
+            'start':['Start virtual machine by name or uuid: start Linux', startCmd, 0],
             'create':['Create virtual machine', createCmd, 0],
             'remove':['Remove virtual machine', removeCmd, 0],
@@ -1161 +1197 @@
             'closeportal':['Close teleportation portal (see openportal,teleport): closeportal Win', closeportalCmd, 0],
             'getextra':['Get extra data, empty key lists all: getextra <vm|global> <key>', getExtraDataCmd, 0],
-            'setextra':['Set extra data, empty value removes key: setextra <vm|global> <key> <value>', setExtraDataCmd, 0]            
+            'setextra':['Set extra data, empty value removes key: setextra <vm|global> <key> <value>', setExtraDataCmd, 0],
+            'gueststats':['Print available guest stats (only Windows guests with additions so far): gueststats Win32', gueststatsCmd, 0],
             }
 

trunk/src/VBox/Main/glue/constants-python.xsl

@@ -59 +59 @@
               </xsl:for-each>}
 
+   _ValuesSym = {<xsl:for-each select="//enum">
+                '<xsl:value-of select="@name"/>':{
+                  <xsl:for-each select="const">'<xsl:value-of select="@name"/>': '<xsl:value-of select="@name"/>'<xsl:if test="not(position()=last())">,</xsl:if>
+                  </xsl:for-each>}<xsl:if test="not(position()=last())">,</xsl:if>
+
+              </xsl:for-each>}
+
    _ValuesFlat = {<xsl:for-each select="//enum">
                    <xsl:variable name="ename">
@@ -92 +99 @@
          raise AttributeError
 
+   def all_values(self,enum_name):
+      if self.isSym:
+        vals = self._ValuesSym.get(enum_name)
+      else:
+        vals = self._Values.get(enum_name)
+      if vals is not None:
+         return vals
+      else:
+         return {}
+
 </xsl:template>
 </xsl:stylesheet>