Prefix logging.h macros with OSP
This change adds an OSP prefix to logging macros for compatibility with
Chromium code. Because we are using Chromium's QUIC implementation
there are places that need see both sets of macros.
Change-Id: I3773a7f4d0ecea58691c36548f4316a763ca9025
Reviewed-on: https://chromium-review.googlesource.com/c/1334977
Reviewed-by: mark a. foltz <mfoltz@chromium.org>
diff --git a/platform/api/logging.h b/platform/api/logging.h
index 4152752..7cec606 100644
--- a/platform/api/logging.h
+++ b/platform/api/logging.h
@@ -51,23 +51,23 @@
std::ostringstream stream_;
};
-#define VLOG(l) \
+#define OSP_VLOG(l) \
::openscreen::platform::LogMessage( \
::openscreen::platform::LogLevel::kVerbose, l, __FILE__, __LINE__) \
.stream()
-#define LOG_INFO \
+#define OSP_LOG_INFO \
::openscreen::platform::LogMessage(::openscreen::platform::LogLevel::kInfo, \
0, __FILE__, __LINE__) \
.stream()
-#define LOG_WARN \
+#define OSP_LOG_WARN \
::openscreen::platform::LogMessage( \
::openscreen::platform::LogLevel::kWarning, 0, __FILE__, __LINE__) \
.stream()
-#define LOG_ERROR \
+#define OSP_LOG_ERROR \
::openscreen::platform::LogMessage(::openscreen::platform::LogLevel::kError, \
0, __FILE__, __LINE__) \
.stream()
-#define LOG_FATAL \
+#define OSP_LOG_FATAL \
::openscreen::platform::LogMessage(::openscreen::platform::LogLevel::kFatal, \
0, __FILE__, __LINE__) \
.stream()
@@ -82,52 +82,57 @@
} // namespace detail
-#define LAZY_STREAM(stream, condition) \
+#define OSP_LAZY_STREAM(stream, condition) \
!(condition) ? (void)0 : ::openscreen::platform::detail::Voidify() & (stream)
-#define EAT_STREAM LAZY_STREAM(LOG_INFO, false)
-#define LOG_IF(level, condition) LAZY_STREAM(LOG_##level, (condition))
-#define VLOG_IF(level, condition) LAZY_STREAM(VLOG(level), (condition))
+#define OSP_EAT_STREAM OSP_LAZY_STREAM(OSP_LOG_INFO, false)
+#define OSP_LOG_IF(level, condition) \
+ OSP_LAZY_STREAM(OSP_LOG_##level, (condition))
+#define OSP_VLOG_IF(level, condition) \
+ OSP_LAZY_STREAM(OSP_VLOG(level), (condition))
-// TODO(btolsch): Add tests for (D)CHECK and possibly logging.
-#define CHECK(condition) \
- LAZY_STREAM(LOG_FATAL, !(condition)) << "CHECK(" << #condition << ") failed: "
+// TODO(btolsch): Add tests for (D)OSP_CHECK and possibly logging.
+#define OSP_CHECK(condition) \
+ OSP_LAZY_STREAM(OSP_LOG_FATAL, !(condition)) \
+ << "OSP_CHECK(" << #condition << ") failed: "
-#define CHECK_EQ(a, b) CHECK((a) == (b)) << a << " vs. " << b << ": "
-#define CHECK_NE(a, b) CHECK((a) != (b)) << a << " vs. " << b << ": "
-#define CHECK_LT(a, b) CHECK((a) < (b)) << a << " vs. " << b << ": "
-#define CHECK_LE(a, b) CHECK((a) <= (b)) << a << " vs. " << b << ": "
-#define CHECK_GT(a, b) CHECK((a) > (b)) << a << " vs. " << b << ": "
-#define CHECK_GE(a, b) CHECK((a) >= (b)) << a << " vs. " << b << ": "
+#define OSP_CHECK_EQ(a, b) OSP_CHECK((a) == (b)) << a << " vs. " << b << ": "
+#define OSP_CHECK_NE(a, b) OSP_CHECK((a) != (b)) << a << " vs. " << b << ": "
+#define OSP_CHECK_LT(a, b) OSP_CHECK((a) < (b)) << a << " vs. " << b << ": "
+#define OSP_CHECK_LE(a, b) OSP_CHECK((a) <= (b)) << a << " vs. " << b << ": "
+#define OSP_CHECK_GT(a, b) OSP_CHECK((a) > (b)) << a << " vs. " << b << ": "
+#define OSP_CHECK_GE(a, b) OSP_CHECK((a) >= (b)) << a << " vs. " << b << ": "
-#if defined(_DEBUG) || defined(DCHECK_ALWAYS_ON)
-#define DCHECK_IS_ON() 1
-#define DCHECK(condition) CHECK(condition)
-#define DCHECK_EQ(a, b) CHECK_EQ(a, b)
-#define DCHECK_NE(a, b) CHECK_NE(a, b)
-#define DCHECK_LT(a, b) CHECK_LT(a, b)
-#define DCHECK_LE(a, b) CHECK_LE(a, b)
-#define DCHECK_GT(a, b) CHECK_GT(a, b)
-#define DCHECK_GE(a, b) CHECK_GE(a, b)
+#if defined(_DEBUG) || defined(OSP_DCHECK_ALWAYS_ON)
+#define OSP_DCHECK_IS_ON() 1
+#define OSP_DCHECK(condition) OSP_CHECK(condition)
+#define OSP_DCHECK_EQ(a, b) OSP_CHECK_EQ(a, b)
+#define OSP_DCHECK_NE(a, b) OSP_CHECK_NE(a, b)
+#define OSP_DCHECK_LT(a, b) OSP_CHECK_LT(a, b)
+#define OSP_DCHECK_LE(a, b) OSP_CHECK_LE(a, b)
+#define OSP_DCHECK_GT(a, b) OSP_CHECK_GT(a, b)
+#define OSP_DCHECK_GE(a, b) OSP_CHECK_GE(a, b)
#else
-#define DCHECK_IS_ON() 0
-#define DCHECK(condition) EAT_STREAM
-#define DCHECK_EQ(a, b) EAT_STREAM
-#define DCHECK_NE(a, b) EAT_STREAM
-#define DCHECK_LT(a, b) EAT_STREAM
-#define DCHECK_LE(a, b) EAT_STREAM
-#define DCHECK_GT(a, b) EAT_STREAM
-#define DCHECK_GE(a, b) EAT_STREAM
+#define OSP_DCHECK_IS_ON() 0
+#define OSP_DCHECK(condition) OSP_EAT_STREAM
+#define OSP_DCHECK_EQ(a, b) OSP_EAT_STREAM
+#define OSP_DCHECK_NE(a, b) OSP_EAT_STREAM
+#define OSP_DCHECK_LT(a, b) OSP_EAT_STREAM
+#define OSP_DCHECK_LE(a, b) OSP_EAT_STREAM
+#define OSP_DCHECK_GT(a, b) OSP_EAT_STREAM
+#define OSP_DCHECK_GE(a, b) OSP_EAT_STREAM
#endif
-#define DLOG_INFO LOG_IF(INFO, DCHECK_IS_ON())
-#define DLOG_WARN LOG_IF(WARN, DCHECK_IS_ON())
-#define DLOG_ERROR LOG_IF(ERROR, DCHECK_IS_ON())
-#define DLOG_FATAL LOG_IF(FATAL, DCHECK_IS_ON())
-#define DLOG_IF(level, condition) LOG_IF(level, DCHECK_IS_ON() && (condition))
-#define DVLOG(l) VLOG_IF(l, DCHECK_IS_ON())
-#define DVLOG_IF(l, condition) VLOG_IF(l, DCHECK_IS_ON() && (condition))
+#define OSP_DLOG_INFO OSP_LOG_IF(INFO, OSP_DCHECK_IS_ON())
+#define OSP_DLOG_WARN OSP_LOG_IF(WARN, OSP_DCHECK_IS_ON())
+#define OSP_DLOG_ERROR OSP_LOG_IF(ERROR, OSP_DCHECK_IS_ON())
+#define OSP_DLOG_FATAL OSP_LOG_IF(FATAL, OSP_DCHECK_IS_ON())
+#define OSP_DLOG_IF(level, condition) \
+ OSP_LOG_IF(level, OSP_DCHECK_IS_ON() && (condition))
+#define OSP_DVLOG(l) OSP_VLOG_IF(l, OSP_DCHECK_IS_ON())
+#define OSP_DVLOG_IF(l, condition) \
+ OSP_VLOG_IF(l, OSP_DCHECK_IS_ON() && (condition))
-#define UNIMPLEMENTED() LOG_ERROR << __func__ << ": unimplemented"
+#define OSP_UNIMPLEMENTED() OSP_LOG_ERROR << __func__ << ": unimplemented"
} // namespace platform
} // namespace openscreen