From: VMware, Inc <>
Date: Thu, 17 Jun 2010 21:29:32 +0000 (-0700)
Subject: lib/lock: allow condVar timeouts
X-Git-Tag: 2010.06.16-268169~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d5ffac00f004a814694a29ecae698ccb7aa3e57;p=thirdparty%2Fopen-vm-tools.git

lib/lock: allow condVar timeouts

Pass the timeout value through now that timeouts are possible

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

diff --git a/open-vm-tools/lib/lock/ulCondVar.c b/open-vm-tools/lib/lock/ulCondVar.c
index d8f2b954f..98c07453f 100644
--- a/open-vm-tools/lib/lock/ulCondVar.c
+++ b/open-vm-tools/lib/lock/ulCondVar.c
@@ -638,7 +638,7 @@ MXUserWaitCondVar(MXUserHeader *header,    // IN:
 
    Atomic_Inc(&condVar->referenceCount);
 
-   err = MXUserWaitInternal(lock, condVar, 0, &signalled);
+   err = MXUserWaitInternal(lock, condVar, msecWait, &signalled);
 
    if (err != 0) {
       MXUserDumpAndPanic(header, "%s: failure %d on condVar (%p; %s)\n",