Changeset 41422 in vbox for trunk/src/VBox

Timestamp:

May 23, 2012 3:59:04 PM (13 years ago)

Author:

vboxsync

Message:

VBoxBalloonCtrl: Get more options from extradata.

Location:

trunk/src/VBox/Frontends/VBoxBalloonCtrl

Files:

• VBoxModAPIMonitor.cpp (modified) (3 diffs)
• VBoxModBallooning.cpp (modified) (4 diffs)
• VBoxWatchdogInternal.h (modified) (1 diff)
• VBoxWatchdogUtils.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxBalloonCtrl/VBoxModAPIMonitor.cpp

@@ -458 +458 @@
         if (g_vecAPIMonGroups.empty()) /* Not set by command line? */
         {
-            CHECK_ERROR_BREAK(g_pVirtualBox, GetExtraData(Bstr("Watchdog/APIMonitor/Groups").raw(),
+            CHECK_ERROR_BREAK(g_pVirtualBox, GetExtraData(Bstr("VBoxInternal2/Watchdog/APIMonitor/Groups").raw(),
                                                           strValue.asOutParam()));
             if (!strValue.isEmpty())
@@ -468 +468 @@
         }
 
-        /* Host isolation timeout (in ms). */
-        if (!g_ulAPIMonIslnTimeoutMS) /* Not set by command line? */
-        {
-            CHECK_ERROR_BREAK(g_pVirtualBox, GetExtraData(Bstr("Watchdog/APIMonitor/IsolationTimeout").raw(),
-                                                          strValue.asOutParam()));
-            if (!strValue.isEmpty())
-                g_ulAPIMonIslnTimeoutMS = Utf8Str(strValue).toUInt32();
-        }
-        if (!g_ulAPIMonIslnTimeoutMS) /* Still not set? Use a default. */
-        {
-            serviceLogVerbose(("apimon: API monitor isolation timeout not given, defaulting to 30s\n"));
-
-            /* Default is 30 seconds timeout. */
-            g_ulAPIMonIslnTimeoutMS = 30 * 1000;
-        }
-
-        /* Host isolation command response. */
+        if (!g_ulAPIMonIslnTimeoutMS)
+            cfgGetValueULong(g_pVirtualBox, NULL /* Machine */,
+                             "VBoxInternal2/Watchdog/APIMonitor/IsolationTimeoutMS", NULL /* Per-machine */,
+                             &g_ulAPIMonIslnTimeoutMS, 30 * 1000 /* Default is 30 seconds timeout. */);
+        g_ulAPIMonIslnTimeoutMS = RT_MIN(1000, g_ulAPIMonIslnTimeoutMS);
+
         if (g_enmAPIMonIslnResp == APIMON_RESPONSE_NONE) /* Not set by command line? */
         {
-            CHECK_ERROR_BREAK(g_pVirtualBox, GetExtraData(Bstr("Watchdog/APIMonitor/IsolationResponse").raw(),
-                                                          strValue.asOutParam()));
-            if (!strValue.isEmpty())
+            Utf8Str strResp;
+            int rc2 = cfgGetValueStr(g_pVirtualBox, NULL /* Machine */,
+                                     "VBoxInternal2/Watchdog/APIMonitor/IsolationResponse", NULL /* Per-machine */,
+                                     strResp, "" /* Default value. */);
+            if (RT_SUCCESS(rc2))
             {
-                int rc2 = apimonResponseToEnum(Utf8Str(strValue).c_str(), &g_enmAPIMonIslnResp);
+                rc2 = apimonResponseToEnum(strResp.c_str(), &g_enmAPIMonIslnResp);
                 if (RT_FAILURE(rc2))
                     serviceLog("apimon: Warning: API monitor response string invalid (%ls), defaulting to no action\n",
@@ -498 +489 @@
         }
 
-        /* Trigger timeout (in ms). */
-        if (!g_ulAPIMonResponseTimeoutMS) /* Not set by command line? */
-        {
-            CHECK_ERROR_BREAK(g_pVirtualBox, GetExtraData(Bstr("Watchdog/APIMonitor/ResponseTimeout").raw(),
-                                                          strValue.asOutParam()));
-            if (!strValue.isEmpty())
-                g_ulAPIMonResponseTimeoutMS = Utf8Str(strValue).toUInt32();
-        }
-        if (!g_ulAPIMonResponseTimeoutMS) /* Still not set? Use a default. */
-        {
-            serviceLogVerbose(("apimon: API monitor response timeout not given, defaulting to 30s\n"));
-
-            /* Default is 30 seconds timeout. */
-            g_ulAPIMonResponseTimeoutMS = 30 * 1000;
-        }
+        if (!g_ulAPIMonResponseTimeoutMS)
+            cfgGetValueULong(g_pVirtualBox, NULL /* Machine */,
+                             "VBoxInternal2/Watchdog/APIMonitor/ResponseTimeoutMS", NULL /* Per-machine */,
+                             &g_ulAPIMonResponseTimeoutMS, 30 * 1000 /* Default is 30 seconds timeout. */);
+        g_ulAPIMonResponseTimeoutMS = RT_MIN(5000, g_ulAPIMonResponseTimeoutMS);
 
 #ifdef DEBUG

trunk/src/VBox/Frontends/VBoxBalloonCtrl/VBoxModBallooning.cpp

@@ -55 +55 @@
 };
 
-static unsigned long g_ulMemoryBalloonTimeoutMS = 30 * 1000; /* Default is 30 seconds timeout. */
-static unsigned long g_ulMemoryBalloonIncrementMB = 256;
-static unsigned long g_ulMemoryBalloonDecrementMB = 128;
+static unsigned long g_ulMemoryBalloonTimeoutMS = 0;
+static unsigned long g_ulMemoryBalloonIncrementMB = 0;
+static unsigned long g_ulMemoryBalloonDecrementMB = 0;
 /** Global balloon limit is 0, so disabled. Can be overridden by a per-VM
  *  "VBoxInternal/Guest/BalloonSizeMax" value. */
 static unsigned long g_ulMemoryBalloonMaxMB = 0;
-static unsigned long g_ulMemoryBalloonLowerLimitMB = 64;
+static unsigned long g_ulMemoryBalloonLowerLimitMB = 0;
 
 /** The ballooning module's payload. */
@@ -135 +135 @@
      *  By default (e.g. if none of above is set), ballooning is disabled.
      */
-    unsigned long ulBalloonMax = g_ulMemoryBalloonMaxMB; /* Use global limit as default. */
-    if (!ulBalloonMax) /* Not set by command line? */
-    {
-        /* Try per-VM approach. */
-        Bstr strValue;
-        HRESULT rc = rptrMachine->GetExtraData(Bstr("VBoxInternal/Guest/BalloonSizeMax").raw(),
-                                               strValue.asOutParam());
-        if (   SUCCEEDED(rc)
-            && !strValue.isEmpty())
+    unsigned long ulBalloonMax = g_ulMemoryBalloonMaxMB;
+    if (!ulBalloonMax)
+    {
+        int rc = cfgGetValueULong(g_pVirtualBox, rptrMachine,
+                                  "VBoxInternal/Guest/BalloonSizeMax", "VBoxInternal/Guest/BalloonSizeMax", &ulBalloonMax, 0 /* Ballooning disabled */);
+        if (RT_FAILURE(rc))
         {
-            ulBalloonMax = Utf8Str(strValue).toUInt32();
+            /* Try (new) VBoxWatch per-VM approach. */
+            Bstr strValue;
+            HRESULT rc = rptrMachine->GetExtraData(Bstr("VBoxInternal2/Watchdog/BalloonCtrl/BalloonSizeMax").raw(),
+                                                   strValue.asOutParam());
+            if (   SUCCEEDED(rc)
+                && !strValue.isEmpty())
+            {
+                ulBalloonMax = Utf8Str(strValue).toUInt32();
+            }
         }
     }
-    if (!ulBalloonMax) /* Still not set by per-VM value? */
-    {
-        /* Try global approach. */
-        Bstr strValue;
-        HRESULT rc = g_pVirtualBox->GetExtraData(Bstr("VBoxInternal/Guest/BalloonSizeMax").raw(),
-                                                 strValue.asOutParam());
-        if (   SUCCEEDED(rc)
-            && !strValue.isEmpty())
-        {
-            ulBalloonMax = Utf8Str(strValue).toUInt32();
-        }
-    }
-    if (!ulBalloonMax)
-    {
-        /** @todo ("VBoxInternal2/Watchdog/BalloonCtrl/BalloonSizeMax") */
-    }
+
     return ulBalloonMax;
 }
@@ -398 +388 @@
                 break;
 
-            /** @todo Add (legacy) "--inverval" setting! */
-            /** @todo This option is a common moudle option! Put
+            /** @todo This option is a common module option! Put
              *        this into a utility function! */
             case GETOPTDEF_BALLOONCTRL_TIMEOUTMS:
@@ -418 +407 @@
 static DECLCALLBACK(int) VBoxModBallooningInit(void)
 {
-    return VINF_SUCCESS; /* Nothing to do here right now. */
+    if (!g_ulMemoryBalloonTimeoutMS)
+        cfgGetValueULong(g_pVirtualBox, NULL /* Machine */,
+                         "VBoxInternal2/Watchdog/BalloonCtrl/TimeoutMS", NULL /* Per-machine */,
+                         &g_ulMemoryBalloonTimeoutMS, 30 * 1000 /* Default is 30 seconds timeout. */);
+
+    if (!g_ulMemoryBalloonIncrementMB)
+        cfgGetValueULong(g_pVirtualBox, NULL /* Machine */,
+                         "VBoxInternal2/Watchdog/BalloonCtrl/BalloonIncrementMB", NULL /* Per-machine */,
+                         &g_ulMemoryBalloonIncrementMB, 256);
+
+    if (!g_ulMemoryBalloonDecrementMB)
+        cfgGetValueULong(g_pVirtualBox, NULL /* Machine */,
+                         "VBoxInternal2/Watchdog/BalloonCtrl/BalloonDecrementMB", NULL /* Per-machine */,
+                         &g_ulMemoryBalloonDecrementMB, 128);
+
+    if (!g_ulMemoryBalloonLowerLimitMB)
+        cfgGetValueULong(g_pVirtualBox, NULL /* Machine */,
+                         "VBoxInternal2/Watchdog/BalloonCtrl/BalloonLowerLimitMB", NULL /* Per-machine */,
+                         &g_ulMemoryBalloonLowerLimitMB, 128);
+
+    return VINF_SUCCESS;
 }
 

trunk/src/VBox/Frontends/VBoxBalloonCtrl/VBoxWatchdogInternal.h

@@ -232 +232 @@
 int payloadAlloc(PVBOXWATCHDOG_MACHINE pMachine, const char *pszModule, size_t cbSize, void **ppszPayload);
 void payloadFree(PVBOXWATCHDOG_MACHINE pMachine, const char *pszModule);
+
 PVBOXWATCHDOG_MACHINE getMachine(const Bstr& strUuid);
 MachineState_T getMachineState(const PVBOXWATCHDOG_MACHINE pMachine);
 
+int cfgGetValueStr(const ComPtr<IVirtualBox> &rptrVBox, const ComPtr<IMachine> &rptrMachine,
+                   const char *pszGlobal, const char *pszVM, Utf8Str &strValue, Utf8Str strDefault);
+int cfgGetValueULong(const ComPtr<IVirtualBox> &rptrVBox, const ComPtr<IMachine> &rptrMachine,
+                     const char *pszGlobal, const char *pszVM, unsigned long *pulValue, unsigned long ulDefault);
 RT_C_DECLS_END
 

trunk/src/VBox/Frontends/VBoxBalloonCtrl/VBoxWatchdogUtils.cpp

@@ -208 +208 @@
 }
 
+int cfgGetValueStr(const ComPtr<IVirtualBox> &rptrVBox, const ComPtr<IMachine> &rptrMachine,
+                   const char *pszGlobal, const char *pszVM, Utf8Str &strValue, Utf8Str strDefault)
+{
+    AssertReturn(!rptrVBox.isNull(), VERR_INVALID_POINTER);
+
+
+    /* Try per-VM approach. */
+    Bstr strTemp;
+    HRESULT hr;
+    if (!rptrMachine.isNull())
+    {
+        AssertPtr(pszVM);
+        hr = rptrMachine->GetExtraData(Bstr(pszVM).raw(),
+                                       strTemp.asOutParam());
+        if (   SUCCEEDED(hr)
+            && !strTemp.isEmpty())
+        {
+            strValue = Utf8Str(strTemp);
+        }
+    }
+
+    if (strValue.isEmpty()) /* Not set by per-VM value? */
+    {
+        AssertPtr(pszGlobal);
+
+        /* Try global approach. */
+        hr = rptrVBox->GetExtraData(Bstr(pszGlobal).raw(),
+                                    strTemp.asOutParam());
+        if (   SUCCEEDED(hr)
+            && !strTemp.isEmpty())
+        {
+            strValue = Utf8Str(strTemp);
+        }
+    }
+
+    if (strValue.isEmpty())
+    {
+        strValue = strDefault;
+        return VERR_NOT_FOUND;
+    }
+
+    return VINF_SUCCESS;
+}
+
+int cfgGetValueULong(const ComPtr<IVirtualBox> &rptrVBox, const ComPtr<IMachine> &rptrMachine,
+                     const char *pszGlobal, const char *pszVM, unsigned long *pulValue, unsigned long ulDefault)
+{
+    Utf8Str strValue;
+    int rc = cfgGetValueStr(rptrVBox, rptrMachine, pszGlobal, pszVM, strValue, "" /* Default */);
+    if (RT_SUCCESS(rc))
+    {
+        *pulValue = strValue.toUInt32();
+    }
+    else
+        *pulValue = ulDefault;
+
+    return rc;
+}
+