Changeset 28446 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Apr 19, 2010 8:45:03 AM (15 years ago)

Author:

vboxsync

Message:

Guest Control/VBoxService: Use RTListForEach; small bugfixes.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp

@@ -240 +240 @@
 static DECLCALLBACK(void) VBoxServiceControlTerm(void)
 {
-    /* Shutdown spawned processes threads. */
-    PVBOXSERVICECTRLTHREAD pNode = RTListNodeGetFirst(&g_GuestControlExecThreads, VBOXSERVICECTRLTHREAD, Node);
-    while (pNode)
-    {
+    /* Signal all threads that we want to shutdown. */
+    PVBOXSERVICECTRLTHREAD pNode;
+    RTListForEach(&g_GuestControlExecThreads, pNode, VBOXSERVICECTRLTHREAD, Node)
         ASMAtomicXchgBool(&pNode->fShutdown, true);
-        if (RTListNodeIsLast(&g_GuestControlExecThreads, &pNode->Node))
-            break;
-        pNode = RTListNodeGetNext(&pNode->Node, VBOXSERVICECTRLTHREAD, Node);
-    }
-
-    pNode = RTListNodeGetFirst(&g_GuestControlExecThreads, VBOXSERVICECTRLTHREAD, Node);
-    while (pNode)
+
+    /* Wait for threads to shutdown. */
+    RTListForEach(&g_GuestControlExecThreads, pNode, VBOXSERVICECTRLTHREAD, Node)
     {
         if (pNode->Thread != NIL_RTTHREAD)
@@ -260 +255 @@
         }
         VBoxServiceControlExecDestroyThreadData(pNode);
-        if (RTListNodeIsLast(&g_GuestControlExecThreads, &pNode->Node))
-            break;
-        pNode = RTListNodeGetNext(&pNode->Node, VBOXSERVICECTRLTHREAD, Node);
-    }
-
+    }
+
+    /* Finally destroy thread list. */
     pNode = RTListNodeGetFirst(&g_GuestControlExecThreads, VBOXSERVICECTRLTHREAD, Node);
     while (pNode)
     {
+        PVBOXSERVICECTRLTHREAD pNext = RTListNodeGetNext(&pNode->Node, VBOXSERVICECTRLTHREAD, Node);
+
         RTListNodeRemove(&pNode->Node);
         RTMemFree(pNode);
-        if (RTListNodeIsLast(&g_GuestControlExecThreads, &pNode->Node))
+
+        if (pNext && RTListNodeIsLast(&g_GuestControlExecThreads, &pNext->Node))
               break;
 
-        PVBOXSERVICECTRLTHREAD pNext = RTListNodeGetNext(&pNode->Node, VBOXSERVICECTRLTHREAD, Node);
         pNode = pNext;
     }