Changeset 25390 in vbox

Timestamp:

Dec 15, 2009 11:16:26 AM (15 years ago)

Author:

vboxsync

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

56015

Message:

VBoxService: Added guest property support for timesync service.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxService.cpp (modified) (2 diffs)
• VBoxServiceExec.cpp (modified) (2 diffs)
• VBoxServiceTimeSync.cpp (modified) (2 diffs)
• VBoxServiceUtils.cpp (modified) (1 diff)
• VBoxServiceUtils.h (modified) (1 diff)

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

@@ -382 +382 @@
 {
     int rc = VINF_SUCCESS;
-
     /*
      * Init globals and such.
      */
     RTR3Init();
+
+    /*
+     * Connect to the kernel part before daemonizing so we can fail
+     * and complain if there is some kind of problem. We need to initialize
+     * the guest lib *before* we do the pre-init just in case one of services
+     * needs do to some initial stuff with it.
+     */
+    VBoxServiceVerbose(2, "Calling VbgR3Init()\n");
+    rc = VbglR3Init();
+    if (RT_FAILURE(rc))
+        return VBoxServiceError("VbglR3Init failed with rc=%Rrc.\n", rc);
+
+    /* Do pre-init of services. */
     g_pszProgName = RTPathFilename(argv[0]);
     for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
@@ -537 +549 @@
     if (iMain == ~0U)
         return VBoxServiceSyntax("At least one service must be enabled.\n");
-
-    /*
-     * Connect to the kernel part before daemonizing so we can fail
-     * and complain if there is some kind of problem.
-     */
-    VBoxServiceVerbose(2, "Calling VbgR3Init()\n");
-    rc = VbglR3Init();
-    if (RT_FAILURE(rc))
-        return VBoxServiceError("VbglR3Init failed with rc=%Rrc.\n", rc);
 
     VBoxServiceVerbose(0, "Started. Verbose level = %d\n", g_cVerbosity);

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

@@ -134 +134 @@
 static int VBoxServiceExecReadHostProp(const char *pszPropName, char **ppszValue, uint64_t *puTimestamp)
 {
-    size_t  cbBuf = _1K;
-    void   *pvBuf = NULL;
-    int     rc;
-
-    *ppszValue = NULL;
-
-    for (unsigned cTries = 0; cTries < 10; cTries++)
+    char *pszFlags, *pszValue;
+    uint64_t uTimestamp;
+    int rc = VBoxServiceReadProp(g_uExecGuestPropSvcClientID, pszPropName, ppszValue, &pszFlags, puTimestamp);
+    if (RT_SUCCESS(rc))
     {
-        /*
-         * (Re-)Allocate the buffer and try read the property.
-         */
-        RTMemFree(pvBuf);
-        pvBuf = RTMemAlloc(cbBuf);
-        if (!pvBuf)
-        {
-            VBoxServiceError("Exec: Failed to allocate %zu bytes\n", cbBuf);
-            rc = VERR_NO_MEMORY;
-            break;
-        }
-        char    *pszValue;
-        char    *pszFlags;
-        uint64_t uTimestamp;
-        rc = VbglR3GuestPropRead(g_uExecGuestPropSvcClientID, pszPropName,
-                                 pvBuf, cbBuf,
-                                 &pszValue, &uTimestamp, &pszFlags, NULL);
-        if (RT_FAILURE(rc))
-        {
-            if (rc == VERR_BUFFER_OVERFLOW)
-            {
-                /* try again with a bigger buffer. */
-                cbBuf *= 2;
-                continue;
-            }
-            if (rc == VERR_NOT_FOUND)
-                VBoxServiceVerbose(2, "Exec: %s not found\n", pszPropName);
-            else
-                VBoxServiceError("Exec: Failed to query \"%s\": %Rrc\n", pszPropName, rc);
-            break;
-        }
-
         /*
          * Validate it and set return values on success.
@@ -184 +149 @@
                 VBoxServiceError("Exec: Flag validation failed for \"%s\": %Rrc; flags=\"%s\"\n",
                                  pszPropName, rc, pszFlags);
-            break;
         }
-        VBoxServiceVerbose(2, "Exec: Read \"%s\" = \"%s\", timestamp %RU64n\n",
-                           pszPropName, pszValue, uTimestamp);
-        *ppszValue = RTStrDup(pszValue);
-        if (!*ppszValue)
+        else
         {
-            VBoxServiceError("Exec: RTStrDup failed for \"%s\"\n", pszValue);
-            rc = VERR_NO_MEMORY;
-            break;
+            VBoxServiceVerbose(2, "Exec: Read \"%s\" = \"%s\", timestamp %RU64n\n",
+                               pszPropName, pszValue, uTimestamp);
+            *ppszValue = RTStrDup(pszValue);
+            if (!*ppszValue)
+            {
+                VBoxServiceError("Exec: RTStrDup failed for \"%s\"\n", pszValue);
+                rc = VERR_NO_MEMORY;
+            }
+            if (puTimestamp)
+                *puTimestamp = uTimestamp;
         }
-
-        if (puTimestamp)
-            *puTimestamp = uTimestamp;
-        break; /* done */
+        RTStrFree(pszFlags);
     }
-
-    RTMemFree(pvBuf);
     return rc;
 }

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

@@ -101 +101 @@
 #include <VBox/VBoxGuestLib.h>
 #include "VBoxServiceInternal.h"
+#include "VBoxServiceUtils.h"
 
 
@@ -151 +152 @@
 static DECLCALLBACK(int) VBoxServiceTimeSyncPreInit(void)
 {
+#ifdef VBOX_WITH_GUEST_PROPS
+    /** @todo Merge this function with VBoxServiceTimeSyncOption() to generalize
+     *        the "command line args override guest property values" behavior.
+
+    /*
+     * Read the service options from the VM's guest properties.
+     * Note that these options can be overriden by the command line options later.
+     */
+    uint32_t uGuestPropSvcClientID;
+    int rc = VbglR3GuestPropConnect(&uGuestPropSvcClientID);
+    if (RT_FAILURE(rc))
+    {
+        VBoxServiceError("Failed to connect to the guest property service! Error: %Rrc\n", rc);
+    }
+    else
+    {
+        rc = VBoxServiceReadPropUInt32(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/VBoxService/--timesync-interval",
+                                       &g_TimeSyncInterval, 1, UINT32_MAX - 1);
+        if (   RT_SUCCESS(rc)
+            || rc == VERR_NOT_FOUND)
+        {
+            rc = VBoxServiceReadPropUInt32(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/VBoxService/--timesync-min-adjust",
+                                           &g_TimeSyncMinAdjust, 0, 3600000);
+        }
+        if (   RT_SUCCESS(rc)
+            || rc == VERR_NOT_FOUND)
+        {
+            rc = VBoxServiceReadPropUInt32(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/VBoxService/--timesync-latency-factor",
+                                           &g_TimeSyncLatencyFactor, 1, 1024);
+        }
+        if (   RT_SUCCESS(rc)
+            || rc == VERR_NOT_FOUND)
+        {
+            rc = VBoxServiceReadPropUInt32(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/VBoxService/--timesync-max-latency",
+                                           &g_TimeSyncMaxLatency, 1, 3600000);
+        }
+        if (   RT_SUCCESS(rc)
+            || rc == VERR_NOT_FOUND)
+        {
+            rc = VBoxServiceReadPropUInt32(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/VBoxService/--timesync-set-threshold",
+                                           &g_TimeSyncSetThreshold, 0, 7*24*60*1000 /* a week */);
+        }
+        if (   RT_SUCCESS(rc)
+            || rc == VERR_NOT_FOUND)
+        {
+            char *pszValue;
+            rc = VBoxServiceReadProp(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/VBoxService/--timesync-set-start",
+                                     &pszValue, NULL /* ppszFlags */, NULL /* puTimestamp */);
+            if (RT_SUCCESS(rc))
+            {
+                g_fTimeSyncSetNext = true;
+                RTStrFree(pszValue);
+            }
+        }
+
+        VbglR3GuestPropDisconnect(uGuestPropSvcClientID);
+    }
+
+    if (rc == VERR_NOT_FOUND) /* If a value is not found, don't be sad! */
+        rc = VINF_SUCCESS;
+    return rc;
+#else
+    /* Nothing to do here yet. */
     return VINF_SUCCESS;
+#endif
 }
 

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

@@ -37 +37 @@
 
 #ifdef VBOX_WITH_GUEST_PROPS
+/**
+ * Reads a guest property.
+ *
+ * @returns VBox status code, fully bitched.
+ *
+ * @param   u32ClientId         The HGCM client ID for the guest property session.
+ * @param   pszPropName         The property name.
+ * @param   ppszValue           Where to return the value.  This is always set
+ *                              to NULL.  Free it using RTStrFree().
+ * @param   ppszFlags           Where to return the value flags. Free it
+ *                              using RTStrFree().  Optional.
+ * @param   puTimestamp         Where to return the timestamp.  This is only set
+ *                              on success.  Optional.
+ */
+int VBoxServiceReadProp(uint32_t u32ClientId, const char *pszPropName, char **ppszValue, char **ppszFlags, uint64_t *puTimestamp)
+{
+    size_t  cbBuf = _1K;
+    void   *pvBuf = NULL;
+    int     rc;
+
+    *ppszValue = NULL;
+
+    for (unsigned cTries = 0; cTries < 10; cTries++)
+    {
+        /*
+         * (Re-)Allocate the buffer and try read the property.
+         */
+        RTMemFree(pvBuf);
+        pvBuf = RTMemAlloc(cbBuf);
+        if (!pvBuf)
+        {
+            VBoxServiceError("Guest Property: Failed to allocate %zu bytes\n", cbBuf);
+            rc = VERR_NO_MEMORY;
+            break;
+        }
+        char    *pszValue;
+        char    *pszFlags;
+        uint64_t uTimestamp;
+        rc = VbglR3GuestPropRead(u32ClientId, pszPropName,
+                                 pvBuf, cbBuf,
+                                 &pszValue, &uTimestamp, &pszFlags, NULL);
+        if (RT_FAILURE(rc))
+        {
+            if (rc == VERR_BUFFER_OVERFLOW)
+            {
+                /* try again with a bigger buffer. */
+                cbBuf *= 2;
+                continue;
+            }
+            if (rc == VERR_NOT_FOUND)
+                VBoxServiceVerbose(2, "Guest Property: %s not found\n", pszPropName);
+            else
+                VBoxServiceError("Guest Property: Failed to query \"%s\": %Rrc\n", pszPropName, rc);
+            break;
+        }
+
+        VBoxServiceVerbose(2, "Guest Property: Read \"%s\" = \"%s\", timestamp %RU64n\n",
+                           pszPropName, pszValue, uTimestamp);
+        *ppszValue = RTStrDup(pszValue);
+        if (!*ppszValue)
+        {
+            VBoxServiceError("Guest Property: RTStrDup failed for \"%s\"\n", pszValue);
+            rc = VERR_NO_MEMORY;
+            break;
+        }
+
+        if (puTimestamp)
+            *puTimestamp = uTimestamp;
+        if (ppszFlags)
+            *ppszFlags = RTStrDup(pszFlags);
+        break; /* done */
+    }
+
+    RTMemFree(pvBuf);
+    return rc;
+}
+
+
+/**
+ * Reads a guest property as a 32-bit value.
+ *
+ * @returns VBox status code, fully bitched.
+ *
+ * @param   u32ClientId         The HGCM client ID for the guest property session.
+ * @param   pszPropName         The property name.
+ * @param   pu32                Where to store the 32-bit value.
+ *
+ */
+int VBoxServiceReadPropUInt32(uint32_t u32ClientId, const char *pszPropName, uint32_t *pu32, uint32_t u32Min, uint32_t u32Max)
+{
+    char *pszValue;
+    int rc = VBoxServiceReadProp(u32ClientId, pszPropName, &pszValue,
+        NULL /* ppszFlags */, NULL /* puTimestamp */);
+    if (RT_SUCCESS(rc))
+    {
+        AssertPtr(pu32);
+        char *pszNext;
+        rc = RTStrToUInt32Ex(pszValue, &pszNext, 0, pu32);
+        if (   RT_SUCCESS(rc)
+            && (*pu32 < u32Min || *pu32 > u32Max))
+        {
+            VBoxServiceError("The guest property value %s = %RU32 is out of range [%RU32..%RU32].\n",
+                             pszPropName, *pu32, u32Min, u32Max);
+        }
+        RTStrFree(pszValue);
+    }
+    return rc;
+}
+
+
 /**
  * Wrapper around VbglR3GuestPropWriteValue that does value formatting and

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.h

@@ -26 +26 @@
 
 #ifdef VBOX_WITH_GUEST_PROPS
+/** Reads a guest property. */
+int VBoxServiceReadProp(uint32_t u32ClientId, const char *pszPropName, char **ppszValue, char **ppszFlags, uint64_t *puTimestamp);
+/** Reads a guest property as a 32-bit value. */
+int VBoxServiceReadPropUInt32(uint32_t u32ClientId, const char *pszPropName, uint32_t *pu32, uint32_t u32Min, uint32_t u32Max);
+/** Wrapper around VbglR3GuestPropWriteValue that does value formatting and logging. */
 int VBoxServiceWritePropF(uint32_t u32ClientId, const char *pszName, const char *pszValueFormat, ...);
 #endif