jdk-sandbox: comparison hotspot/src/share/vm/logging/log.hpp

equal deleted inserted replaced

-:b9961c99c356
+:91e5f98fff6f
 // e.g.
 //   log_debug(logging)("message %d", i);
 //
 // Note that these macros will not evaluate the arguments unless the logging is enabled.
 //
-#define log_error(...)   (!log_is_enabled(Error, __VA_ARGS__))   ? (void)0 : Log<LOG_TAGS(__VA_ARGS__)>::write<LogLevel::Error>
+#define log_error(...)   (!log_is_enabled(Error, __VA_ARGS__))   ? (void)0 : LogImpl<LOG_TAGS(__VA_ARGS__)>::write<LogLevel::Error>
-#define log_warning(...) (!log_is_enabled(Warning, __VA_ARGS__)) ? (void)0 : Log<LOG_TAGS(__VA_ARGS__)>::write<LogLevel::Warning>
+#define log_warning(...) (!log_is_enabled(Warning, __VA_ARGS__)) ? (void)0 : LogImpl<LOG_TAGS(__VA_ARGS__)>::write<LogLevel::Warning>
-#define log_info(...)    (!log_is_enabled(Info, __VA_ARGS__))    ? (void)0 : Log<LOG_TAGS(__VA_ARGS__)>::write<LogLevel::Info>
+#define log_info(...)    (!log_is_enabled(Info, __VA_ARGS__))    ? (void)0 : LogImpl<LOG_TAGS(__VA_ARGS__)>::write<LogLevel::Info>
-#define log_debug(...)   (!log_is_enabled(Debug, __VA_ARGS__))   ? (void)0 : Log<LOG_TAGS(__VA_ARGS__)>::write<LogLevel::Debug>
+#define log_debug(...)   (!log_is_enabled(Debug, __VA_ARGS__))   ? (void)0 : LogImpl<LOG_TAGS(__VA_ARGS__)>::write<LogLevel::Debug>
-#define log_trace(...)   (!log_is_enabled(Trace, __VA_ARGS__))   ? (void)0 : Log<LOG_TAGS(__VA_ARGS__)>::write<LogLevel::Trace>
+#define log_trace(...)   (!log_is_enabled(Trace, __VA_ARGS__))   ? (void)0 : LogImpl<LOG_TAGS(__VA_ARGS__)>::write<LogLevel::Trace>
 // Macros for logging that should be excluded in product builds.
 // Available for levels Info, Debug and Trace. Includes test macro that
 // evaluates to false in product builds.
 #ifndef PRODUCT
-#define log_develop_info(...)  (!log_is_enabled(Info, __VA_ARGS__))   ? (void)0 : Log<LOG_TAGS(__VA_ARGS__)>::write<LogLevel::Info>
+#define log_develop_info(...)  (!log_is_enabled(Info, __VA_ARGS__))   ? (void)0 : LogImpl<LOG_TAGS(__VA_ARGS__)>::write<LogLevel::Info>
-#define log_develop_debug(...) (!log_is_enabled(Debug, __VA_ARGS__)) ? (void)0 : Log<LOG_TAGS(__VA_ARGS__)>::write<LogLevel::Debug>
+#define log_develop_debug(...) (!log_is_enabled(Debug, __VA_ARGS__)) ? (void)0 : LogImpl<LOG_TAGS(__VA_ARGS__)>::write<LogLevel::Debug>
-#define log_develop_trace(...) (!log_is_enabled(Trace, __VA_ARGS__))  ? (void)0 : Log<LOG_TAGS(__VA_ARGS__)>::write<LogLevel::Trace>
+#define log_develop_trace(...) (!log_is_enabled(Trace, __VA_ARGS__))  ? (void)0 : LogImpl<LOG_TAGS(__VA_ARGS__)>::write<LogLevel::Trace>
 #define log_develop_is_enabled(level, ...)  log_is_enabled(level, __VA_ARGS__)
 #else
 #define DUMMY_ARGUMENT_CONSUMER(...)
 #define log_develop_info(...)  DUMMY_ARGUMENT_CONSUMER
 #define log_develop_debug(...) DUMMY_ARGUMENT_CONSUMER
 #define log_develop_trace(...) DUMMY_ARGUMENT_CONSUMER
 #define log_develop_is_enabled(...)  false
 #endif
 // Convenience macro to test if the logging is enabled on the specified level for given tags.
-#define log_is_enabled(level, ...) (Log<LOG_TAGS(__VA_ARGS__)>::is_level(LogLevel::level))
+#define log_is_enabled(level, ...) (LogImpl<LOG_TAGS(__VA_ARGS__)>::is_level(LogLevel::level))
 //
 // Log class for more advanced logging scenarios.
 // Has printf-style member functions for each log level (trace(), debug(), etc).
 //
 // Also has outputStream compatible API for the different log-levels.
 // The streams are resource allocated when requested and are accessed through
 // calls to <level>_stream() functions (trace_stream(), debug_stream(), etc).
 //
 // Example usage:
-//   LogHandle(logging) log;
+//   Log(logging) log;
 //   if (log.is_debug()) {
 //     ...
 //     log.debug("result = %d", result).trace(" tracing info");
 //     obj->print_on(log.debug_stream());
 //   }
 //
-#define LogHandle(...)  Log<LOG_TAGS(__VA_ARGS__)>
+#define Log(...)  LogImpl<LOG_TAGS(__VA_ARGS__)>
 template <LogTagType T0, LogTagType T1, LogTagType T2, LogTagType T3, LogTagType T4, LogTagType GuardTag>
-class Log;
+class LogImpl;
 // Non-template helper class for implementing write-slowpath in cpp
 class LogWriteHelper : AllStatic {
 private:
 template <LogTagType T0, LogTagType T1, LogTagType T2, LogTagType T3, LogTagType T4, LogTagType GuardTag>
-friend class Log;
+friend class LogImpl;
 ATTRIBUTE_PRINTF(6, 0)
 static void write_large(LogTagSet& lts,
 LogLevelType level,
 const char* prefix,
 va_list args);
 };
 template <LogTagType T0, LogTagType T1 = LogTag::__NO_TAG, LogTagType T2 = LogTag::__NO_TAG, LogTagType T3 = LogTag::__NO_TAG,
 LogTagType T4 = LogTag::__NO_TAG, LogTagType GuardTag = LogTag::__NO_TAG>
-class Log VALUE_OBJ_CLASS_SPEC {
+class LogImpl VALUE_OBJ_CLASS_SPEC {
 private:
 static const size_t LogBufferSize = 512;
 public:
 // Make sure no more than the maximum number of tags have been given.
 // The GuardTag allows this to be detected if/when it happens. If the GuardTag
 // is not __NO_TAG, the number of tags given exceeds the maximum allowed.
 STATIC_ASSERT(GuardTag == LogTag::__NO_TAG); // Number of logging tags exceeds maximum supported!
 // Empty constructor to avoid warnings on MSVC about unused variables
 // when the log instance is only used for static functions.
-Log() {
+LogImpl() {
 }
 static bool is_level(LogLevelType level) {
 return LogTagSetMapping<T0, T1, T2, T3, T4>::tagset().is_level(level);
 }
 }
 va_end(saved_args);
 }
 #define LOG_LEVEL(level, name) ATTRIBUTE_PRINTF(2, 0) \
-Log& v##name(const char* fmt, va_list args) { \
+LogImpl& v##name(const char* fmt, va_list args) { \
 vwrite(LogLevel::level, fmt, args); \
 return *this; \
 } \
-Log& name(const char* fmt, ...) ATTRIBUTE_PRINTF(2, 3) { \
+LogImpl& name(const char* fmt, ...) ATTRIBUTE_PRINTF(2, 3) { \
 va_list args; \
 va_start(args, fmt); \
 vwrite(LogLevel::level, fmt, args); \
 va_end(args); \
 return *this; \

changeset 37242	91e5f98fff6f
parent 37201	928cf689af1a
child 37245	70413a0266d4