Changeset 39988 in vbox

Timestamp:

Feb 3, 2012 4:23:24 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

76098

Message:

VBoxBalloonCtrl: Update.

Location:

trunk/src/VBox/Frontends/VBoxBalloonCtrl

Files:

• VBoxModAPIMonitor.cpp (modified) (6 diffs)
• VBoxModBallooning.cpp (modified) (1 diff)
• VBoxWatchdog.cpp (modified) (1 diff)

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

@@ -60 +60 @@
 using namespace com;
 
-#define VBOX_MOD_APIMONITOR_NAME "apimonitor"
+#define VBOX_MOD_APIMON_NAME "apimon"
 
 /**
  * The module's RTGetOpt-IDs for the command line.
  */
-enum GETOPTDEF_APIMONITOR
-{
-    GETOPTDEF_APIMONITOR_GROUPS = 1000,
+enum GETOPTDEF_APIMON
+{
+    GETOPTDEF_APIMON_ISLN_RESPONSE = 1000,
+    GETOPTDEF_APIMON_ISLN_TIMEOUT,
+    GETOPTDEF_APIMON_GROUPS
 };
 
@@ -74 +76 @@
  */
 static const RTGETOPTDEF g_aAPIMonitorOpts[] = {
-    { "--apimonitor-groups",         GETOPTDEF_APIMONITOR_GROUPS,         RTGETOPT_REQ_STRING }
+    { "--apimon-isln-response",  GETOPTDEF_APIMON_ISLN_RESPONSE,  RTGETOPT_REQ_STRING },
+    { "--apimon-isln-timeout",   GETOPTDEF_APIMON_ISLN_TIMEOUT,   RTGETOPT_REQ_UINT32 },
+    { "--apimon-groups",         GETOPTDEF_APIMON_GROUPS,         RTGETOPT_REQ_STRING }
 };
+
+static unsigned long g_ulAPIMonIslnTimeoutMS = 0;
+static Bstr g_strAPIMonGroups;
+static Bstr g_strAPIMonIslnCmdResp;
 
 /* Callbacks. */
@@ -105 +113 @@
         switch (c)
         {
-            case GETOPTDEF_APIMONITOR_GROUPS:
+            case GETOPTDEF_APIMON_ISLN_RESPONSE:
+                break;
+
+            case GETOPTDEF_APIMON_ISLN_TIMEOUT:
+                g_ulAPIMonIslnTimeoutMS = ValueUnion.u32;
+                if (g_ulAPIMonIslnTimeoutMS < 1000)
+                    g_ulAPIMonIslnTimeoutMS = 1000;
+                break;
+
+            case GETOPTDEF_APIMON_GROUPS:
                 break;
 
@@ -119 +136 @@
 static DECLCALLBACK(int) VBoxModAPIMonitorInit(void)
 {
-    return VINF_SUCCESS; /* Nothing to do here right now. */
+    HRESULT rc = S_OK;
+
+    do
+    {
+        Bstr bstrValue;
+
+        /* Host isolation timeout (in ms). */
+        if (!g_ulAPIMonIslnTimeoutMS) /* Not set by command line? */
+        {
+            CHECK_ERROR_BREAK(g_pVirtualBox, GetExtraData(Bstr("VBoxInternal2/Watchdog/APIMonitor/IsolationTimeout").raw(),
+                                                          bstrValue.asOutParam()));
+            g_ulAPIMonIslnTimeoutMS = Utf8Str(bstrValue).toUInt32();
+        }
+        if (!g_ulAPIMonIslnTimeoutMS)
+        {
+             /* Default is 30 seconds timeout. */
+            g_ulAPIMonIslnTimeoutMS = 30 * 1000;
+        }
+
+        /* VM groups to watch for. */
+        if (g_strAPIMonGroups.isEmpty()) /* Not set by command line? */
+        {
+            CHECK_ERROR_BREAK(g_pVirtualBox, GetExtraData(Bstr("VBoxInternal2/Watchdog/APIMonitor/Groups").raw(),
+                                                          g_strAPIMonGroups.asOutParam()));
+        }
+
+        /* Host isolation command response. */
+        if (g_strAPIMonIslnCmdResp.isEmpty()) /* Not set by command line? */
+        {
+            CHECK_ERROR_BREAK(g_pVirtualBox, GetExtraData(Bstr("VBoxInternal2/Watchdog/APIMonitor/IsolationResponse").raw(),
+                                                          g_strAPIMonIslnCmdResp.asOutParam()));
+        }
+    } while (0);
+
+    return SUCCEEDED(rc) ? VINF_SUCCESS : VERR_COM_IPRT_ERROR; /* @todo Find a better rc! */
 }
 
@@ -163 +214 @@
 {
     /* pszName. */
-    VBOX_MOD_APIMONITOR_NAME,
+    VBOX_MOD_APIMON_NAME,
     /* pszDescription. */
     "API monitor for host isolation detection",
@@ -171 +222 @@
     0 /* Not used */,
     /* pszUsage. */
-    " [--apimonitor-groups <string>]\n"
-    ,
+    " [--apimon-isln-response=<cmd>] [--apimon-isln-timeout=<ms>]\n"
+    " [--apimon-groups=<string>]\n",
     /* pszOptions. */
-    "--apimonitor-groups    Sets the VM groups for monitoring (none).\n",
+    "--apimon-isln-response   Sets the isolation response (shutdown VM).\n"
+    "--apimon-isln-timeout    Sets the isolation timeout in ms (none).\n"
+    "--apimon-groups          Sets the VM groups for monitoring (none).\n",
     /* methods. */
     VBoxModAPIMonitorPreInit,

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

@@ -542 +542 @@
     0 /* Not used */,
     /* pszUsage. */
-    " [--balloon-dec <MB>] [--balloon-groups <string>] [--balloon-inc <MB>]\n"
-    " [--balloon-interval <ms>] [--balloon-lower-limit <MB>]\n"
-    " [--balloon-max <MB>]\n",
+    " [--balloon-dec=<MB>] [--balloon-groups=<string>] [--balloon-inc=<MB>]\n"
+    " [--balloon-interval=<ms>] [--balloon-lower-limit=<MB>]\n"
+    " [--balloon-max=<MB>]\n",
     /* pszOptions. */
     "--balloon-dec          Sets the ballooning decrement in MB (128 MB).\n"

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

@@ -827 +827 @@
     for (unsigned j = 0; j < RT_ELEMENTS(g_aModules); j++)
         if (g_aModules[j].pDesc->pszUsage)
-            RTStrmPrintf(g_pStdErr, "%s\n", g_aModules[j].pDesc->pszUsage);
+            RTStrmPrintf(g_pStdErr, "%s", g_aModules[j].pDesc->pszUsage);
 
     RTStrmPrintf(g_pStdErr, "\n"