← Back to branch summary

~ubuntu-branches/ubuntu/quantal/open-vm-tools/quantal-201210021442

« back to all changes in this revision

Viewing changes to lib/lock/ulCondVar.c

  • Committer: Package Import Robot
  • Author(s): Nate Muench
  • Date: 2012-06-20 15:59:51 UTC
  • mfrom: (1.4.8)
  • Revision ID: package-import@ubuntu.com-20120620155951-6rupmpb0f70b52zr
Tags: 2012.05.21-724730-0ubuntu1
https://launchpad.net/bugs/1000344
https://launchpad.net/bugs/1019031
* Merging upstream version 2012.05.21-724730.
  - Fixes building against the current Quantal kernel. (LP: #1000344)
  - Fixes Quantal installation issues. (LP: #1019031)

* Sync with Debian
  - Updating to debhelper version 9.
  - Updating to standards version 3.9.3.
  - Updating copyright file machine-readable format version 1.0.
  - Building without multiarch paths for now

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lock/ulCondVar.c
232
232
                   MXUserCondVar *condVar,  // IN:
233
233
                   uint32 msecWait)         // IN:
234
234
{
235
 
   uint32 lockCount = MXRecLockCount(lock);
 
235
   int lockCount = MXRecLockCount(lock);
236
236
   DWORD waitTime = (msecWait == MXUSER_WAIT_INFINITE) ? INFINITE : msecWait;
237
237
 
238
238
   if (pSleepConditionVariableCS) {
300
300
         LeaveCriticalSection(&condVar->x.compat.condVarLock);
301
301
      } while (!done);
302
302
 
303
 
      MXRecLockAcquire(lock);
 
303
      MXRecLockAcquire(lock,
 
304
                       NULL);  // non-stats
 
305
 
304
306
      MXRecLockIncCount(lock, lockCount - 1);
305
307
 
306
308
      if (err != ERROR_SUCCESS) {
461
463
                   uint32 msecWait)         // IN:
462
464
{
463
465
   int err;
464
 
   uint32 lockCount = MXRecLockCount(lock);
 
466
   int lockCount = MXRecLockCount(lock);
465
467
 
466
468
   /*
467
469
    * When using the native lock found within the MXUser lock, be sure to
632
634
             __FUNCTION__, header->name, condVar, condVar->header->name);
633
635
   }
634
636
 
635
 
   if (!MXRecLockIsOwner(lock)) {
 
637
   if (vmx86_debug && !MXRecLockIsOwner(lock)) {
636
638
      Panic("%s: lock %s for condVar (0x%p) not owned\n",
637
639
            __FUNCTION__, condVar->header->name, condVar);
638
640
   }