make logging, trace-logging and asserts optional during compile-time

906675869 · Jan 6, 2020 · cfe3d32 · cfe3d32
1 parent 50fd7bb
commit cfe3d32
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 9 deletions.
diff --git a/src/hvpp/hvpp/config.h b/src/hvpp/hvpp/config.h
@@ -5,6 +5,20 @@
 //
 #define HVPP_MAX_CPU  256
 
+//
+// Disable logging (DbgPrintEx) and/or ETW logging.
+//
+
+// #define HVPP_DISABLE_LOG
+
+// #define HVPP_DISABLE_TRACELOG
+
+//
+// Disable asserts (hvpp_assert()).
+//
+
+// #define HVPP_DISABLE_ASSERT
+
 //
 // Uncomment this if you plan to intercept I/O ports 0x5658/0x5659
 // in VMWare and you don't want the VMWare Tools to crash.

diff --git a/src/hvpp/hvpp/lib/assert.h b/src/hvpp/hvpp/lib/assert.h
@@ -1,14 +1,15 @@
 #pragma once
 #include "debugger.h"
+#include "../config.h"
 
-#if 1
+#if defined(HVPP_DISABLE_ASSERT)
+# define hvpp_assert(expression)
+#else
 # define hvpp_assert(expression)                        \
   do                                                    \
   {                                                     \
     if (!(expression)) {                                \
       debugger::breakpoint();                           \
     }                                                   \
   } while (0)
-#else
-# define hvpp_assert(expression)
 #endif
diff --git a/src/hvpp/hvpp/lib/log.h b/src/hvpp/hvpp/lib/log.h
@@ -1,14 +1,27 @@
 #pragma once
 #include "enum.h"
 #include "error.h"
+#include "../config.h"
 
 #include <cstdint>
 
-#define hvpp_trace(format, ...)  ::logger::print(::logger::level_t::trace, __FUNCTION__, format, __VA_ARGS__)
-#define hvpp_debug(format, ...)  ::logger::print(::logger::level_t::debug, __FUNCTION__, format, __VA_ARGS__)
-#define hvpp_info(format, ...)   ::logger::print(::logger::level_t::info,  __FUNCTION__, format, __VA_ARGS__)
-#define hvpp_warn(format, ...)   ::logger::print(::logger::level_t::warn,  __FUNCTION__, format, __VA_ARGS__)
-#define hvpp_error(format, ...)  ::logger::print(::logger::level_t::error, __FUNCTION__, format, __VA_ARGS__)
+#if defined(HVPP_DISABLE_TRACELOG)
+# define hvpp_trace(format, ...)
+#else
+# define hvpp_trace(format, ...)  ::logger::print(::logger::level_t::trace, __FUNCTION__, format, __VA_ARGS__)
+#endif
+
+#if defined(HVPP_DISABLE_LOG)
+# define hvpp_debug(format, ...)
+# define hvpp_info(format, ...)
+# define hvpp_warn(format, ...)
+# define hvpp_error(format, ...)
+#else
+# define hvpp_debug(format, ...)  ::logger::print(::logger::level_t::debug, __FUNCTION__, format, __VA_ARGS__)
+# define hvpp_info(format, ...)   ::logger::print(::logger::level_t::info,  __FUNCTION__, format, __VA_ARGS__)
+# define hvpp_warn(format, ...)   ::logger::print(::logger::level_t::warn,  __FUNCTION__, format, __VA_ARGS__)
+# define hvpp_error(format, ...)  ::logger::print(::logger::level_t::error, __FUNCTION__, format, __VA_ARGS__)
+#endif
 
 namespace logger
 {

diff --git a/src/hvpp/hvpp/lib/mm/mtrr_descriptor.h b/src/hvpp/hvpp/lib/mm/mtrr_descriptor.h
@@ -101,7 +101,8 @@ namespace mm
 
       void dump() const noexcept
       {
-        auto dump_range = [](int i, const mtrr_range& mtrr) noexcept
+        auto dump_range = []([[maybe_unused]] int i,
+                             [[maybe_unused]] const mtrr_range& mtrr) noexcept
         {
           hvpp_info(
             "  %3i) %s [%016" PRIx64 " - %016" PRIx64 "] (%8u kb)", i,