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

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.

File:

• trunk/src/VBox/Main/src-all/ProgressImpl.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))