Changeset 32445 in vbox

Timestamp:

Sep 13, 2010 12:22:30 PM (15 years ago)

Author:

vboxsync

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

65813

Message:

iprt/list.h: Added RTListForEachSafe and RTListForEachReverseSafe.

Location:

trunk

Files:

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

trunk/include/iprt/list.h

@@ -228 +228 @@
 
 /**
+ * Enumerate the list in head to tail order, safe against removal of the
+ * current node.
+ *
+ * @param   pList               List to enumerate.
+ * @param   pIterator           The iterator variable name.
+ * @param   pIterNext           The name of the variable saving the pointer to
+ *                              the next element.
+ * @param   Type                Structure the list node is a member of.
+ * @param   Member              The list node member name.
+ */
+#define RTListForEachSafe(pList, pIterator, pIterNext, Type, Member) \
+    for (pIterator = RTListNodeGetNext(pList, Type, Member), \
+         pIterNext = RT_FROM_MEMBER((pIterator)->Member.pNext, Type, Member); \
+         !RTListNodeIsDummy(pList, pIterator, Type, Member); \
+         pIterator = pIterNext, \
+         pIterNext = RT_FROM_MEMBER((pIterator)->Member.pNext, Type, Member) )
+
+
+/**
  * Enumerate the list in reverse order (tail to head).
  *
@@ -242 +261 @@
 
 /**
+ * Enumerate the list in reverse order (tail to head).
+ *
+ * @param   pList               List to enumerate.
+ * @param   pIterator           The iterator variable name.
+ * @param   pIterPrev           The name of the variable saving the pointer to
+ *                              the previous element.
+ * @param   Type                Structure the list node is a member of.
+ * @param   Member              The list node member name.
+ */
+#define RTListForEachReverseSafe(pList, pIterator, pIterPrev, Type, Member) \
+    for (pIterator = RTListNodeGetPrev(pList, Type, Member), \
+         pIterPrev = RT_FROM_MEMBER((pIterator)->Member.pPrev, Type, Member); \
+         !RTListNodeIsDummy(pList, pIterator, Type, Member); \
+         pIterator = pIterPrev, \
+         pIterPrev = RT_FROM_MEMBER((pIterator)->Member.pPrev, Type, Member) )
+
+
+/**
  * Move the given list to a new list header.
  *

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

@@ -106 +106 @@
 static void tstRTListCreate(RTTEST hTest, unsigned cElements)
 {
-    RTTestISubF("RTList - Test with %u elements", cElements);
+    RTTestISubF("Creating and moving - %u elements", cElements);
 
     RTLISTNODE ListHead;
@@ -140 +140 @@
     tstRTListOrder(hTest, &ListHeadNew, cElements, 0, cElements-1, 1);
 
-    /* Remove elements now  */
+    /*
+     * Safe iteration w/ removal.
+     */
+    RTTestISubF("Safe iteration w/ removal - %u elements", cElements);
+
+    /* Move it element by element. */
+    PLISTELEM pNode, pSafe;
+    RTListForEachSafe(&ListHeadNew, pNode, pSafe, LISTELEM, Node)
+    {
+        RTListNodeRemove(&pNode->Node);
+        RTListAppend(&ListHead, &pNode->Node);
+    }
+    tstRTListOrder(hTest, &ListHead, cElements, 0, cElements-1, 1);
+
+    /* And the other way. */
+    RTListForEachReverseSafe(&ListHead, pNode, pSafe, LISTELEM, Node)
+    {
+        RTListNodeRemove(&pNode->Node);
+        RTListPrepend(&ListHeadNew, &pNode->Node);
+    }
+    tstRTListOrder(hTest, &ListHeadNew, cElements, 0, cElements-1, 1);
+
+    /*
+     * Remove elements now.
+     */
     if (cElements > 1)
     {
         /* Remove every second */
-        RTTestISub("Remove every second node");
-
-        PLISTELEM pNode = RTListNodeGetFirst(&ListHeadNew, LISTELEM, Node);
+        RTTestISubF("Remove every second node - %u elements", cElements);
+
+        pNode = RTListNodeGetFirst(&ListHeadNew, LISTELEM, Node);
         for (unsigned i = 0; i < cElements; i++)
         {
@@ -168 +192 @@
 
     /* Remove the rest now. */
-    RTTestISub("Remove all nodes");
-    PLISTELEM pNode = RTListNodeGetFirst(&ListHeadNew, LISTELEM, Node);
+    RTTestISubF("Remove all nodes - %u elements", cElements);
+    pNode = RTListNodeGetFirst(&ListHeadNew, LISTELEM, Node);
     for (unsigned i = 0; i < cElements; i++)
     {