Changeset 71343 in vbox for trunk/src/VBox/HostServices

Timestamp:

Mar 15, 2018 9:09:28 AM (7 years ago)

Author:

vboxsync

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

121294

Message:

Guest Control/service: Logging.

File:

• trunk/src/VBox/HostServices/GuestControl/service.cpp (modified) (14 diffs)

trunk/src/VBox/HostServices/GuestControl/service.cpp

@@ -118 +118 @@
     {
 #ifdef DEBUG_andy
-        LogFlowFunc(("Adding reference pHostCmd=%p, CID=%RU32, new refCount=%RU32\n",
-                     this, mContextID, mRefCount + 1));
+        LogFlowThisFunc(("[Cmd %RU32] Adding reference, new refCount=%RU32\n", mMsgType, mRefCount + 1));
 #endif
         return ++mRefCount;
@@ -127 +126 @@
     {
 #ifdef DEBUG_andy
-        LogFlowFunc(("Releasing reference pHostCmd=%p, CID=%RU32, new refCount=%RU32\n",
-                     this, mContextID, mRefCount - 1));
+        LogFlowThisFunc(("[Cmd %RU32] Releasing reference, new refCount=%RU32\n", mMsgType, mRefCount - 1));
 #endif
         /* Release reference for current command. */
@@ -148 +146 @@
     int Allocate(uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
     {
-        LogFlowFunc(("Allocating pHostCmd=%p, uMsg=%RU32, cParms=%RU32, paParms=%p\n",
-                     this, uMsg, cParms, paParms));
+        LogFlowThisFunc(("[Cmd %RU32] Allocating cParms=%RU32, paParms=%p\n", uMsg, cParms, paParms));
 
         if (!cParms) /* At least one parameter (context ID) must be present. */
@@ -245 +242 @@
     void Free(void)
     {
-        AssertMsg(mRefCount == 0, ("pHostCmd=%p, CID=%RU32 still being used by a client (%RU32 refs), cannot free yet\n",
-                                   this, mContextID, mRefCount));
-
-        LogFlowFunc(("Freeing host command pHostCmd=%p, CID=%RU32, mMsgType=%RU32, mParmCount=%RU32, mpParms=%p\n",
-                     this, mContextID, mMsgType, mParmCount, mpParms));
+        AssertMsg(mRefCount == 0, ("uMsg=%RU32, CID=%RU32 still being used by a client (%RU32 refs), cannot free yet\n",
+                                   mMsgType, mContextID, mRefCount));
+
+        LogFlowThisFunc(("[Cmd %RU32] Freeing\n", mMsgType));
 
         for (uint32_t i = 0; i < mParmCount; i++)
@@ -286 +282 @@
     int CopyTo(VBOXHGCMSVCPARM paDstParms[], uint32_t cDstParms) const
     {
-        LogFlowFunc(("pHostCmd=%p, mMsgType=%RU32, mParmCount=%RU32, mContextID=%RU32 (Session %RU32)\n",
-                     this, mMsgType, mParmCount, mContextID, VBOX_GUESTCTRL_CONTEXTID_GET_SESSION(mContextID)));
+        LogFlowThisFunc(("[Cmd %RU32] mParmCount=%RU32, mContextID=%RU32 (Session %RU32)\n",
+                         mMsgType, mParmCount, mContextID, VBOX_GUESTCTRL_CONTEXTID_GET_SESSION(mContextID)));
 
         int rc = VINF_SUCCESS;
@@ -380 +376 @@
         int rc;
 
-        LogFlowFunc(("pHostCmd=%p, mMsgType=%RU32, mParmCount=%RU32, mpParms=%p\n",
-                     this, mMsgType, mParmCount, mpParms));
+        LogFlowThisFunc(("[Cmd %RU32] mParmCount=%RU32, mpParms=%p\n", mMsgType, mParmCount, mpParms));
 
         /* Does the current host command need more parameter space which
@@ -387 +382 @@
         if (mParmCount > pConnection->mNumParms)
         {
-            LogFlowFunc(("pHostCmd=%p requires %RU32 parms, only got %RU32 from client\n",
-                         this, mParmCount, pConnection->mNumParms));
-
+            LogFlowThisFunc(("[Cmd %RU32] Requires %RU32 parms, only got %RU32 from client\n",
+                             mMsgType, mParmCount, pConnection->mNumParms));
             /*
             * So this call apparently failed because the guest wanted to peek
@@ -420 +414 @@
         AssertPtrReturn(pConnection, VERR_INVALID_POINTER);
 
-        LogFlowFunc(("pHostCmd=%p, mMsgType=%RU32, mParmCount=%RU32, mpParms=%p\n",
-                     this, mMsgType, mParmCount, mpParms));
+        LogFlowThisFunc(("[Cmd %RU32] mParmCount=%RU32, mpParms=%p\n", mMsgType, mParmCount, mpParms));
 
         if (pConnection->mNumParms >= 2)
@@ -429 +422 @@
         }
         else
-            LogFlowFunc(("Warning: Client has not (yet) submitted enough parameters (%RU32, must be at least 2) to at least peak for the next message\n",
-                         pConnection->mNumParms));
+            LogFlowThisFunc(("Warning: Client has not (yet) submitted enough parameters (%RU32, must be at least 2) to at least peak for the next message\n",
+                             pConnection->mNumParms));
 
         /*
@@ -524 +517 @@
         if (pHostCmd->Release() == 0)
         {
-            LogFlowFunc(("[Client %RU32] Destroying pHostCmd=%p\n",
-                         mID, (*curItem)));
+            LogFlowThisFunc(("[Client %RU32] Destroying command %RU32\n", mID, pHostCmd->mMsgType));
 
             delete pHostCmd;
@@ -660 +652 @@
 
         mHostCmdRc = SendReply(pConnection, pHostCmd);
-        LogFlowFunc(("[Client %RU32] Processing pHostCmd=%p ended with rc=%Rrc\n",
-                     mID, pHostCmd, mHostCmdRc));
+
+        LogFlowThisFunc(("[Client %RU32] Processing command %RU32 ended with rc=%Rrc\n", mID, pHostCmd->mMsgType, mHostCmdRc));
 
         bool fRemove = false;
@@ -695 +687 @@
             fRemove = true; /* Everything went fine, remove it. */
 
-        LogFlowFunc(("[Client %RU32] Tried pHostCmd=%p for %RU32 times, (last result=%Rrc, fRemove=%RTbool)\n",
-                     mID, pHostCmd, mHostCmdTries, mHostCmdRc, fRemove));
+        LogFlowThisFunc(("[Client %RU32] Tried command %RU32 for %RU32 times, (last result=%Rrc, fRemove=%RTbool)\n",
+                         mID, pHostCmd->mMsgType, mHostCmdTries, mHostCmdRc, fRemove));
 
         if (RT_SUCCESS(rc)) /** @todo r=bird: confusing statement+state, rc hasn't been touched since the top and is always VINF_SUCCESS. */
@@ -762 +754 @@
                 AssertPtrReturn(pHostCmd, VERR_INVALID_POINTER);
 
-                LogFlowFunc(("[Client %RU32] Current host command is pHostCmd=%p, CID=%RU32, cmdType=%RU32, cmdParms=%RU32, refCount=%RU32\n",
-                             mID, pHostCmd, pHostCmd->mContextID, pHostCmd->mMsgType, pHostCmd->mParmCount, pHostCmd->mRefCount));
+                LogFlowThisFunc(("[Client %RU32] Current host command is %RU32 (CID=%RU32, cParms=%RU32, refCount=%RU32)\n",
+                                 mID, pHostCmd->mMsgType, pHostCmd->mContextID, pHostCmd->mParmCount, pHostCmd->mRefCount));
 
                 rc = Run(&mPendingCon, pHostCmd);
@@ -850 +842 @@
         mSvcHelpers->pfnCallComplete(pConnection->mHandle, rc);
 
-        LogFlowFunc(("[Client %RU32] mPeekCount=%RU32, pConnection=%p, pHostCmd=%p, replyRc=%Rrc\n",
-                     mID, mPeekCount, pConnection, pHostCmd, rc));
+        LogFlowThisFunc(("[Client %RU32] Command %RU32 ended with %Rrc (mPeekCount=%RU32, pConnection=%p)\n",
+                         mID, pHostCmd->mMsgType, rc, mPeekCount, pConnection));
         return rc;
     }