Changeset 37210 in vbox for trunk/src/VBox

Timestamp:

May 25, 2011 9:55:16 AM (14 years ago)

Author:

vboxsync

Message:

circbuf: make the structure abstract.

Location:

trunk/src/VBox/Runtime

Files:

• common/misc/circbuf.cpp (modified) (1 diff)
• testcase/tstRTCircBuf.cpp (modified) (5 diffs)

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

@@ -36 +36 @@
 
 
+/*******************************************************************************
+*   Structures and Typedefs                                                    *
+*******************************************************************************/
+/** @todo r=bird: this is missing docs and magic. uXPos should be offX.
+ *        cbBufSize should be cbBuf. */
+typedef struct RTCIRCBUF
+{
+    /** The current read position in the buffer. */
+    size_t          uReadPos;
+    /** The current write position in the buffer. */
+    size_t          uWritePos;
+    /** How much space of the buffer is currently in use. */
+    volatile size_t cbBufUsed;
+    /** How big is the buffer. */
+    size_t          cbBufSize;
+    /** The buffer itself. */
+    void           *pvBuf;
+} RTCIRCBUF;
+
+
+
 RTDECL(int) RTCircBufCreate(PRTCIRCBUF *ppBuf, size_t cbSize)
 {

trunk/src/VBox/Runtime/testcase/tstRTCircBuf.cpp

@@ -30 +30 @@
 #include <iprt/circbuf.h>
 
+#include <iprt/err.h>
 #include <iprt/string.h>
-#include <iprt/err.h>
 #include <iprt/test.h>
 
@@ -40 +40 @@
 static void tst1(void)
 {
-    void *pvBuf = NULL;
-    size_t cbSize = 0;
+    void *pvBuf;
+    size_t cbSize;
 
     char pcTestPattern1[] = { 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9 };
@@ -62 +62 @@
     RTTESTI_CHECK(RTCircBufFree(pBuf) == 0);
     RTTESTI_CHECK(RTCircBufUsed(pBuf) == 10);
-    RTTESTI_CHECK(memcmp(pBuf->pvBuf, pcTestPattern1, 10) == 0); /* Check the internal state */
+//    RTTESTI_CHECK(memcmp(pBuf->pvBuf, pcTestPattern1, 10) == 0); /* Check the internal state */
 
     /* Half read */
@@ -81 +81 @@
     RTTESTI_CHECK(RTCircBufFree(pBuf) == 3);
     RTTESTI_CHECK(RTCircBufUsed(pBuf) == 7);
-    RTTESTI_CHECK(memcmp(pBuf->pvBuf, pcTestPattern2, 10) == 0); /* Check the internal state */
+//    RTTESTI_CHECK(memcmp(pBuf->pvBuf, pcTestPattern2, 10) == 0); /* Check the internal state */
 
     /* Split tests */
@@ -113 +113 @@
     RTTESTI_CHECK(RTCircBufFree(pBuf) == 0);
     RTTESTI_CHECK(RTCircBufUsed(pBuf) == 10);
-    RTTESTI_CHECK(memcmp(pBuf->pvBuf, pcTestPattern3, 10) == 0); /* Check the internal state */
+//    RTTESTI_CHECK(memcmp(pBuf->pvBuf, pcTestPattern3, 10) == 0); /* Check the internal state */
 
     /* Destroy */