Change to common source files not applicable to open-vm-tools.

diff --git a/open-vm-tools/lib/include/userlock.h b/open-vm-tools/lib/include/userlock.h
index 043077509b1cb6f538477519f9c6d8f26de5ef9d..2dff3bb6bf4a1912d2d47299158ac20fdb954299 100644 (file)
--- a/open-vm-tools/lib/include/userlock.h
+++ b/open-vm-tools/lib/include/userlock.h
@@ -45,6 +45,7 @@ typedef struct MXUserSemaphore     MXUserSemaphore;
 typedef struct MXUserBinSemaphore  MXUserBinSemaphore;
 typedef struct MXUserEvent         MXUserEvent;
 typedef struct MXUserBarrier       MXUserBarrier;
+typedef struct MXUserLockChain     MXUserLockChain;
 
 /*
  * Exclusive ownership lock
@@ -321,6 +322,25 @@ void MXUser_DumpLockTree(const char *fileName,
 
 void MXUser_EmptyLockTree(void);
 
+void MXUser_AcquireChain(MXUserLockChain *chain);
+uint32 MXUser_AddChainRecLock(MXUserRecLock *lock);
+uint32 MXUser_ChainLength(MXUserLockChain *chain);
+MXUserLockChain *MXUser_CopyChain(void);
+void MXUser_DescribeChain(uint32 routing,
+                          MXUserLockChain *chain);
+uint32 MXUser_GraftChainRecLock(MXUserLockChain *chain,
+                                MXUserRecLock *lock);
+Bool MXUser_InitChain(MXUserRecLock *lock,
+                      Bool derive,
+                      Bool skipIfInitialized);
+Bool MXUser_IsChainInitialized(MXUserLockChain *chain);
+Bool MXUser_PurgeChainRecLock(MXUserLockChain *chain,
+                              MXUserRecLock *lock);
+void MXUser_ReleaseChain(MXUserLockChain *chain);
+uint32 MXUser_RemoveChainRecLock(MXUserRecLock *lock);
+void MXUser_SetChain(MXUserLockChain *chain,
+                     Bool shouldFree);
+const char * MXUser_TryAcquireChain(MXUserLockChain *chain);
 
 #if defined(VMX86_DEBUG) && !defined(DISABLE_MXUSER_DEBUG)
 #define MXUSER_DEBUG  // debugging "everywhere" when requested
@@ -352,6 +372,7 @@ MXUserRecLock       *MXUser_BindMXMutexRec(struct MX_MutexRec *mutex,
 
 struct MX_MutexRec  *MXUser_GetRecLockVmm(MXUserRecLock *lock);
 MX_Rank              MXUser_GetRecLockRank(MXUserRecLock *lock);
+const char          *MXUser_GetRecLockName(MXUserRecLock *lock);
 
 #if defined(__cplusplus)
 }  // extern "C"

diff --git a/open-vm-tools/lib/lock/ulRec.c b/open-vm-tools/lib/lock/ulRec.c
index 05f437acc54beb3eb1cdd22ee2578bba94a6e862..e863c23963873483883bc2e96637ddbf596c606d 100644 (file)
--- a/open-vm-tools/lib/lock/ulRec.c
+++ b/open-vm-tools/lib/lock/ulRec.c
@@ -1,5 +1,6 @@
 /*********************************************************
- * Copyright (C) 2009-2019 VMware, Inc. All rights reserved.
+ * Copyright (c) 2009-2025 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * 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
@@ -1059,3 +1060,31 @@ MXUser_DecRefRecLock(MXUserRecLock *lock)  // IN:
 
    MXUserCondDestroyRecLock(lock);
 }
+
+
+/*
+ *-----------------------------------------------------------------------------
+ *
+ * MXUser_GetRecLockName
+ *
+ *      Peek under the hood of the lock to retrieve it's name.
+ *
+ * Results:
+ *
+ *      Name of the lock.
+ *
+ * Side effects:
+ *      None.
+ *
+ *-----------------------------------------------------------------------------
+ */
+
+ const char *
+ MXUser_GetRecLockName(MXUserRecLock *lock)  // IN:
+ {
+    ASSERT(lock != NULL);
+
+    MXUserValidateHeader(&lock->header, MXUSER_TYPE_REC);
+
+    return lock->header.name;
+ }
\ No newline at end of file

diff --git a/open-vm-tools/lib/stubs/stub-log.c b/open-vm-tools/lib/stubs/stub-log.c
index fd5c107abf23abf5f1704e3a8017361a14cfc945..5e96d604df1cd6244801a4848a7af3bbee789ef1 100644 (file)
--- a/open-vm-tools/lib/stubs/stub-log.c
+++ b/open-vm-tools/lib/stubs/stub-log.c
@@ -132,3 +132,27 @@ Log_GetFileName(void)
 {
    return NULL;
 }
+
+
+void *
+Log_BufBegin(void)
+{
+   return NULL;
+}
+
+
+void
+Log_BufAppend(void *acc,        // IN/OUT:
+              const char *fmt,  // IN:
+              ...)              // IN/OUT:
+{
+
+}
+
+
+void
+Log_BufEndLevel(void *acc,       // IN/OUT:
+                uint32 routing)  // IN:
+{
+
+}