VirtualBox

Changeset 43869 in vbox for trunk


Ignore:
Timestamp:
Nov 14, 2012 4:33:35 PM (12 years ago)
Author:
vboxsync
Message:

Main/MachineDebugger: make it available over the webservice (except the attribute returning the VM pointer which is useless), with assorted minor cleanups

Location:
trunk/src/VBox
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMInformationDlg.cpp

    r43484 r43869  
    397397    for (DataMapType::const_iterator it = mNamesMap.begin(); it != mNamesMap.end(); ++ it)
    398398    {
    399         dbg.GetStats (it.key(), true, info);
    400         mValuesMap [it.key()] = parseStatistics (info);
     399        info = dbg.GetStats(it.key(), true);
     400        mValuesMap[it.key()] = parseStatistics(info);
    401401    }
    402402

  • trunk/src/VBox/Main/glue/glue-java.xsl

    r43103 r43869  
    1111        VirtualBox.xidl.
    1212
    13     Copyright (C) 2010-2011 Oracle Corporation
     13    Copyright (C) 2010-2012 Oracle Corporation
    1414
    1515    This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    4848  <xsl:param name="name" />
    4949  <xsl:text>/*
    50  *  Copyright (C) 2010-2011 Oracle Corporation
     50 *  Copyright (C) 2010-2012 Oracle Corporation
    5151 *
    5252 *  This file is part of the VirtualBox SDK, as available from
    … …  
    17431743    </xsl:if>
    17441744
    1745     <!-- Emit getter -->
    1746     <xsl:variable name="backgettername">
    1747       <xsl:choose>
    1748         <!-- Stupid, but backend boolean getters called isFoo(), not getFoo() -->
    1749         <xsl:when test="$attrtype = 'boolean'">
    1750           <xsl:variable name="capsname">
    1751             <xsl:call-template name="capitalize">
    1752               <xsl:with-param name="str" select="$attrname" />
     1745    <xsl:if test="($G_vboxGlueStyle != 'jaxws') or (@wsmap != 'suppress')">
     1746      <!-- Emit getter -->
     1747      <xsl:variable name="backgettername">
     1748        <xsl:choose>
     1749          <!-- Stupid, but backend boolean getters called isFoo(), not getFoo() -->
     1750          <xsl:when test="$attrtype = 'boolean'">
     1751            <xsl:variable name="capsname">
     1752              <xsl:call-template name="capitalize">
     1753                <xsl:with-param name="str" select="$attrname" />
     1754              </xsl:call-template>
     1755            </xsl:variable>
     1756            <xsl:value-of select="concat('is', $capsname)" />
     1757          </xsl:when>
     1758          <xsl:otherwise>
     1759            <xsl:call-template name="makeGetterName">
     1760              <xsl:with-param name="attrname" select="$attrname" />
    17531761            </xsl:call-template>
    1754           </xsl:variable>
    1755           <xsl:value-of select="concat('is', $capsname)" />
    1756         </xsl:when>
    1757         <xsl:otherwise>
    1758           <xsl:call-template name="makeGetterName">
    1759             <xsl:with-param name="attrname" select="$attrname" />
    1760           </xsl:call-template>
    1761         </xsl:otherwise>
    1762       </xsl:choose>
    1763     </xsl:variable>
    1764 
    1765     <xsl:variable name="gluegettername">
    1766       <xsl:call-template name="makeGetterName">
    1767         <xsl:with-param name="attrname" select="$attrname" />
    1768       </xsl:call-template>
    1769     </xsl:variable>
    1770 
    1771     <xsl:variable name="gluegettertype">
    1772       <xsl:call-template name="typeIdl2Glue">
    1773         <xsl:with-param name="type" select="$attrtype" />
    1774         <xsl:with-param name="safearray" select="@safearray" />
    1775       </xsl:call-template>
    1776     </xsl:variable>
    1777 
    1778     <xsl:variable name="backgettertype">
    1779       <xsl:call-template name="typeIdl2Back">
    1780         <xsl:with-param name="type" select="$attrtype" />
    1781         <xsl:with-param name="safearray" select="@safearray" />
    1782       </xsl:call-template>
    1783     </xsl:variable>
    1784 
    1785     <xsl:value-of select="concat('    public ', $gluegettertype, ' ', $gluegettername, '() {&#10;')" />
    1786     <xsl:value-of select="concat('            ', $backgettertype, ' retVal = real.', $backgettername, '();&#10;')" />
    1787     <xsl:variable name="wrapped">
    1788       <xsl:call-template name="cookOutParam">
    1789         <xsl:with-param name="value" select="'retVal'" />
    1790         <xsl:with-param name="idltype" select="$attrtype" />
    1791         <xsl:with-param name="safearray" select="@safearray" />
    1792       </xsl:call-template>
    1793     </xsl:variable>
    1794     <xsl:value-of select="concat('            return ', $wrapped, ';&#10;')" />
    1795     <xsl:value-of select="       '    }&#10;'" />
     1762          </xsl:otherwise>
     1763        </xsl:choose>
     1764      </xsl:variable>
     1765 
     1766      <xsl:variable name="gluegettername">
     1767        <xsl:call-template name="makeGetterName">
     1768          <xsl:with-param name="attrname" select="$attrname" />
     1769        </xsl:call-template>
     1770      </xsl:variable>
     1771
     1772      <xsl:variable name="gluegettertype">
     1773        <xsl:call-template name="typeIdl2Glue">
     1774          <xsl:with-param name="type" select="$attrtype" />
     1775          <xsl:with-param name="safearray" select="@safearray" />
     1776        </xsl:call-template>
     1777      </xsl:variable>
     1778 
     1779      <xsl:variable name="backgettertype">
     1780        <xsl:call-template name="typeIdl2Back">
     1781          <xsl:with-param name="type" select="$attrtype" />
     1782          <xsl:with-param name="safearray" select="@safearray" />
     1783        </xsl:call-template>
     1784      </xsl:variable>
     1785 
     1786      <xsl:value-of select="concat('    public ', $gluegettertype, ' ', $gluegettername, '() {&#10;')" />
     1787      <xsl:value-of select="concat('            ', $backgettertype, ' retVal = real.', $backgettername, '();&#10;')" />
     1788      <xsl:variable name="wrapped">
     1789        <xsl:call-template name="cookOutParam">
     1790          <xsl:with-param name="value" select="'retVal'" />
     1791          <xsl:with-param name="idltype" select="$attrtype" />
     1792          <xsl:with-param name="safearray" select="@safearray" />
     1793        </xsl:call-template>
     1794      </xsl:variable>
     1795      <xsl:value-of select="concat('            return ', $wrapped, ';&#10;')" />
     1796      <xsl:value-of select="       '    }&#10;'" />
     1797    </xsl:if>
    17961798
    17971799  </xsl:for-each>
    … …  
    18061808  <xsl:choose>
    18071809    <xsl:when test="(param[@mod='ptr']) or (($G_vboxGlueStyle='jaxws') and (param[@type=($G_setSuppressedInterfaces/@name)]))" >
    1808       <xsl:comment>
    1809         <xsl:value-of select="concat('Skipping method ', $methodname, ' for it has parameters with suppressed types')" />
    1810       </xsl:comment>
     1810      <xsl:value-of select="concat('    // Skipping method ', $methodname, ' for it has parameters with suppressed types&#10;')" />
     1811    </xsl:when>
     1812    <xsl:when test="($G_vboxGlueStyle='jaxws') and (@wsmap = 'suppress')" >
     1813      <xsl:value-of select="concat('    // Skipping method ', $methodname, ' for it is suppressed&#10;')" />
    18111814    </xsl:when>
    18121815    <xsl:otherwise>
    … …  
    19731976  <xsl:choose>
    19741977    <xsl:when test="(param[@mod='ptr'])" >
    1975       <xsl:comment>
    1976         <xsl:value-of select="concat('Skipping method ', $methodname, ' for it has parameters with suppressed types')" />
    1977       </xsl:comment>
     1978      <xsl:value-of select="concat('    // Skipping method ', $methodname, ' for it has parameters with suppressed types&#10;')" />
    19781979    </xsl:when>
    19791980    <xsl:otherwise>
    … …  
    20642065  <xsl:choose>
    20652066    <xsl:when test="(param[@mod='ptr'])" >
    2066       <xsl:comment>
    2067         <xsl:value-of select="concat('Skipping method ', $methodname, ' for it has parameters with suppressed types')" />
    2068       </xsl:comment>
     2067      <xsl:value-of select="concat('    // Skipping method ', $methodname, ' for it has parameters with suppressed types&#10;')" />
    20692068    </xsl:when>
    20702069    <xsl:otherwise>
    … …  
    22742273    <xsl:choose>
    22752274      <xsl:when test="($G_vboxGlueStyle='jaxws') and ($attrtype=($G_setSuppressedInterfaces/@name))">
    2276         <xsl:value-of select="concat('  // skip attribute ',$attrname, ' of suppressed type ', $attrtype, '&#10;&#10;')" />
     2275        <xsl:value-of select="concat('  // Skipping attribute ',$attrname, ' of suppressed type ', $attrtype, '&#10;&#10;')" />
     2276      </xsl:when>
     2277      <xsl:when test="($G_vboxGlueStyle='jaxws') and (@wsmap = 'suppress')" >
     2278        <xsl:value-of select="concat('    // Skipping attribute ', $attrname, ' for it is suppressed&#10;')" />
    22772279      </xsl:when>
    22782280

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

    r43162 r43869  
    1498414984  <interface
    1498514985    name="IMachineDebugger" extends="$unknown"
    14986     uuid="a9abbb7c-d678-43b2-bed2-19ec0e32303d"
    14987     wsmap="suppress"
     14986    uuid="a80bb82c-37c5-4155-a524-9c1d0a1689ba"
     14987    wsmap="managed"
    1498814988    >
    1498914989    <method name="dumpGuestCore">
    … …  
    1531115311        <desc>Whether to include the descriptions.</desc>
    1531215312      </param>
    15313       <param name="stats" type="wstring" dir="out">
     15313      <param name="stats" type="wstring" dir="return">
    1531415314        <desc>The XML document containing the statistics.</desc>
    1531515315      </param>
    … …  
    1541715417    </attribute>
    1541815418
    15419     <attribute name="VM" type="long long" readonly="yes">
     15419    <attribute name="VM" type="long long" readonly="yes" wsmap="suppress">
    1542015420      <desc>
    1542115421        Gets the VM handle. This is only for internal use while
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette