Changeset 22092 for branches

Timestamp:

Mar 31, 2015, 5:56:39 PM (11 years ago)

Author:

rousseau

Message:

Made simple console logging a build option

Location:

branches/swt

Files:

• Config.kmk (modified) (2 diffs)
• LocalConfig.kmk.tpl (modified) (2 diffs)
• include/dbgcon.h (deleted)
• include/dbglog.h (modified) (1 diff)

branches/swt/Config.kmk

@@ -338 +338 @@
 ifneq ($(PATH_SDK_OS2TK4),)
 #
-# We can't add Toolkit includes in _INCS (it will casuse then to be searched
+# We can't add Toolkit includes in _INCS (it will cause them to be searched
 # before GCC headers and lead to conflicts), so use -idirafter.
 #
@@ -344 +344 @@
 TEMPLATE_OdinCxx_CXXFLAGS  += -idirafter $(PATH_SDK_OS2TK4)/h
 endif
+
+#
+# If DBG_CON is defined, jam it in to globally enable simple console logging.
+# If not, then per source console logging can be enabled by defining DBG_CON
+# _before_ the inclusion of the <misc.h> header.
+#
+ifneq ($(DBG_CON),undefined)
+TEMPLATE_OdinCxx_CFLAGS    += -DDBG_CON
+TEMPLATE_OdinCxx_CXXFLAGS  += -DDBG_CON
+endif

branches/swt/LocalConfig.kmk.tpl

@@ -8 +8 @@
 # NOTES:
 #
-#   This file is a template! Copy it to a file named LocalConfig.kmk in 
+#   This file is a template! Copy it to a file named LocalConfig.kmk in
 #   the same directory and modify the copy to fit your local environment.
 #
@@ -33 +33 @@
 #
 # PATH_TOOL_ALP := alp.exe
+
+#
+# Globally enable simple console logging.
+# Per source console logging can be enabled by defining DBG_CON _before_
+# the inclusion of the <misc.h> header.
+# DBG_CON=

branches/swt/include/dbglog.h

@@ -14 +14 @@
 #ifdef __cplusplus
       extern "C" {
+#endif
+
+// To enable global console logging, use 'kmk DBG_CON=' _or_ set 'DBG_CON='
+// in LocalConfig.kmk _or_ set DBG_CON to some value in the environment.
+// Per source console logging can be enabled by defining DBG_CON _before_
+// the inclusion of the <misc.h> header.
+#ifdef DBG_CON
+#define PFXFMT  "**__con_debug(%d)** "
+#define __con_debug(lvl, fmt, ...)\
+switch (lvl) {\
+  case 0:\
+    break;\
+  case 2:\
+    printf(PFXFMT, lvl);\
+    printf(fmt, __VA_ARGS__);\
+    break;\
+  case 3:\
+    printf(PFXFMT"FUNCTION:%s ", lvl, __FUNCTION__);\
+    printf(fmt, __VA_ARGS__);\
+    break;\
+  case 4:\
+    printf(PFXFMT"FILE:%s FUNCTION:%s ", lvl, __FILE__, __FUNCTION__);\
+    printf(fmt, __VA_ARGS__);\
+    break;\
+  case 5:\
+    printf(PFXFMT, lvl);\
+    printf(fmt, __VA_ARGS__);\
+    break;\
+  default:\
+    printf(fmt, __VA_ARGS__);\
+    break;\
+}\
+fflush(stdout)
+#else
+#define __con_debug(lvl, fmt, ...)
 #endif