vbox的更動 36548 路徑 trunk/src

時間撮記:

2011-4-5 上午09:27:33 (14 年 以前)

作者:

vboxsync

訊息:

VBoxService/GuestCopy: Fixed copying of small and 0-byte files. Refactored per-process threading code into own module, added thread locking/access.

位置:

trunk/src/VBox/Additions/common/VBoxService

檔案:

• Makefile.kmk (修改) (2 筆差異)
• VBoxServiceControl.cpp (修改) (6 筆差異)
• VBoxServiceControlExec.cpp (修改) (11 筆差異)
• VBoxServiceControlExecThread.cpp (新增)
• VBoxServiceControlExecThread.h (新增)
• VBoxServiceInternal.h (修改) (1 筆差異)

trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk

@@ -5 +5 @@
 
 #
-# Copyright (C) 2007-2010 Oracle Corporation
+# Copyright (C) 2007-2011 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -70 +70 @@
         VBoxServiceControl.cpp \
         VBoxServiceControlExec.cpp \
+        VBoxServiceControlExecThread.cpp \
         VBoxServicePipeBuf.cpp
 endif

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20 +20 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include <iprt/asm.h>
 #include <iprt/assert.h>
 #include <iprt/getopt.h>
@@ -30 +29 @@
 #include "VBoxServiceInternal.h"
 #include "VBoxServiceUtils.h"
+#include "VBoxServiceControlExecThread.h"
 
 using namespace guestControl;
@@ -42 +42 @@
 /** The Guest Control service client ID. */
 static uint32_t             g_GuestControlSvcClientID = 0;
-/** List of spawned processes */
+/** List of spawned processes. */
 RTLISTNODE                  g_GuestControlExecThreads;
-
+/** Critical section protecting g_GuestControlExecThreads. */
+RTCRITSECT                  g_GuestControlExecThreadsCritSect;
 
 /** @copydoc VBOXSERVICE::pfnPreInit */
@@ -86 +87 @@
         /* Init thread list. */
         RTListInit(&g_GuestControlExecThreads);
+        rc = RTCritSectInit(&g_GuestControlExecThreadsCritSect);
+        AssertRC(rc);
     }
     else
@@ -216 +219 @@
     VBoxServiceVerbose(3, "Control: Terminating ...\n");
 
-    /* Signal all threads that we want to shutdown. */
-    PVBOXSERVICECTRLTHREAD pNode;
-    RTListForEach(&g_GuestControlExecThreads, pNode, VBOXSERVICECTRLTHREAD, Node)
-        ASMAtomicXchgBool(&pNode->fShutdown, true);
-
-    /* Wait for threads to shutdown. */
-    RTListForEach(&g_GuestControlExecThreads, pNode, VBOXSERVICECTRLTHREAD, Node)
-    {
-        if (pNode->Thread != NIL_RTTHREAD)
-        {
-            /* Wait a bit ... */
-            int rc2 = RTThreadWait(pNode->Thread, 30 * 1000 /* Wait 30 seconds max. */, NULL);
-            if (RT_FAILURE(rc2))
-                VBoxServiceError("Control: Thread failed to stop; rc2=%Rrc\n", rc2);
-        }
-
-        /* Destroy thread specific data. */
-        switch (pNode->enmType)
-        {
-            case kVBoxServiceCtrlThreadDataExec:
-                VBoxServiceControlExecDestroyThreadData((PVBOXSERVICECTRLTHREADDATAEXEC)pNode->pvData);
-                break;
-
-            default:
-                break;
-        }
-    }
-
-    /* Finally destroy thread list. */
-    pNode = RTListGetFirst(&g_GuestControlExecThreads, VBOXSERVICECTRLTHREAD, Node);
-    while (pNode)
-    {
-        PVBOXSERVICECTRLTHREAD pNext = RTListNodeGetNext(&pNode->Node, VBOXSERVICECTRLTHREAD, Node);
-        bool fLast = RTListNodeIsLast(&g_GuestControlExecThreads, &pNode->Node);
-
-        RTListNodeRemove(&pNode->Node);
-        RTMemFree(pNode);
-
-        if (fLast)
-            break;
-
-        pNode = pNext;
-    }
+    VBoxServiceControlExecThreadsShutdown();
 
     VbglR3GuestCtrlDisconnect(g_GuestControlSvcClientID);

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

@@ -43 +43 @@
 #include "VBoxServiceUtils.h"
 #include "VBoxServicePipeBuf.h"
+#include "VBoxServiceControlExecThread.h"
 
 using namespace guestControl;
 
 extern RTLISTNODE g_GuestControlExecThreads;
+extern RTCRITSECT g_GuestControlExecThreadsCritSect;
 
 
@@ -80 +82 @@
     /* Remove stdin error handle from set. */
     rc = RTPollSetRemove(hPollSet, VBOXSERVICECTRLPIPEID_STDIN_ERROR);
-    AssertRC(rc);
+    /* Don't assert if writable handle is not in poll set anymore. */
+    if (   RT_FAILURE(rc)
+        && rc != VERR_POLL_HANDLE_ID_NOT_FOUND)
+    {
+        AssertRC(rc);
+    }
+    else
+        rc = VINF_SUCCESS;
 
     return rc;
@@ -182 +191 @@
 
 /**
- * Handle a transport event or successful pfnPollIn() call.
- *
- * @returns IPRT status code from client send.
- * @retval  VINF_EOF indicates ABORT command.
- *
- * @param   hPollSet            The polling set.
- * @param   fPollEvt            The event mask returned by RTPollNoResume.
- * @param   idPollHnd           The handle ID.
- * @param   hStdInW             The standard input pipe.
- * @param   pStdInBuf           The standard input buffer.
- */
-static int VBoxServiceControlExecProcHandleTransportEvent(RTPOLLSET hPollSet, uint32_t fPollEvt, uint32_t idPollHnd,
-                                                          PRTPIPE phStdInW, PVBOXSERVICECTRLEXECPIPEBUF pStdInBuf)
-{
-    return 0; //RTPollSetAddPipe(hPollSet, *phStdInW, RTPOLL_EVT_WRITE, 4 /*TXSEXECHNDID_STDIN_WRITABLE*/);
-}
-
-
-/**
  * Handle pending output data or error on standard out, standard error or the
  * test pipe.
@@ -290 +280 @@
 
 /**
- * Execution loop which (usually) runs in a dedicated per-started-process thread and
+ * Execution loop which runs in a dedicated per-started-process thread and
  * handles all pipe input/output and signalling stuff.
  *
@@ -637 +627 @@
 
     return rc;
-}
-
-
-/**
- *  Allocates and gives back a thread data struct which then can be used by the worker thread.
- *  Needs to be freed with VBoxServiceControlExecDestroyThreadData().
- *
- * @return  IPRT status code.
- * @param   pThread                     The thread's handle to allocate the data for.
- * @param   u32ContextID                The context ID bound to this request / command.
- * @param   pszCmd                      Full qualified path of process to start (without arguments).
- * @param   uFlags                      Process execution flags.
- * @param   pszArgs                     String of arguments to pass to the process to start.
- * @param   uNumArgs                    Number of arguments specified in pszArgs.
- * @param   pszEnv                      String of environment variables ("FOO=BAR") to pass to the process
- *                                      to start.
- * @param   cbEnv                       Size (in bytes) of environment variables.
- * @param   uNumEnvVars                 Number of environment variables specified in pszEnv.
- * @param   pszUser                     User name (account) to start the process under.
- * @param   pszPassword                 Password of specified user name (account).
- * @param   uTimeLimitMS                Time limit (in ms) of the process' life time.
- */
-static int VBoxServiceControlExecAllocateThreadData(PVBOXSERVICECTRLTHREAD pThread,
-                                                    uint32_t u32ContextID,
-                                                    const char *pszCmd, uint32_t uFlags,
-                                                    const char *pszArgs, uint32_t uNumArgs,
-                                                    const char *pszEnv, uint32_t cbEnv, uint32_t uNumEnvVars,
-                                                    const char *pszUser, const char *pszPassword, uint32_t uTimeLimitMS)
-{
-    AssertPtr(pThread);
-
-    /* General stuff. */
-    pThread->Node.pPrev = NULL;
-    pThread->Node.pNext = NULL;
-
-    pThread->fShutdown = false;
-    pThread->fStarted = false;
-    pThread->fStopped = false;
-
-    pThread->uContextID = u32ContextID;
-    /* ClientID will be assigned when thread is started! */
-
-    /* Specific stuff. */
-    PVBOXSERVICECTRLTHREADDATAEXEC pData = (PVBOXSERVICECTRLTHREADDATAEXEC)RTMemAlloc(sizeof(VBOXSERVICECTRLTHREADDATAEXEC));
-    if (pData == NULL)
-        return VERR_NO_MEMORY;
-
-    pData->uPID = 0; /* Don't have a PID yet. */
-    pData->pszCmd = RTStrDup(pszCmd);
-    pData->uFlags = uFlags;
-    pData->uNumEnvVars = 0;
-    pData->uNumArgs = 0; /* Initialize in case of RTGetOptArgvFromString() is failing ... */
-
-    /* Prepare argument list. */
-    int rc = RTGetOptArgvFromString(&pData->papszArgs, (int*)&pData->uNumArgs,
-                                    (uNumArgs > 0) ? pszArgs : "", NULL);
-    /* Did we get the same result? */
-    Assert(uNumArgs == pData->uNumArgs);
-
-    if (RT_SUCCESS(rc))
-    {
-        /* Prepare environment list. */
-        if (uNumEnvVars)
-        {
-            pData->papszEnv = (char **)RTMemAlloc(uNumEnvVars * sizeof(char*));
-            AssertPtr(pData->papszEnv);
-            pData->uNumEnvVars = uNumEnvVars;
-
-            const char *pszCur = pszEnv;
-            uint32_t i = 0;
-            uint32_t cbLen = 0;
-            while (cbLen < cbEnv)
-            {
-                /* sanity check */
-                if (i >= uNumEnvVars)
-                {
-                    rc = VERR_INVALID_PARAMETER;
-                    break;
-                }
-                int cbStr = RTStrAPrintf(&pData->papszEnv[i++], "%s", pszCur);
-                if (cbStr < 0)
-                {
-                    rc = VERR_NO_STR_MEMORY;
-                    break;
-                }
-                pszCur += cbStr + 1; /* Skip terminating '\0' */
-                cbLen  += cbStr + 1; /* Skip terminating '\0' */
-            }
-        }
-
-        pData->pszUser = RTStrDup(pszUser);
-        pData->pszPassword = RTStrDup(pszPassword);
-        pData->uTimeLimitMS = uTimeLimitMS;
-
-        /* Adjust time limit value. */
-        pData->uTimeLimitMS = (   uTimeLimitMS == UINT32_MAX
-                               || uTimeLimitMS == 0)
-                            ? RT_INDEFINITE_WAIT : uTimeLimitMS;
-
-        /* Init buffers. */
-        rc = VBoxServicePipeBufInit(&pData->stdOut, false /*fNeedNotificationPipe*/);
-        if (RT_SUCCESS(rc))
-        {
-            rc = VBoxServicePipeBufInit(&pData->stdErr, false /*fNeedNotificationPipe*/);
-            if (RT_SUCCESS(rc))
-                rc = VBoxServicePipeBufInit(&pData->stdIn, true /*fNeedNotificationPipe*/);
-        }
-    }
-
-    if (RT_FAILURE(rc))
-    {
-        VBoxServiceControlExecDestroyThreadData(pData);
-    }
-    else
-    {
-        pThread->enmType = kVBoxServiceCtrlThreadDataExec;
-        pThread->pvData = pData;
-    }
-    return rc;
-}
-
-
-/**
- *  Frees an allocated thread data structure along with all its allocated parameters.
- *
- * @param   pData          Pointer to thread data to free.
- */
-void VBoxServiceControlExecDestroyThreadData(PVBOXSERVICECTRLTHREADDATAEXEC pData)
-{
-    if (pData)
-    {
-        RTStrFree(pData->pszCmd);
-        if (pData->uNumEnvVars)
-        {
-            for (uint32_t i = 0; i < pData->uNumEnvVars; i++)
-                RTStrFree(pData->papszEnv[i]);
-            RTMemFree(pData->papszEnv);
-        }
-        RTGetOptArgvFree(pData->papszArgs);
-        RTStrFree(pData->pszUser);
-        RTStrFree(pData->pszPassword);
-
-        VBoxServicePipeBufDestroy(&pData->stdOut);
-        VBoxServicePipeBufDestroy(&pData->stdErr);
-        VBoxServicePipeBufDestroy(&pData->stdIn);
-
-        RTMemFree(pData);
-        pData = NULL;
-    }
 }
 
@@ -1218 +1059 @@
 
 /**
- * Finds a (formerly) started process given by its PID.
- *
- * @return  PVBOXSERVICECTRLTHREAD      Process structure if found, otherwise NULL.
- * @param   uPID                        PID to search for.
- */
-static PVBOXSERVICECTRLTHREAD VBoxServiceControlExecFindProcess(uint32_t uPID)
-{
-    PVBOXSERVICECTRLTHREAD pNode;
-    bool fFound = false;
-    RTListForEach(&g_GuestControlExecThreads, pNode, VBOXSERVICECTRLTHREAD, Node)
-    {
-        if (   pNode->fStarted
-            && pNode->enmType == kVBoxServiceCtrlThreadDataExec)
-        {
-            PVBOXSERVICECTRLTHREADDATAEXEC pData = (PVBOXSERVICECTRLTHREADDATAEXEC)pNode->pvData;
-            if (pData && pData->uPID == uPID)
-            {
-                return pNode;
-            }
-        }
-    }
-    return NULL;
-}
-
-
-/**
  * Thread main routine for a started process.
  *
@@ -1282 +1097 @@
                                   const char *pszUser, const char *pszPassword, uint32_t uTimeLimitMS)
 {
+    int rc;
+
     PVBOXSERVICECTRLTHREAD pThread = (PVBOXSERVICECTRLTHREAD)RTMemAlloc(sizeof(VBOXSERVICECTRLTHREAD));
-
-    int rc;
     if (pThread)
     {
-        rc = VBoxServiceControlExecAllocateThreadData(pThread,
-                                                      uContextID,
-                                                      pszCmd, uFlags,
-                                                      pszArgs, uNumArgs,
-                                                      pszEnv, cbEnv, uNumEnvVars,
-                                                      pszUser, pszPassword,
-                                                      uTimeLimitMS);
+        rc = VBoxServiceControlExecThreadAlloc(pThread,
+                                               uContextID,
+                                               pszCmd, uFlags,
+                                               pszArgs, uNumArgs,
+                                               pszEnv, cbEnv, uNumEnvVars,
+                                               pszUser, pszPassword,
+                                               uTimeLimitMS);
         if (RT_SUCCESS(rc))
         {
@@ -1323 +1138 @@
 
             if (RT_FAILURE(rc))
-                VBoxServiceControlExecDestroyThreadData((PVBOXSERVICECTRLTHREADDATAEXEC)pThread->pvData);
+                VBoxServiceControlExecThreadDestroy((PVBOXSERVICECTRLTHREADDATAEXEC)pThread->pvData);
         }
         if (RT_FAILURE(rc))
@@ -1419 +1234 @@
     AssertPtrReturn(pabBuffer, VERR_NO_MEMORY);
 
+    uint32_t uStatus = INPUT_STS_UNDEFINED; /* Status sent back to the host. */
+    uint32_t cbWritten = 0; /* Number of bytes written to the guest. */
+
     /*
      * Ask the host for the input data.
@@ -1438 +1256 @@
     {
         /*
-         * Resolve the PID.
+         * Is this the last input block we need to deliver? Then let the pipe know ...
          */
-        VBoxServiceVerbose(4, "ControlExec: Input (PID %u) received: cbSize=%u\n", uPID, cbSize);
-
-        PVBOXSERVICECTRLTHREAD pNode = VBoxServiceControlExecFindProcess(uPID);
-        if (pNode)
-        {
-            PVBOXSERVICECTRLTHREADDATAEXEC pData = (PVBOXSERVICECTRLTHREADDATAEXEC)pNode->pvData;
-            AssertPtr(pData);
-
-            /*
-             * Is this the last input block we need to deliver? Then let the pipe know ...
-             */
-            bool fPendingClose = false;
-            if (uFlags & INPUT_FLAG_EOF)
-            {
-                fPendingClose = true;
-                VBoxServiceVerbose(4, "ControlExec: Got last input block (PID %u) ...\n", uPID);
-            }
-
-            uint32_t cbWritten;
-            if (VBoxServicePipeBufIsEnabled(&pData->stdIn))
-            {
-                /*
-                 * Feed the data to the pipe.
-                 */
-                rc = VBoxServicePipeBufWriteToBuf(&pData->stdIn, pabBuffer,
-                                                  cbSize, fPendingClose, &cbWritten);
-        #ifdef DEBUG
-                VBoxServiceVerbose(4, "ControlExec: Written to StdIn buffer (PID %u): rc=%Rrc, uFlags=0x%x, cbAlloc=%u, cbSize=%u, cbOffset=%u\n",
-                                   uPID, rc, uFlags,
-                                   pData->stdIn.cbAllocated, pData->stdIn.cbSize, pData->stdIn.cbOffset);
-        #endif
-            }
-            else
-            {
-                /* If input buffer is not enabled anymore we cannot handle that data ... */
-                rc = VERR_BAD_PIPE;
-            }
-
-            uint32_t uStatus = INPUT_STS_UNDEFINED;
-            if (RT_SUCCESS(rc))
-            {
-                if (cbWritten || !cbSize) /* Did we write something or was there anything to write at all? */
-                {
-                    uStatus = INPUT_STS_WRITTEN;
-                    uFlags = 0;
-                }
-            }
-            else
-            {
-                if (rc == VERR_BAD_PIPE)
-                    uStatus = INPUT_STS_TERMINATED;
-                else if (rc == VERR_BUFFER_OVERFLOW)
-                    uStatus = INPUT_STS_OVERFLOW;
-                else
-                {
-                    uStatus = INPUT_STS_ERROR;
-                    uFlags = rc;
-                }
-            }
-
-            if (uStatus > INPUT_STS_UNDEFINED)
-            {
-                VBoxServiceVerbose(3, "ControlExec: VbglR3GuestCtrlExecReportStatusIn (PID %u), Status = %u, Flags=%u, cbWritten=%u\n",
-                                   uPID, uStatus, uFlags, cbWritten);
-
-                /* Note: Since the context ID is unique the request *has* to be completed here,
-                 *       regardless whether we got data or not! Otherwise the progress object
-                 *       on the host never will get completed! */
-                rc = VbglR3GuestCtrlExecReportStatusIn(u32ClientId, uContextID, uPID,
-                                                       uStatus, uFlags, (uint32_t)cbWritten);
+        bool fPendingClose = false;
+        if (uFlags & INPUT_FLAG_EOF)
+        {
+            fPendingClose = true;
+            VBoxServiceVerbose(4, "ControlExec: Got last input block (PID %u) of size %u ...\n", uPID, cbSize);
+        }
+
+        rc = VBoxServiceControlExecThreadSetInput(uPID, fPendingClose, pabBuffer,
+                                                  cbSize, &cbWritten);
+        VBoxServiceVerbose(4, "ControlExec: Written input (PID %u): rc=%Rrc, uFlags=0x%x, fPendingClose=%d, cbSize=%u, cbWritten=%u\n",
+                           uPID, rc, uFlags, fPendingClose, cbSize, cbWritten);
+        if (RT_SUCCESS(rc))
+        {
+            if (cbWritten || !cbSize) /* Did we write something or was there anything to write at all? */
+            {
+                uStatus = INPUT_STS_WRITTEN;
+                uFlags = 0;
             }
         }
         else
-            rc = VERR_NOT_FOUND; /* PID not found! */
+        {
+            if (rc == VERR_BAD_PIPE)
+                uStatus = INPUT_STS_TERMINATED;
+            else if (rc == VERR_BUFFER_OVERFLOW)
+                uStatus = INPUT_STS_OVERFLOW;
+        }
     }
     RTMemFree(pabBuffer);
+
+    /*
+     * If there was an error and we did not set the host status
+     * yet, then do it now.
+     */
+    if (   RT_FAILURE(rc)
+        && uStatus == INPUT_STS_UNDEFINED)
+    {
+        uStatus = INPUT_STS_ERROR;
+        uFlags = rc;
+    }
+    Assert(uStatus > INPUT_STS_UNDEFINED);
+
+    VBoxServiceVerbose(3, "ControlExec: Input processed (PID %u), Status=%u, Flags=0x%x, cbWritten=%u\n",
+                       uPID, uStatus, uFlags, cbWritten);
+
+    /* Note: Since the context ID is unique the request *has* to be completed here,
+     *       regardless whether we got data or not! Otherwise the progress object
+     *       on the host never will get completed! */
+    rc = VbglR3GuestCtrlExecReportStatusIn(u32ClientId, uContextID, uPID,
+                                           uStatus, uFlags, (uint32_t)cbWritten);
+
     VBoxServiceVerbose(3, "ControlExec: VBoxServiceControlExecHandleCmdSetInput returned with %Rrc\n", rc);
     return rc;
@@ -1540 +1332 @@
     if (RT_SUCCESS(rc))
     {
-        PVBOXSERVICECTRLTHREAD pNode = VBoxServiceControlExecFindProcess(uPID);
-        if (pNode)
-        {
-            PVBOXSERVICECTRLTHREADDATAEXEC pData = (PVBOXSERVICECTRLTHREADDATAEXEC)pNode->pvData;
-            AssertPtr(pData);
-
-            const uint32_t cbSize = _1M;
-            uint32_t cbRead = cbSize;
-            uint8_t *pBuf = (uint8_t*)RTMemAlloc(cbSize);
-            if (pBuf)
-            {
-                /* If the stdout pipe buffer is enabled (that is, still could be filled by a running
-                 * process) wait for the signal to arrive so that we don't return without any actual
-                 * data read. */
-                if (VBoxServicePipeBufIsEnabled(&pData->stdOut))
-                {
-                    VBoxServiceVerbose(4, "ControlExec: Waiting for output data becoming ready ...\n");
-                    /** @todo Add a timeout here!  */
-                    rc = VBoxServicePipeBufWaitForEvent(&pData->stdOut, RT_INDEFINITE_WAIT);
-                }
-                if (RT_SUCCESS(rc))
-                {
-                    /** @todo Use uHandleID to distinguish between stdout/stderr! */
-                    rc = VBoxServicePipeBufRead(&pData->stdOut, pBuf, cbSize, &cbRead);
-                    if (RT_SUCCESS(rc))
-                    {
-                        /* Note: Since the context ID is unique the request *has* to be completed here,
-                         *       regardless whether we got data or not! Otherwise the progress object
-                         *       on the host never will get completed! */
-                        /* cbRead now contains actual size. */
-                        rc = VbglR3GuestCtrlExecSendOut(u32ClientId, uContextID, uPID, 0 /* Handle ID */, 0 /* Flags */,
-                                                        pBuf, cbRead);
-                    }
-                }
-                RTMemFree(pBuf);
-            }
-            else
-                rc = VERR_NO_MEMORY;
+        uint32_t cbRead;
+        uint8_t *pBuf = (uint8_t*)RTMemAlloc(_64K);
+        if (pBuf)
+        {
+            rc = VBoxServiceControlExecThreadGetOutput(uPID, uHandleID, RT_INDEFINITE_WAIT /* Timeout */,
+                                                       pBuf, _64K /* cbSize */, &cbRead);
+            if (RT_SUCCESS(rc))
+            {
+                /* Note: Since the context ID is unique the request *has* to be completed here,
+                 *       regardless whether we got data or not! Otherwise the progress object
+                 *       on the host never will get completed! */
+                /* cbRead now contains actual size. */
+                rc = VbglR3GuestCtrlExecSendOut(u32ClientId, uContextID, uPID, uHandleID, 0 /* Flags */,
+                                                pBuf, cbRead);
+            }
+            RTMemFree(pBuf);
         }
         else
-            rc = VERR_NOT_FOUND; /* PID not found! */
+            rc = VERR_NO_MEMORY;
     }
     else

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

@@ -307 +307 @@
                                                   const char *pszEnv, uint32_t cbEnv, uint32_t uNumEnvVars,
                                                   const char *pszUser, const char *pszPassword, uint32_t uTimeLimitMS);
-extern void         VBoxServiceControlExecDestroyThreadData(PVBOXSERVICECTRLTHREADDATAEXEC pThread);
+extern void         VBoxServiceControlExecThreadDestroy(PVBOXSERVICECTRLTHREADDATAEXEC pThread);
 #endif /* VBOX_WITH_GUEST_CONTROL */