Index: /trunk/include/VBox/log.h =================================================================== --- /trunk/include/VBox/log.h (revision 42477) +++ /trunk/include/VBox/log.h (revision 42478) @@ -220,4 +220,6 @@ /** GMM group. */ LOG_GROUP_GMM, + /** Guest control. */ + LOG_GROUP_GUEST_CONTROL, /** GUI group. */ LOG_GROUP_GUI, @@ -473,4 +475,5 @@ "FTM", \ "GMM", \ + "GUEST_CONTROL", \ "GUI", \ "GVMM", \ Index: /trunk/src/VBox/Main/include/GuestCtrlImplPrivate.h =================================================================== --- /trunk/src/VBox/Main/include/GuestCtrlImplPrivate.h (revision 42477) +++ /trunk/src/VBox/Main/include/GuestCtrlImplPrivate.h (revision 42478) @@ -36,4 +36,7 @@ using namespace guestControl; #endif + +#define LOG_GROUP LOG_GROUP_GUEST_CONTROL +#include /** Maximum number of guest sessions a VM can have. */ Index: /trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp (revision 42477) +++ /trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp (revision 42478) @@ -26,5 +26,4 @@ #include "AutoCaller.h" -#include "Logging.h" #include Index: /trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp (revision 42477) +++ /trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp (revision 42478) @@ -25,5 +25,4 @@ #include #ifdef DEBUG -# include "Logging.h" # include #endif /* DEBUG */ @@ -74,6 +73,4 @@ void GuestCtrlEvent::Destroy(void) { - LogFlowThisFuncEnter(); - int rc = Cancel(); AssertRC(rc); @@ -84,6 +81,4 @@ hEventSem = NIL_RTSEMEVENT; } - - LogFlowThisFuncLeave(); } @@ -114,4 +109,6 @@ if (RT_SUCCESS(rc)) ASMAtomicWriteBool(&fCompleted, true); + + LogFlowFuncLeaveRC(rc); return rc; } Index: /trunk/src/VBox/Main/src-client/GuestDirectoryImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/GuestDirectoryImpl.cpp (revision 42477) +++ /trunk/src/VBox/Main/src-client/GuestDirectoryImpl.cpp (revision 42478) @@ -22,8 +22,8 @@ *******************************************************************************/ #include "GuestDirectoryImpl.h" +#include "GuestCtrlImplPrivate.h" #include "Global.h" #include "AutoCaller.h" -#include "Logging.h" #include Index: /trunk/src/VBox/Main/src-client/GuestFileImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/GuestFileImpl.cpp (revision 42477) +++ /trunk/src/VBox/Main/src-client/GuestFileImpl.cpp (revision 42478) @@ -22,8 +22,8 @@ *******************************************************************************/ #include "GuestFileImpl.h" +#include "GuestCtrlImplPrivate.h" #include "Global.h" #include "AutoCaller.h" -#include "Logging.h" #include Index: /trunk/src/VBox/Main/src-client/GuestFsObjInfoImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/GuestFsObjInfoImpl.cpp (revision 42477) +++ /trunk/src/VBox/Main/src-client/GuestFsObjInfoImpl.cpp (revision 42478) @@ -22,8 +22,8 @@ *******************************************************************************/ #include "GuestFsObjInfoImpl.h" +#include "GuestCtrlImplPrivate.h" #include "Global.h" #include "AutoCaller.h" -#include "Logging.h" #include Index: /trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp (revision 42477) +++ /trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp (revision 42478) @@ -23,9 +23,9 @@ #include "GuestProcessImpl.h" #include "GuestSessionImpl.h" +#include "GuestCtrlImplPrivate.h" #include "ConsoleImpl.h" #include "Global.h" #include "AutoCaller.h" -#include "Logging.h" #include "VMMDev.h" @@ -137,5 +137,5 @@ mData.mParent->processClose(this); - LogFlowFuncLeave(); + LogFlowThisFuncLeave(); #endif } @@ -355,5 +355,5 @@ *puContextID = uNewContextID; - LogFlowFunc(("Added new callback (Session: %RU32, Process: %RU32, Count=%RU32) CID=%RU32\n", + LogFlowThisFunc(("Added new callback (Session: %RU32, Process: %RU32, Count=%RU32) CID=%RU32\n", uSessionID, mData.mProcessID, mData.mNextContextID, uNewContextID)); } @@ -365,5 +365,5 @@ { #ifdef DEBUG - LogFlowFunc(("uPID=%RU32, uContextID=%RU32, uFunction=%RU32, pvData=%p, cbData=%RU32\n", + LogFlowThisFunc(("uPID=%RU32, uContextID=%RU32, uFunction=%RU32, pvData=%p, cbData=%RU32\n", mData.mPID, uContextID, uFunction, pvData, cbData)); #endif @@ -387,5 +387,5 @@ AssertPtr(pCallback); #ifdef DEBUG - LogFlowFunc(("pCallback=%p\n", pCallback)); + LogFlowThisFunc(("pCallback=%p\n", pCallback)); #endif } @@ -527,5 +527,5 @@ AssertPtrReturn(pData, VERR_INVALID_POINTER); - LogFlowFunc(("uPID=%RU32, pCallback=%p, pData=%p\n", mData.mPID, pCallback, pData)); + LogFlowThisFunc(("uPID=%RU32, pCallback=%p, pData=%p\n", mData.mPID, pCallback, pData)); mData.mStatus = ProcessStatus_Down; @@ -555,5 +555,5 @@ AssertPtrReturn(pData, VERR_INVALID_POINTER); - LogFlowFunc(("uPID=%RU32, uStatus=%RU32, uFlags=%RU32, cbProcessed=%RU32, pCallback=%p, pData=%p\n", + LogFlowThisFunc(("uPID=%RU32, uStatus=%RU32, uFlags=%RU32, cbProcessed=%RU32, pCallback=%p, pData=%p\n", mData.mPID, pData->u32Status, pData->u32Flags, pData->cbProcessed, pCallback, pData)); @@ -590,5 +590,5 @@ AssertPtrReturn(pData, VERR_INVALID_POINTER); - LogFlowFunc(("uPID=%RU32, uStatus=%RU32, uFlags=%RU32, pCallback=%p, pData=%p\n", + LogFlowThisFunc(("uPID=%RU32, uStatus=%RU32, uFlags=%RU32, pCallback=%p, pData=%p\n", pData->u32PID, pData->u32Status, pData->u32Flags, pCallback, pData)); @@ -750,6 +750,5 @@ } - LogFlowFunc(("Got rc=%Rrc, waitResult=%d\n", - rc, waitRes)); + LogFlowThisFunc(("Got rc=%Rrc, waitResult=%d\n", rc, waitRes)); /* @@ -775,5 +774,5 @@ AssertPtrReturn(pData, VERR_INVALID_POINTER); - LogFlowFunc(("uPID=%RU32, uHandle=%RU32, uFlags=%RU32, pvData=%p, cbData=%RU32, pCallback=%p, pData=%p\n", + LogFlowThisFunc(("uPID=%RU32, uHandle=%RU32, uFlags=%RU32, pvData=%p, cbData=%RU32, pCallback=%p, pData=%p\n", mData.mPID, pData->u32HandleId, pData->u32Flags, pData->pvData, pData->cbData, pCallback, pData)); @@ -828,5 +827,5 @@ BYTE *pbData, size_t cbData, size_t *pcbRead) { - LogFlowFunc(("uPID=%RU32, uHandle=%RU32, uSize=%RU32, uTimeoutMS=%RU32, pbData=%p, cbData=%RU32\n", + LogFlowThisFunc(("uPID=%RU32, uHandle=%RU32, uSize=%RU32, uTimeoutMS=%RU32, pbData=%p, cbData=%RU32\n", mData.mPID, uHandle, uSize, uTimeoutMS, pbData, cbData)); AssertReturn(uSize, VERR_INVALID_PARAMETER); @@ -871,10 +870,10 @@ * Note: Be sure not keeping a AutoRead/WriteLock here. */ - LogFlowFunc(("Waiting for callback (%RU32ms) ...\n", uTimeoutMS)); + LogFlowThisFunc(("Waiting for callback (%RU32ms) ...\n", uTimeoutMS)); rc = pCallbackRead->Wait(uTimeoutMS); if (RT_SUCCESS(rc)) /* Wait was successful, check for supplied information. */ { rc = pCallbackRead->GetResultCode(); - LogFlowFunc(("Callback returned rc=%Rrc, cbData=%RU32\n", rc, pCallbackRead->GetPayloadSize())); + LogFlowThisFunc(("Callback returned rc=%Rrc, cbData=%RU32\n", rc, pCallbackRead->GetPayloadSize())); if (RT_SUCCESS(rc)) @@ -918,5 +917,5 @@ AssertPtr(pVMMDev); - LogFlowFunc(("uFunction=%RU32, uParms=%RU32\n", uFunction, uParms)); + LogFlowThisFunc(("uFunction=%RU32, uParms=%RU32\n", uFunction, uParms)); int rc = pVMMDev->hgcmHostCall("VBoxGuestControlSvc", uFunction, uParms, paParms); if (RT_FAILURE(rc)) @@ -940,5 +939,5 @@ int GuestProcess::setErrorInternal(int rc, const Utf8Str &strMessage) { - LogFlowFunc(("rc=%Rrc, strMsg=%s\n", rc, strMessage.c_str())); + LogFlowThisFunc(("rc=%Rrc, strMsg=%s\n", rc, strMessage.c_str())); Assert(RT_FAILURE(rc)); @@ -971,5 +970,5 @@ int GuestProcess::signalWaiters(ProcessWaitResult_T enmWaitResult) { - LogFlowFunc(("enmWaitResult=%d, mWaitCount=%RU32, mWaitEvent=%p\n", + LogFlowThisFunc(("enmWaitResult=%d, mWaitCount=%RU32, mWaitEvent=%p\n", enmWaitResult, mData.mWaitCount, mData.mWaitEvent)); @@ -985,5 +984,5 @@ int GuestProcess::startProcess(void) { - LogFlowFunc(("aCmd=%s, aTimeoutMS=%RU32, fFlags=%x\n", + LogFlowThisFunc(("aCmd=%s, aTimeoutMS=%RU32, fFlags=%x\n", mData.mProcess.mCommand.c_str(), mData.mProcess.mTimeoutMS, mData.mProcess.mFlags)); @@ -1081,10 +1080,10 @@ * Note: Be sure not keeping a AutoRead/WriteLock here. */ - LogFlowFunc(("Waiting for callback (%RU32ms) ...\n", uTimeoutMS)); + LogFlowThisFunc(("Waiting for callback (%RU32ms) ...\n", uTimeoutMS)); rc = pCallbackStart->Wait(uTimeoutMS); if (RT_SUCCESS(rc)) /* Wait was successful, check for supplied information. */ { rc = pCallbackStart->GetResultCode(); - LogFlowFunc(("Callback returned rc=%Rrc\n", rc)); + LogFlowThisFunc(("Callback returned rc=%Rrc\n", rc)); } else @@ -1157,5 +1156,5 @@ return VERR_NOT_SUPPORTED; - LogFlowFuncLeave(); + LogFlowThisFuncLeave(); return VERR_NOT_IMPLEMENTED; } @@ -1167,5 +1166,5 @@ AssertReturn(fWaitFlags, VERR_INVALID_PARAMETER); - LogFlowFunc(("fWaitFlags=%x, uTimeoutMS=%RU32, mStatus=%RU32, mWaitCount=%RU32, mWaitEvent=%p\n", + LogFlowThisFunc(("fWaitFlags=%x, uTimeoutMS=%RU32, mStatus=%RU32, mWaitCount=%RU32, mWaitEvent=%p\n", fWaitFlags, uTimeoutMS, mData.mStatus, mData.mWaitCount, mData.mWaitEvent)); @@ -1267,5 +1266,5 @@ } - LogFlowFunc(("waitResult=%ld, waitRC=%Rrc\n", waitRes.mResult, waitRes.mRC)); + LogFlowThisFunc(("waitResult=%ld, waitRC=%Rrc\n", waitRes.mResult, waitRes.mRC)); /* No waiting needed? Return immediately. */ @@ -1441,5 +1440,5 @@ int GuestProcess::writeData(ULONG uHandle, const BYTE *pbData, size_t cbData, ULONG uTimeoutMS, ULONG *puWritten) { - LogFlowFunc(("uPID=%RU32, uHandle=%RU32, pbData=%p, cbData=%RU32, uTimeoutMS=%RU32, puWritten=%p\n", + LogFlowThisFunc(("uPID=%RU32, uHandle=%RU32, pbData=%p, cbData=%RU32, uTimeoutMS=%RU32, puWritten=%p\n", mData.mPID, uHandle, pbData, cbData, uTimeoutMS, puWritten)); AssertPtrReturn(pbData, VERR_INVALID_POINTER); @@ -1447,5 +1446,5 @@ /* Rest is optional. */ - LogFlowFuncLeave(); + LogFlowThisFuncLeave(); return 0; } Index: /trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp (revision 42477) +++ /trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp (revision 42478) @@ -23,8 +23,8 @@ #include "GuestImpl.h" #include "GuestSessionImpl.h" +#include "GuestCtrlImplPrivate.h" #include "Global.h" #include "AutoCaller.h" -#include "Logging.h" #include