Changeset 19570 in vbox for trunk

Timestamp:

May 11, 2009 9:00:58 AM (16 years ago)

Author:

vboxsync

Message:

Use RT critical sections, so we get an assertion for deadlocks

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxFrameBuffer.h (modified) (3 diffs)
• src/VBoxFrameBuffer.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxFrameBuffer.h

@@ -25 +25 @@
 
 #include "COMDefs.h"
+#include <iprt/critsect.h>
 
 /* Qt includes */
@@ -222 +223 @@
     }
 
-    void lock() { mMutex->lock(); }
-    void unlock() { mMutex->unlock(); }
+    void lock() { RTCritSectEnter(&mCritSect); }
+    void unlock() { RTCritSectLeave(&mCritSect); }
 
     virtual uchar *address() = 0;
@@ -254 +255 @@
 
     VBoxConsoleView *mView;
-    QMutex *mMutex;
+    RTCRITSECT mCritSect;
     int mWdt;
     int mHgt;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFrameBuffer.cpp

@@ -45 +45 @@
 
 VBoxFrameBuffer::VBoxFrameBuffer (VBoxConsoleView *aView)
-    : mView (aView), mMutex (new QMutex (QMutex::Recursive))
+    : mView (aView)
     , mWdt (0), mHgt (0)
 #if defined (Q_OS_WIN32)
@@ -53 +53 @@
     AssertMsg (mView, ("VBoxConsoleView must not be null\n"));
     mWinId = (mView && mView->viewport()) ? (ULONG64) mView->viewport()->winId() : 0;
+    int rc = RTCritSectInit(&mCritSect);
+    AssertRC(rc);
 }
 
 VBoxFrameBuffer::~VBoxFrameBuffer()
 {
-    delete mMutex;
+    RTCritSectDelete(&mCritSect);
 }