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 30c322069515bf378c62403e8aa0f14e50e8eee6..fc1774d80decd67e6a986eb25e6753ad519198ba 100644 (file)
--- 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 0675d9fede67c1d2982b27b1ab69b66fcab35699..5faddaa070736fcd8b13a5aa748e9494695ee126 100644 (file)
--- 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 9a5e985088149bf920edbfaaa6d9d9389ec24b47..18336478f6ef23273ac2dec7c6fd15a651e9eda7 100644 (file)
--- 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 2c8566f9538f5daf827ddddd4a27aeed841c0733..294f93a2ad94a0a0c0ff71ac8a50110b0a59bedf 100644 (file)
--- 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);