Fix Tools build.

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

diff --git a/open-vm-tools/lib/include/libMutexRank.h b/open-vm-tools/lib/include/libMutexRank.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/open-vm-tools/lib/include/mutexRank.h b/open-vm-tools/lib/include/mutexRank.h
new file mode 100644 (file)
index 0000000..0008400
--- /dev/null
+++ b/open-vm-tools/lib/include/mutexRank.h
@@ -0,0 +1,81 @@
+/*********************************************************
+ * Copyright (C) 2010 VMware, Inc. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation version 2.1 and no later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the Lesser GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA.
+ *
+ *********************************************************/
+
+/*
+ * mutexRank.h --
+ *
+ *     Base lock rank defines. See userlock.h for the related APIs.
+ */
+
+#ifndef _MUTEXRANK_H_
+#define _MUTEXRANK_H_
+
+#define INCLUDE_ALLOW_USERLEVEL
+#define INCLUDE_ALLOW_VMCORE
+
+#include "includeCheck.h"
+
+/*
+ * Core rank defines.
+ */
+
+#define RANK_UNRANKED            0
+#define RANK_LEAF                0xFF000000
+#define RANK_INVALID             0xFFFFFFFF
+
+/*
+ * For situations where we need to create locks on behalf of
+ * third-party code, but we don't know what ranking scheme, if any,
+ * that code uses.  For now, the only usage is in bora/lib/ssl.
+ */
+#define RANK_THIRDPARTY          RANK_UNRANKED
+
+/*
+ * Log lock rank.
+ *
+ * Very special case. Don't change it. The effect is that critical
+ * logging code cannot call anything else which requires a lock, but
+ * everyone else can safely Log() while holding a leaf lock.
+ */
+#define RANK_logLock             (RANK_LEAF + 1)
+
+/*
+ * bora/lib/allocTrack rank (not really).
+ *
+ * This is another special case. It hooks malloc/free and the like,
+ * and thus can basically sneak in underneath anyone. To that end
+ * allocTrack uses unranked, native locks internally to avoid any
+ * complications.
+ */
+
+/*
+ * VMX/VMM/device lock rank space.
+ *
+ * This rank space is at the bottom, from 1 to RANK_VMX_LEAF. See
+ * vmx/public/mutexRankVMX.h for definitions.
+ */
+
+/*
+ * bora/lib lock rank space.
+ *
+ * This rank space is from RANK_libLockBase on up to RANK_LEAF. See
+ * lib/public/mutexRankLib.h for definitions.
+ */
+#define RANK_libLockBase         0xF0000000
+
+#endif // ifndef _MUTEXRANK_H_

diff --git a/open-vm-tools/lib/include/mutexRankLib.h b/open-vm-tools/lib/include/mutexRankLib.h
new file mode 100644 (file)
index 0000000..a2a5acd
--- /dev/null
+++ b/open-vm-tools/lib/include/mutexRankLib.h
@@ -0,0 +1,112 @@
+/*********************************************************
+ * Copyright (C) 2010 VMware, Inc. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation version 2.1 and no later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the Lesser GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA.
+ *
+ *********************************************************/
+
+#ifndef _LIBMUTEXRANK_H
+#define _LIBMUTEXRANK_H
+
+#include "mutexRank.h"
+
+/*
+ * MXUser mutex ranks for bora/lib code.
+ *
+ * bora/lib lock rank space is from RANK_libLockBase on up to
+ * RANK_LEAF (see vm_basic_defs).asdf
+ *
+ * (Keep all of the below offsets in hex).
+ */
+
+/*
+ * vmhs locks
+ */
+#define RANK_vmhsThrMxLock          (RANK_libLockBase + 0x3005)
+#define RANK_vmhsVmxMxLock          (RANK_libLockBase + 0x3005)
+#define RANK_vmhsMvmtsMxLock        (RANK_libLockBase + 0x3005)
+#define RANK_vmhsHotfixesMxLock     (RANK_libLockBase + 0x3005)
+
+/*
+ * hgfs locks
+ */
+#define RANK_hgfsNotifyLock          (RANK_libLockBase + 0x4005)
+#define RANK_hgfsFileIOLock          (RANK_libLockBase + 0x4010)
+#define RANK_hgfsSearchArrayLock     (RANK_libLockBase + 0x4020)
+#define RANK_hgfsNodeArrayLock       (RANK_libLockBase + 0x4030)
+
+/*
+ * SLPv2 global lock
+ */
+#define RANK_slpv2GlobalLock         (RANK_libLockBase + 0x4305)
+
+/*
+ * NFC lib lock
+ */
+#define RANK_nfcLibLock              (RANK_libLockBase + 0x4505)
+
+/*
+ * policy ops pending list lock
+ */
+#define RANK_popPendingListLock      (RANK_libLockBase + 0x4605)
+
+/*
+ * disklib and I/O related locks
+ */
+#define RANK_diskLibWrapperLock      (RANK_libLockBase + 0x5005)
+#define RANK_diskLibPluginLock       (RANK_libLockBase + 0x5010)
+#define RANK_vmioPluginRootLock      (RANK_libLockBase + 0x5020)
+#define RANK_vmioPluginEvtLock       (RANK_libLockBase + 0x5030)
+#define RANK_vmioPluginSysLock       (RANK_libLockBase + 0x5040)
+#define RANK_fsCmdLock               (RANK_libLockBase + 0x5050)
+
+/*
+ * RANK_vigorClientLock < VMDB range
+ */
+#define RANK_vigorClientLock         (RANK_libLockBase + 0x5400)
+
+/*
+ * VMDB range:
+ * (RANK_libLockBase + 0x5500, RANK_libLockBase + 0x5600)
+ */
+#define RANK_vmuSecPolicyLock        (RANK_libLockBase + 0x5505)
+#define RANK_vmdbCnxRpcLock          (RANK_libLockBase + 0x5510)
+#define RANK_vmdbCnxRpcBarrierLock   (RANK_libLockBase + 0x5520)
+#define RANK_vmdbCnxLock             (RANK_libLockBase + 0x5530)
+#define RANK_vmdbSecureLock          (RANK_libLockBase + 0x5540)
+#define RANK_vmdbDbLock              (RANK_libLockBase + 0x5550)
+#define RANK_vmdbW32HookLock         (RANK_libLockBase + 0x5560)
+#define RANK_vmdbWQPoolLock          (RANK_libLockBase + 0x5570)
+#define RANK_vmdbMemMapLock          (RANK_libLockBase + 0x5580)
+
+/*
+ * poll default lock
+ *
+ * There is a LOT of code under this lock, but it appears reasonably
+ * low-level, so this seems as good a rank as any.
+ */
+#define RANK_pollDefaultLock         (RANK_libLockBase + 0x8505)
+
+/*
+ * Low-level misc. range:
+ * (RANK_libLockBase + 0x9000, RANK_libLockBase + 0x9100)
+ */
+#define RANK_licenseCheckLock        (RANK_libLockBase + 0x9004)
+#define RANK_sslConnectionLock       (RANK_libLockBase + 0x9005)
+#define RANK_getSafeTmpDirLock       (RANK_libLockBase + 0x9010)
+#define RANK_keyLocatorLock          (RANK_libLockBase + 0x9020)
+#define RANK_randGetBytesLock        (RANK_libLockBase + 0x9030)
+#define RANK_randSeedLock            (RANK_libLockBase + 0x9040)
+
+#endif /* _LIBMUTEXRANK_H */