Changeset 77775 in vbox

Timestamp:

Mar 19, 2019 1:00:20 AM (6 years ago)

Author:

vboxsync

Message:

DBGPlugInLinux.cpp: More verbose on errors.

File:

• trunk/src/VBox/Debugger/DBGPlugInLinux.cpp (modified) (15 diffs)

trunk/src/VBox/Debugger/DBGPlugInLinux.cpp

@@ -687 +687 @@
             if (RT_SUCCESS(rc))
                 continue;
-            Log(("dbgDiggerLinuxIDmsg_QueryKernelLog: Reading '%s' at %RGv: %Rrc\n", aSymbols[i].pszSymbol, Addr.FlatPtr, rc));
+            LogRel(("dbgDiggerLinuxIDmsg_QueryKernelLog: Reading '%s' at %RGv: %Rrc\n", aSymbols[i].pszSymbol, Addr.FlatPtr, rc));
         }
         else
-            Log(("dbgDiggerLinuxIDmsg_QueryKernelLog: Error looking up '%s': %Rrc\n", aSymbols[i].pszSymbol, rc));
+            LogRel(("dbgDiggerLinuxIDmsg_QueryKernelLog: Error looking up '%s': %Rrc\n", aSymbols[i].pszSymbol, rc));
         rc = VERR_NOT_FOUND;
         break;
@@ -713 +713 @@
     if (pThis->f64Bit ? !LNX64_VALID_ADDRESS(GCPtrLogBuf) : !LNX32_VALID_ADDRESS(GCPtrLogBuf))
     {
-        Log(("dbgDiggerLinuxIDmsg_QueryKernelLog: 'log_buf' value %RGv is not valid.\n", GCPtrLogBuf));
+        LogRel(("dbgDiggerLinuxIDmsg_QueryKernelLog: 'log_buf' value %RGv is not valid.\n", GCPtrLogBuf));
         return VERR_NOT_FOUND;
     }
@@ -720 +720 @@
         || cbLogBuf > 16*_1M)
     {
-        Log(("dbgDiggerLinuxIDmsg_QueryKernelLog: 'log_buf_len' value %#x is not valid.\n", cbLogBuf));
+        LogRel(("dbgDiggerLinuxIDmsg_QueryKernelLog: 'log_buf_len' value %#x is not valid.\n", cbLogBuf));
         return VERR_NOT_FOUND;
     }
@@ -730 +730 @@
     if (!pbLogBuf)
     {
-        Log(("dbgDiggerLinuxIDmsg_QueryKernelLog: Failed to allocate %#x bytes for log buffer\n", cbLogBuf));
+        LogRel(("dbgDiggerLinuxIDmsg_QueryKernelLog: Failed to allocate %#x bytes for log buffer\n", cbLogBuf));
         return VERR_NO_MEMORY;
     }
@@ -737 +737 @@
     if (RT_FAILURE(rc))
     {
-        Log(("dbgDiggerLinuxIDmsg_QueryKernelLog: Error reading %#x bytes of log buffer at %RGv: %Rrc\n",
-             cbLogBuf, Addr.FlatPtr, rc));
+        LogRel(("dbgDiggerLinuxIDmsg_QueryKernelLog: Error reading %#x bytes of log buffer at %RGv: %Rrc\n",
+                cbLogBuf, Addr.FlatPtr, rc));
         RTMemFree(pbLogBuf);
         return VERR_NOT_FOUND;
@@ -805 +805 @@
             if (RT_SUCCESS(rc))
                 continue;
-            Log(("dbgDiggerLinuxIDmsg_QueryKernelLog: Reading '%s' at %RGv: %Rrc\n", aSymbols[i].pszSymbol, Addr.FlatPtr, rc));
+            LogRel(("dbgDiggerLinuxIDmsg_QueryKernelLog: Reading '%s' at %RGv: %Rrc\n", aSymbols[i].pszSymbol, Addr.FlatPtr, rc));
         }
         else
-            Log(("dbgDiggerLinuxIDmsg_QueryKernelLog: Error looking up '%s': %Rrc\n", aSymbols[i].pszSymbol, rc));
+            LogRel(("dbgDiggerLinuxIDmsg_QueryKernelLog: Error looking up '%s': %Rrc\n", aSymbols[i].pszSymbol, rc));
         rc = VERR_NOT_FOUND;
         break;
@@ -833 +833 @@
     if (pThis->f64Bit ? !LNX64_VALID_ADDRESS(GCPtrLogBuf) : !LNX32_VALID_ADDRESS(GCPtrLogBuf))
     {
-        Log(("dbgDiggerLinuxIDmsg_QueryKernelLog: 'log_buf' value %RGv is not valid.\n", GCPtrLogBuf));
+        LogRel(("dbgDiggerLinuxIDmsg_QueryKernelLog: 'log_buf' value %RGv is not valid.\n", GCPtrLogBuf));
         return VERR_NOT_FOUND;
     }
@@ -840 +840 @@
         || cbLogBuf > 16*_1M)
     {
-        Log(("dbgDiggerLinuxIDmsg_QueryKernelLog: 'log_buf_len' value %#x is not valid.\n", cbLogBuf));
+        LogRel(("dbgDiggerLinuxIDmsg_QueryKernelLog: 'log_buf_len' value %#x is not valid.\n", cbLogBuf));
         return VERR_NOT_FOUND;
     }
@@ -847 +847 @@
         || (idxFirst & (cbLogAlign - 1)) != 0)
     {
-        Log(("dbgDiggerLinuxIDmsg_QueryKernelLog: 'log_first_idx' value %#x is not valid.\n", idxFirst));
+        LogRel(("dbgDiggerLinuxIDmsg_QueryKernelLog: 'log_first_idx' value %#x is not valid.\n", idxFirst));
         return VERR_NOT_FOUND;
     }
@@ -853 +853 @@
         || (idxNext & (cbLogAlign - 1)) != 0)
     {
-        Log(("dbgDiggerLinuxIDmsg_QueryKernelLog: 'log_next_idx' value %#x is not valid.\n", idxNext));
+        LogRel(("dbgDiggerLinuxIDmsg_QueryKernelLog: 'log_next_idx' value %#x is not valid.\n", idxNext));
         return VERR_NOT_FOUND;
     }
@@ -863 +863 @@
     if (!pbLogBuf)
     {
-        Log(("dbgDiggerLinuxIDmsg_QueryKernelLog: Failed to allocate %#x bytes for log buffer\n", cbLogBuf));
+        LogRel(("dbgDiggerLinuxIDmsg_QueryKernelLog: Failed to allocate %#x bytes for log buffer\n", cbLogBuf));
         return VERR_NO_MEMORY;
     }
@@ -870 +870 @@
     if (RT_FAILURE(rc))
     {
-        Log(("dbgDiggerLinuxIDmsg_QueryKernelLog: Error reading %#x bytes of log buffer at %RGv: %Rrc\n",
-             cbLogBuf, Addr.FlatPtr, rc));
+        LogRel(("dbgDiggerLinuxIDmsg_QueryKernelLog: Error reading %#x bytes of log buffer at %RGv: %Rrc\n",
+                cbLogBuf, Addr.FlatPtr, rc));
         RTMemFree(pbLogBuf);
         return VERR_NOT_FOUND;
@@ -901 +901 @@
                         || pHdr->cbTotal < (uint32_t)pHdr->cbText + (uint32_t)pHdr->cbDict + sizeof(*pHdr) ))
         {
-            Log(("dbgDiggerLinuxIDmsg_QueryKernelLog: Invalid printk_log record at %#x: cbTotal=%#x cbText=%#x cbDict=%#x cbLogBuf=%#x cbLeft=%#x\n",
-                 offCur, pHdr->cbTotal, pHdr->cbText, pHdr->cbDict, cbLogBuf, cbLeft));
+            LogRel(("dbgDiggerLinuxIDmsg_QueryKernelLog: Invalid printk_log record at %#x: cbTotal=%#x cbText=%#x cbDict=%#x cbLogBuf=%#x cbLeft=%#x\n",
+                    offCur, pHdr->cbTotal, pHdr->cbText, pHdr->cbDict, cbLogBuf, cbLeft));
             rc = VERR_INVALID_STATE;
             break;
@@ -1013 +1013 @@
     RTDBGMOD hMod;
     int rc = RTDbgAsModuleByName(hAs, "vmlinux", 0, &hMod);
+    RTDbgAsRelease(hAs);
     if (RT_FAILURE(rc))
         return VERR_NOT_FOUND;
-    RTDbgAsRelease(hAs);
-
-    size_t cbActual;
+
     /*
      * Check whether the kernel log buffer is a simple char buffer or the newer
@@ -1024 +1023 @@
      * see: http://thread.gmane.org/gmane.linux.kernel/1284184
      */
+    size_t cbActual;
     if (dbgDiggerLinuxLogBufferIsAsciiBuffer(pData, pUVM))
         rc = dbgDiggerLinuxLogBufferQueryAscii(pData, pUVM, hMod, fFlags, cMessages, pszBuf, cbBuf, &cbActual);