Changeset 7448 in vbox

Timestamp:

Mar 14, 2008 6:04:46 AM (17 years ago)

Author:

vboxsync

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

28886

Message:

Runtime/Logger: added "LOG_TO_BACKDOOR_FULL" for guest R3 executables to control what is (debug) logged to the backdoor logger using the usual VBOX_LOG environment variable

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• include/iprt/log.h (modified) (6 diffs)

trunk/Config.kmk

@@ -2683 +2683 @@
 TEMPLATE_VBOXGUESTR3EXE_BLD_TRG_ARCH  = x86
 TEMPLATE_VBOXGUESTR3EXE_BLD_TRG_CPU   = blend
-TEMPLATE_VBOXGUESTR3EXE_DEFS     := IN_GUEST IN_GUEST_R3 IN_RT_R3 LOG_TO_BACKDOOR \
+TEMPLATE_VBOXGUESTR3EXE_DEFS     := IN_GUEST IN_GUEST_R3 IN_RT_R3 LOG_TO_BACKDOOR_FULL \
                                     $(filter-out $(ARCH_BITS_DEFS),$(TEMPLATE_VBOXR3EXE_DEFS)) HC_ARCH_BITS=32 GC_ARCH_BITS=32
 if1of ($(BUILD_TARGET),l4 linux) # As few libs as possible on linux.

trunk/include/iprt/log.h

@@ -400 +400 @@
 #endif
 
+/*
+ * If we are doing full backdoor logging disable the weaker form
+ */
+#if defined(LOG_TO_BACKDOOR_FULL)
+# undef LOG_TO_BACKDOOR
+#endif
 
 /** @def LogIt
@@ -405 +411 @@
  */
 #ifdef LOG_ENABLED
-# if defined(RT_ARCH_AMD64) || defined(LOG_USE_C99)
-#  define _LogRemoveParentheseis(...)               __VA_ARGS__
-#  define _LogIt(pvInst, fFlags, iGroup, ...)       RTLogLoggerEx((PRTLOGGER)pvInst, fFlags, iGroup, __VA_ARGS__)
-#  define LogIt(pvInst, fFlags, iGroup, fmtargs)    _LogIt(pvInst, fFlags, iGroup, _LogRemoveParentheseis fmtargs)
-# else
-#  define LogIt(pvInst, fFlags, iGroup, fmtargs) \
+# if !defined(LOG_TO_BACKDOOR_FULL) || defined(LOG_NO_BACKDOOR)
+#  if defined(RT_ARCH_AMD64) || defined(LOG_USE_C99)
+#   define _LogRemoveParentheseis(...)               __VA_ARGS__
+#   define _LogIt(pvInst, fFlags, iGroup, ...)       RTLogLoggerEx((PRTLOGGER)pvInst, fFlags, iGroup, __VA_ARGS__)
+#   define LogIt(pvInst, fFlags, iGroup, fmtargs)    _LogIt(pvInst, fFlags, iGroup, _LogRemoveParentheseis fmtargs)
+#  else
+#   define LogIt(pvInst, fFlags, iGroup, fmtargs) \
     do \
     { \
@@ -421 +428 @@
         } \
     } while (0)
-# endif
+#  endif
+# else  /* LOG_TO_BACKDOOR_FULL defined */
+#  define LogIt(pvInst, fFlags, iGroup, fmtargs) \
+    do \
+    { \
+        register PRTLOGGER LogIt_pLogger = (PRTLOGGER)(pvInst) ? (PRTLOGGER)(pvInst) : RTLogDefaultInstance(); \
+        if (LogIt_pLogger) \
+        { \
+            register unsigned LogIt_fFlags = LogIt_pLogger->afGroups[(unsigned)(iGroup) < LogIt_pLogger->cGroups ? (unsigned)(iGroup) : 0]; \
+            if ((LogIt_fFlags & ((fFlags) | RTLOGGRPFLAGS_ENABLED)) == ((fFlags) | RTLOGGRPFLAGS_ENABLED)) \
+                RTLogBackdoorPrintf fmtargs; \
+        } \
+    } while (0)
+# endif  /* LOG_TO_BACKDOOR_FULL defined */
 #else
 # define LogIt(pvInst, fFlags, iGroup, fmtargs) do { } while (0)
@@ -708 +728 @@
  * Write to specific logger if group enabled.
  */
-#if defined(RT_ARCH_AMD64) || defined(LOG_USE_C99)
-# define _LogRelRemoveParentheseis(...)                __VA_ARGS__
-#  define _LogRelIt(pvInst, fFlags, iGroup, ...)       RTLogLoggerEx((PRTLOGGER)pvInst, fFlags, iGroup, __VA_ARGS__)
-#  define LogRelIt(pvInst, fFlags, iGroup, fmtargs) \
+#if !defined(LOG_TO_BACKDOOR_FULL) || defined(LOG_NO_BACKDOOR)
+# if defined(RT_ARCH_AMD64) || defined(LOG_USE_C99)
+#  define _LogRelRemoveParentheseis(...)                __VA_ARGS__
+#   define _LogRelIt(pvInst, fFlags, iGroup, ...)       RTLogLoggerEx((PRTLOGGER)pvInst, fFlags, iGroup, __VA_ARGS__)
+#   define LogRelIt(pvInst, fFlags, iGroup, fmtargs) \
     do \
     { \
@@ -719 +740 @@
         LogIt(LOG_INSTANCE, fFlags, iGroup, fmtargs); \
     } while (0)
-#else
-# define LogRelIt(pvInst, fFlags, iGroup, fmtargs) \
+# else
+#  define LogRelIt(pvInst, fFlags, iGroup, fmtargs) \
    do \
    { \
@@ -732 +753 @@
        LogIt(LOG_INSTANCE, fFlags, iGroup, fmtargs); \
   } while (0)
-#endif
+# endif
+#else /* LOG_TO_BACKDOOR_FULL defined and LOG_NO_BACKDOOR not defined */
+# define LogRelIt(pvInst, fFlags, iGroup, fmtargs) \
+   do { \
+       RTLogBackdoorPrintf fmtargs; \
+   } while (0)
+#endif /* LOG_TO_BACKDOOR_FULL defined and LOG_NO_BACKDOOR not defined */