Thread fixes for HostinfoOSVersionInit

Make HostinfoOSVersionInit atomic.  Clean it up some
while we're in there.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>

diff --git a/open-vm-tools/lib/include/hostinfo.h b/open-vm-tools/lib/include/hostinfo.h
index 852505f4999b3b4b3cac21b90f3bde72e83e4807..04b1926e3e116a5776951e950d36636a5d05c39c 100644 (file)
--- a/open-vm-tools/lib/include/hostinfo.h
+++ b/open-vm-tools/lib/include/hostinfo.h
@@ -61,7 +61,7 @@ extern VmTimeType Hostinfo_RawSystemTimerNS(void);
 extern VmTimeType Hostinfo_RawSystemTimerUS(void);
 extern VmTimeType Hostinfo_SystemTimerNS(void);
 extern VmTimeType Hostinfo_SystemTimerUS(void);
-extern int Hostinfo_OSVersion(int i);
+extern int Hostinfo_OSVersion(unsigned int i);
 extern int Hostinfo_GetSystemBitness(void);
 extern const char *Hostinfo_OSVersionString(void);
 

diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
index 8b04a0033331d8cc02ee5b05e3db1c8e859dc963..da216db3f422b850621ba1c24c900ee521efc2c1 100644 (file)
--- a/open-vm-tools/lib/misc/hostinfoPosix.c
+++ b/open-vm-tools/lib/misc/hostinfoPosix.c
@@ -43,7 +43,6 @@
 # include <sys/sysctl.h>
 #endif
 #if defined(__APPLE__)
-#define SYS_NMLN _SYS_NAMELEN
 #include <assert.h>
 #include <CoreServices/CoreServices.h>
 #include <mach-o/dyld.h>
@@ -126,13 +125,12 @@
    MAX(sizeof SYSTEM_BITNESS_64_SUN, \
        sizeof SYSTEM_BITNESS_64_LINUX))
 
-static Bool hostinfoOSVersionInitialized;
+struct hostinfoOSVersion {
+   int hostinfoOSVersion[4];
+   char *hostinfoOSVersionString;
+};
 
-#if defined(__APPLE__)
-#define SYS_NMLN _SYS_NAMELEN
-#endif
-static int hostinfoOSVersion[4];
-static char hostinfoOSVersionString[SYS_NMLN];
+static Atomic_Ptr hostinfoOSVersion;
 
 #define DISTRO_BUF_SIZE 255
 
@@ -219,10 +217,12 @@ static DistroInfo distroArray[] = {
 static void
 HostinfoOSVersionInit(void)
 {
+   struct hostinfoOSVersion *version;
    struct utsname u;
-   char extra[SYS_NMLN] = "";
+   char *extra;
+   char *p;
 
-   if (hostinfoOSVersionInitialized) {
+   if (Atomic_ReadPtr(&hostinfoOSVersion)) {
       return;
    }
 
@@ -232,23 +232,43 @@ HostinfoOSVersionInit(void)
       NOT_IMPLEMENTED();
    }
 
-   Str_Strcpy(hostinfoOSVersionString, u.release, SYS_NMLN);
+   version = Util_SafeCalloc(1, sizeof *version);
+   version->hostinfoOSVersionString = Util_SafeStrndup(u.release, 
+                                                       sizeof u.release);
+
+   ASSERT(ARRAYSIZE(version->hostinfoOSVersion) >= 4);
 
-   ASSERT(ARRAYSIZE(hostinfoOSVersion) >= 4);
+   /*
+    * The first three numbers are separated by '.', if there is 
+    * a fourth number, it's probably separated by '.' or '-',
+    * but it could be preceded by anything.
+    */
+
+   extra = Util_SafeCalloc(1, sizeof u.release);
    if (sscanf(u.release, "%d.%d.%d%s",
-             &hostinfoOSVersion[0], &hostinfoOSVersion[1],
-             &hostinfoOSVersion[2], extra) < 1) {
+             &version->hostinfoOSVersion[0], &version->hostinfoOSVersion[1],
+             &version->hostinfoOSVersion[2], extra) < 1) {
       Warning("%s: unable to parse host OS version string: %s\n",
               __FUNCTION__, u.release);
       NOT_IMPLEMENTED();
    }
 
-   /* If there is a 4th number, use it, otherwise use 0. */
-   if (sscanf(extra, ".%d%*s", &hostinfoOSVersion[3]) < 1) {
-      hostinfoOSVersion[3] = 0;
+   /*
+    * If there is a 4th number, use it, otherwise use 0.
+    * Explicitly skip over any non-digits, including '-'
+    */
+
+   p = extra;
+   while (*p && !isdigit(*p)) {
+      p++;
    }
+   sscanf(p, "%d", &version->hostinfoOSVersion[3]);
+   free(extra);
 
-   hostinfoOSVersionInitialized = TRUE;
+   if (Atomic_ReadIfEqualWritePtr(&hostinfoOSVersion, NULL, version)) {
+      free(version->hostinfoOSVersionString);
+      free(version);
+   }
 }
 
 
@@ -272,9 +292,13 @@ HostinfoOSVersionInit(void)
 const char *
 Hostinfo_OSVersionString(void)
 {
+   struct hostinfoOSVersion *version;
+
    HostinfoOSVersionInit();
 
-   return hostinfoOSVersionString;
+   version = Atomic_ReadPtr(&hostinfoOSVersion);
+
+   return version->hostinfoOSVersionString;
 }
 
 
@@ -296,11 +320,16 @@ Hostinfo_OSVersionString(void)
  */
 
 int
-Hostinfo_OSVersion(int i)
+Hostinfo_OSVersion(unsigned int i)  // IN:
 {
+   struct hostinfoOSVersion *version;
+
    HostinfoOSVersionInit();
 
-   return i < ARRAYSIZE(hostinfoOSVersion) ? hostinfoOSVersion[i] : 0;
+   version = Atomic_ReadPtr(&hostinfoOSVersion);
+
+   return (i < ARRAYSIZE(version->hostinfoOSVersion)) ?
+           version->hostinfoOSVersion[i] : 0;
 }