Changeset 55958 in vbox

Timestamp:

May 20, 2015 12:33:40 AM (10 years ago)

Author:

vboxsync

Message:

VirtualBoxBase.cpp: One more RT_UNLIKELY in lockHandle().

File:

• trunk/src/VBox/Main/src-all/VirtualBoxBase.cpp (modified) (1 diff)

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

@@ -75 +75 @@
 {
     /* lazy initialization */
-    if (RT_UNLIKELY(!mObjectLock))
-    {
-        AssertCompile(sizeof(RWLockHandle *) == sizeof(void *));
-
-        // getLockingClass() is overridden by many subclasses to return
-        // one of the locking classes listed at the top of AutoLock.h
-        RWLockHandle *objLock = new RWLockHandle(getLockingClass());
-        if (!ASMAtomicCmpXchgPtr(&mObjectLock, objLock, NULL))
-        {
-            delete objLock;
-            objLock = ASMAtomicReadPtrT(&mObjectLock, RWLockHandle *);
-        }
-        return objLock;
-    }
-    return mObjectLock;
+    if (RT_LIKELY(mObjectLock))
+        return mObjectLock;
+
+    AssertCompile(sizeof(RWLockHandle *) == sizeof(void *));
+
+    // getLockingClass() is overridden by many subclasses to return
+    // one of the locking classes listed at the top of AutoLock.h
+    RWLockHandle *objLock = new RWLockHandle(getLockingClass());
+    if (!ASMAtomicCmpXchgPtr(&mObjectLock, objLock, NULL))
+    {
+        delete objLock;
+        objLock = ASMAtomicReadPtrT(&mObjectLock, RWLockHandle *);
+    }
+    return objLock;
 }