← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/virtualbox/oneiric-updates

« back to all changes in this revision

Viewing changes to src/VBox/VMM/VMMAll/PDMAllCritSect.cpp

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2011-09-02 11:50:47 UTC
  • mfrom: (3.1.4 sid)
  • Revision ID: package-import@ubuntu.com-20110902115047-kfhmsikrpydgyoji
Tags: 4.1.2-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Apport hook.
    - debian/virtualbox.files/source_virtualbox.py
    - debian/virtualbox.install
  - Drop *-source packages.
  - Add vboxguest modalias the to the package control field.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/VMM/VMMAll/PDMAllCritSect.cpp
1
 
/* $Id: PDMAllCritSect.cpp 38059 2011-07-19 09:34:44Z vboxsync $ */
 
1
/* $Id: PDMAllCritSect.cpp 38081 2011-07-20 14:21:36Z vboxsync $ */
2
2
/** @file
3
3
 * PDM - Critical Sections, All Contexts.
4
4
 */
505
505
     * Always check that the caller is the owner (screw performance).
506
506
     */
507
507
    RTNATIVETHREAD const hNativeSelf = pdmCritSectGetNativeSelf(pCritSect);
508
 
    if (RT_UNLIKELY(pCritSect->s.Core.NativeThreadOwner != hNativeSelf))
509
 
    {
510
 
#if 1
511
 
        AssertMsgFailed(("%p %s: %p != %p; cLockers=%d cNestings=%d\n", pCritSect, R3STRING(pCritSect->s.pszName),
512
 
                         pCritSect->s.Core.NativeThreadOwner, hNativeSelf,
513
 
                         pCritSect->s.Core.cLockers, pCritSect->s.Core.cNestings));
514
 
#else
515
 
        AssertReleaseMsgFailed(("%p %s: %p != %p; cLockers=%d cNestings=%d\n", pCritSect, R3STRING(pCritSect->s.pszName),
 
508
    AssertReleaseMsgReturnVoid(pCritSect->s.Core.NativeThreadOwner == hNativeSelf,
 
509
                               ("%p %s: %p != %p; cLockers=%d cNestings=%d\n", pCritSect, R3STRING(pCritSect->s.pszName),
516
510
                                pCritSect->s.Core.NativeThreadOwner, hNativeSelf,
517
511
                                pCritSect->s.Core.cLockers, pCritSect->s.Core.cNestings));
518
 
#endif
519
 
        return;
520
 
    }
521
512
    Assert(pCritSect->s.Core.cNestings >= 1);
522
513
 
523
514
    /*