Changeset 28978 in vbox

Timestamp:

May 3, 2010 2:22:54 PM (15 years ago)

Author:

vboxsync

Message:

VBoxService/PropCache: Bugfixes.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServicePropCache.cpp (modified) (3 diffs)
• VBoxServiceVMInfo.cpp (modified) (2 diffs)

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

@@ -93 +93 @@
 int VBoxServicePropCacheUpdate(PVBOXSERVICEVEPROPCACHE pCache, const char *pszName, const char *pszValueFormat, ...)
 {
-    va_list va;
-    va_start(va, pszValueFormat);
-    char *pszValue;
-    int rc = RTStrAPrintfV(&pszValue, pszValueFormat, va);
-    if (RT_SUCCESS(rc))
-    {
-        rc = VBoxServicePropCacheUpdateEx(pCache, pszName, 0 /* Not used */, NULL /* Not used */, pszValue);
+    char *pszValue = NULL;
+    int rc;
+    if (pszValueFormat)
+    {
+        va_list va;
+        va_start(va, pszValueFormat);
+        RTStrAPrintfV(&pszValue, pszValueFormat, va);
+        va_end(va);
+    }
+    rc = VBoxServicePropCacheUpdateEx(pCache, pszName, 0 /* Not used */, NULL /* Not used */, pszValue);
+    if (pszValue)
         RTStrFree(pszValue);
-    }
-    va_end(va);
     return rc;
 }
@@ -123 +125 @@
     Assert(pCache->uClientID);
     AssertPtr(pszName);
-    AssertPtr(pszValueFormat);
-
-    int rc = VINF_SUCCESS;
+
     char *pszValue = NULL;
     if (pszValueFormat)
@@ -131 +131 @@
         va_list va;
         va_start(va, pszValueFormat);
-        rc = RTStrAPrintfV(&pszValue, pszValueFormat, va);
+        RTStrAPrintfV(&pszValue, pszValueFormat, va);
         va_end(va);
     }
 
     PVBOXSERVICEVEPROPCACHEENTRY pNode = VBoxServicePropCacheFind(pCache, pszName, 0);
-    if (pNode != NULL)
-    {            
-        if (pszValue)
-        {
-            bool fUpdate = false;
-            if (pNode->uFlags & VBOXSERVICEPROPCACHEFLAG_ALWAYS_UPDATE)
-                fUpdate = true;
-            else if (pNode->pszValue && strcmp(pNode->pszValue, pszValue) != 0)
-                fUpdate = true;
-
-            if (fUpdate)
-            {
-                /* Write the update. */
-                rc = VBoxServiceWritePropF(pCache->uClientID, pNode->pszName, pszValue);
-                if (pNode->pszValue)
-                    RTStrFree(pNode->pszValue);
-                pNode->pszValue = RTStrDup(pszValue);
-                if (pszValueReset)
-                {
-                    if (pNode->pszValueReset)
-                        RTStrFree(pNode->pszValueReset);
-                    pNode->pszValueReset = RTStrDup(pszValueReset);
-                }
-                if (u32Flags)
-                    pNode->uFlags = u32Flags;
-            }
-            else
-                rc = VINF_ALREADY_INITIALIZED; /* No update needed. */
-        }
-        else if (pNode->pszValue)
+    if (pNode == NULL)
+    {          
+        pNode = (PVBOXSERVICEVEPROPCACHEENTRY)RTMemAlloc(sizeof(VBOXSERVICEVEPROPCACHEENTRY));
+        AssertPtrReturn(pNode, VERR_NO_MEMORY);
+
+        pNode->pszName = RTStrDup(pszName);
+        pNode->pszValue = NULL; 
+        pNode->uFlags = 0;
+        pNode->pszValueReset = NULL;
+
+        /*rc =*/ RTListAppend(&pCache->Node, &pNode->Node);
+    }
+
+    int rc;
+    AssertPtr(pNode);
+    if (pszValue) /* Do we have a value to check for? */
+    {
+        bool fUpdate = false;
+        /* Always update this property, no matter what? */
+        if (pNode->uFlags & VBOXSERVICEPROPCACHEFLAG_ALWAYS_UPDATE)
+            fUpdate = true;
+        /* Did the value change so we have to update? */
+        else if (pNode->pszValue && strcmp(pNode->pszValue, pszValue) != 0)
+            fUpdate = true;
+        /* No value stored at the moment but we have a value now? */
+        else if (pNode->pszValue == NULL) 
+            fUpdate = true;
+
+        if (fUpdate)
+        {
+            /* Write the update. */
+            rc = VBoxServiceWritePropF(pCache->uClientID, pNode->pszName, pszValue);
+            if (pNode->pszValue)
+                RTStrFree(pNode->pszValue);
+            pNode->pszValue = RTStrDup(pszValue);
+        }
+        else
+            rc = VINF_ALREADY_INITIALIZED; /* No update needed. */
+    }
+    else 
+    {
+        /* No value specified. Deletion (or no action required). */
+        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. */
-            VBoxServiceWritePropF(pCache->uClientID, pNode->pszName, NULL);
+            rc = VBoxServiceWritePropF(pCache->uClientID, pNode->pszName, NULL);
             RTStrFree(pNode->pszValue);
             pNode->pszValue = NULL;
         }
-    }
-    else /* Node not found; add it and update HGCM service. */
-    {
-        PVBOXSERVICEVEPROPCACHEENTRY pNewNode = (PVBOXSERVICEVEPROPCACHEENTRY)RTMemAlloc(sizeof(VBOXSERVICEVEPROPCACHEENTRY));
-        pNewNode->pszName = RTStrDup(pszName);
-        if (pszValue)
-            pNewNode->pszValue = RTStrDup(pszValue);
         else
-            pNewNode->pszValue = NULL;
-         if (pszValueReset)
-            pNewNode->pszValueReset = RTStrDup(pszValueReset);
-        else
-            pNewNode->pszValueReset = NULL;
-        pNewNode->uFlags = u32Flags;
-        /*rc =*/ RTListAppend(&pCache->Node, &pNewNode->Node);
-        if (RT_SUCCESS(rc))
-            rc = VERR_NOT_FOUND;
-    }
-
+            rc = VINF_ALREADY_INITIALIZED; /* No update needed. */
+    }
+
+    /* Update rest of the fields. */
+    if (pszValueReset)
+    {
+        if (pNode->pszValueReset)
+            RTStrFree(pNode->pszValueReset);
+        pNode->pszValueReset = RTStrDup(pszValueReset);
+    }
+    if (u32Flags)
+        pNode->uFlags = u32Flags;
+ 
+    /* Delete temp stuff. */
     if (pszValue)
         RTStrFree(pszValue);   

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

@@ -131 +131 @@
         VBoxServicePropCacheInit(&g_VMInfoPropCache, g_VMInfoGuestPropSvcClientID);
 
+        /*
+         * Set flags and reset values for some guest proerties that need to have that.
+         * Passing NULL as an actual value does not write the properties yet.
+         */
+        VBoxServicePropCacheUpdateEx(&g_VMInfoPropCache, "/VirtualBox/GuestInfo/OS/LoggedInUsersList", 
+                                     VBOXSERVICEPROPCACHEFLAG_TEMPORARY, NULL /* Delete on exit */, NULL);
+        VBoxServicePropCacheUpdateEx(&g_VMInfoPropCache, "/VirtualBox/GuestInfo/OS/LoggedInUsers", 
+                                     VBOXSERVICEPROPCACHEFLAG_TEMPORARY, "0", NULL);
+        VBoxServicePropCacheUpdateEx(&g_VMInfoPropCache, "/VirtualBox/GuestInfo/OS/NoLoggedInUsers", 
+                                     VBOXSERVICEPROPCACHEFLAG_TEMPORARY, "true", NULL);
+        /*
+         * This property is a beacon which is _always_ written, even if the network configuration
+         * does not change. If this property is missing, the host assumes that all other GuestInfo
+         * properties are no longer valid.
+         */
         VBoxServicePropCacheUpdateEx(&g_VMInfoPropCache, "/VirtualBox/GuestInfo/Net/Count", 
-                                     VBOXSERVICEPROPCACHEFLAG_TEMPORARY | VBOXSERVICEPROPCACHEFLAG_ALWAYS_UPDATE, "0", "0");
-        VBoxServicePropCacheUpdateEx(&g_VMInfoPropCache, "/VirtualBox/GuestInfo/OS/LoggedInUsersList", 
-                                     VBOXSERVICEPROPCACHEFLAG_TEMPORARY, NULL, NULL);
-        VBoxServicePropCacheUpdateEx(&g_VMInfoPropCache, "/VirtualBox/GuestInfo/OS/LoggedInUsers", 
-                                     VBOXSERVICEPROPCACHEFLAG_TEMPORARY, "0", "0");
-        VBoxServicePropCacheUpdateEx(&g_VMInfoPropCache, "/VirtualBox/GuestInfo/OS/NoLoggedInUsers", 
-                                     VBOXSERVICEPROPCACHEFLAG_TEMPORARY, "true", "true");
+                                     VBOXSERVICEPROPCACHEFLAG_TEMPORARY | VBOXSERVICEPROPCACHEFLAG_ALWAYS_UPDATE, "0", NULL);
     }
     return rc;
@@ -396 +405 @@
         int iCurIface = 0;
 
-        /*
-         * This property is a beacon which is _always_ written, even if the network configuration
-         * does not change. If this property is missing, the host assumes that all other GuestInfo
-         * properties are no longer valid.
-         */
         VBoxServicePropCacheUpdate(&g_VMInfoPropCache, "/VirtualBox/GuestInfo/Net/Count", "%d",
                                    nNumInterfaces > 1 ? nNumInterfaces-1 : 0);