From: VMware, Inc <>
Date: Thu, 17 Jun 2010 22:00:21 +0000 (-0700)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2010.06.16-268169~69
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=317a8748ae9aa8b01ddda7bed965609eb68d4394;p=thirdparty%2Fopen-vm-tools.git

Changes in shared code that don't affect open-vm-tools functionality.

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

diff --git a/open-vm-tools/lib/include/userlock.h b/open-vm-tools/lib/include/userlock.h
index cd6571781..88d76ae5f 100644
--- a/open-vm-tools/lib/include/userlock.h
+++ b/open-vm-tools/lib/include/userlock.h
@@ -176,7 +176,11 @@ void MXUser_TryAcquireFailureControl(Bool (*func)(const char *lockName));
 #if defined(MXUSER_STATS)
 void MXUser_StatisticsControl(double contentionRatio,
                               uint64 minCount);
-void MXUser_LogStats(unsigned epoch);
+
+void MXUser_PerLockData(unsigned epoch);
+void MXUser_PerThreadData(VThreadID tid,
+                          uint64 *totalAcquisitions,
+                          uint64 *contendedAcquisitions);
 #endif
 
 void MXUser_SetInPanic(void);
diff --git a/open-vm-tools/lib/lock/ulIntShared.h b/open-vm-tools/lib/lock/ulIntShared.h
index 1feae6a54..08604a485 100644
--- a/open-vm-tools/lib/lock/ulIntShared.h
+++ b/open-vm-tools/lib/lock/ulIntShared.h
@@ -23,8 +23,6 @@ extern void (*MXUserVThreadWatchDog)(void);
 
 extern void MXUserListLocks(void);
 
-extern void MXUserPerThreadData(VThreadID, uint64 *, uint64 *);
-
 extern void MXUserInstallMxHooks(void (*theLockListFunc)(void),
                                  MX_Rank (*theRankFunc)(void),
                                  void (*theLockFunc)(struct MX_MutexRec *lock),