Changeset 55948 in vbox for trunk

Timestamp:

May 19, 2015 11:44:11 PM (10 years ago)

Author:

vboxsync

Message:

iprt/cpuset.h: Eliminated RT_UNLIKELY use.

File:

• trunk/include/iprt/cpuset.h (modified) (6 diffs)

trunk/include/iprt/cpuset.h

@@ -111 +111 @@
 {
     int iCpu = RTMpCpuIdToSetIndex(idCpu);
-    if (RT_UNLIKELY(iCpu < 0))
-        return -1;
-    ASMAtomicBitSet(pSet, iCpu);
-    return 0;
+    if (RT_LIKELY(iCpu >= 0))
+    {
+        ASMAtomicBitSet(pSet, iCpu);
+        return 0;
+    }
+    return -1;
 }
 
@@ -128 +130 @@
 DECLINLINE(int) RTCpuSetAddByIndex(PRTCPUSET pSet, int iCpu)
 {
-    if (RT_UNLIKELY((unsigned)iCpu >= RTCPUSET_MAX_CPUS))
-        return -1;
-    ASMAtomicBitSet(pSet, iCpu);
-    return 0;
+    if (RT_LIKELY((unsigned)iCpu < RTCPUSET_MAX_CPUS))
+    {
+        ASMAtomicBitSet(pSet, iCpu);
+        return 0;
+    }
+    return -1;
 }
 
@@ -146 +150 @@
 {
     int iCpu = RTMpCpuIdToSetIndex(idCpu);
-    if (RT_UNLIKELY(iCpu < 0))
-        return -1;
-    ASMAtomicBitClear(pSet, iCpu);
-    return 0;
+    if (RT_LIKELY(iCpu >= 0))
+    {
+        ASMAtomicBitClear(pSet, iCpu);
+        return 0;
+    }
+    return -1;
 }
 
@@ -163 +169 @@
 DECLINLINE(int) RTCpuSetDelByIndex(PRTCPUSET pSet, int iCpu)
 {
-    if (RT_UNLIKELY((unsigned)iCpu >= RTCPUSET_MAX_CPUS))
-        return -1;
-    ASMAtomicBitClear(pSet, iCpu);
-    return 0;
+    if (RT_LIKELY((unsigned)iCpu < RTCPUSET_MAX_CPUS))
+    {
+        ASMAtomicBitClear(pSet, iCpu);
+        return 0;
+    }
+    return -1;
 }
 
@@ -181 +189 @@
 {
     int iCpu = RTMpCpuIdToSetIndex(idCpu);
-    if (RT_UNLIKELY(iCpu < 0))
-        return false;
-    return ASMBitTest((volatile void *)pSet, iCpu);
+    if (RT_LIKELY(iCpu >= 0))
+        return ASMBitTest((volatile void *)pSet, iCpu);
+    return false;
 }
 
@@ -197 +205 @@
 DECLINLINE(bool) RTCpuSetIsMemberByIndex(PCRTCPUSET pSet, int iCpu)
 {
-    if (RT_UNLIKELY((unsigned)iCpu >= RTCPUSET_MAX_CPUS))
-        return false;
-    return ASMBitTest((volatile void *)pSet, iCpu);
+    if (RT_LIKELY((unsigned)iCpu < RTCPUSET_MAX_CPUS))
+        return ASMBitTest((volatile void *)pSet, iCpu);
+    return false;
 }