Changeset 27217 in vbox for trunk/src/VBox/Additions

Timestamp:

Mar 9, 2010 2:53:00 PM (15 years ago)

Author:

vboxsync

Message:

Additions/VBoxServiceBalloon: Solaris fixes and some logging.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceBalloon.cpp (modified) (6 diffs)

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

@@ -62 +62 @@
         return VINF_SUCCESS;
 
+    VBoxServiceVerbose(3, "VBoxServiceBalloonSetUser: cNewChunks=%u g_cMemBalloonChunks=%u\n", cNewChunks, g_cMemBalloonChunks);
     int rc = VINF_SUCCESS;
     if (cNewChunks > g_cMemBalloonChunks)
     {
         /* inflate */
+        g_pavBalloon = (void**)RTMemRealloc(g_pavBalloon, cNewChunks * sizeof(void*));
         uint32_t i;
-        g_pavBalloon = (void**)RTMemRealloc(g_pavBalloon, cNewChunks * sizeof(void*));
         for (i = g_cMemBalloonChunks; i < cNewChunks; i++)
         {
@@ -79 +80 @@
             {
                 g_pavBalloon[i] = pv;
-                /* protect against access by dangling pointers (may fail) */
+#ifndef RT_OS_SOLARIS
+                /*
+                 * Protect against access by dangling pointers (ignore errors as it may fail).
+                 * On Solaris it corrupts the address space leaving the process unkillable. This could
+                 * perhaps be related to what the underlying segment driver does; currently just disable it.
+                 */
                 RTMemProtect(pv, VMMDEV_MEMORY_BALLOON_CHUNK_SIZE, RTMEM_PROT_NONE);
+#endif
                 g_cMemBalloonChunks++;
             }
@@ -89 +96 @@
             }
         }
+        VBoxServiceVerbose(3, "VBoxServiceBalloonSetUser: inflation complete. chunks=%u rc=%d\n", i, rc);
     }
     else
@@ -100 +108 @@
             if (RT_SUCCESS(rc))
             {
+#ifndef RT_OS_SOLARIS
                 /* unprotect */
                 RTMemProtect(pv, VMMDEV_MEMORY_BALLOON_CHUNK_SIZE, RTMEM_PROT_READ | RTMEM_PROT_WRITE);
+#endif
                 RTMemPageFree(g_pavBalloon[i]);
                 g_pavBalloon[i] = NULL;
@@ -108 +118 @@
             else
                 break;
+            VBoxServiceVerbose(3, "VBoxServiceBalloonSetUser: deflation complete. chunks=%u rc=%d\n", i, rc);
         }
     }
@@ -213 +224 @@
                                    cNewChunks, fHandleInR3 ? "R3" : "R0");
                 if (fHandleInR3)
+                {
                     rc = VBoxServiceBalloonSetUser(cNewChunks);
+                    if (RT_FAILURE(rc))
+                    {
+                        VBoxServiceVerbose(3, "VBoxServiceBalloonWorker: failed to set balloon size %d MB (%s memory)\n",
+                                    cNewChunks, fHandleInR3 ? "R3" : "R0");
+                    }
+                    else
+                        VBoxServiceVerbose(3, "VBoxServiceBalloonWorker: successfully set requested balloon size %d.\n", cNewChunks);
+                }
                 else
                     g_cMemBalloonChunks = cNewChunks;