Changeset 14217 in vbox for trunk

Timestamp:

Nov 14, 2008 2:51:23 PM (16 years ago)

Author:

vboxsync

Message:

Additions/Guest Library: comments and logging

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

• HGCMInternal.cpp (modified) (5 diffs)
• VBGLInternal.h (modified) (1 diff)
• VBoxGuestR3Lib.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp

@@ -138 +138 @@
     }
 
-    /* Anyone who needs this can re-enable it locally */
-    /* dprintf (("VbglHGCMCall: pCallInfo->cParms = %d, pHGCMCall->u32Function = %d\n", pCallInfo->cParms, pCallInfo->u32Function)); */
+    Log (("VbglHGCMCall: pCallInfo->cParms = %d, pHGCMCall->u32Function = %d\n", pCallInfo->cParms, pCallInfo->u32Function));
 
     pHGCMCall = NULL;
@@ -148 +147 @@
     rc = VbglGRAlloc ((VMMDevRequestHeader **)&pHGCMCall, sizeof (VMMDevHGCMCall) + cbParms, VMMDevReq_HGCMCall);
 
-    /* Anyone who needs this can re-enable it locally */
-    /* dprintf (("VbglHGCMCall Allocated gr %p, rc = %Rrc, cbParms = %d\n", pHGCMCall, rc, cbParms)); */
+    Log (("VbglHGCMCall Allocated gr %p, rc = %Rrc, cbParms = %d\n", pHGCMCall, rc, cbParms));
 
     if (RT_SUCCESS(rc))
@@ -209 +207 @@
         if (RT_SUCCESS(rc))
         {
-            /* Anyone who needs this can re-enable it locally */
-            /* dprintf (("calling VbglGRPerform\n")); */
+            Log (("calling VbglGRPerform\n"));
 
             /* Issue request */
             rc = VbglGRPerform (&pHGCMCall->header.header);
 
-            /* Anyone who needs this can re-enable it locally */
-            /* dprintf (("VbglGRPerform rc = %Rrc (header rc=%d)\n", rc, pHGCMCall->header.result)); */
+            Log (("VbglGRPerform rc = %Rrc (header rc=%d)\n", rc, pHGCMCall->header.result));
 
             /** If the call failed, but as a result of the request itself, then pretend success
@@ -233 +229 @@
                 {
                     /* Wait for request completion interrupt notification from host */
+                    Log (("Processing HGCM call asynchronously\n"));
                     pAsyncCallback (&pHGCMCall->header, pvAsyncData, u32AsyncData);
                 }
@@ -248 +245 @@
                     /* The callback returns without completing the request,
                      * that means the wait was interrrupted. That can happen
-                     * if system reboots or the VBoxService ended abnormally.
+                     * if the request times out, the system reboots or the
+                     * VBoxService ended abnormally.
                      *
                      * Cancel the request, the host will not write to the
                      * memory related to the cancelled request.
                      */
+                    Log (("Cancelling HGCM call\n"));
                     pHGCMCall->header.fu32Flags |= VBOX_HGCM_REQ_CANCELLED;
 

trunk/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h

@@ -32 +32 @@
 #include <VBox/VBoxGuestLib.h>
 
+#include <VBox/log.h>
+
 #if (defined(DEBUG) && !defined(NO_LOGGING)) || defined(LOG_ENABLED)
-#include <VBox/log.h>
 # define dprintf(a) RTLogBackdoorPrintf a
 #else

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp

@@ -311 +311 @@
     {
 /** @todo The passing of error codes needs to be tested and fixed (as does *all* the other hosts except for
- * OS, Michael and Ramshankar!). The idea is that the VBox status codes in ring-0 should be
- * transfered without loss down to ring-3. However, it's not vitally important right now (obviously, since
- * the other guys has been ignoring it for 1+ years now). */
+ * OS/2).  The idea is that the VBox status codes in ring-0 should be transfered without loss down to
+ * ring-3. However, it's not vitally important right now (obviously, since the other guys has been
+ * ignoring it for 1+ years now).  On Linux and Solaris the transfer is done, but it is currently not
+ * lossless, so still needs fixing. */
         DWORD LastErr = GetLastError();
         return RTErrConvertFromWin32(LastErr);