From: VMware, Inc <>
Date: Thu, 17 Jun 2010 20:59:46 +0000 (-0700)
Subject: Thread fixes for Hostinfo_MachineID
X-Git-Tag: 2010.06.16-268169~175
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f21a5c2a5bd73378377e040c7108ed18e36bf9cd;p=thirdparty%2Fopen-vm-tools.git

Thread fixes for Hostinfo_MachineID

Hostinfo_MachineID caches its results.  Make the cache atomic.
This uses atomic pointers because zero is a valid value for both
the name hash and hardware ID.

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

diff --git a/open-vm-tools/lib/misc/machineID.c b/open-vm-tools/lib/misc/machineID.c
index c2fd5c86b..a51e64ef2 100644
--- a/open-vm-tools/lib/misc/machineID.c
+++ b/open-vm-tools/lib/misc/machineID.c
@@ -43,6 +43,7 @@
 #include "str.h"
 #include "err.h"
 #include "vm_product.h"
+#include "vm_atomic.h"
 
 #define LOGLEVEL_MODULE main
 #include "loglevel_user.h"
@@ -576,17 +577,20 @@ void
 Hostinfo_MachineID(uint32 *hostNameHash,    // OUT:
                    uint64 *hostHardwareID)  // OUT:
 {
-   static Bool fetchValues = TRUE;
-   static uint64 cachedHardwareID;
-   static uint32 cachedHostNameHash;
+   static Atomic_Ptr cachedHardwareID;
+   static Atomic_Ptr cachedHostNameHash;
+   uint64 *tmpHardwareID;
+   uint32 *tmpNameHash;
 
    ASSERT(hostNameHash);
    ASSERT(hostHardwareID);
 
-   if (fetchValues) {
-      int  erc;
+   tmpNameHash = Atomic_ReadPtr(&cachedHostNameHash);
+   if (!tmpNameHash) {
       char *hostName;
 
+      tmpNameHash = Util_SafeMalloc(sizeof *tmpNameHash);
+
       // 4 bytes (32 bits) of host name information
       hostName = (char *) Hostinfo_HostName();
 
@@ -594,24 +598,40 @@ Hostinfo_MachineID(uint32 *hostNameHash,    // OUT:
          Warning("%s Hostinfo_HostName failure; providing default.\n",
                 __FUNCTION__);
 
-         cachedHostNameHash = 0;
+         *tmpNameHash = 0;
       } else {
-         cachedHostNameHash = HostNameHash((unsigned char *) hostName);
+         *tmpNameHash = HostNameHash((unsigned char *) hostName);
          free(hostName);
       }
 
+      if (Atomic_ReadIfEqualWritePtr(&cachedHostNameHash, NULL, 
+                                     tmpNameHash)) {
+         free(tmpNameHash);
+         tmpNameHash = Atomic_ReadPtr(&cachedHostNameHash);
+      }
+   }
+   *hostNameHash = *tmpNameHash;
+
+   tmpHardwareID = Atomic_ReadPtr(&cachedHardwareID);
+   if (!tmpHardwareID) {
+      int  erc;
+
+      tmpHardwareID = Util_SafeMalloc(sizeof *tmpHardwareID);
+
       // 8 bytes (64 bits) of hardware information
-      erc = ObtainHardwareID(&cachedHardwareID);
+      erc = ObtainHardwareID(tmpHardwareID);
       if (erc != 0) {
          Warning("%s ObtainHardwareID failure (%s); providing default.\n",
                  __FUNCTION__, Err_Errno2String(erc));
 
-         cachedHardwareID = 0;
+         *tmpHardwareID = 0;
       }
 
-      fetchValues = FALSE;
+      if (Atomic_ReadIfEqualWritePtr(&cachedHardwareID, NULL, 
+                                     tmpHardwareID)) {
+         free(tmpHardwareID);
+         tmpHardwareID = Atomic_ReadPtr(&cachedHardwareID);
+      }
    }
-
-   *hostNameHash = cachedHostNameHash;
-   *hostHardwareID = cachedHardwareID;
+   *hostHardwareID = *tmpHardwareID;
 }