Changeset 6493 in vbox

Timestamp:

Jan 24, 2008 6:37:10 PM (17 years ago)

Author:

vboxsync

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

27499

Message:

Made it possible to make debug versions of vboxdrv on linux. This will check for BUILD_TYPE=debug, so for those who doesn't want ring-0 assertions in vboxdrv make sure you built it with BUILD_TYPE <> debug.

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/linux/Makefile (modified) (5 diffs)
• HostDrivers/Support/linux/files_vboxdrv (modified) (3 diffs)
• Runtime/common/log/log.cpp (modified) (1 diff)
• Runtime/common/log/logcom.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/linux/Makefile

@@ -27 +27 @@
 
 #
-# First, figure out which architecture we're targeting.
+# First, figure out which architecture we're targeting and the build type.
 # (We have to support basic cross building (ARCH=i386|x86_64).)
+# While at it, warn about BUILD_* vars found to help with user problems.
 #
 ifneq ($(filter-out amd64 x86,$(BUILD_TARGET_ARCH)),)
@@ -48 +49 @@
   endif
  endif
+else
+ $(warning Using BUILD_TARGET_ARCH='$(BUILD_TARGET_ARCH)' from the $(origin BUILD_TARGET_ARCH).)
+endif
+
+ifneq ($(filter-out release profile debug strict,$(BUILD_TYPE)),)
+ $(warning Ignoring unknown BUILD_TYPE value '$(BUILD_TYPE)'.)
+ BUILD_TYPE :=
+endif
+ifeq ($(BUILD_TYPE),)
+ BUILD_TYPE := release
+else
+ $(warning Using BUILD_TYPE='$(BUILD_TYPE)' from the $(origin BUILD_TYPE).)
 endif
 
@@ -68 +81 @@
 OBJS  += alloc/heapsimple.o
 endif
+ifeq ($(BUILD_TYPE),debug)
+OBJS  += \
+        common/log/log.o \
+        common/log/logcom.o \
+        common/log/logformat.o \
+        common/string/strformat.o \
+        common/string/strformatrt.o \
+        common/string/strprintf.o \
+        common/string/strtonum.o \
+        r0drv/linux/RTLogWriteDebugger-r0drv-linux.o \
+        generic/RTLogWriteStdErr-stub-generic.o \
+        generic/RTLogWriteStdOut-stub-generic.o \
+        generic/RTLogWriteUser-generic.o \
+        VBox/log-vbox.o \
+        VBox/strformat-vbox.o
+endif
 
 ifneq ($(MAKECMDGOALS),clean)
@@ -143 +172 @@
  export INCL
 endif
-KFLAGS   := -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0
+KFLAGS   := -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX
 ifndef CONFIG_VBOXDRV_FIXEDMAJOR
  KFLAGS  += -DCONFIG_VBOXDRV_AS_MISC
@@ -152 +181 @@
  KFLAGS  += -DRT_ARCH_X86
 endif
-#ifeq ($(BUILD_TYPE),debug) - you'll have to enable this manually to get debug stuff.
-#KFLAGS   += -DDEBUG
-#endif
+ifeq ($(BUILD_TYPE),debug)
+ KFLAGS  += -DDEBUG -DDEBUG_$(USER)
+endif
 
 #

trunk/src/VBox/HostDrivers/Support/linux/files_vboxdrv

@@ -29 +29 @@
     ${PATH_ROOT}/include/iprt/avl.h=>include/iprt/avl.h \
     ${PATH_ROOT}/include/iprt/cdefs.h=>include/iprt/cdefs.h \
+    ${PATH_ROOT}/include/iprt/ctype.h=>include/iprt/ctype.h \
     ${PATH_ROOT}/include/iprt/err.h=>include/iprt/err.h \
     ${PATH_ROOT}/include/iprt/heap.h=>include/iprt/heap.h \
@@ -57 +58 @@
     ${PATH_ROOT}/src/VBox/HostDrivers/Support/SUPDRVShared.c=>SUPDRVShared.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/alloc/heapsimple.cpp=>alloc/heapsimple.c \
+    ${PATH_ROOT}/src/VBox/Runtime/common/log/log.cpp=>common/log/log.c \
+    ${PATH_ROOT}/src/VBox/Runtime/common/log/logcom.cpp=>common/log/logcom.c \
+    ${PATH_ROOT}/src/VBox/Runtime/common/log/logformat.cpp=>common/log/logformat.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/divdi3.c=>math/gcc/divdi3.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/qdivrem.c=>math/gcc/qdivrem.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/quad.h=>math/gcc/quad.h \
+    ${PATH_ROOT}/src/VBox/Runtime/common/string/strformat.cpp=>common/string/strformat.c \
+    ${PATH_ROOT}/src/VBox/Runtime/common/string/strformatrt.cpp=>common/string/strformatrt.c \
+    ${PATH_ROOT}/src/VBox/Runtime/common/string/strprintf.cpp=>common/string/strprintf.c \
+    ${PATH_ROOT}/src/VBox/Runtime/common/string/strtonum.cpp=>common/string/strtonum.c \
     ${PATH_ROOT}/src/VBox/Runtime/include/internal/initterm.h=>include/internal/initterm.h \
     ${PATH_ROOT}/src/VBox/Runtime/include/internal/magics.h=>include/internal/magics.h \
     ${PATH_ROOT}/src/VBox/Runtime/include/internal/memobj.h=>include/internal/memobj.h \
+    ${PATH_ROOT}/src/VBox/Runtime/include/internal/string.h=>include/internal/string.h \
     ${PATH_ROOT}/src/VBox/Runtime/include/internal/thread.h=>include/internal/thread.h \
+    ${PATH_ROOT}/src/VBox/Runtime/generic/RTLogWriteStdErr-stub-generic.cpp=>generic/RTLogWriteStdErr-stub-generic.c \
+    ${PATH_ROOT}/src/VBox/Runtime/generic/RTLogWriteStdOut-stub-generic.cpp=>generic/RTLogWriteStdOut-stub-generic.c \
+    ${PATH_ROOT}/src/VBox/Runtime/generic/RTLogWriteUser-generic.cpp=>generic/RTLogWriteUser-generic.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.cpp=>r0drv/alloc-r0drv.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.h=>r0drv/alloc-r0drv.h \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/initterm-r0drv.cpp=>r0drv/initterm-r0drv.c \
+    ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/RTLogWriteDebugger-r0drv-linux.c=>r0drv/linux/RTLogWriteDebugger-r0drv-linux.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c=>r0drv/linux/alloc-r0drv-linux.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/initterm-r0drv-linux.c=>r0drv/linux/initterm-r0drv-linux.c \
@@ -79 +92 @@
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/thread-r0drv-linux.c=>r0drv/linux/thread-r0drv-linux.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/memobj-r0drv.cpp=>r0drv/memobj-r0drv.c \
+    ${PATH_ROOT}/src/VBox/Runtime/VBox/log-vbox.cpp=>VBox/log-vbox.c \
+    ${PATH_ROOT}/src/VBox/Runtime/VBox/strformat-vbox.cpp=>VBox/strformat-vbox.c \
     ${PATH_OUT}/version-generated.h=>version-generated.h \
 "

trunk/src/VBox/Runtime/common/log/log.cpp

@@ -1392 +1392 @@
         }
 
-        for (unsigned j = 0; j < 10; j++)
+        unsigned j;
+        for (j = 0; j < 10; j++)
         {
             i = ELEMENTS(g_aPerThreadLoggers);

trunk/src/VBox/Runtime/common/log/logcom.cpp

@@ -101 +101 @@
 RTDECL(void) RTLogWriteCom(const char *pach, size_t cb)
 {
-    for (const uint8_t *pu8 = (const uint8_t *)pach; cb-- > 0; pu8++)
+    const uint8_t *pu8;
+    for (pu8 = (const uint8_t *)pach; cb-- > 0; pu8++)
     {
         /* expand \n -> \r\n */