Changeset 45874 in vbox for trunk/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp

Timestamp:

May 2, 2013 12:16:42 PM (12 years ago)

Author:

vboxsync

Message:

VBoxService: More logging for property cache / user enumeration.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp

@@ -217 +217 @@
 {
     AssertPtrReturn(pCache, VERR_INVALID_POINTER);
+    AssertPtrReturn(pszName, VERR_INVALID_POINTER);
+
     Assert(pCache->uClientID);
-    AssertPtrReturn(pszName, VERR_INVALID_POINTER);
 
     /*
@@ -261 +262 @@
                 /* Write the update. */
                 rc = vboxServicePropCacheWritePropF(pCache->uClientID, pNode->pszName, pNode->fFlags, pszValue);
-                VBoxServiceVerbose(4, "PropCache %p: Written \"%s\"=\"%s\" (flags: %x), rc=%Rrc\n",
+                VBoxServiceVerbose(4, "[PropCache %p]: Written \"%s\"=\"%s\" (flags: %x), rc=%Rrc\n",
                                    pCache, pNode->pszName, pszValue, pNode->fFlags, rc);
-                RTStrFree(pNode->pszValue);
-                pNode->pszValue = RTStrDup(pszValue);
-                if (!pNode->pszValue)
-                    rc = VERR_NO_MEMORY;
+                if (RT_SUCCESS(rc)) /* Only update the node's value on successful write. */
+                {
+                    RTStrFree(pNode->pszValue);
+                    pNode->pszValue = RTStrDup(pszValue);
+                    if (!pNode->pszValue)
+                        rc = VERR_NO_MEMORY;
+                }
             }
             else
@@ -276 +280 @@
             if (pNode->pszValue) /* Did we have a value before? Then the value needs to be deleted. */
             {
-                /* Delete property (but do not remove from cache) if not deleted yet. */
-                RTStrFree(pNode->pszValue);
-                pNode->pszValue = NULL;
                 rc = vboxServicePropCacheWritePropF(pCache->uClientID, pNode->pszName,
                                                     0, /* Flags */ NULL /* Value */);
-                VBoxServiceVerbose(4, "PropCache %p: Deleted \"%s\"=\"%s\" (flags: %x), rc=%Rrc\n",
+                VBoxServiceVerbose(4, "[PropCache %p]: Deleted \"%s\"=\"%s\" (flags: %x), rc=%Rrc\n",
                                    pCache, pNode->pszName, pNode->pszValue, pNode->fFlags, rc);
+                if (RT_SUCCESS(rc)) /* Only delete property value on successful Vbgl deletion. */
+                {
+                    /* Delete property (but do not remove from cache) if not deleted yet. */
+                    RTStrFree(pNode->pszValue);
+                    pNode->pszValue = NULL;
+                }
             }
             else
@@ -291 +298 @@
         RTCritSectLeave(&pCache->CritSect);
     }
+
+    VBoxServiceVerbose(4, "[PropCache %p]: Updating \"%s\" resulted in rc=%Rrc\n",
+                       pCache, pszName, rc);
 
     /* Delete temp stuff. */