Changeset 37209 in vbox for trunk/src/VBox

Timestamp:

May 25, 2011 9:33:12 AM (14 years ago)

Author:

vboxsync

Message:

circbuf: Use ASMAtomic*Z instead of ASMAtomic*Size because the latter is causing trouble on recent microsoft compilers.

File:

• trunk/src/VBox/Runtime/common/misc/circbuf.cpp (modified) (6 diffs)

trunk/src/VBox/Runtime/common/misc/circbuf.cpp

@@ -87 +87 @@
     AssertPtrReturn(pBuf, 0);
 
-    size_t cbSize = 0;
-    ASMAtomicReadSize(&pBuf->cbBufUsed, &cbSize);
-    return pBuf->cbBufSize - cbSize;
+    return pBuf->cbBufSize - ASMAtomicReadZ(&pBuf->cbBufUsed);
 }
 
@@ -98 +96 @@
     AssertPtrReturn(pBuf, 0);
 
-    size_t cbSize = 0;
-    ASMAtomicReadSize(&pBuf->cbBufUsed, &cbSize);
-    return cbSize;
+    return ASMAtomicReadZ(&pBuf->cbBufUsed);
 }
 
@@ -121 +117 @@
     AssertPtr(pcbSize);
 
-    size_t uUsed = 0;
-    size_t uSize = 0;
-
     *ppvStart = 0;
     *pcbSize = 0;
 
     /* How much is in use? */
-    ASMAtomicReadSize(&pBuf->cbBufUsed, &uUsed);
-    if (uUsed > 0)
+    size_t cbUsed = ASMAtomicReadZ(&pBuf->cbBufUsed);
+    if (cbUsed > 0)
     {
         /* Get the size out of the requested size, the read block till the end
          * of the buffer & the currently used size. */
-        uSize = RT_MIN(cbReqSize, RT_MIN(pBuf->cbBufSize - pBuf->uReadPos, uUsed));
-        if (uSize > 0)
+        size_t cbSize = RT_MIN(cbReqSize, RT_MIN(pBuf->cbBufSize - pBuf->uReadPos, cbUsed));
+        if (cbSize > 0)
         {
             /* Return the pointer address which point to the current read
              * position. */
             *ppvStart = (char *)pBuf->pvBuf + pBuf->uReadPos;
-            *pcbSize = uSize;
+            *pcbSize = cbSize;
         }
     }
@@ -153 +146 @@
     pBuf->uReadPos = (pBuf->uReadPos + cbSize) % pBuf->cbBufSize;
 
-    size_t cbOld = 0;
-    ASMAtomicSubSize(&pBuf->cbBufUsed, cbSize, &cbOld);
+    ASMAtomicSubZ(&pBuf->cbBufUsed, cbSize);
 }
 
@@ -170 +162 @@
 
     /* How much is free? */
-    size_t cbSize = 0;
-    ASMAtomicReadSize(&pBuf->cbBufUsed, &cbSize);
-    size_t uFree = pBuf->cbBufSize - cbSize;
-    if (uFree > 0)
+    size_t cbFree = pBuf->cbBufSize - ASMAtomicReadZ(&pBuf->cbBufUsed);
+    if (cbFree > 0)
     {
         /* Get the size out of the requested size, the write block till the end
          * of the buffer & the currently free size. */
-        size_t uSize = RT_MIN(cbReqSize, RT_MIN(pBuf->cbBufSize - pBuf->uWritePos, uFree));
-        if (uSize > 0)
+        size_t cbSize = RT_MIN(cbReqSize, RT_MIN(pBuf->cbBufSize - pBuf->uWritePos, cbFree));
+        if (cbSize > 0)
         {
             /* Return the pointer address which point to the current write
              * position. */
             *ppvStart = (char*)pBuf->pvBuf + pBuf->uWritePos;
-            *pcbSize = uSize;
+            *pcbSize = cbSize;
         }
     }
@@ -198 +188 @@
 
     size_t cbOldIgnored = 0;
-    ASMAtomicAddSize(&pBuf->cbBufUsed, cbSize, &cbOldIgnored);
+    ASMAtomicAddZ(&pBuf->cbBufUsed, cbSize);
 }