Changeset 70488 in vbox for trunk/src/VBox/ValidationKit/utils/TestExecServ

Timestamp:

Jan 8, 2018 8:40:45 PM (7 years ago)

Author:

vboxsync

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

120102

Message:

ValidationKit/TestExecService: Added verbose output option. Made the txsDoUnpackFile command available on windows too.

Location:

trunk/src/VBox/ValidationKit/utils/TestExecServ

Files:

• TestExecService.cpp (modified) (15 diffs)
• TestExecServiceInternal.h (modified) (1 diff)

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

@@ -58 +58 @@
 #include <iprt/time.h>
 #include <iprt/uuid.h>
-
-#ifndef RT_OS_WINDOWS
-# include <iprt/zip.h>
-#endif
+#include <iprt/zip.h>
 
 #include "TestExecServiceInternal.h"
@@ -198 +195 @@
  * @todo implement signals and stuff.  */
 static bool volatile        g_fTerminate = false;
+/** Verbosity level. */
+uint32_t                    g_cVerbose = 1;
+
 
 /**
@@ -742 +742 @@
 }
 
-#ifndef RT_OS_WINDOWS
 /**
  * Unpacks a tar file.
@@ -797 +796 @@
     return rc;
 }
-#endif
 
 /**
@@ -2763 +2761 @@
 static RTEXITCODE txsMainLoop(void)
 {
+    if (g_cVerbose > 0)
+        RTMsgInfo("txsMainLoop: start...\n");
     RTEXITCODE enmExitCode = RTEXITCODE_SUCCESS;
     while (!g_fTerminate)
@@ -2773 +2773 @@
         if (RT_FAILURE(rc))
             continue;
+        if (g_cVerbose > 0)
+            RTMsgInfo("txsMainLoop: CMD: %.8s...", pPktHdr->achOpcode);
 
         /*
@@ -2834 +2836 @@
         else if (txsIsSameOpcode(pPktHdr, "GET FILE"))
             rc = txsDoGetFile(pPktHdr);
-#ifndef RT_OS_WINDOWS
         else if (txsIsSameOpcode(pPktHdr, "UNPKFILE"))
             rc = txsDoUnpackFile(pPktHdr);
-#endif
         /* Misc: */
         else
             rc = txsReplyUnknown(pPktHdr);
 
+        if (g_cVerbose > 0)
+            RTMsgInfo("txsMainLoop: CMD: %.8s -> %Rrc", pPktHdr->achOpcode, rc);
         RTMemFree(pPktHdr);
     }
 
+    if (g_cVerbose > 0)
+        RTMsgInfo("txsMainLoop: end\n");
     return enmExitCode;
 }
@@ -2896 +2900 @@
 static RTEXITCODE txsAutoUpdateStage2(int argc, char **argv, bool *pfExit, const char *pszUpgrading)
 {
+    if (g_cVerbose > 0)
+        RTMsgInfo("Auto update stage 2...");
+
     /*
      * Copy the current executable onto the original.
@@ -2980 +2987 @@
 static RTEXITCODE txsAutoUpdateStage1(int argc, char **argv, uint32_t cSecsCdWait, bool *pfExit)
 {
+    if (g_cVerbose > 1)
+        RTMsgInfo("Auto update stage 1...");
+
     /*
      * Figure names of the current service image and the potential upgrade.
@@ -3022 +3032 @@
         uint64_t cNsElapsed = RTTimeNanoTS() - nsStart;
         if (cNsElapsed >= cSecsCdWait * RT_NS_1SEC_64)
+        {
+            if (g_cVerbose > 0)
+                RTMsgInfo("Auto update: Giving up waiting for media.");
             return RTEXITCODE_SUCCESS;
+        }
         RTThreadSleep(500);
     }
@@ -3063 +3077 @@
         {
             RTFileReadAllFree(pvUpgrade, cbUpgrade);
+            if (g_cVerbose > 0)
+                RTMsgInfo("Auto update: Not necessary.");
             return RTEXITCODE_SUCCESS;
         }
@@ -3302 +3318 @@
         { "--foreground",       'f', RTGETOPT_REQ_NOTHING },
         { "--daemonized",       'Z', RTGETOPT_REQ_NOTHING },
+        { "--quiet",            'q', RTGETOPT_REQ_NOTHING },
+        { "--verbose",          'v', RTGETOPT_REQ_NOTHING },
     };
 
@@ -3391 +3409 @@
             case 'w':
                 cSecsCdWait = Val.u32;
+                break;
+
+            case 'q':
+                g_cVerbose = 0;
+                break;
+
+            case 'v':
+                g_cVerbose++;
                 break;
 
@@ -3448 +3474 @@
     if (fDaemonize && !*pfExit)
     {
+        if (g_cVerbose > 0)
+            RTMsgInfo("Daemonizing...");
         rc = RTProcDaemonize(argv, "--daemonized");
         if (RT_FAILURE(rc))
@@ -3482 +3510 @@
     if (RT_FAILURE(rc))
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTUuidCreate failed: %Rrc", rc);
+    if (g_cVerbose > 0)
+        RTMsgInfo("Instance UUID: %RTuuid", &g_InstanceUuid);
 
     /*

trunk/src/VBox/ValidationKit/utils/TestExecServ/TestExecServiceInternal.h

@@ -212 +212 @@
 extern TXSTRANSPORT const g_TestDevTransport;
 
+extern uint32_t           g_cVerbose;
+
 RT_C_DECLS_END