VirtualBox

Changeset 42478 in vbox


Ignore:
Timestamp:
Jul 31, 2012 1:20:37 PM (12 years ago)
Author:
vboxsync
Message:

Guest Control 2.0: Update.

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/log.h

    r40652 r42478  
    220220    /** GMM group. */
    221221    LOG_GROUP_GMM,
     222    /** Guest control. */
     223    LOG_GROUP_GUEST_CONTROL,
    222224    /** GUI group. */
    223225    LOG_GROUP_GUI,
    … …  
    473475    "FTM",          \
    474476    "GMM",          \
     477    "GUEST_CONTROL", \
    475478    "GUI",          \
    476479    "GVMM",         \

  • trunk/src/VBox/Main/include/GuestCtrlImplPrivate.h

    r42461 r42478  
    3636using namespace guestControl;
    3737#endif
     38
     39#define LOG_GROUP LOG_GROUP_GUEST_CONTROL
     40#include <VBox/log.h>
    3841
    3942/** Maximum number of guest sessions a VM can have. */

  • trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp

    r42461 r42478  
    2626
    2727#include "AutoCaller.h"
    28 #include "Logging.h"
    2928
    3029#include <VBox/VMMDev.h>

  • trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp

    r42461 r42478  
    2525#include <iprt/ctype.h>
    2626#ifdef DEBUG
    27 # include "Logging.h"
    2827# include <iprt/file.h>
    2928#endif /* DEBUG */
    … …  
    7473void GuestCtrlEvent::Destroy(void)
    7574{
    76     LogFlowThisFuncEnter();
    77 
    7875    int rc = Cancel();
    7976    AssertRC(rc);
    … …  
    8481        hEventSem = NIL_RTSEMEVENT;
    8582    }
    86 
    87     LogFlowThisFuncLeave();
    8883}
    8984
    … …  
    114109    if (RT_SUCCESS(rc))
    115110        ASMAtomicWriteBool(&fCompleted, true);
     111
     112    LogFlowFuncLeaveRC(rc);
    116113    return rc;
    117114}

  • trunk/src/VBox/Main/src-client/GuestDirectoryImpl.cpp

    r42095 r42478  
    2222*******************************************************************************/
    2323#include "GuestDirectoryImpl.h"
     24#include "GuestCtrlImplPrivate.h"
    2425
    2526#include "Global.h"
    2627#include "AutoCaller.h"
    27 #include "Logging.h"
    2828
    2929#include <VBox/com/array.h>

  • trunk/src/VBox/Main/src-client/GuestFileImpl.cpp

    r42095 r42478  
    2222*******************************************************************************/
    2323#include "GuestFileImpl.h"
     24#include "GuestCtrlImplPrivate.h"
    2425
    2526#include "Global.h"
    2627#include "AutoCaller.h"
    27 #include "Logging.h"
    2828
    2929#include <VBox/com/array.h>

  • trunk/src/VBox/Main/src-client/GuestFsObjInfoImpl.cpp

    r42095 r42478  
    2222*******************************************************************************/
    2323#include "GuestFsObjInfoImpl.h"
     24#include "GuestCtrlImplPrivate.h"
    2425
    2526#include "Global.h"
    2627#include "AutoCaller.h"
    27 #include "Logging.h"
    2828
    2929#include <VBox/com/array.h>

  • trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp

    r42461 r42478  
    2323#include "GuestProcessImpl.h"
    2424#include "GuestSessionImpl.h"
     25#include "GuestCtrlImplPrivate.h"
    2526#include "ConsoleImpl.h"
    2627
    2728#include "Global.h"
    2829#include "AutoCaller.h"
    29 #include "Logging.h"
    3030#include "VMMDev.h"
    3131
    … …  
    137137    mData.mParent->processClose(this);
    138138
    139     LogFlowFuncLeave();
     139    LogFlowThisFuncLeave();
    140140#endif
    141141}
    … …  
    355355            *puContextID = uNewContextID;
    356356
    357         LogFlowFunc(("Added new callback (Session: %RU32, Process: %RU32, Count=%RU32) CID=%RU32\n",
     357        LogFlowThisFunc(("Added new callback (Session: %RU32, Process: %RU32, Count=%RU32) CID=%RU32\n",
    358358                     uSessionID, mData.mProcessID, mData.mNextContextID, uNewContextID));
    359359    }
    … …  
    365365{
    366366#ifdef DEBUG
    367     LogFlowFunc(("uPID=%RU32, uContextID=%RU32, uFunction=%RU32, pvData=%p, cbData=%RU32\n",
     367    LogFlowThisFunc(("uPID=%RU32, uContextID=%RU32, uFunction=%RU32, pvData=%p, cbData=%RU32\n",
    368368                 mData.mPID, uContextID, uFunction, pvData, cbData));
    369369#endif
    … …  
    387387        AssertPtr(pCallback);
    388388#ifdef DEBUG
    389         LogFlowFunc(("pCallback=%p\n", pCallback));
     389        LogFlowThisFunc(("pCallback=%p\n", pCallback));
    390390#endif
    391391    }
    … …  
    527527    AssertPtrReturn(pData, VERR_INVALID_POINTER);
    528528
    529     LogFlowFunc(("uPID=%RU32, pCallback=%p, pData=%p\n", mData.mPID, pCallback, pData));
     529    LogFlowThisFunc(("uPID=%RU32, pCallback=%p, pData=%p\n", mData.mPID, pCallback, pData));
    530530
    531531    mData.mStatus = ProcessStatus_Down;
    … …  
    555555    AssertPtrReturn(pData, VERR_INVALID_POINTER);
    556556
    557     LogFlowFunc(("uPID=%RU32, uStatus=%RU32, uFlags=%RU32, cbProcessed=%RU32, pCallback=%p, pData=%p\n",
     557    LogFlowThisFunc(("uPID=%RU32, uStatus=%RU32, uFlags=%RU32, cbProcessed=%RU32, pCallback=%p, pData=%p\n",
    558558                 mData.mPID, pData->u32Status, pData->u32Flags, pData->cbProcessed, pCallback, pData));
    559559
    … …  
    590590    AssertPtrReturn(pData, VERR_INVALID_POINTER);
    591591
    592     LogFlowFunc(("uPID=%RU32, uStatus=%RU32, uFlags=%RU32, pCallback=%p, pData=%p\n",
     592    LogFlowThisFunc(("uPID=%RU32, uStatus=%RU32, uFlags=%RU32, pCallback=%p, pData=%p\n",
    593593                 pData->u32PID, pData->u32Status, pData->u32Flags, pCallback, pData));
    594594
    … …  
    750750    }
    751751
    752     LogFlowFunc(("Got rc=%Rrc, waitResult=%d\n",
    753                  rc, waitRes));
     752    LogFlowThisFunc(("Got rc=%Rrc, waitResult=%d\n", rc, waitRes));
    754753
    755754    /*
    … …  
    775774    AssertPtrReturn(pData, VERR_INVALID_POINTER);
    776775
    777     LogFlowFunc(("uPID=%RU32, uHandle=%RU32, uFlags=%RU32, pvData=%p, cbData=%RU32, pCallback=%p, pData=%p\n",
     776    LogFlowThisFunc(("uPID=%RU32, uHandle=%RU32, uFlags=%RU32, pvData=%p, cbData=%RU32, pCallback=%p, pData=%p\n",
    778777                 mData.mPID, pData->u32HandleId, pData->u32Flags, pData->pvData, pData->cbData, pCallback, pData));
    779778
    … …  
    828827                           BYTE *pbData, size_t cbData, size_t *pcbRead)
    829828{
    830     LogFlowFunc(("uPID=%RU32, uHandle=%RU32, uSize=%RU32, uTimeoutMS=%RU32, pbData=%p, cbData=%RU32\n",
     829    LogFlowThisFunc(("uPID=%RU32, uHandle=%RU32, uSize=%RU32, uTimeoutMS=%RU32, pbData=%p, cbData=%RU32\n",
    831830                 mData.mPID, uHandle, uSize, uTimeoutMS, pbData, cbData));
    832831    AssertReturn(uSize, VERR_INVALID_PARAMETER);
    … …  
    871870         * Note: Be sure not keeping a AutoRead/WriteLock here.
    872871         */
    873         LogFlowFunc(("Waiting for callback (%RU32ms) ...\n", uTimeoutMS));
     872        LogFlowThisFunc(("Waiting for callback (%RU32ms) ...\n", uTimeoutMS));
    874873        rc = pCallbackRead->Wait(uTimeoutMS);
    875874        if (RT_SUCCESS(rc)) /* Wait was successful, check for supplied information. */
    876875        {
    877876            rc = pCallbackRead->GetResultCode();
    878             LogFlowFunc(("Callback returned rc=%Rrc, cbData=%RU32\n", rc, pCallbackRead->GetPayloadSize()));
     877            LogFlowThisFunc(("Callback returned rc=%Rrc, cbData=%RU32\n", rc, pCallbackRead->GetPayloadSize()));
    879878
    880879            if (RT_SUCCESS(rc))
    … …  
    918917    AssertPtr(pVMMDev);
    919918
    920     LogFlowFunc(("uFunction=%RU32, uParms=%RU32\n", uFunction, uParms));
     919    LogFlowThisFunc(("uFunction=%RU32, uParms=%RU32\n", uFunction, uParms));
    921920    int rc = pVMMDev->hgcmHostCall("VBoxGuestControlSvc", uFunction, uParms, paParms);
    922921    if (RT_FAILURE(rc))
    … …  
    940939int GuestProcess::setErrorInternal(int rc, const Utf8Str &strMessage)
    941940{
    942     LogFlowFunc(("rc=%Rrc, strMsg=%s\n", rc, strMessage.c_str()));
     941    LogFlowThisFunc(("rc=%Rrc, strMsg=%s\n", rc, strMessage.c_str()));
    943942
    944943    Assert(RT_FAILURE(rc));
    … …  
    971970int GuestProcess::signalWaiters(ProcessWaitResult_T enmWaitResult)
    972971{
    973     LogFlowFunc(("enmWaitResult=%d, mWaitCount=%RU32, mWaitEvent=%p\n",
     972    LogFlowThisFunc(("enmWaitResult=%d, mWaitCount=%RU32, mWaitEvent=%p\n",
    974973                 enmWaitResult, mData.mWaitCount, mData.mWaitEvent));
    975974
    … …  
    985984int GuestProcess::startProcess(void)
    986985{
    987     LogFlowFunc(("aCmd=%s, aTimeoutMS=%RU32, fFlags=%x\n",
     986    LogFlowThisFunc(("aCmd=%s, aTimeoutMS=%RU32, fFlags=%x\n",
    988987                 mData.mProcess.mCommand.c_str(), mData.mProcess.mTimeoutMS, mData.mProcess.mFlags));
    989988
    … …  
    10811080             * Note: Be sure not keeping a AutoRead/WriteLock here.
    10821081             */
    1083             LogFlowFunc(("Waiting for callback (%RU32ms) ...\n", uTimeoutMS));
     1082            LogFlowThisFunc(("Waiting for callback (%RU32ms) ...\n", uTimeoutMS));
    10841083            rc = pCallbackStart->Wait(uTimeoutMS);
    10851084            if (RT_SUCCESS(rc)) /* Wait was successful, check for supplied information. */
    10861085            {
    10871086                rc = pCallbackStart->GetResultCode();
    1088                 LogFlowFunc(("Callback returned rc=%Rrc\n", rc));
     1087                LogFlowThisFunc(("Callback returned rc=%Rrc\n", rc));
    10891088            }
    10901089            else
    … …  
    11571156        return VERR_NOT_SUPPORTED;
    11581157
    1159     LogFlowFuncLeave();
     1158    LogFlowThisFuncLeave();
    11601159    return VERR_NOT_IMPLEMENTED;
    11611160}
    … …  
    11671166    AssertReturn(fWaitFlags, VERR_INVALID_PARAMETER);
    11681167
    1169     LogFlowFunc(("fWaitFlags=%x, uTimeoutMS=%RU32, mStatus=%RU32, mWaitCount=%RU32, mWaitEvent=%p\n",
     1168    LogFlowThisFunc(("fWaitFlags=%x, uTimeoutMS=%RU32, mStatus=%RU32, mWaitCount=%RU32, mWaitEvent=%p\n",
    11701169                 fWaitFlags, uTimeoutMS, mData.mStatus, mData.mWaitCount, mData.mWaitEvent));
    11711170
    … …  
    12671266    }
    12681267
    1269     LogFlowFunc(("waitResult=%ld, waitRC=%Rrc\n", waitRes.mResult, waitRes.mRC));
     1268    LogFlowThisFunc(("waitResult=%ld, waitRC=%Rrc\n", waitRes.mResult, waitRes.mRC));
    12701269
    12711270    /* No waiting needed? Return immediately. */
    … …  
    14411440int GuestProcess::writeData(ULONG uHandle, const BYTE *pbData, size_t cbData, ULONG uTimeoutMS, ULONG *puWritten)
    14421441{
    1443     LogFlowFunc(("uPID=%RU32, uHandle=%RU32, pbData=%p, cbData=%RU32, uTimeoutMS=%RU32, puWritten=%p\n",
     1442    LogFlowThisFunc(("uPID=%RU32, uHandle=%RU32, pbData=%p, cbData=%RU32, uTimeoutMS=%RU32, puWritten=%p\n",
    14441443                 mData.mPID, uHandle, pbData, cbData, uTimeoutMS, puWritten));
    14451444    AssertPtrReturn(pbData, VERR_INVALID_POINTER);
    … …  
    14471446    /* Rest is optional. */
    14481447
    1449     LogFlowFuncLeave();
     1448    LogFlowThisFuncLeave();
    14501449    return 0;
    14511450}

  • trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp

    r42461 r42478  
    2323#include "GuestImpl.h"
    2424#include "GuestSessionImpl.h"
     25#include "GuestCtrlImplPrivate.h"
    2526
    2627#include "Global.h"
    2728#include "AutoCaller.h"
    28 #include "Logging.h"
    2929
    3030#include <iprt/env.h>
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