Changeset 38437 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Aug 12, 2011 3:05:41 PM (14 years ago)

Author:

vboxsync

Message:

GuestCtrl: Update.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceControlExecThread.cpp (modified) (2 diffs)
• VBoxServicePipeBuf.cpp (modified) (2 diffs)

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

@@ -373 +373 @@
             {
 #ifdef DEBUG_andy
-                VBoxServiceVerbose(4, "ControlExec: [PID %u]: Waiting for pipe buffer %u\n",
-                                   uPID, pPipeBuf->uPipeId);
+                VBoxServiceVerbose(4, "ControlExec: [PID %u]: Waiting for pipe buffer %u (%ums)\n",
+                                   uPID, pPipeBuf->uPipeId, uTimeout);
 #endif
                 rc = VBoxServicePipeBufWaitForEvent(pPipeBuf, uTimeout);
@@ -385 +385 @@
                 {
                     if (fEnabled && !cbRead)
-                        AssertMsgFailed(("Waited for pipe buffer %u, but nothing read!\n",
-                                         pPipeBuf->uPipeId));
+                        AssertMsgFailed(("[PID %u]: Waited (%ums) for pipe buffer %u (%u bytes left) , but nothing read!\n",
+                                         uPID, uTimeout, pPipeBuf->uPipeId, pPipeBuf->cbSize - pPipeBuf->cbOffset));
                     if (pcbRead)
                         *pcbRead = cbRead;

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

@@ -111 +111 @@
             pBuf->cbOffset += cbToRead;
 
+#ifdef DEBUG_andy
+            VBoxServiceVerbose(4, "Pipe [%u %u 0x%p %s] read pcbToRead=%u, cbSize=%u, cbAlloc=%u, cbOff=%u\n",
+                               pBuf->uPID, pBuf->uPipeId, pBuf, pBuf->fEnabled ? "EN" : "DIS", cbToRead, pBuf->cbSize, pBuf->cbAllocated, pBuf->cbOffset);
+#endif
             if (pBuf->hEventSem != NIL_RTSEMEVENT)
             {
@@ -117 +121 @@
             }
 
-#ifdef DEBUG_andy
-            VBoxServiceVerbose(4, "Pipe [%u %u 0x%p %s] read pcbToRead=%u, cbSize=%u, cbAlloc=%u, cbOff=%u\n",
-                               pBuf->uPID, pBuf->uPipeId, pBuf, pBuf->fEnabled ? "EN" : "DIS", cbToRead, pBuf->cbSize, pBuf->cbAllocated, pBuf->cbOffset);
-#endif
             *pcbToRead = cbToRead;
         }