Changeset 28437 in vbox

Timestamp:

Apr 17, 2010 9:58:07 PM (15 years ago)

Author:

vboxsync

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

60208

Message:

RTList: Fixed RTListNodeIsDummy and added RTListForEachReverse. Added testcases for RTListForEach and RTListForEachReverse.

Location:

trunk

Files:

• include/iprt/list.h (modified) (2 diffs)
• src/VBox/Runtime/testcase/tstRTList.cpp (modified) (5 diffs)

trunk/include/iprt/list.h

@@ -155 +155 @@
  */
 #define RTListNodeIsDummy(pList, pNode, Type, Member) \
-         ( (pNode) != RT_FROM_MEMBER((pList), Type, Member) )
+         ( (pNode) == RT_FROM_MEMBER((pList), Type, Member) )
 
 /**
@@ -232 +232 @@
 
 /**
+ * Enumerate the list in reverse order (tail to head).
+ *
+ * @param   pList               List to enumerate.
+ * @param   pIterator           The iterator variable name.
+ * @param   Type                Structure the list node is a member of.
+ * @param   Member              The list node member name.
+ */
+#define RTListForEachReverse(pList, pIterator, Type, Member) \
+    for (pIterator = RTListNodeGetLast(pList, Type, Member); \
+         !RTListNodeIsDummy(pList, pIterator, Type, Member); \
+         pIterator = RT_FROM_MEMBER((pIterator)->Member.pPrev, Type, Member) )
+
+
+/**
  * Move the given list to a new list header.
  *

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

@@ -54 +54 @@
 
 static void tstRTListOrder(RTTEST hTest, PRTLISTNODE pList, unsigned cElements,
-                           unsigned idxStart, unsigned idxEnd, unsigned idxStep)
+                           unsigned idxFirst, unsigned idxLast, unsigned idxStep)
 {
     RTTEST_CHECK(hTest, RTListIsEmpty(pList) == false);
@@ -66 +66 @@
     /* Check that the order is right. */
     PLISTELEM pNode = RTListNodeGetFirst(pList, LISTELEM, Node);
-    for (unsigned i = idxStart; i < idxEnd; i += idxStep)
+    for (unsigned i = idxFirst; i < idxLast; i += idxStep)
     {
         RTTEST_CHECK(hTest, pNode->idx == i);
@@ -72 +72 @@
     }
 
-    RTTEST_CHECK(hTest, pNode->idx == idxEnd);
+    RTTEST_CHECK(hTest, pNode->idx == idxLast);
     RTTEST_CHECK(hTest, RTListNodeGetLast(pList, LISTELEM, Node) == pNode);
     RTTEST_CHECK(hTest, RTListNodeIsLast(pList, &pNode->Node) == true);
@@ -78 +78 @@
     /* Check reverse order */
     pNode = RTListNodeGetLast(pList, LISTELEM, Node);
-    for (unsigned i = idxEnd; i > idxStart; i -= idxStep)
+    for (unsigned i = idxLast; i > idxFirst; i -= idxStep)
     {
         RTTEST_CHECK(hTest, pNode->idx == i);
@@ -84 +84 @@
     }
 
-    RTTEST_CHECK(hTest, pNode->idx == idxStart);
+    RTTEST_CHECK(hTest, pNode->idx == idxFirst);
     RTTEST_CHECK(hTest, RTListNodeGetFirst(pList, LISTELEM, Node) == pNode);
     RTTEST_CHECK(hTest, RTListNodeIsFirst(pList, &pNode->Node) == true);
+
+    /* The list enumeration. */
+    unsigned idx = idxFirst;
+    RTListForEach(pList, pNode, LISTELEM, Node)
+    {
+        RTTEST_CHECK_RETV(hTest, idx == pNode->idx);
+        idx += idxStep;
+    }
+    RTTEST_CHECK_MSG_RETV(hTest, idx == idxLast + idxStep || (idx == idxFirst && idxFirst == idxLast),
+                          (hTest, "idx=%u idxFirst=%u idxLast=%u idxStep=%u\n", idx, idxFirst, idxLast, idxStep));
+
+    idx = idxLast;
+    RTListForEachReverse(pList, pNode, LISTELEM, Node)
+    {
+        RTTEST_CHECK_RETV(hTest, idx == pNode->idx);
+        idx -= idxStep;
+    }
+    RTTEST_CHECK_MSG_RETV(hTest, idx == idxFirst - idxStep || (idx == idxLast && idxFirst == idxLast),
+                          (hTest, "idx=%u idxFirst=%u idxLast idxStep=%u\n", idx, idxFirst, idxLast, idxStep));
 }