From: VMware, Inc <>
Date: Thu, 17 Jun 2010 21:19:54 +0000 (-0700)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2010.06.16-268169~143
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f46c0321658a6f412a2b60d25fb802854a0537aa;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/lock/ul.c b/open-vm-tools/lib/lock/ul.c
index 30c322069..fc1774d80 100644
--- a/open-vm-tools/lib/lock/ul.c
+++ b/open-vm-tools/lib/lock/ul.c
@@ -264,6 +264,10 @@ MXUserAcquisitionTracking(MXUserHeader *header,  // IN:
 
    ASSERT_NOT_IMPLEMENTED(perThread->locksHeld < MXUSER_MAX_LOCKS_PER_THREAD);
 
+#ifdef DISABLE_MXUSER_LOCK_RANKS
+   checkRank = FALSE;
+#endif
+
    /* Rank checking anyone? */
    if (checkRank && (header->lockRank != RANK_UNRANKED)) {
       uint32 i;
@@ -633,7 +637,7 @@ MXUserListLocks(void)
       for (i = 0; i < perThread->locksHeld; i++) {
          MXUserHeader *hdr = perThread->lockArray[i];
 
-         Warning("\tMXUser lock %s (@%p) rank %d\n", hdr->lockName, hdr,
+         Warning("\tMXUser lock %s (@%p) rank 0x%x\n", hdr->lockName, hdr,
                  hdr->lockRank);
       }
    }
diff --git a/open-vm-tools/lib/lock/ulExcl.c b/open-vm-tools/lib/lock/ulExcl.c
index 0675d9fed..5faddaa07 100644
--- a/open-vm-tools/lib/lock/ulExcl.c
+++ b/open-vm-tools/lib/lock/ulExcl.c
@@ -134,7 +134,7 @@ MXUserDumpExclLock(MXUserHeader *header)  // IN:
 
    Warning("\tsignature %X\n", lock->header.lockSignature);
    Warning("\tname %s\n", lock->header.lockName);
-   Warning("\trank %d\n", lock->header.lockRank);
+   Warning("\trank 0x%x\n", lock->header.lockRank);
 
    Warning("\tcount %u\n", lock->recursiveLock.referenceCount);
 
diff --git a/open-vm-tools/lib/lock/ulRW.c b/open-vm-tools/lib/lock/ulRW.c
index 9a5e98508..18336478f 100644
--- a/open-vm-tools/lib/lock/ulRW.c
+++ b/open-vm-tools/lib/lock/ulRW.c
@@ -353,7 +353,7 @@ MXUserDumpRWLock(MXUserHeader *header)  // IN:
 
    Warning("\tsignature %X\n", lock->header.lockSignature);
    Warning("\tname %s\n", lock->header.lockName);
-   Warning("\trank %d\n", lock->header.lockRank);
+   Warning("\trank 0x%x\n", lock->header.lockRank);
 
    if (LIKELY(lock->useNative)) {
       Warning("\tnativeLock %p\n", &lock->nativeLock);
diff --git a/open-vm-tools/lib/lock/ulRec.c b/open-vm-tools/lib/lock/ulRec.c
index 2c8566f95..294f93a2a 100644
--- a/open-vm-tools/lib/lock/ulRec.c
+++ b/open-vm-tools/lib/lock/ulRec.c
@@ -146,7 +146,7 @@ MXUserDumpRecLock(MXUserHeader *header)  // IN:
 
    Warning("\tsignature %X\n", lock->header.lockSignature);
    Warning("\tname %s\n", lock->header.lockName);
-   Warning("\trank %d\n", lock->header.lockRank);
+   Warning("\trank 0x%x\n", lock->header.lockRank);
 
    if (lock->vmmLock == NULL) {
       Warning("\tcount %u\n", lock->recursiveLock.referenceCount);