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

Timestamp:

Apr 16, 2010 1:32:14 PM (15 years ago)

Author:

vboxsync

Message:

Guest Control/VBoxService: Use RTList instead of STL.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceControl.cpp (modified) (3 diffs)
• VBoxServiceControlExec.cpp (modified) (3 diffs)
• VBoxServiceInternal.h (modified) (3 diffs)

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

@@ -48 +48 @@
 static uint32_t             g_GuestControlSvcClientID = 0;
 /** List of spawned processes */
-GuestCtrlExecThreads        g_GuestControlExecThreads;
+RTLISTNODE                  g_GuestControlExecThreads;
 
 
@@ -94 +94 @@
     }
 
+    /* Init thread list. */
+    RTListInit(&g_GuestControlExecThreads);
     return rc;
 }
@@ -239 +241 @@
 {
     /* Shutdown spawned processes threads. */
-    for (GuestCtrlExecListIter it = g_GuestControlExecThreads.begin();
-         it != g_GuestControlExecThreads.end(); it++)
-    {
-        ASMAtomicXchgBool(&(*it)->fShutdown, true);
-    }
-    
-    for (GuestCtrlExecListIter it = g_GuestControlExecThreads.begin();
-         it != g_GuestControlExecThreads.end(); it++)
-    {
-        if ((*it)->Thread != NIL_RTTHREAD)
-        {
-            int rc2 = RTThreadWait((*it)->Thread, 30 * 1000 /* Wait 30 second */, NULL);
+    PVBOXSERVICECTRLTHREAD pNode = RTListNodeGetFirst(&g_GuestControlExecThreads, VBOXSERVICECTRLTHREAD, Node);
+    while (pNode)
+    {
+        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)
+    {
+        if (pNode->Thread != NIL_RTTHREAD)
+        {
+            int rc2 = RTThreadWait(pNode->Thread, 30 * 1000 /* Wait 30 seconds max. */, NULL);
             if (RT_FAILURE(rc2))
-                VBoxServiceError("Control: Thread (PID: %u) failed to stop; rc2=%Rrc\n", (*it)->uPID, rc2);
-        }
-        VBoxServiceControlExecDestroyThreadData((*it));
-    }
-
-    for (GuestCtrlExecListIter it = g_GuestControlExecThreads.begin();
-         it != g_GuestControlExecThreads.end(); it++)
-            RTMemFree((*it));
-
-    g_GuestControlExecThreads.clear();
+                VBoxServiceError("Control: Thread (PID: %u) failed to stop; rc2=%Rrc\n", pNode->uPID, rc2);
+        }
+        VBoxServiceControlExecDestroyThreadData(pNode);
+        if (RTListNodeIsLast(&g_GuestControlExecThreads, &pNode->Node))
+            break;
+        pNode = RTListNodeGetNext(&pNode->Node, VBOXSERVICECTRLTHREAD, Node);
+    }
+
+    pNode = RTListNodeGetFirst(&g_GuestControlExecThreads, VBOXSERVICECTRLTHREAD, Node);
+    while (pNode)
+    {
+        RTListNodeRemove(&pNode->Node);
+        RTMemFree(pNode);
+        if (RTListNodeIsLast(&g_GuestControlExecThreads, &pNode->Node))
+              break;
+        
+        PVBOXSERVICECTRLTHREAD pNext = RTListNodeGetNext(&pNode->Node, VBOXSERVICECTRLTHREAD, Node);        
+        pNode = pNext;
+    }
+
     VbglR3GuestCtrlDisconnect(g_GuestControlSvcClientID);
     g_GuestControlSvcClientID = 0;

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

@@ -50 +50 @@
 using namespace guestControl;
 
-extern GuestCtrlExecThreads g_GuestControlExecThreads;
+extern RTLISTNODE g_GuestControlExecThreads;
 
 /**
@@ -537 +537 @@
 {
     AssertPtr(pThread);
+
+    pThread->Node.pPrev = NULL;
+    pThread->Node.pNext = NULL;
 
     pThread->fShutdown = false;
@@ -802 +805 @@
                 else
                 {
-                    g_GuestControlExecThreads.push_back(pThread);
+                    /*rc =*/ RTListAppend(&g_GuestControlExecThreads, &pThread->Node);
                 }
             }

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h

@@ -28 +28 @@
 # include <process.h> /* Needed for file version information. */
 #endif
+
 #ifdef VBOX_WITH_GUEST_CONTROL
-# include <list>
+# include <iprt/list.h>
 #endif
 
@@ -132 +133 @@
 typedef struct
 {
+    /** Node. */
+    RTLISTNODE                 Node;
     /** The worker thread. */
     RTTHREAD                   Thread;
@@ -228 +231 @@
 
 #ifdef VBOX_WITH_GUEST_CONTROL
-using namespace std;
-
-typedef std::list< PVBOXSERVICECTRLTHREAD > GuestCtrlExecThreads;
-typedef std::list< PVBOXSERVICECTRLTHREAD >::iterator GuestCtrlExecListIter;
-typedef std::list< PVBOXSERVICECTRLTHREAD >::const_iterator GuestCtrlExecListIterConst;
-
 extern int VBoxServiceControlExecProcess(uint32_t uContext, const char *pszCmd, uint32_t uFlags, 
                                          const char *pszArgs, uint32_t uNumArgs,