Changeset 99393 in vbox

Timestamp:

Apr 13, 2023 5:09:53 PM (23 months ago)

Author:

vboxsync

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

156833

Message:

Guest Control: Completely revamped / overhauled the (now legacy) stream output parsing code and added lots of documentation to it. This way it should be a lot clearer what it's supposed to be doing. Also, this now should fix some nasty bugs in that area we had in the past especially with some Linux guests (i.e. OL6), which sometimes send output data in a very unsteady manner. Also overhauled the testcases while at it [build fix].

Location:

trunk/src/VBox/Main

Files:

• src-client/GuestCtrlPrivate.cpp (modified) (2 diffs)
• testcase/tstGuestCtrlParseBuffer.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp

@@ -939 +939 @@
     char         *pszParsed    = pszStart; /* Points to data considered as being parsed already. */
 
-    Log4Func(("Current @ %zu/%zu:\n%.*RhXd\n", m_offBuf, m_cbUsed, RT_MIN(cbLeftParsed, _1K), pszStart));
+    Log4Func(("Current @ %zu/%zu:\n%.*Rhxd\n", m_offBuf, m_cbUsed, RT_MIN(cbLeftParsed, _1K), pszStart));
 
     size_t cTerm = 0;
@@ -1009 +1009 @@
 
         if (cbLeftParsed)
-            Log4Func(("Next iteration @ %zu:\n%.*RhXd\n", pszParsed - pszStart, cbLeftParsed, pszParsed));
+            Log4Func(("Next iteration @ %zu:\n%.*Rhxd\n", pszParsed - pszStart, cbLeftParsed, pszParsed));
     }
 
     if (cbLeftParsed)
-        Log4Func(("Done @ %zu:\n%.*RhXd\n", pszParsed - pszStart, cbLeftParsed, pszParsed));
+        Log4Func(("Done @ %zu:\n%.*Rhxd\n", pszParsed - pszStart, cbLeftParsed, pszParsed));
 
     m_offBuf += pszParsed - pszStart; /* Only account really parsed content. */

trunk/src/VBox/Main/testcase/tstGuestCtrlParseBuffer.cpp

@@ -206 +206 @@
     AssertRCReturn(rc, RTEXITCODE_FAILURE);
 
-    size_t cbFileSize;
+    uint64_t cbFileSize;
     rc = RTFileQuerySize(fh, &cbFileSize);
     AssertRCReturn(rc, RTEXITCODE_FAILURE);
@@ -219 +219 @@
     unsigned i = 0;
 
-    size_t cbToRead = cbFileSize;
+    uint64_t cbToRead = cbFileSize;
 
     for (unsigned a = 0; a < 32; a++)
@@ -320 +320 @@
     for (unsigned iTest = 0; iTest < RT_ELEMENTS(g_aTestBlocks); iTest++)
     {
-        RTTestIPrintf(RTTESTLVL_DEBUG, "=> Block test #%u:\n'%.*RhXd\n", iTest, g_aTestBlocks[iTest].cbData, g_aTestBlocks[iTest].pbData);
+        RTTestIPrintf(RTTESTLVL_DEBUG, "=> Block test #%u:\n'%.*Rhxd\n", iTest, g_aTestBlocks[iTest].cbData, g_aTestBlocks[iTest].pbData);
 
         GuestToolboxStream stream;
@@ -365 +365 @@
     for (unsigned iTest = 0; iTest < RT_ELEMENTS(g_aTestStream); iTest++)
     {
-        RTTestIPrintf(RTTESTLVL_DEBUG, "=> Stream test #%u\n%.*RhXd\n",
+        RTTestIPrintf(RTTESTLVL_DEBUG, "=> Stream test #%u\n%.*Rhxd\n",
                       iTest, g_aTestStream[iTest].cbData, g_aTestStream[iTest].pbData);