Changeset 34855 in vbox

Timestamp:

Dec 9, 2010 9:08:01 AM (14 years ago)

Author:

vboxsync

Message:

HostServices/SharedFolders: Release (less noisy) + debug logging adjustments.

File:

• trunk/src/VBox/HostServices/SharedFolders/service.cpp (modified) (41 diffs)

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

@@ -88 +88 @@
     NOREF(pvClient);
 
-    LogRel(("SharedFolders host service: connected, u32ClientID = %d\n", u32ClientID));
+    Log(("SharedFolders host service: connected, u32ClientID = %u\n", u32ClientID));
 
     return rc;
@@ -98 +98 @@
     SHFLCLIENTDATA *pClient = (SHFLCLIENTDATA *)pvClient;
 
-    LogRel(("SharedFolders host service: disconnected, u32ClientID = %d\n", u32ClientID));
+    Log(("SharedFolders host service: disconnected, u32ClientID = %u\n", u32ClientID));
 
     vbsfDisconnect(pClient);
@@ -114 +114 @@
     SHFLCLIENTDATA *pClient = (SHFLCLIENTDATA *)pvClient;
 
-    LogRel(("SharedFolders host service: saving state, u32ClientID = %d\n", u32ClientID));
+    Log(("SharedFolders host service: saving state, u32ClientID = %u\n", u32ClientID));
 
     int rc = SSMR3PutU32(pSSM, SHFL_SSM_VERSION);
@@ -176 +176 @@
     uint32_t        len, version;
 
-    LogRel(("SharedFolders host service: loading state, u32ClientID = %d\n", u32ClientID));
+    Log(("SharedFolders host service: loading state, u32ClientID = %u\n", u32ClientID));
 
     int rc = SSMR3GetU32(pSSM, &version);
@@ -259 +259 @@
         }
     }
-    LogRel(("SharedFolders host service: success\n"));
+    Log(("SharedFolders host service: successfully loaded state\n"));
     return VINF_SUCCESS;
 }
@@ -267 +267 @@
     int rc = VINF_SUCCESS;
 
-    Log(("svcCall: u32ClientID = %d, fn = %d, cParms = %d, pparms = %d\n", u32ClientID, u32Function, cParms, paParms));
+    Log(("SharedFolders host service: svcCall: u32ClientID = %u, fn = %u, cParms = %u, pparms = %p\n", u32ClientID, u32Function, cParms, paParms));
 
     SHFLCLIENTDATA *pClient = (SHFLCLIENTDATA *)pvClient;
@@ -279 +279 @@
     {
         /** @todo parameters other than 32 bit */
-        Log(("    pparms[%d]: type %d value %d\n", i, paParms[i].type, paParms[i].u.uint32));
+        Log(("    pparms[%d]: type %u, value %u\n", i, paParms[i].type, paParms[i].u.uint32));
     }
 #endif
@@ -287 +287 @@
         case SHFL_FN_QUERY_MAPPINGS:
         {
-            Log(("svcCall: SHFL_FN_QUERY_MAPPINGS\n"));
+            Log(("SharedFolders host service: svcCall: SHFL_FN_QUERY_MAPPINGS\n"));
 
             /* Verify parameter count and types. */
@@ -343 +343 @@
         case SHFL_FN_QUERY_MAP_NAME:
         {
-            Log(("svcCall: SHFL_FN_QUERY_MAP_NAME\n"));
+            Log(("SharedFolders host service: svcCall: SHFL_FN_QUERY_MAP_NAME\n"));
 
             /* Verify parameter count and types. */
@@ -384 +384 @@
         case SHFL_FN_CREATE:
         {
-            Log(("svcCall: SHFL_FN_CREATE\n"));
+            Log(("SharedFolders host service: svcCall: SHFL_FN_CREATE\n"));
 
             /* Verify parameter count and types. */
@@ -396 +396 @@
                     )
             {
-                Log(("Invalid parameters types\n"));
+                Log(("SharedFolders host service: Invalid parameters types\n"));
                 rc = VERR_INVALID_PARAMETER;
             }
@@ -435 +435 @@
         case SHFL_FN_CLOSE:
         {
-            Log(("svcCall: SHFL_FN_CLOSE\n"));
+            Log(("SharedFolders host service: svcCall: SHFL_FN_CLOSE\n"));
 
             /* Verify parameter count and types. */
@@ -462 +462 @@
                 if (Handle == SHFL_HANDLE_NIL)
                 {
-                    AssertMsgFailed(("Invalid handle!!!!\n"));
+                    AssertMsgFailed(("Invalid handle!\n"));
                     rc = VERR_INVALID_HANDLE;
                 }
@@ -484 +484 @@
         /** Read object content. */
         case SHFL_FN_READ:
-            Log(("svcCall: SHFL_FN_READ\n"));
+            Log(("SharedFolders host service: svcCall: SHFL_FN_READ\n"));
 
             /* Verify parameter count and types. */
@@ -520 +520 @@
                 if (Handle == SHFL_HANDLE_NIL)
                 {
-                    AssertMsgFailed(("Invalid handle!!!!\n"));
+                    AssertMsgFailed(("Invalid handle!\n"));
                     rc = VERR_INVALID_HANDLE;
                 }
@@ -551 +551 @@
         /** Write new object content. */
         case SHFL_FN_WRITE:
-            Log(("svcCall: SHFL_FN_WRITE\n"));
+            Log(("SharedFolders host service: svcCall: SHFL_FN_WRITE\n"));
 
             /* Verify parameter count and types. */
@@ -587 +587 @@
                 if (Handle == SHFL_HANDLE_NIL)
                 {
-                    AssertMsgFailed(("Invalid handle!!!!\n"));
+                    AssertMsgFailed(("Invalid handle!\n"));
                     rc = VERR_INVALID_HANDLE;
                 }
@@ -618 +618 @@
         /** Lock/unlock a range in the object. */
         case SHFL_FN_LOCK:
-            Log(("svcCall: SHFL_FN_LOCK\n"));
+            Log(("SharedFolders host service: svcCall: SHFL_FN_LOCK\n"));
 
             /* Verify parameter count and types. */
@@ -652 +652 @@
                 if (Handle == SHFL_HANDLE_NIL)
                 {
-                    AssertMsgFailed(("Invalid handle!!!!\n"));
+                    AssertMsgFailed(("Invalid handle!\n"));
                     rc = VERR_INVALID_HANDLE;
                 }
@@ -705 +705 @@
         case SHFL_FN_LIST:
         {
-            Log(("svcCall: SHFL_FN_LIST\n"));
+            Log(("SharedFolders host service: svcCall: SHFL_FN_LIST\n"));
 
             /* Verify parameter count and types. */
@@ -783 +783 @@
         case SHFL_FN_READLINK:
         {
-            Log(("svcCall: SHFL_FN_READLINK\n"));
+            Log(("SharedFolders host service: svcCall: SHFL_FN_READLINK\n"));
 
             /* Verify parameter count and types. */
@@ -831 +831 @@
         case SHFL_FN_MAP_FOLDER_OLD:
         {
-            Log(("svcCall: SHFL_FN_MAP_FOLDER_OLD\n"));
+            Log(("SharedFolders host service: svcCall: SHFL_FN_MAP_FOLDER_OLD\n"));
 
             /* Verify parameter count and types. */
@@ -874 +874 @@
         case SHFL_FN_MAP_FOLDER:
         {
-            Log(("svcCall: SHFL_FN_MAP_FOLDER\n"));
+            Log(("SharedFolders host service: svcCall: SHFL_FN_MAP_FOLDER\n"));
             if (BIT_FLAG(pClient->fu32Flags, SHFL_CF_UTF8))
-                LogRel(("SharedFolders host service: request to map folder '%S'\n",
-                        ((PSHFLSTRING)paParms[0].u.pointer.addr)->String.utf8));
-            else
-                LogRel(("SharedFolders host service: request to map folder '%lS'\n",
-                        ((PSHFLSTRING)paParms[0].u.pointer.addr)->String.ucs2));
+                Log(("SharedFolders host service: request to map folder '%S'\n",
+                     ((PSHFLSTRING)paParms[0].u.pointer.addr)->String.utf8));
+            else
+                Log(("SharedFolders host service: request to map folder '%lS'\n",
+                     ((PSHFLSTRING)paParms[0].u.pointer.addr)->String.ucs2));
 
             /* Verify parameter count and types. */
@@ -921 +921 @@
                 }
             }
-            LogRel(("SharedFolders host service: map operation result %Rrc.\n", rc));
+            Log(("SharedFolders host service: map operation result %Rrc\n", rc));
             if (RT_SUCCESS(rc))
-                LogRel(("    Mapped to handle %d.\n", paParms[1].u.uint32));
+                Log(("SharedFolders host service: mapped to handle %d\n", paParms[1].u.uint32));
             break;
         }
@@ -929 +929 @@
         case SHFL_FN_UNMAP_FOLDER:
         {
-            Log(("svcCall: SHFL_FN_UNMAP_FOLDER\n"));
-            LogRel(("SharedFolders host service: request to unmap folder handle %d\n",
-                    paParms[0].u.uint32));
+            Log(("SharedFolders host service: svcCall: SHFL_FN_UNMAP_FOLDER\n"));
+            Log(("SharedFolders host service: request to unmap folder handle %u\n",
+                 paParms[0].u.uint32));
 
             /* Verify parameter count and types. */
@@ -957 +957 @@
                 }
             }
-            LogRel(("SharedFolders host service: unmap operation result %Rrc.\n", rc));
+            Log(("SharedFolders host service: unmap operation result %Rrc\n", rc));
             break;
         }
@@ -964 +964 @@
         case SHFL_FN_INFORMATION:
         {
-            Log(("svcCall: SHFL_FN_INFORMATION\n"));
+            Log(("SharedFolders host service: svcCall: SHFL_FN_INFORMATION\n"));
 
             /* Verify parameter count and types. */
@@ -1020 +1020 @@
         case SHFL_FN_REMOVE:
         {
-            Log(("svcCall: SHFL_FN_REMOVE\n"));
+            Log(("SharedFolders host service: svcCall: SHFL_FN_REMOVE\n"));
 
             /* Verify parameter count and types. */
@@ -1063 +1063 @@
         case SHFL_FN_RENAME:
         {
-            Log(("svcCall: SHFL_FN_RENAME\n"));
+            Log(("SharedFolders host service: svcCall: SHFL_FN_RENAME\n"));
 
             /* Verify parameter count and types. */
@@ -1109 +1109 @@
         case SHFL_FN_FLUSH:
         {
-            Log(("svcCall: SHFL_FN_FLUSH\n"));
+            Log(("SharedFolders host service: svcCall: SHFL_FN_FLUSH\n"));
 
             /* Verify parameter count and types. */
@@ -1137 +1137 @@
                 if (Handle == SHFL_HANDLE_NIL)
                 {
-                    AssertMsgFailed(("Invalid handle!!!!\n"));
+                    AssertMsgFailed(("Invalid handle!\n"));
                     rc = VERR_INVALID_HANDLE;
                 }
@@ -1163 +1163 @@
         case SHFL_FN_SYMLINK:
         {
-            Log(("svnCall: SHFL_FN_SYMLINK\n"));
+            Log(("SharedFolders host service: svnCall: SHFL_FN_SYMLINK\n"));
             /* Verify parameter count and types. */
             if (cParms != SHFL_CPARMS_SYMLINK)
@@ -1223 +1223 @@
     }
 
-    LogFlow(("svcCall: rc = %Rrc\n", rc));
+    LogFlow(("SharedFolders host service: svcCall: rc=%Rrc\n", rc));
 
     if (   !fAsynchronousProcessing
@@ -1260 +1260 @@
     case SHFL_FN_ADD_MAPPING:
     {
-        Log(("svcCall: SHFL_FN_ADD_MAPPING\n"));
-        LogRel(("SharedFolders host service: adding host mapping.\n"));
+        Log(("SharedFolders host service: svcCall: SHFL_FN_ADD_MAPPING\n"));
+        LogRel(("SharedFolders host service: adding host mapping\n"));
         LogRel(("    Host path '%lS', map name '%lS', %s\n",
                 ((SHFLSTRING *)paParms[0].u.pointer.addr)->String.ucs2,
@@ -1313 +1313 @@
             }
         }
-        LogRel(("SharedFolders host service: add mapping result %Rrc\n", rc));
+        if (RT_FAILURE(rc))
+            LogRel(("SharedFolders host service: adding host mapping failed with rc=%Rrc\n", rc));
         break;
     }
@@ -1319 +1320 @@
     case SHFL_FN_REMOVE_MAPPING:
     {
-        Log(("svcCall: SHFL_FN_REMOVE_MAPPING\n"));
+        Log(("SharedFolders host service: svcCall: SHFL_FN_REMOVE_MAPPING\n"));
         LogRel(("SharedFolders host service: removing host mapping '%lS'\n",
                 ((SHFLSTRING *)paParms[0].u.pointer.addr)->String.ucs2));
@@ -1355 +1356 @@
             }
         }
-        LogRel(("SharedFolders host service: remove mapping result %Rrc\n", rc));
+        if (RT_FAILURE(rc))
+            LogRel(("SharedFolders host service: removing host mapping failed with rc=%Rrc\n", rc));
         break;
     }
@@ -1361 +1363 @@
     case SHFL_FN_SET_STATUS_LED:
     {
-        Log(("svcCall: SHFL_FN_SET_STATUS_LED\n"));
+        Log(("SharedFolders host service: svcCall: SHFL_FN_SET_STATUS_LED\n"));
 
         /* Verify parameter count and types. */
@@ -1400 +1402 @@
     }
 
-    LogFlow(("svcHostCall: rc = %Rrc\n", rc));
+    LogFlow(("SharedFolders host service: svcHostCall ended with rc=%Rrc\n", rc));
     return rc;
 }
@@ -1408 +1410 @@
     int rc = VINF_SUCCESS;
 
-    Log(("VBoxHGCMSvcLoad: ptable = %p\n", ptable));
+    Log(("SharedFolders host service: VBoxHGCMSvcLoad: ptable = %p\n", ptable));
 
     if (!VALID_PTR(ptable))
     {
-        LogRelFunc(("Bad value of ptable (%p) in shared folders service\n", ptable));
+        LogRelFunc(("SharedFolders host service: bad value of ptable (%p)\n", ptable));
         rc = VERR_INVALID_PARAMETER;
     }
     else
     {
-        Log(("VBoxHGCMSvcLoad: ptable->cbSize = %d, ptable->u32Version = 0x%08X\n", ptable->cbSize, ptable->u32Version));
+        Log(("SharedFolders host service: VBoxHGCMSvcLoad: ptable->cbSize = %u, ptable->u32Version = 0x%08X\n",
+             ptable->cbSize, ptable->u32Version));
 
         if (    ptable->cbSize != sizeof (VBOXHGCMSVCFNTABLE)
             ||  ptable->u32Version != VBOX_HGCM_SVC_VERSION)
         {
-            LogRelFunc(("version mismatch loading shared folders service: ptable->cbSize = %d, should be %d, ptable->u32Version = 0x%08X, should be 0x%08X\n", ptable->cbSize, sizeof (VBOXHGCMSVCFNTABLE), ptable->u32Version, VBOX_HGCM_SVC_VERSION));
+            LogRelFunc(("SharedFolders host service: version mismatch while loading: ptable->cbSize = %u (should be %u), ptable->u32Version = 0x%08X (should be 0x%08X)\n",
+                        ptable->cbSize, sizeof (VBOXHGCMSVCFNTABLE), ptable->u32Version, VBOX_HGCM_SVC_VERSION));
             rc = VERR_VERSION_MISMATCH;
         }
@@ -1450 +1454 @@
     return rc;
 }
+