Changeset 40257 in vbox for trunk/src/VBox/Main/src-all

Timestamp:

Feb 27, 2012 9:25:12 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

76471

Message:

Main/Medium: rework locking scheme to solve lock order violations and long GUI start up time caused by too much locking
Main/all: Remove the enter and leave methods from write locks, they cause hard to find locking problems. Better solve them explicitly.

Location:

trunk/src/VBox/Main/src-all

Files:

• ProgressImpl.cpp (modified) (5 diffs)
• VirtualBoxBase.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-all/ProgressImpl.cpp

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -820 +820 @@
         {
             mWaitersCount++;
-            alock.leave();
+            alock.release();
             vrc = RTSemEventMultiWait(mCompletedSem,
                                       fForever ? RT_INDEFINITE_WAIT : (RTMSINTERVAL)timeLeft);
-            alock.enter();
+            alock.acquire();
             mWaitersCount--;
 
@@ -884 +884 @@
         {
             mWaitersCount ++;
-            alock.leave();
+            alock.release();
             vrc = RTSemEventMultiWait(mCompletedSem,
                                       fForever ? RT_INDEFINITE_WAIT : (unsigned) timeLeft);
-            alock.enter();
+            alock.acquire();
             mWaitersCount--;
 
@@ -1664 +1664 @@
         while (!mCompleted && (forever || timeLeft > 0))
         {
-            alock.leave();
+            alock.release();
             rc = mProgresses.back()->WaitForCompletion(forever ? -1 : (LONG) timeLeft);
-            alock.enter();
+            alock.acquire();
 
             if (SUCCEEDED(rc))
@@ -1748 +1748 @@
                (forever || timeLeft > 0))
         {
-            alock.leave();
+            alock.release();
             /* wait for the appropriate progress operation completion */
             rc = mProgresses[progress]-> WaitForOperationCompletion(operation,
                                                                     forever ? -1 : (LONG) timeLeft);
-            alock.enter();
+            alock.acquire();
 
             if (SUCCEEDED(rc))

trunk/src/VBox/Main/src-all/VirtualBoxBase.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -209 +209 @@
             LogFlowThisFunc(("Waiting for AutoInitSpan/AutoReinitSpan to finish...\n"));
 
-            stateLock.leave();
+            stateLock.release();
             RTSemEventMultiWait (mInitUninitSem, RT_INDEFINITE_WAIT);
-            stateLock.enter();
+            stateLock.acquire();
 
             if (-- mInitUninitWaiters == 0)
@@ -776 +776 @@
     {
         mObj->setState(VirtualBoxBase::InitFailed);
-        /* leave the lock to prevent nesting when uninit() is called */
-        stateLock.leave();
+        /* release the lock to prevent nesting when uninit() is called */
+        stateLock.acquire();
         /* call uninit() to let the object uninit itself after failed init() */
         mObj->uninit();
@@ -906 +906 @@
                          mObj));
 
-            stateLock.leave();
+            stateLock.release();
             RTSemEventMultiWait(mObj->mInitUninitSem, RT_INDEFINITE_WAIT);
-            stateLock.enter();
+            stateLock.acquire();
 
             if (--mObj->mInitUninitWaiters == 0)
@@ -935 +935 @@
                      mObj, mObj->mCallers));
 
-        stateLock.leave();
+        stateLock.release();
         RTSemEventWait(mObj->mZeroCallersSem, RT_INDEFINITE_WAIT);
     }