Changeset 25813 in vbox

Timestamp:

Jan 13, 2010 5:24:35 PM (15 years ago)

Author:

vboxsync

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

56586

Message:

Main: move AutoLock classes to glue

Location:

trunk

Files:

• include/VBox/com/AutoLock.h (moved) (moved from trunk/src/VBox/Main/include/AutoLock.h )
• src/VBox/Main/Makefile.kmk (modified) (3 diffs)
• src/VBox/Main/glue/AutoLock.cpp (moved) (moved from trunk/src/VBox/Main/AutoLock.cpp ) (6 diffs)
• src/VBox/Main/glue/initterm.cpp (modified) (2 diffs)
• src/VBox/Main/include/VirtualBoxBase.h (modified) (2 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -283 +283 @@
         Global.cpp \
         Logging.cpp \
-        AutoLock.cpp \
         Matching.cpp \
         xml/Settings.cpp \
@@ -610 +609 @@
         Global.cpp \
         Logging.cpp \
-        AutoLock.cpp \
         VBoxDll.cpp \
         USBDeviceImpl.cpp \
@@ -687 +685 @@
         glue/initterm.cpp \
         glue/string.cpp \
+        glue/AutoLock.cpp \
         glue/EventQueue.cpp \
         glue/ErrorInfo.cpp \

trunk/src/VBox/Main/glue/AutoLock.cpp

@@ -20 +20 @@
  */
 
-#include "AutoLock.h"
-
-#include "Logging.h"
-
 #include <iprt/cdefs.h>
 #include <iprt/critsect.h>
@@ -40 +36 @@
 #include <iprt/stream.h>
 
+#include "VBox/com/AutoLock.h"
 #include <VBox/com/string.h>
 
@@ -535 +532 @@
             AssertMsg(m->acUnlockedInLeave[i] >= 1, ("m->cUnlockedInLeave[%d] is %d, must be >=1!", i, m->acUnlockedInLeave[i]));
 
-#ifdef RT_LOCK_STRICT
-            LogFlowFunc(("LOCKVAL: will unlock handle %d [%s] %d times\n", i, pHandle->describe(), m->acUnlockedInLeave[i]));
-#endif
-
             for (uint32_t left = m->acUnlockedInLeave[i];
                  left;
@@ -566 +559 @@
         {
             AssertMsg(m->acUnlockedInLeave[i] != 0, ("m->cUnlockedInLeave[%d] is 0! enter() without leave()?", i));
-
-#ifdef RT_LOCK_STRICT
-            LogFlowFunc(("LOCKVAL: will lock handle %d [%s] %d times\n", i, pHandle->describe(), m->acUnlockedInLeave[i]));
-#endif
 
             for (; m->acUnlockedInLeave[i]; --m->acUnlockedInLeave[i])
@@ -600 +589 @@
                 AssertMsg(m->acUnlockedInLeave[i] >= 1, ("m->cUnlockedInLeave[%d] is %d, must be >=1!", i, m->acUnlockedInLeave[i]));
 
-#ifdef RT_LOCK_STRICT
-                LogFlowFunc(("LOCKVAL: will unlock handle %d [%s] %d times\n", i, pHandle->describe(), m->acUnlockedInLeave[i]));
-#endif
-
                 for (uint32_t left = m->acUnlockedInLeave[i];
                      left;
@@ -631 +616 @@
             if (!pHandle->isWriteLockOnCurrentThread())
             {
-#ifdef RT_LOCK_STRICT
-                LogFlowFunc(("LOCKVAL: will lock handle %d [%s] %d times\n", i, pHandle->describe(), m->acUnlockedInLeave[i]));
-#endif
-
                 for (; m->acUnlockedInLeave[i]; --m->acUnlockedInLeave[i])
                     callLockImpl(*pHandle);

trunk/src/VBox/Main/glue/initterm.cpp

@@ -54 +54 @@
 #include "VBox/com/assert.h"
 #include "VBox/com/EventQueue.h"
+#include "VBox/com/AutoLock.h"
 
 #include "../include/Logging.h"
@@ -539 +540 @@
 #endif /* !defined (VBOX_WITH_XPCOM) */
 
+    // for both COM and XPCOM, we only get here if this is the main thread;
+    // only then initialize the autolock system (AutoLock.cpp)
+    Assert(RTThreadIsMain(RTThreadSelf()));
+    util::InitAutoLockSystem();
+
     AssertComRC (rc);
 

trunk/src/VBox/Main/include/VirtualBoxBase.h

@@ -30 +30 @@
 
 #include "VBox/com/ErrorInfo.h"
-#include <VBox/com/SupportErrorInfo.h>
+#include "VBox/com/SupportErrorInfo.h"
+#include "VBox/com/AutoLock.h"
 
 #include "VBox/com/VirtualBox.h"
@@ -40 +41 @@
 class File;
 }
-
-#include "AutoLock.h"
 
 using namespace com;