Changeset 93158 in vbox

Timestamp:

Jan 10, 2022 12:01:55 AM (3 years ago)

Author:

vboxsync

Message:

ValKit/TestExecService: Don't break immediately on timeout, try kill the child process first. duh.

File:

• trunk/src/VBox/ValidationKit/utils/TestExecServ/TestExecService.cpp (modified) (4 diffs)

trunk/src/VBox/ValidationKit/utils/TestExecServ/TestExecService.cpp

@@ -2179 +2179 @@
     uint64_t            MsProcessKilled     = UINT64_MAX;
     RTMSINTERVAL const  cMsPollBase         = g_pTransport->pfnPollSetAdd || pTxsExec->hStdInW == NIL_RTPIPE
-                                            ? 5000 : 100;
+                                            ? RT_MS_5SEC : 100;
     RTMSINTERVAL        cMsPollCur          = 0;
 
@@ -2277 +2277 @@
                 fProcessTimedOut = true;
                 if (    MsProcessKilled == UINT64_MAX
-                    ||  u64Now - MsProcessKilled > 1000)
+                    ||  u64Now - MsProcessKilled > RT_MS_1SEC)
                 {
-                    if (u64Now - MsProcessKilled > 20*60*1000)
+                    if (   MsProcessKilled != UINT64_MAX
+                        && u64Now - MsProcessKilled > 20*RT_MS_1MIN)
                         break; /* give up after 20 mins */
                     RTCritSectEnter(&pTxsExec->CritSect);
@@ -2288 +2289 @@
                     continue;
                 }
-                cMilliesLeft = 10000;
+                cMilliesLeft = RT_MS_10SEC;
             }
             else
@@ -2305 +2306 @@
     for (size_t i = 0; i < 22; i++)
     {
-        rc2 = RTThreadWait(pTxsExec->hThreadWaiter, 500, NULL);
+        rc2 = RTThreadWait(pTxsExec->hThreadWaiter, RT_MS_1SEC / 2, NULL);
         if (RT_SUCCESS(rc))
         {