Changeset 40855 in vbox

Timestamp:

Apr 10, 2012 3:10:41 PM (13 years ago)

Author:

vboxsync

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

77384

Message:

RTR0DbgKrnlInfo: Release shall accept NIL handle. Made QuerySymbol accept ppvSymbol=NULL. Promoted the magic.

Location:

trunk

Files:

• include/iprt/dbg.h (modified) (3 diffs)
• src/VBox/Runtime/include/internal/magics.h (modified) (1 diff)
• src/VBox/Runtime/r0drv/solaris/dbg-r0drv-solaris.c (modified) (5 diffs)

trunk/include/iprt/dbg.h

@@ -1151 +1151 @@
 # endif /* IN_RING3 */
 
-# ifdef IN_RING0
 
 /** @name Kernel Debug Info API
@@ -1232 +1231 @@
  * @param   pszModule       Reserved for future extensions. Pass NULL.
  * @param   pszSymbol       The C name of the symbol.
- * @param   ppvSymbol       Where to return the symbol value.
+ * @param   ppvSymbol       Where to return the symbol value, passing NULL is
+ *                          OK. This may be modified even on failure, in
+ *                          particular, it will be set to NULL when
+ *                          VERR_SYMBOL_NOT_FOUND is returned.
  *
  * @sa      RTLdrGetSymbol.
@@ -1240 +1242 @@
 /** @} */
 
-# endif /* IN_RING0 */
-
 /** @} */
 

trunk/src/VBox/Runtime/include/internal/magics.h

@@ -39 +39 @@
 /** Magic number for RTDBGMODVTIMG::u32Magic. (Cecil McBee) */
 #define RTDBGMODVTIMG_MAGIC             UINT32_C(0x19350419)
+/** Magic value for RTDBGKRNLINFOINT::u32Magic. (John Carmack) */
+#define RTDBGKRNLINFO_MAGIC             UINT32_C(0x19700820)
 /** The value of RTDIR::u32Magic. (Michael Ende) */
 #define RTDIR_MAGIC                     UINT32_C(0x19291112)

trunk/src/VBox/Runtime/r0drv/solaris/dbg-r0drv-solaris.c

@@ -40 +40 @@
 #include <iprt/string.h>
 #include <iprt/thread.h>
+
+#include "internal/magics.h"
 
 
@@ -62 +64 @@
 typedef struct RTDBGKRNLINFOINT *PRTDBGKRNLINFOINT;
 
-/** Magic value for RTDBGKRNLINFOINT::u32Magic. (John Carmack) */
-#define RTDBGKRNLINFO_MAGIC       UINT32_C(0x19700820)
-
 
 /**
@@ -168 +167 @@
 {
     PRTDBGKRNLINFOINT pThis = hKrnlInfo;
+    AssertPtrReturn(pThis, UINT32_MAX);
+    AssertMsgReturn(pThis->u32Magic == RTDBGKRNLINFO_MAGIC, ("%p: u32Magic=%RX32\n", pThis, pThis->u32Magic), UINT32_MAX);
+
     uint32_t cRefs = ASMAtomicIncU32(&pThis->cRefs);
     Assert(cRefs && cRefs < 100000);
@@ -177 +179 @@
 {
     PRTDBGKRNLINFOINT pThis = hKrnlInfo;
+    if (pThis == NIL_RTDBGKRNLINFO)
+        return 0;
     AssertPtrReturn(pThis, UINT32_MAX);
     AssertMsgReturn(pThis->u32Magic == RTDBGKRNLINFO_MAGIC, ("%p: u32Magic=%RX32\n", pThis, pThis->u32Magic), UINT32_MAX);
@@ -227 +231 @@
     AssertMsgReturn(pThis->u32Magic == RTDBGKRNLINFO_MAGIC, ("%p: u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_HANDLE);
     AssertPtrReturn(pszSymbol, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(ppvSymbol, VERR_INVALID_PARAMETER);
+    AssertPtrNullReturn(ppvSymbol, VERR_INVALID_PARAMETER);
     AssertReturn(!pszModule, VERR_MODULE_NOT_FOUND);
     RT_ASSERT_PREEMPTIBLE();
 
-    *ppvSymbol = (void *)kobj_getsymvalue((char *)pszSymbol, 1 /* only kernel */);
-    if (*ppvSymbol)
+    uintptr_t uValue = kobj_getsymvalue((char *)pszSymbol, 1 /* only kernel */);
+    if (ppvSymbol)
+        *ppvSymbol = (void *)uValue;
+    if (uValue)
         return VINF_SUCCESS;
-
     return VERR_SYMBOL_NOT_FOUND;
 }