Changeset 15166 in vbox

Timestamp:

Dec 9, 2008 1:38:57 PM (16 years ago)

Author:

vboxsync

Message:

Main and HostServices/GuestProps: additional logging

Location:

trunk/src/VBox

Files:

• HostServices/GuestProperties/service.cpp (modified) (6 diffs)
• Main/ConsoleImpl.cpp (modified) (3 diffs)

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

@@ -275 +275 @@
     {
         AssertLogRelReturnVoid(VALID_PTR(pvService));
+        LogFlowFunc (("pvService=%p, callHandle=%p, u32ClientID=%u, pvClient=%p, u32Function=%u, cParms=%u, paParms=%p\n", pvService, callHandle, u32ClientID, pvClient, u32Function, cParms, paParms));
         SELF *pSelf = reinterpret_cast<SELF *>(pvService);
         pSelf->call(callHandle, u32ClientID, pvClient, u32Function, cParms, paParms);
+        LogFlowFunc (("returning\n"));
     }
 
@@ -289 +291 @@
     {
         AssertLogRelReturn(VALID_PTR(pvService), VERR_INVALID_PARAMETER);
+        LogFlowFunc (("pvService=%p, u32Function=%u, cParms=%u, paParms=%p\n", pvService, u32Function, cParms, paParms));
         SELF *pSelf = reinterpret_cast<SELF *>(pvService);
-        return pSelf->hostCall(u32Function, cParms, paParms);
+        int rc = pSelf->hostCall(u32Function, cParms, paParms);
+        LogFlowFunc (("rc=%Rrc\n", rc));
+        return rc;
     }
 
@@ -982 +987 @@
 
     AssertPtrReturnVoid(pszProperty);
+    LogFlowThisFunc (("pszProperty=%s, u64Timestamp=%llu\n", pszProperty, u64Timestamp));
     /* Ensure that our timestamp is different to the last one. */
     if (   !mGuestNotifications.empty()
@@ -1085 +1091 @@
     if (RT_FAILURE(rc)) /* clean up if we failed somewhere */
     {
+        LogThisFunc (("Failed, freeing allocated strings.\n"));
         RTStrFree(pszName);
         RTStrFree(pszValue);
         RTStrFree(pszFlags);
     }
+    LogFlowThisFunc (("returning\n"));
 #endif /* VBOX_GUEST_PROP_TEST_NOTHREAD not defined */
 }
@@ -1101 +1109 @@
  * @thread  request thread
  */
+/* static */
 int Service::reqNotify(PFNHGCMSVCEXT pfnCallback, void *pvData,
                        char *pszName, char *pszValue, uint32_t u32TimeHigh,
                        uint32_t u32TimeLow, char *pszFlags)
 {
+    LogFlowFunc (("pfnCallback=%p, pvData=%p, pszName=%s, pszValue=%s, u32TimeHigh=%u, u32TimeLow=%u, pszFlags=%s\n", pfnCallback, pvData, pszName, pszValue, u32TimeHigh, u32TimeLow, pszFlags));
     HOSTCALLBACKDATA HostCallbackData;
     HostCallbackData.u32Magic     = HOSTCALLBACKMAGIC;
@@ -1113 +1123 @@
     AssertRC(pfnCallback(pvData, 0, reinterpret_cast<void *>(&HostCallbackData),
                          sizeof(HostCallbackData)));
+    LogFlowFunc (("Freeing strings\n"));
     RTStrFree(pszName);
     RTStrFree(pszValue);
     RTStrFree(pszFlags);
+    LogFlowFunc (("returning success\n"));
     return VINF_SUCCESS;
 }

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -1040 +1040 @@
     using namespace guestProp;
 
+    LogFlowFunc (("pvExtension=%p, pvParms=%p, cbParms=%u\n", pvExtension, pvParms, cbParms));
     int rc = VINF_SUCCESS;
     /* No locking, as this is purely a notification which does not make any
@@ -1047 +1048 @@
     AssertReturn(HOSTCALLBACKMAGIC == pCBData->u32Magic, VERR_INVALID_PARAMETER);
     ComObjPtr <Console> pConsole = reinterpret_cast <Console *> (pvExtension);
+    LogFlowFunc (("pCBData->pcszName=%s, pCBData->pcszValue=%s, pCBData->pcszFlags=%s\n", pCBData->pcszName, pCBData->pcszValue, pCBData->pcszFlags));
     Bstr name(pCBData->pcszName);
     Bstr value(pCBData->pcszValue);
@@ -1069 +1071 @@
         }
     }
+    LogFlowFunc (("rc=%Rrc\n", rc));
     return rc;
 }