Changeset 77324 in vbox

Timestamp:

Feb 14, 2019 9:23:14 PM (6 years ago)

Author:

vboxsync

Message:

Devices/Serial: Don't try to process data if the either the buffer is full or there is nothing to process

Location:

trunk/src/VBox/Devices/Serial

Files:

• DrvChar.cpp (modified) (2 diffs)
• DrvHostSerial.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Serial/DrvChar.cpp

@@ -259 +259 @@
             if (fEvtsRecv & RTPOLL_EVT_WRITE)
             {
-                if (pThis->fAvailWrInt)
+                if (   pThis->fAvailWrInt
+                    && pThis->cbTxUsed < RT_ELEMENTS(pThis->abTxBuf))
                 {
                     /* Stuff as much data into the TX buffer as we can. */
@@ -284 +285 @@
                     {
                         pThis->cbTxUsed -= cbProcessed;
-                        if (pThis->cbTxUsed)
+                        if (   pThis->cbTxUsed
+                            && cbProcessed)
                         {
                             /* Move the data in the TX buffer to the front to fill the end again. */

trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp

@@ -418 +418 @@
             if (fEvtsRecv & RTSERIALPORT_EVT_F_DATA_TX)
             {
-                if (pThis->fAvailWrInt)
+                if (   pThis->fAvailWrInt
+                    && pThis->cbTxUsed < RT_ELEMENTS(pThis->abTxBuf))
                 {
                     /* Stuff as much data into the TX buffer as we can. */
@@ -443 +444 @@
                     {
                         pThis->cbTxUsed -= cbProcessed;
-                        if (pThis->cbTxUsed)
+                        if (   pThis->cbTxUsed
+                            && cbProcessed)
                         {
                             /* Move the data in the TX buffer to the front to fill the end again. */
-                            memmove(&pThis->abTxBuf[0], &pThis->abTxBuf[cbProcessed], pThis->cbTxUsed);
-                        }
+                            memmove(&pThis->abTxBuf[0], &pThis->abTxBuf[cbProcessed], pThis->cbTxUsed);                        }
                         else
                             pThis->pDrvSerialPort->pfnDataSentNotify(pThis->pDrvSerialPort);