diff --git a/glog/arm64-v8a/include/glog/flags.h b/glog/arm64-v8a/include/glog/flags.h new file mode 100644 index 00000000..8349639a --- /dev/null +++ b/glog/arm64-v8a/include/glog/flags.h @@ -0,0 +1,191 @@ +// Copyright (c) 2024, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#ifndef GLOG_FLAGS_H +#define GLOG_FLAGS_H + +#include + +#if defined(GLOG_USE_GFLAGS) +# include +#endif + +#if defined(GLOG_USE_GLOG_EXPORT) +# include "glog/export.h" +#endif + +#if !defined(GLOG_EXPORT) +# error was not included correctly. See the documention for how to consume the library. +#endif + +#include "glog/platform.h" +#include "glog/types.h" + +#pragma push_macro("DECLARE_VARIABLE") +#pragma push_macro("DECLARE_bool") +#pragma push_macro("DECLARE_string") +#pragma push_macro("DECLARE_int32") +#pragma push_macro("DECLARE_uint32") + +#ifdef DECLARE_VARIABLE +# undef DECLARE_VARIABLE +#endif + +#ifdef DECLARE_bool +# undef DECLARE_bool +#endif + +#ifdef DECLARE_string +# undef DECLARE_string +#endif + +#ifdef DECLARE_int32 +# undef DECLARE_int32 +#endif + +#ifdef DECLARE_uint32 +# undef DECLARE_uint32 +#endif + +#ifndef DECLARE_VARIABLE +# define DECLARE_VARIABLE(type, shorttype, name, tn) \ + namespace fL##shorttype { \ + extern GLOG_EXPORT type FLAGS_##name; \ + } \ + using fL##shorttype::FLAGS_##name + +// bool specialization +# define DECLARE_bool(name) DECLARE_VARIABLE(bool, B, name, bool) + +// int32 specialization +# define DECLARE_int32(name) DECLARE_VARIABLE(google::int32, I, name, int32) + +# if !defined(DECLARE_uint32) +// uint32 specialization +# define DECLARE_uint32(name) \ + DECLARE_VARIABLE(google::uint32, U, name, uint32) +# endif // !defined(DECLARE_uint32) && !defined(GLOG_USE_GFLAGS) + +// Special case for string, because we have to specify the namespace +// std::string, which doesn't play nicely with our FLAG__namespace hackery. +# define DECLARE_string(name) \ + namespace fLS { \ + extern GLOG_EXPORT std::string& FLAGS_##name; \ + } \ + using fLS::FLAGS_##name +#endif + +DECLARE_int32(logemaillevel); +DECLARE_int32(logcleansecs); + +#ifdef GLOG_OS_LINUX +DECLARE_bool(drop_log_memory); +#endif +DECLARE_string(alsologtoemail); +DECLARE_string(log_backtrace_at); + +// Set whether appending a timestamp to the log file name +DECLARE_bool(timestamp_in_logfile_name); + +// Set whether log messages go to stdout instead of logfiles +DECLARE_bool(logtostdout); + +// Set color messages logged to stdout (if supported by terminal). +DECLARE_bool(colorlogtostdout); + +// Set whether log messages go to stderr instead of logfiles +DECLARE_bool(logtostderr); + +// Set whether log messages go to stderr in addition to logfiles. +DECLARE_bool(alsologtostderr); + +// Set color messages logged to stderr (if supported by terminal). +DECLARE_bool(colorlogtostderr); + +// Log messages at a level >= this flag are automatically sent to +// stderr in addition to log files. +DECLARE_int32(stderrthreshold); + +// Set whether the log file header should be written upon creating a file. +DECLARE_bool(log_file_header); + +// Set whether the log prefix should be prepended to each line of output. +DECLARE_bool(log_prefix); + +// Set whether the year should be included in the log prefix. +DECLARE_bool(log_year_in_prefix); + +// Log messages at a level <= this flag are buffered. +// Log messages at a higher level are flushed immediately. +DECLARE_int32(logbuflevel); + +// Sets the maximum number of seconds which logs may be buffered for. +DECLARE_int32(logbufsecs); + +// Log suppression level: messages logged at a lower level than this +// are suppressed. +DECLARE_int32(minloglevel); + +// If specified, logfiles are written into this directory instead of the +// default logging directory. +DECLARE_string(log_dir); + +// Set the log file mode. +DECLARE_int32(logfile_mode); + +// Sets the path of the directory into which to put additional links +// to the log files. +DECLARE_string(log_link); + +DECLARE_int32(v); // in vlog_is_on.cc + +DECLARE_string(vmodule); // also in vlog_is_on.cc + +// Sets the maximum log file size (in MB). +DECLARE_uint32(max_log_size); + +// Sets whether to avoid logging to the disk if the disk is full. +DECLARE_bool(stop_logging_if_full_disk); + +// Use UTC time for logging +DECLARE_bool(log_utc_time); + +// Mailer used to send logging email +DECLARE_string(logmailer); + +DECLARE_bool(symbolize_stacktrace); + +#pragma pop_macro("DECLARE_VARIABLE") +#pragma pop_macro("DECLARE_bool") +#pragma pop_macro("DECLARE_string") +#pragma pop_macro("DECLARE_int32") +#pragma pop_macro("DECLARE_uint32") + +#endif // GLOG_FLAGS_H diff --git a/glog/arm64-v8a/include/glog/log_severity.h b/glog/arm64-v8a/include/glog/log_severity.h index aa48f531..1fb6a4c0 100644 --- a/glog/arm64-v8a/include/glog/log_severity.h +++ b/glog/arm64-v8a/include/glog/log_severity.h @@ -1,4 +1,4 @@ -// Copyright (c) 2007, Google Inc. +// Copyright (c) 2024, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -30,6 +30,16 @@ #ifndef BASE_LOG_SEVERITY_H__ #define BASE_LOG_SEVERITY_H__ +#if defined(GLOG_USE_GLOG_EXPORT) +# include "glog/export.h" +#endif + +#if !defined(GLOG_EXPORT) +# error was not included correctly. See the documention for how to consume the library. +#endif + +namespace google { + // The recommended semantics of the log levels are as follows: // // INFO: @@ -48,27 +58,43 @@ // Variables of type LogSeverity are widely taken to lie in the range // [0, NUM_SEVERITIES-1]. Be careful to preserve this assumption if // you ever need to change their values or add a new severity. -typedef int LogSeverity; -const int GLOG_INFO = 0, GLOG_WARNING = 1, GLOG_ERROR = 2, GLOG_FATAL = 3, - NUM_SEVERITIES = 4; +enum LogSeverity { + GLOG_INFO = 0, + GLOG_WARNING = 1, + GLOG_ERROR = 2, + GLOG_FATAL = 3, #ifndef GLOG_NO_ABBREVIATED_SEVERITIES -# ifdef ERROR +# ifdef ERROR # error ERROR macro is defined. Define GLOG_NO_ABBREVIATED_SEVERITIES before including logging.h. See the document for detail. -# endif -const int INFO = GLOG_INFO, WARNING = GLOG_WARNING, - ERROR = GLOG_ERROR, FATAL = GLOG_FATAL; +# endif + INFO = GLOG_INFO, + WARNING = GLOG_WARNING, + ERROR = GLOG_ERROR, + FATAL = GLOG_FATAL #endif +}; + +#if defined(__cpp_inline_variables) +# if (__cpp_inline_variables >= 201606L) +# define GLOG_INLINE_VARIABLE inline +# endif // (__cpp_inline_variables >= 201606L) +#endif // defined(__cpp_inline_variables) + +#if !defined(GLOG_INLINE_VARIABLE) +# define GLOG_INLINE_VARIABLE +#endif // !defined(GLOG_INLINE_VARIABLE) + +GLOG_INLINE_VARIABLE +constexpr int NUM_SEVERITIES = 4; // DFATAL is FATAL in debug mode, ERROR in normal mode #ifdef NDEBUG -#define DFATAL_LEVEL ERROR +# define DFATAL_LEVEL ERROR #else -#define DFATAL_LEVEL FATAL +# define DFATAL_LEVEL FATAL #endif -extern GLOG_EXPORT const char* const LogSeverityNames[NUM_SEVERITIES]; - // NDEBUG usage helpers related to (RAW_)DCHECK: // // DEBUG_MODE is for small !NDEBUG uses like @@ -89,10 +115,12 @@ extern GLOG_EXPORT const char* const LogSeverityNames[NUM_SEVERITIES]; // #ifdef NDEBUG enum { DEBUG_MODE = 0 }; -#define IF_DEBUG_MODE(x) +# define IF_DEBUG_MODE(x) #else enum { DEBUG_MODE = 1 }; -#define IF_DEBUG_MODE(x) x +# define IF_DEBUG_MODE(x) x #endif +} // namespace google + #endif // BASE_LOG_SEVERITY_H__ diff --git a/glog/arm64-v8a/include/glog/logging.h b/glog/arm64-v8a/include/glog/logging.h index af2219cc..9ab897e4 100644 --- a/glog/arm64-v8a/include/glog/logging.h +++ b/glog/arm64-v8a/include/glog/logging.h @@ -1,4 +1,4 @@ -// Copyright (c) 2022, Google Inc. +// Copyright (c) 2024, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -36,141 +36,104 @@ #ifndef GLOG_LOGGING_H #define GLOG_LOGGING_H -#if 1 && __cplusplus >= 201103L -#include -#endif - +#include #include +#include #include #include #include #include #include +#include #include #include #include -#if 1 -# include -#endif +#include +#include #include -#if defined(_MSC_VER) -#define GLOG_MSVC_PUSH_DISABLE_WARNING(n) __pragma(warning(push)) \ - __pragma(warning(disable:n)) -#define GLOG_MSVC_POP_WARNING() __pragma(warning(pop)) -#else -#define GLOG_MSVC_PUSH_DISABLE_WARNING(n) -#define GLOG_MSVC_POP_WARNING() +#if defined(GLOG_USE_GLOG_EXPORT) +# include "glog/export.h" #endif -#include - -#if 1 -#include +#if !defined(GLOG_EXPORT) || !defined(GLOG_NO_EXPORT) +# error was not included correctly. See the documention for how to consume the library. #endif -// We care a lot about number of bits things take up. Unfortunately, -// systems define their bit-specific ints in a lot of different ways. -// We use our own way, and have a typedef to get there. -// Note: these commands below may look like "#if 1" or "#if 0", but -// that's because they were constructed that way at ./configure time. -// Look at logging.h.in to see how they're calculated (based on your config). -#if 1 -#include // the normal place uint16_t is defined -#endif -#if 1 -#include // the normal place u_int16_t is defined -#endif -#if 1 -#include // a third place for uint16_t or u_int16_t -#endif +#include "glog/flags.h" +#include "glog/platform.h" +#include "glog/types.h" -#if 0 -#include -#endif +#if defined(__has_attribute) +# if __has_attribute(used) +# define GLOG_USED __attribute__((used)) +# endif // __has_attribute(used) +#endif // defined(__has_attribute) -#if 1 && __cplusplus >= 201103L -#include -#elif defined(GLOG_OS_WINDOWS) -#include -#endif +#if !defined(GLOG_USED) +# define GLOG_USED +#endif // !defined(GLOG_USED) + +#include "glog/log_severity.h" +#include "glog/vlog_is_on.h" namespace google { -#if 1 // the C99 format -typedef int32_t int32; -typedef uint32_t uint32; -typedef int64_t int64; -typedef uint64_t uint64; -#elif 1 // the BSD format -typedef int32_t int32; -typedef u_int32_t uint32; -typedef int64_t int64; -typedef u_int64_t uint64; -#elif 0 // the windows (vc7) format -typedef __int32 int32; -typedef unsigned __int32 uint32; -typedef __int64 int64; -typedef unsigned __int64 uint64; -#else -#error Do not know how to define a 32-bit integer quantity on your system -#endif - -typedef double WallTime; - struct GLOG_EXPORT LogMessageTime { LogMessageTime(); - LogMessageTime(std::tm t); - LogMessageTime(std::time_t timestamp, WallTime now); + explicit LogMessageTime(std::chrono::system_clock::time_point now); - const time_t& timestamp() const { return timestamp_; } - const int& sec() const { return time_struct_.tm_sec; } - const int32_t& usec() const { return usecs_; } - const int&(min)() const { return time_struct_.tm_min; } - const int& hour() const { return time_struct_.tm_hour; } - const int& day() const { return time_struct_.tm_mday; } - const int& month() const { return time_struct_.tm_mon; } - const int& year() const { return time_struct_.tm_year; } - const int& dayOfWeek() const { return time_struct_.tm_wday; } - const int& dayInYear() const { return time_struct_.tm_yday; } - const int& dst() const { return time_struct_.tm_isdst; } - const long int& gmtoff() const { return gmtoffset_; } - const std::tm& tm() const { return time_struct_; } + [[deprecated("Use LogMessageTime::when() instead.")]] std::time_t timestamp() + const noexcept { + return std::chrono::system_clock::to_time_t(when()); + } + const std::chrono::system_clock::time_point& when() const noexcept { + return timestamp_; + } + int sec() const noexcept { return tm_.tm_sec; } + long usec() const noexcept { return usecs_.count(); } + int(min)() const noexcept { return tm_.tm_min; } + int hour() const noexcept { return tm_.tm_hour; } + int day() const noexcept { return tm_.tm_mday; } + int month() const noexcept { return tm_.tm_mon; } + int year() const noexcept { return tm_.tm_year; } + int dayOfWeek() const noexcept { return tm_.tm_wday; } + int dayInYear() const noexcept { return tm_.tm_yday; } + int dst() const noexcept { return tm_.tm_isdst; } + [[deprecated("Use LogMessageTime::gmtoffset() instead.")]] long gmtoff() + const noexcept { + return gmtoffset_.count(); + } + std::chrono::seconds gmtoffset() const noexcept { return gmtoffset_; } + const std::tm& tm() const noexcept { return tm_; } private: - void init(const std::tm& t, std::time_t timestamp, WallTime now); - std::tm time_struct_; // Time of creation of LogMessage - time_t timestamp_; // Time of creation of LogMessage in seconds - int32_t usecs_; // Time of creation of LogMessage - microseconds part - long int gmtoffset_; - - void CalcGmtOffset(); + std::tm tm_{}; // Time of creation of LogMessage + std::chrono::system_clock::time_point + timestamp_; // Time of creation of LogMessage in seconds + std::chrono::microseconds usecs_; + std::chrono::seconds gmtoffset_; }; -#ifdef GLOG_CUSTOM_PREFIX_SUPPORT -struct LogMessageInfo { +struct [[deprecated("Use LogMessage instead.")]] LogMessageInfo { explicit LogMessageInfo(const char* const severity_, - const char* const filename_, - const int& line_number_, - const int& thread_id_, - const LogMessageTime& time_): - severity(severity_), filename(filename_), line_number(line_number_), - thread_id(thread_id_), time(time_) - {} + const char* const filename_, const int& line_number_, + std::thread::id thread_id_, + const LogMessageTime& time_) + : severity(severity_), + filename(filename_), + line_number(line_number_), + thread_id(thread_id_), + time(time_) {} const char* const severity; const char* const filename; - const int &line_number; - const int &thread_id; + const int& line_number; + std::thread::id thread_id; const LogMessageTime& time; }; -typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, void* data); - -#endif - -} - +} // namespace google // The global value of GOOGLE_STRIP_LOG. All the messages logged to // LOG(XXX) with severity less than GOOGLE_STRIP_LOG will not be displayed. @@ -182,7 +145,7 @@ typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, vo // file, add "#define GOOGLE_STRIP_LOG 1" to that file _before_ including // base/logging.h #ifndef GOOGLE_STRIP_LOG -#define GOOGLE_STRIP_LOG 0 +# define GOOGLE_STRIP_LOG 0 #endif // GCC can be told that a certain branch is not likely to be taken (for @@ -190,30 +153,48 @@ typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, vo // Giving it this information can help it optimize for the common case in // the absence of better information (ie. -fprofile-arcs). // -#ifndef GOOGLE_PREDICT_BRANCH_NOT_TAKEN -#if 1 -#define GOOGLE_PREDICT_BRANCH_NOT_TAKEN(x) (__builtin_expect(x, 0)) -#else -#define GOOGLE_PREDICT_BRANCH_NOT_TAKEN(x) x -#endif +#if defined(__has_builtin) +# if __has_builtin(__builtin_expect) +# define GLOG_BUILTIN_EXPECT_PRESENT +# endif #endif -#ifndef GOOGLE_PREDICT_FALSE -#if 1 -#define GOOGLE_PREDICT_FALSE(x) (__builtin_expect(x, 0)) -#else -#define GOOGLE_PREDICT_FALSE(x) x -#endif +#if !defined(GLOG_BUILTIN_EXPECT_PRESENT) && defined(__GNUG__) +// __has_builtin is not available prior to GCC 10 +# define GLOG_BUILTIN_EXPECT_PRESENT #endif -#ifndef GOOGLE_PREDICT_TRUE -#if 1 -#define GOOGLE_PREDICT_TRUE(x) (__builtin_expect(!!(x), 1)) +#if defined(GLOG_BUILTIN_EXPECT_PRESENT) + +# ifndef GOOGLE_PREDICT_BRANCH_NOT_TAKEN +# define GOOGLE_PREDICT_BRANCH_NOT_TAKEN(x) (__builtin_expect(x, 0)) +# endif + +# ifndef GOOGLE_PREDICT_FALSE +# define GOOGLE_PREDICT_FALSE(x) (__builtin_expect(x, 0)) +# endif + +# ifndef GOOGLE_PREDICT_TRUE +# define GOOGLE_PREDICT_TRUE(x) (__builtin_expect(!!(x), 1)) +# endif + #else -#define GOOGLE_PREDICT_TRUE(x) x -#endif + +# ifndef GOOGLE_PREDICT_BRANCH_NOT_TAKEN +# define GOOGLE_PREDICT_BRANCH_NOT_TAKEN(x) x +# endif + +# ifndef GOOGLE_PREDICT_TRUE +# define GOOGLE_PREDICT_FALSE(x) x +# endif + +# ifndef GOOGLE_PREDICT_TRUE +# define GOOGLE_PREDICT_TRUE(x) x +# endif + #endif +#undef GLOG_BUILTIN_EXPECT_PRESENT // Make a bunch of macros for logging. The way to log things is to stream // things to LOG(). E.g., @@ -226,7 +207,7 @@ typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, vo // vector errors; // LOG_STRING(ERROR, &errors) << "Couldn't parse cookie #" << cookie_num; // -// This pushes back the new error onto 'errors'; if given a NULL pointer, +// This pushes back the new error onto 'errors'; if given a nullptr pointer, // it reports the error via LOG(ERROR). // // You can also do conditional logging: @@ -311,11 +292,11 @@ typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, vo // "program with --v=1 or more"; // VLOG_EVERY_N(1, 10) // << "I'm printed every 10th occurrence, and when you run the program " -// "with --v=1 or more. Present occurence is " << google::COUNTER; +// "with --v=1 or more. Present occurrence is " << google::COUNTER; // VLOG_IF_EVERY_N(1, (size > 1024), 10) -// << "I'm printed on every 10th occurence of case when size is more " +// << "I'm printed on every 10th occurrence of case when size is more " // " than 1024, when you run the program with --v=1 or more. "; -// "Present occurence is " << google::COUNTER; +// "Present occurrence is " << google::COUNTER; // // The supported severity levels for macros that allow you to specify one // are (in increasing order of severity) INFO, WARNING, ERROR, and FATAL. @@ -369,234 +350,119 @@ typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, vo // synchronized. Hence, use caution when comparing the low bits of // timestamps from different machines. -#pragma push_macro("DECLARE_VARIABLE") -#pragma push_macro("DECLARE_bool") -#pragma push_macro("DECLARE_string") -#pragma push_macro("DECLARE_int32") -#pragma push_macro("DECLARE_uint32") - -#ifdef DECLARE_VARIABLE -#undef DECLARE_VARIABLE -#endif - -#ifdef DECLARE_bool -#undef DECLARE_bool -#endif - -#ifdef DECLARE_string -#undef DECLARE_string -#endif - -#ifdef DECLARE_int32 -#undef DECLARE_int32 -#endif - -#ifdef DECLARE_uint32 -#undef DECLARE_uint32 -#endif - -#ifndef DECLARE_VARIABLE -#define DECLARE_VARIABLE(type, shorttype, name, tn) \ - namespace fL##shorttype { \ - extern GLOG_EXPORT type FLAGS_##name; \ - } \ - using fL##shorttype::FLAGS_##name - -// bool specialization -#define DECLARE_bool(name) \ - DECLARE_VARIABLE(bool, B, name, bool) - -// int32 specialization -#define DECLARE_int32(name) \ - DECLARE_VARIABLE(google::int32, I, name, int32) - -#if !defined(DECLARE_uint32) -// uint32 specialization -#define DECLARE_uint32(name) \ - DECLARE_VARIABLE(google::uint32, U, name, uint32) -#endif // !defined(DECLARE_uint32) && !(0) - -// Special case for string, because we have to specify the namespace -// std::string, which doesn't play nicely with our FLAG__namespace hackery. -#define DECLARE_string(name) \ - namespace fLS { \ - extern GLOG_EXPORT std::string& FLAGS_##name; \ - } \ - using fLS::FLAGS_##name -#endif - -// Set whether appending a timestamp to the log file name -DECLARE_bool(timestamp_in_logfile_name); - -// Set whether log messages go to stdout instead of logfiles -DECLARE_bool(logtostdout); - -// Set color messages logged to stdout (if supported by terminal). -DECLARE_bool(colorlogtostdout); - -// Set whether log messages go to stderr instead of logfiles -DECLARE_bool(logtostderr); - -// Set whether log messages go to stderr in addition to logfiles. -DECLARE_bool(alsologtostderr); - -// Set color messages logged to stderr (if supported by terminal). -DECLARE_bool(colorlogtostderr); - -// Log messages at a level >= this flag are automatically sent to -// stderr in addition to log files. -DECLARE_int32(stderrthreshold); - -// Set whether the log prefix should be prepended to each line of output. -DECLARE_bool(log_prefix); - -// Set whether the year should be included in the log prefix. -DECLARE_bool(log_year_in_prefix); - -// Log messages at a level <= this flag are buffered. -// Log messages at a higher level are flushed immediately. -DECLARE_int32(logbuflevel); - -// Sets the maximum number of seconds which logs may be buffered for. -DECLARE_int32(logbufsecs); - -// Log suppression level: messages logged at a lower level than this -// are suppressed. -DECLARE_int32(minloglevel); - -// If specified, logfiles are written into this directory instead of the -// default logging directory. -DECLARE_string(log_dir); - -// Set the log file mode. -DECLARE_int32(logfile_mode); - -// Sets the path of the directory into which to put additional links -// to the log files. -DECLARE_string(log_link); - -DECLARE_int32(v); // in vlog_is_on.cc - -DECLARE_string(vmodule); // also in vlog_is_on.cc - -// Sets the maximum log file size (in MB). -DECLARE_uint32(max_log_size); - -// Sets whether to avoid logging to the disk if the disk is full. -DECLARE_bool(stop_logging_if_full_disk); - -// Use UTC time for logging -DECLARE_bool(log_utc_time); - // Log messages below the GOOGLE_STRIP_LOG level will be compiled away for -// security reasons. See LOG(severtiy) below. +// security reasons. See LOG(severity) below. // A few definitions of macros that don't generate much code. Since // LOG(INFO) and its ilk are used all over our code, it's // better to have compact code for these operations. #if GOOGLE_STRIP_LOG == 0 -#define COMPACT_GOOGLE_LOG_INFO google::LogMessage( \ - __FILE__, __LINE__) -#define LOG_TO_STRING_INFO(message) google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_INFO, message) +# define COMPACT_GOOGLE_LOG_INFO google::LogMessage(__FILE__, __LINE__) +# define LOG_TO_STRING_INFO(message) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_INFO, message) #else -#define COMPACT_GOOGLE_LOG_INFO google::NullStream() -#define LOG_TO_STRING_INFO(message) google::NullStream() +# define COMPACT_GOOGLE_LOG_INFO google::NullStream() +# define LOG_TO_STRING_INFO(message) google::NullStream() #endif #if GOOGLE_STRIP_LOG <= 1 -#define COMPACT_GOOGLE_LOG_WARNING google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_WARNING) -#define LOG_TO_STRING_WARNING(message) google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_WARNING, message) +# define COMPACT_GOOGLE_LOG_WARNING \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_WARNING) +# define LOG_TO_STRING_WARNING(message) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_WARNING, message) #else -#define COMPACT_GOOGLE_LOG_WARNING google::NullStream() -#define LOG_TO_STRING_WARNING(message) google::NullStream() +# define COMPACT_GOOGLE_LOG_WARNING google::NullStream() +# define LOG_TO_STRING_WARNING(message) google::NullStream() #endif #if GOOGLE_STRIP_LOG <= 2 -#define COMPACT_GOOGLE_LOG_ERROR google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ERROR) -#define LOG_TO_STRING_ERROR(message) google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ERROR, message) +# define COMPACT_GOOGLE_LOG_ERROR \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_ERROR) +# define LOG_TO_STRING_ERROR(message) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_ERROR, message) #else -#define COMPACT_GOOGLE_LOG_ERROR google::NullStream() -#define LOG_TO_STRING_ERROR(message) google::NullStream() +# define COMPACT_GOOGLE_LOG_ERROR google::NullStream() +# define LOG_TO_STRING_ERROR(message) google::NullStream() #endif #if GOOGLE_STRIP_LOG <= 3 -#define COMPACT_GOOGLE_LOG_FATAL google::LogMessageFatal( \ - __FILE__, __LINE__) -#define LOG_TO_STRING_FATAL(message) google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_FATAL, message) +# define COMPACT_GOOGLE_LOG_FATAL google::LogMessageFatal(__FILE__, __LINE__) +# define LOG_TO_STRING_FATAL(message) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_FATAL, message) #else -#define COMPACT_GOOGLE_LOG_FATAL google::NullStreamFatal() -#define LOG_TO_STRING_FATAL(message) google::NullStreamFatal() +# define COMPACT_GOOGLE_LOG_FATAL google::NullStreamFatal() +# define LOG_TO_STRING_FATAL(message) google::NullStreamFatal() #endif #if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON) -#define DCHECK_IS_ON() 0 +# define DCHECK_IS_ON() 0 #else -#define DCHECK_IS_ON() 1 +# define DCHECK_IS_ON() 1 #endif // For DFATAL, we want to use LogMessage (as opposed to // LogMessageFatal), to be consistent with the original behavior. #if !DCHECK_IS_ON() -#define COMPACT_GOOGLE_LOG_DFATAL COMPACT_GOOGLE_LOG_ERROR +# define COMPACT_GOOGLE_LOG_DFATAL COMPACT_GOOGLE_LOG_ERROR #elif GOOGLE_STRIP_LOG <= 3 -#define COMPACT_GOOGLE_LOG_DFATAL google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_FATAL) +# define COMPACT_GOOGLE_LOG_DFATAL \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_FATAL) #else -#define COMPACT_GOOGLE_LOG_DFATAL google::NullStreamFatal() +# define COMPACT_GOOGLE_LOG_DFATAL google::NullStreamFatal() #endif -#define GOOGLE_LOG_INFO(counter) google::LogMessage(__FILE__, __LINE__, google::GLOG_INFO, counter, &google::LogMessage::SendToLog) -#define SYSLOG_INFO(counter) \ +#define GOOGLE_LOG_INFO(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_INFO, counter, \ - &google::LogMessage::SendToSyslogAndLog) -#define GOOGLE_LOG_WARNING(counter) \ + &google::LogMessage::SendToLog) +#define SYSLOG_INFO(counter) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_INFO, counter, \ + &google::LogMessage::SendToSyslogAndLog) +#define GOOGLE_LOG_WARNING(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_WARNING, counter, \ - &google::LogMessage::SendToLog) -#define SYSLOG_WARNING(counter) \ + &google::LogMessage::SendToLog) +#define SYSLOG_WARNING(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_WARNING, counter, \ - &google::LogMessage::SendToSyslogAndLog) -#define GOOGLE_LOG_ERROR(counter) \ + &google::LogMessage::SendToSyslogAndLog) +#define GOOGLE_LOG_ERROR(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_ERROR, counter, \ - &google::LogMessage::SendToLog) -#define SYSLOG_ERROR(counter) \ + &google::LogMessage::SendToLog) +#define SYSLOG_ERROR(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_ERROR, counter, \ - &google::LogMessage::SendToSyslogAndLog) -#define GOOGLE_LOG_FATAL(counter) \ + &google::LogMessage::SendToSyslogAndLog) +#define GOOGLE_LOG_FATAL(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_FATAL, counter, \ - &google::LogMessage::SendToLog) -#define SYSLOG_FATAL(counter) \ + &google::LogMessage::SendToLog) +#define SYSLOG_FATAL(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_FATAL, counter, \ - &google::LogMessage::SendToSyslogAndLog) -#define GOOGLE_LOG_DFATAL(counter) \ + &google::LogMessage::SendToSyslogAndLog) +#define GOOGLE_LOG_DFATAL(counter) \ google::LogMessage(__FILE__, __LINE__, google::DFATAL_LEVEL, counter, \ - &google::LogMessage::SendToLog) -#define SYSLOG_DFATAL(counter) \ + &google::LogMessage::SendToLog) +#define SYSLOG_DFATAL(counter) \ google::LogMessage(__FILE__, __LINE__, google::DFATAL_LEVEL, counter, \ - &google::LogMessage::SendToSyslogAndLog) + &google::LogMessage::SendToSyslogAndLog) -#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) || defined(__CYGWIN32__) +#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || \ + defined(__CYGWIN__) || defined(__CYGWIN32__) // A very useful logging macro to log windows errors: -#define LOG_SYSRESULT(result) \ - if (FAILED(HRESULT_FROM_WIN32(result))) { \ - LPSTR message = NULL; \ - LPSTR msg = reinterpret_cast(&message); \ - DWORD message_length = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | \ - FORMAT_MESSAGE_FROM_SYSTEM, \ - 0, result, 0, msg, 100, NULL); \ - if (message_length > 0) { \ - google::LogMessage(__FILE__, __LINE__, google::GLOG_ERROR, 0, \ - &google::LogMessage::SendToLog).stream() \ - << reinterpret_cast(message); \ - LocalFree(message); \ - } \ - } +# define LOG_SYSRESULT(result) \ + if (FAILED(HRESULT_FROM_WIN32(result))) { \ + LPSTR message = nullptr; \ + LPSTR msg = reinterpret_cast(&message); \ + DWORD message_length = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | \ + FORMAT_MESSAGE_FROM_SYSTEM | \ + FORMAT_MESSAGE_IGNORE_INSERTS, \ + 0, result, 0, msg, 100, nullptr); \ + std::unique_ptr release{message, \ + &LocalFree}; \ + if (message_length > 0) { \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_ERROR, 0, \ + &google::LogMessage::SendToLog) \ + .stream() \ + << reinterpret_cast(message); \ + } \ + } #endif // We use the preprocessor's merging operator, "##", so that, e.g., @@ -607,24 +473,35 @@ DECLARE_bool(log_utc_time); // impossible to stream something like a string directly to an unnamed // ostream. We employ a neat hack by calling the stream() member // function of LogMessage which seems to avoid the problem. -#define LOG(severity) COMPACT_GOOGLE_LOG_ ## severity.stream() -#define SYSLOG(severity) SYSLOG_ ## severity(0).stream() +#define LOG(severity) COMPACT_GOOGLE_LOG_##severity.stream() +#define SYSLOG(severity) SYSLOG_##severity(0).stream() namespace google { -// They need the definitions of integer types. -#include -#include - // Initialize google's logging library. You will see the program name // specified by argv0 in log outputs. GLOG_EXPORT void InitGoogleLogging(const char* argv0); -#ifdef GLOG_CUSTOM_PREFIX_SUPPORT -GLOG_EXPORT void InitGoogleLogging(const char* argv0, - CustomPrefixCallback prefix_callback, - void* prefix_callback_data = NULL); -#endif +class LogMessage; + +#if defined(__GNUG__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#elif defined(_MSC_VER) +# pragma warning(push) +# pragma warning(disable : 4996) +#endif // __GNUG__ +using CustomPrefixCallback + [[deprecated("Use PrefixFormatterCallback instead.")]] = + void (*)(std::ostream&, const LogMessageInfo&, void*); +#if defined(__GNUG__) +# pragma GCC diagnostic pop +#elif defined(_MSC_VER) +# pragma warning(pop) +#endif // __GNUG__ +[[deprecated("Use InstallPrefixFormatter instead.")]] GLOG_EXPORT void +InitGoogleLogging(const char* argv0, CustomPrefixCallback prefix_callback, + void* prefix_callback_data = nullptr); // Check if google's logging library has been initialized. GLOG_EXPORT bool IsGoogleLoggingInitialized(); @@ -638,67 +515,81 @@ typedef void (*logging_fail_func_t)() __attribute__((noreturn)); typedef void (*logging_fail_func_t)(); #endif -// Install a function which will be called after LOG(FATAL). -GLOG_EXPORT void InstallFailureFunction(logging_fail_func_t fail_func); +using PrefixFormatterCallback = void (*)(std::ostream&, const LogMessage&, + void*); +GLOG_EXPORT void InstallPrefixFormatter(PrefixFormatterCallback callback, + void* data = nullptr); + +// Install a function which will be called after LOG(FATAL). Returns the +// previously set function. +GLOG_EXPORT logging_fail_func_t +InstallFailureFunction(logging_fail_func_t fail_func); + +[[deprecated( + "Use the type-safe std::chrono::minutes EnableLogCleaner overload " + "instead.")]] GLOG_EXPORT void +EnableLogCleaner(unsigned int overdue_days); // Enable/Disable old log cleaner. -GLOG_EXPORT void EnableLogCleaner(unsigned int overdue_days); +GLOG_EXPORT void EnableLogCleaner(const std::chrono::minutes& overdue); GLOG_EXPORT void DisableLogCleaner(); GLOG_EXPORT void SetApplicationFingerprint(const std::string& fingerprint); class LogSink; // defined below -// If a non-NULL sink pointer is given, we push this message to that sink. +// If a non-nullptr sink pointer is given, we push this message to that sink. // For LOG_TO_SINK we then do normal LOG(severity) logging as well. // This is useful for capturing messages and passing/storing them // somewhere more specific than the global log of the process. // Argument types: // LogSink* sink; // LogSeverity severity; -// The cast is to disambiguate NULL arguments. -#define LOG_TO_SINK(sink, severity) \ - google::LogMessage( \ - __FILE__, __LINE__, \ - google::GLOG_ ## severity, \ - static_cast(sink), true).stream() -#define LOG_TO_SINK_BUT_NOT_TO_LOGFILE(sink, severity) \ - google::LogMessage( \ - __FILE__, __LINE__, \ - google::GLOG_ ## severity, \ - static_cast(sink), false).stream() +// The cast is to disambiguate nullptr arguments. +#define LOG_TO_SINK(sink, severity) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + static_cast(sink), true) \ + .stream() +#define LOG_TO_SINK_BUT_NOT_TO_LOGFILE(sink, severity) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + static_cast(sink), false) \ + .stream() -// If a non-NULL string pointer is given, we write this message to that string. -// We then do normal LOG(severity) logging as well. -// This is useful for capturing messages and storing them somewhere more -// specific than the global log of the process. -// Argument types: +// If a non-nullptr string pointer is given, we write this message to that +// string. We then do normal LOG(severity) logging as well. This is useful for +// capturing messages and storing them somewhere more specific than the global +// log of the process. Argument types: // string* message; // LogSeverity severity; -// The cast is to disambiguate NULL arguments. +// The cast is to disambiguate nullptr arguments. // NOTE: LOG(severity) expands to LogMessage().stream() for the specified // severity. #define LOG_TO_STRING(severity, message) \ LOG_TO_STRING_##severity(static_cast(message)).stream() -// If a non-NULL pointer is given, we push the message onto the end +// If a non-nullptr pointer is given, we push the message onto the end // of a vector of strings; otherwise, we report it with LOG(severity). // This is handy for capturing messages and perhaps passing them back // to the caller, rather than reporting them immediately. // Argument types: // LogSeverity severity; // vector *outvec; -// The cast is to disambiguate NULL arguments. -#define LOG_STRING(severity, outvec) \ - LOG_TO_STRING_##severity(static_cast*>(outvec)).stream() +// The cast is to disambiguate nullptr arguments. +#define LOG_STRING(severity, outvec) \ + LOG_TO_STRING_##severity(static_cast*>(outvec)) \ + .stream() #define LOG_IF(severity, condition) \ static_cast(0), \ - !(condition) ? (void) 0 : google::LogMessageVoidify() & LOG(severity) + !(condition) \ + ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) #define SYSLOG_IF(severity, condition) \ static_cast(0), \ - !(condition) ? (void) 0 : google::LogMessageVoidify() & SYSLOG(severity) + !(condition) \ + ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & SYSLOG(severity) -#define LOG_ASSERT(condition) \ +#define LOG_ASSERT(condition) \ LOG_IF(FATAL, !(condition)) << "Assert failed: " #condition #define SYSLOG_ASSERT(condition) \ SYSLOG_IF(FATAL, !(condition)) << "Assert failed: " #condition @@ -707,58 +598,55 @@ class LogSink; // defined below // controlled by DCHECK_IS_ON(), so the check will be executed regardless of // compilation mode. Therefore, it is safe to do things like: // CHECK(fp->Write(x) == 4) -#define CHECK(condition) \ - LOG_IF(FATAL, GOOGLE_PREDICT_BRANCH_NOT_TAKEN(!(condition))) \ - << "Check failed: " #condition " " +#define CHECK(condition) \ + LOG_IF(FATAL, GOOGLE_PREDICT_BRANCH_NOT_TAKEN(!(condition))) \ + << "Check failed: " #condition " " + +namespace logging { +namespace internal { // A container for a string pointer which can be evaluated to a bool - -// true iff the pointer is NULL. +// true iff the pointer is nullptr. struct CheckOpString { - CheckOpString(std::string* str) : str_(str) { } - // No destructor: if str_ is non-NULL, we're about to LOG(FATAL), - // so there's no point in cleaning up str_. - operator bool() const { - return GOOGLE_PREDICT_BRANCH_NOT_TAKEN(str_ != NULL); + CheckOpString(std::unique_ptr str) : str_(std::move(str)) {} + explicit operator bool() const noexcept { + return GOOGLE_PREDICT_BRANCH_NOT_TAKEN(str_ != nullptr); } - std::string* str_; + std::unique_ptr str_; }; // Function is overloaded for integral types to allow static const // integrals declared in classes and not defined to be used as arguments to // CHECK* macros. It's not encouraged though. template -inline const T& GetReferenceableValue(const T& t) { return t; } -inline char GetReferenceableValue(char t) { return t; } -inline unsigned char GetReferenceableValue(unsigned char t) { return t; } -inline signed char GetReferenceableValue(signed char t) { return t; } -inline short GetReferenceableValue(short t) { return t; } -inline unsigned short GetReferenceableValue(unsigned short t) { return t; } -inline int GetReferenceableValue(int t) { return t; } -inline unsigned int GetReferenceableValue(unsigned int t) { return t; } -inline long GetReferenceableValue(long t) { return t; } -inline unsigned long GetReferenceableValue(unsigned long t) { return t; } -#if __cplusplus >= 201103L -inline long long GetReferenceableValue(long long t) { return t; } +inline const T& GetReferenceableValue(const T& t) { + return t; +} +inline char GetReferenceableValue(char t) { return t; } +inline unsigned char GetReferenceableValue(unsigned char t) { return t; } +inline signed char GetReferenceableValue(signed char t) { return t; } +inline short GetReferenceableValue(short t) { return t; } +inline unsigned short GetReferenceableValue(unsigned short t) { return t; } +inline int GetReferenceableValue(int t) { return t; } +inline unsigned int GetReferenceableValue(unsigned int t) { return t; } +inline long GetReferenceableValue(long t) { return t; } +inline unsigned long GetReferenceableValue(unsigned long t) { return t; } +inline long long GetReferenceableValue(long long t) { return t; } inline unsigned long long GetReferenceableValue(unsigned long long t) { return t; } -#endif // This is a dummy class to define the following operator. struct DummyClassToDefineOperator {}; -} - // Define global operator<< to declare using ::operator<<. // This declaration will allow use to use CHECK macros for user // defined classes which have operator<< (e.g., stl_logging.h). -inline std::ostream& operator<<( - std::ostream& out, const google::DummyClassToDefineOperator&) { +inline std::ostream& operator<<(std::ostream& out, + const DummyClassToDefineOperator&) { return out; } -namespace google { - // This formats a value for a failing CHECK_XX statement. Ordinarily, // it uses the definition for operator<<, with a few special cases below. template @@ -768,34 +656,29 @@ inline void MakeCheckOpValueString(std::ostream* os, const T& v) { // Overrides for char types provide readable values for unprintable // characters. -template <> GLOG_EXPORT -void MakeCheckOpValueString(std::ostream* os, const char& v); -template <> GLOG_EXPORT -void MakeCheckOpValueString(std::ostream* os, const signed char& v); -template <> GLOG_EXPORT -void MakeCheckOpValueString(std::ostream* os, const unsigned char& v); +template <> +GLOG_EXPORT void MakeCheckOpValueString(std::ostream* os, const char& v); +template <> +GLOG_EXPORT void MakeCheckOpValueString(std::ostream* os, const signed char& v); +template <> +GLOG_EXPORT void MakeCheckOpValueString(std::ostream* os, + const unsigned char& v); -// This is required because nullptr is only present in c++ 11 and later. -#if 1 && __cplusplus >= 201103L // Provide printable value for nullptr_t -template <> GLOG_EXPORT -void MakeCheckOpValueString(std::ostream* os, const std::nullptr_t& v); -#endif +template <> +GLOG_EXPORT void MakeCheckOpValueString(std::ostream* os, + const std::nullptr_t& v); // Build the error message string. Specify no inlining for code size. template -std::string* MakeCheckOpString(const T1& v1, const T2& v2, const char* exprtext) - __attribute__((noinline)); - -namespace base { -namespace internal { - -// If "s" is less than base_logging::INFO, returns base_logging::INFO. -// If "s" is greater than base_logging::FATAL, returns -// base_logging::ERROR. Otherwise, returns "s". -LogSeverity NormalizeSeverity(LogSeverity s); - -} // namespace internal +std::unique_ptr MakeCheckOpString(const T1& v1, const T2& v2, + const char* exprtext) +#if defined(__has_attribute) +# if __has_attribute(used) + __attribute__((noinline)) +# endif +#endif + ; // A helper class for formatting "expr (V1 vs. V2)" in a CHECK_XX // statement. See MakeCheckOpString for sample usage. Other @@ -806,7 +689,7 @@ LogSeverity NormalizeSeverity(LogSeverity s); class GLOG_EXPORT CheckOpMessageBuilder { public: // Inserts "exprtext" and " (" to the stream. - explicit CheckOpMessageBuilder(const char *exprtext); + explicit CheckOpMessageBuilder(const char* exprtext); // Deletes "stream_". ~CheckOpMessageBuilder(); // For inserting the first variable. @@ -814,17 +697,16 @@ class GLOG_EXPORT CheckOpMessageBuilder { // For inserting the second variable (adds an intermediate " vs. "). std::ostream* ForVar2(); // Get the result (inserts the closing ")"). - std::string* NewString(); + std::unique_ptr NewString(); private: - std::ostringstream *stream_; + std::ostringstream* stream_; }; -} // namespace base - template -std::string* MakeCheckOpString(const T1& v1, const T2& v2, const char* exprtext) { - base::CheckOpMessageBuilder comb(exprtext); +std::unique_ptr MakeCheckOpString(const T1& v1, const T2& v2, + const char* exprtext) { + CheckOpMessageBuilder comb(exprtext); MakeCheckOpValueString(comb.ForVar1(), v1); MakeCheckOpValueString(comb.ForVar2(), v2); return comb.NewString(); @@ -834,27 +716,31 @@ std::string* MakeCheckOpString(const T1& v1, const T2& v2, const char* exprtext) // The (int, int) specialization works around the issue that the compiler // will not instantiate the template version of the function on values of // unnamed enum type - see comment below. -#define DEFINE_CHECK_OP_IMPL(name, op) \ - template \ - inline std::string* name##Impl(const T1& v1, const T2& v2, \ - const char* exprtext) { \ - if (GOOGLE_PREDICT_TRUE(v1 op v2)) return NULL; \ - else return MakeCheckOpString(v1, v2, exprtext); \ - } \ - inline std::string* name##Impl(int v1, int v2, const char* exprtext) { \ - return name##Impl(v1, v2, exprtext); \ +#define DEFINE_CHECK_OP_IMPL(name, op) \ + template \ + inline std::unique_ptr name##Impl(const T1& v1, const T2& v2, \ + const char* exprtext) { \ + if (GOOGLE_PREDICT_TRUE(v1 op v2)) { \ + return nullptr; \ + } \ + return MakeCheckOpString(v1, v2, exprtext); \ + } \ + inline std::unique_ptr name##Impl(int v1, int v2, \ + const char* exprtext) { \ + return name##Impl(v1, v2, exprtext); \ } // We use the full name Check_EQ, Check_NE, etc. in case the file including // base/logging.h provides its own #defines for the simpler names EQ, NE, etc. // This happens if, for example, those are used as token names in a // yacc grammar. -DEFINE_CHECK_OP_IMPL(Check_EQ, ==) // Compilation error with CHECK_EQ(NULL, x)? -DEFINE_CHECK_OP_IMPL(Check_NE, !=) // Use CHECK(x == NULL) instead. +DEFINE_CHECK_OP_IMPL(Check_EQ, ==) +DEFINE_CHECK_OP_IMPL(Check_NE, !=) DEFINE_CHECK_OP_IMPL(Check_LE, <=) -DEFINE_CHECK_OP_IMPL(Check_LT, < ) +DEFINE_CHECK_OP_IMPL(Check_LT, <) DEFINE_CHECK_OP_IMPL(Check_GE, >=) -DEFINE_CHECK_OP_IMPL(Check_GT, > ) +DEFINE_CHECK_OP_IMPL(Check_GT, >) + #undef DEFINE_CHECK_OP_IMPL // Helper macro for binary operators. @@ -862,10 +748,10 @@ DEFINE_CHECK_OP_IMPL(Check_GT, > ) #if defined(STATIC_ANALYSIS) // Only for static analysis tool to know that it is equivalent to assert -#define CHECK_OP_LOG(name, op, val1, val2, log) CHECK((val1) op (val2)) +# define CHECK_OP_LOG(name, op, val1, val2, log) CHECK((val1)op(val2)) #elif DCHECK_IS_ON() // In debug mode, avoid constructing CheckOpStrings if possible, -// to reduce the overhead of CHECK statments by 2x. +// to reduce the overhead of CHECK statements by 2x. // Real DCHECK-heavy tests have seen 1.5x speedups. // The meaning of "string" might be different between now and @@ -873,34 +759,35 @@ DEFINE_CHECK_OP_IMPL(Check_GT, > ) // with other string implementations that get defined after this // file is included). Save the current meaning now and use it // in the macro. -typedef std::string _Check_string; -#define CHECK_OP_LOG(name, op, val1, val2, log) \ - while (google::_Check_string* _result = \ - google::Check##name##Impl( \ - google::GetReferenceableValue(val1), \ - google::GetReferenceableValue(val2), \ - #val1 " " #op " " #val2)) \ - log(__FILE__, __LINE__, \ - google::CheckOpString(_result)).stream() +using _Check_string = std::string; +# define CHECK_OP_LOG(name, op, val1, val2, log) \ + while (std::unique_ptr _result = \ + google::logging::internal::Check##name##Impl( \ + google::logging::internal::GetReferenceableValue(val1), \ + google::logging::internal::GetReferenceableValue(val2), \ + #val1 " " #op " " #val2)) \ + log(__FILE__, __LINE__, \ + google::logging::internal::CheckOpString(std::move(_result))) \ + .stream() #else // In optimized mode, use CheckOpString to hint to compiler that // the while condition is unlikely. -#define CHECK_OP_LOG(name, op, val1, val2, log) \ - while (google::CheckOpString _result = \ - google::Check##name##Impl( \ - google::GetReferenceableValue(val1), \ - google::GetReferenceableValue(val2), \ - #val1 " " #op " " #val2)) \ +# define CHECK_OP_LOG(name, op, val1, val2, log) \ + while (google::logging::internal::CheckOpString _result = \ + google::logging::internal::Check##name##Impl( \ + google::logging::internal::GetReferenceableValue(val1), \ + google::logging::internal::GetReferenceableValue(val2), \ + #val1 " " #op " " #val2)) \ log(__FILE__, __LINE__, _result).stream() #endif // STATIC_ANALYSIS, DCHECK_IS_ON() #if GOOGLE_STRIP_LOG <= 3 -#define CHECK_OP(name, op, val1, val2) \ - CHECK_OP_LOG(name, op, val1, val2, google::LogMessageFatal) +# define CHECK_OP(name, op, val1, val2) \ + CHECK_OP_LOG(name, op, val1, val2, google::LogMessageFatal) #else -#define CHECK_OP(name, op, val1, val2) \ - CHECK_OP_LOG(name, op, val1, val2, google::NullStreamFatal) -#endif // STRIP_LOG <= 3 +# define CHECK_OP(name, op, val1, val2) \ + CHECK_OP_LOG(name, op, val1, val2, google::NullStreamFatal) +#endif // STRIP_LOG <= 3 // Equality/Inequality checks - compare two values, and log a FATAL message // including the two values when the result is not as expected. The values @@ -917,41 +804,46 @@ typedef std::string _Check_string; // CHECK_EQ(string("abc")[1], 'b'); // // WARNING: These don't compile correctly if one of the arguments is a pointer -// and the other is NULL. To work around this, simply static_cast NULL to the -// type of the desired pointer. +// and the other is nullptr. To work around this, simply static_cast nullptr to +// the type of the desired pointer. #define CHECK_EQ(val1, val2) CHECK_OP(_EQ, ==, val1, val2) #define CHECK_NE(val1, val2) CHECK_OP(_NE, !=, val1, val2) #define CHECK_LE(val1, val2) CHECK_OP(_LE, <=, val1, val2) -#define CHECK_LT(val1, val2) CHECK_OP(_LT, < , val1, val2) +#define CHECK_LT(val1, val2) CHECK_OP(_LT, <, val1, val2) #define CHECK_GE(val1, val2) CHECK_OP(_GE, >=, val1, val2) -#define CHECK_GT(val1, val2) CHECK_OP(_GT, > , val1, val2) +#define CHECK_GT(val1, val2) CHECK_OP(_GT, >, val1, val2) -// Check that the input is non NULL. This very useful in constructor +// Check that the input is non nullptr. This very useful in constructor // initializer lists. -#define CHECK_NOTNULL(val) \ - google::CheckNotNull(__FILE__, __LINE__, "'" #val "' Must be non NULL", (val)) +#define CHECK_NOTNULL(val) \ + google::logging::internal::CheckNotNull( \ + __FILE__, __LINE__, "'" #val "' Must be non nullptr", (val)) // Helper functions for string comparisons. // To avoid bloat, the definitions are in logging.cc. -#define DECLARE_CHECK_STROP_IMPL(func, expected) \ - GLOG_EXPORT std::string* Check##func##expected##Impl( \ +#define DECLARE_CHECK_STROP_IMPL(func, expected) \ + GLOG_EXPORT std::unique_ptr Check##func##expected##Impl( \ const char* s1, const char* s2, const char* names); + DECLARE_CHECK_STROP_IMPL(strcmp, true) DECLARE_CHECK_STROP_IMPL(strcmp, false) DECLARE_CHECK_STROP_IMPL(strcasecmp, true) DECLARE_CHECK_STROP_IMPL(strcasecmp, false) + +} // namespace internal +} // namespace logging + #undef DECLARE_CHECK_STROP_IMPL // Helper macro for string comparisons. // Don't use this macro directly in your code, use CHECK_STREQ et al below. -#define CHECK_STROP(func, op, expected, s1, s2) \ - while (google::CheckOpString _result = \ - google::Check##func##expected##Impl((s1), (s2), \ - #s1 " " #op " " #s2)) \ - LOG(FATAL) << *_result.str_ - +#define CHECK_STROP(func, op, expected, s1, s2) \ + while (google::logging::internal::CheckOpString _result = \ + google::logging::internal::Check##func##expected##Impl( \ + (s1), (s2), #s1 " " #op " " #s2)) \ + LOG(FATAL) << (*_result.str_) // String (char*) equality/inequality checks. // CASE versions are case-insensitive. @@ -965,19 +857,19 @@ DECLARE_CHECK_STROP_IMPL(strcasecmp, false) #define CHECK_STRCASEEQ(s1, s2) CHECK_STROP(strcasecmp, ==, true, s1, s2) #define CHECK_STRCASENE(s1, s2) CHECK_STROP(strcasecmp, !=, false, s1, s2) -#define CHECK_INDEX(I,A) CHECK(I < (sizeof(A)/sizeof(A[0]))) -#define CHECK_BOUND(B,A) CHECK(B <= (sizeof(A)/sizeof(A[0]))) +#define CHECK_INDEX(I, A) CHECK(I < (sizeof(A) / sizeof(A[0]))) +#define CHECK_BOUND(B, A) CHECK(B <= (sizeof(A) / sizeof(A[0]))) -#define CHECK_DOUBLE_EQ(val1, val2) \ - do { \ - CHECK_LE((val1), (val2)+0.000000000000001L); \ - CHECK_GE((val1), (val2)-0.000000000000001L); \ +#define CHECK_DOUBLE_EQ(val1, val2) \ + do { \ + CHECK_LE((val1), (val2) + 0.000000000000001L); \ + CHECK_GE((val1), (val2)-0.000000000000001L); \ } while (0) -#define CHECK_NEAR(val1, val2, margin) \ - do { \ - CHECK_LE((val1), (val2)+(margin)); \ - CHECK_GE((val1), (val2)-(margin)); \ +#define CHECK_NEAR(val1, val2, margin) \ + do { \ + CHECK_LE((val1), (val2) + (margin)); \ + CHECK_GE((val1), (val2) - (margin)); \ } while (0) // perror()..googly style! @@ -988,21 +880,22 @@ DECLARE_CHECK_STROP_IMPL(strcasecmp, false) #define PLOG(severity) GOOGLE_PLOG(severity, 0).stream() -#define GOOGLE_PLOG(severity, counter) \ - google::ErrnoLogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, counter, \ - &google::LogMessage::SendToLog) +#define GOOGLE_PLOG(severity, counter) \ + google::ErrnoLogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + counter, &google::LogMessage::SendToLog) #define PLOG_IF(severity, condition) \ static_cast(0), \ - !(condition) ? (void) 0 : google::LogMessageVoidify() & PLOG(severity) + !(condition) \ + ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & PLOG(severity) // A CHECK() macro that postpends errno if the condition is false. E.g. // // if (poll(fds, nfds, timeout) == -1) { PCHECK(errno == EINTR); ... } -#define PCHECK(condition) \ - PLOG_IF(FATAL, GOOGLE_PREDICT_BRANCH_NOT_TAKEN(!(condition))) \ - << "Check failed: " #condition " " +#define PCHECK(condition) \ + PLOG_IF(FATAL, GOOGLE_PREDICT_BRANCH_NOT_TAKEN(!(condition))) \ + << "Check failed: " #condition " " // A CHECK() macro that lets you assert the success of a function that // returns -1 and sets errno in case of an error. E.g. @@ -1012,258 +905,117 @@ DECLARE_CHECK_STROP_IMPL(strcasecmp, false) // or // // int fd = open(filename, flags); CHECK_ERR(fd) << ": open " << filename; -#define CHECK_ERR(invocation) \ -PLOG_IF(FATAL, GOOGLE_PREDICT_BRANCH_NOT_TAKEN((invocation) == -1)) \ - << #invocation +#define CHECK_ERR(invocation) \ + PLOG_IF(FATAL, GOOGLE_PREDICT_BRANCH_NOT_TAKEN((invocation) == -1)) \ + << #invocation // Use macro expansion to create, for each use of LOG_EVERY_N(), static // variables with the __LINE__ expansion as part of the variable name. #define LOG_EVERY_N_VARNAME(base, line) LOG_EVERY_N_VARNAME_CONCAT(base, line) -#define LOG_EVERY_N_VARNAME_CONCAT(base, line) base ## line +#define LOG_EVERY_N_VARNAME_CONCAT(base, line) base##line #define LOG_OCCURRENCES LOG_EVERY_N_VARNAME(occurrences_, __LINE__) #define LOG_OCCURRENCES_MOD_N LOG_EVERY_N_VARNAME(occurrences_mod_n_, __LINE__) -#if 1 && __cplusplus >= 201103L -#define GLOG_CONSTEXPR constexpr -#else -#define GLOG_CONSTEXPR const -#endif - #define LOG_TIME_PERIOD LOG_EVERY_N_VARNAME(timePeriod_, __LINE__) #define LOG_PREVIOUS_TIME_RAW LOG_EVERY_N_VARNAME(previousTimeRaw_, __LINE__) #define LOG_TIME_DELTA LOG_EVERY_N_VARNAME(deltaTime_, __LINE__) #define LOG_CURRENT_TIME LOG_EVERY_N_VARNAME(currentTime_, __LINE__) #define LOG_PREVIOUS_TIME LOG_EVERY_N_VARNAME(previousTime_, __LINE__) -#if defined(__has_feature) -# if __has_feature(thread_sanitizer) -# define GLOG_SANITIZE_THREAD 1 -# endif -#endif - -#if !defined(GLOG_SANITIZE_THREAD) && defined(__SANITIZE_THREAD__) && __SANITIZE_THREAD__ -# define GLOG_SANITIZE_THREAD 1 -#endif - -#if defined(GLOG_SANITIZE_THREAD) -#define GLOG_IFDEF_THREAD_SANITIZER(X) X -#else -#define GLOG_IFDEF_THREAD_SANITIZER(X) -#endif - -#if defined(GLOG_SANITIZE_THREAD) -} // namespace google - -// We need to identify the static variables as "benign" races -// to avoid noisy reports from TSAN. -extern "C" void AnnotateBenignRaceSized( - const char *file, - int line, - const volatile void *mem, - size_t size, - const char *description); +} // namespace google namespace google { -#endif -#if __cplusplus >= 201103L && 1 && 1 // Have and -#define SOME_KIND_OF_LOG_EVERY_T(severity, seconds) \ - GLOG_CONSTEXPR std::chrono::nanoseconds LOG_TIME_PERIOD = std::chrono::duration_cast(std::chrono::duration(seconds)); \ - static std::atomic LOG_PREVIOUS_TIME_RAW; \ - GLOG_IFDEF_THREAD_SANITIZER( \ - AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_TIME_PERIOD, sizeof(google::int64), "")); \ - GLOG_IFDEF_THREAD_SANITIZER( \ - AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_PREVIOUS_TIME_RAW, sizeof(google::int64), "")); \ - const auto LOG_CURRENT_TIME = std::chrono::duration_cast(std::chrono::steady_clock::now().time_since_epoch()); \ - const auto LOG_PREVIOUS_TIME = LOG_PREVIOUS_TIME_RAW.load(std::memory_order_relaxed); \ - const auto LOG_TIME_DELTA = LOG_CURRENT_TIME - std::chrono::nanoseconds(LOG_PREVIOUS_TIME); \ - if (LOG_TIME_DELTA > LOG_TIME_PERIOD) \ - LOG_PREVIOUS_TIME_RAW.store(std::chrono::duration_cast(LOG_CURRENT_TIME).count(), std::memory_order_relaxed); \ - if (LOG_TIME_DELTA > LOG_TIME_PERIOD) google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity).stream() -#elif defined(GLOG_OS_WINDOWS) -#define SOME_KIND_OF_LOG_EVERY_T(severity, seconds) \ - GLOG_CONSTEXPR LONGLONG LOG_TIME_PERIOD = (seconds) * LONGLONG(1000000000); \ - static LARGE_INTEGER LOG_PREVIOUS_TIME; \ - LONGLONG LOG_TIME_DELTA; \ - { \ - LARGE_INTEGER currTime; \ - LARGE_INTEGER freq; \ - QueryPerformanceCounter(&currTime); \ - QueryPerformanceFrequency(&freq); \ - InterlockedCompareExchange64(&LOG_PREVIOUS_TIME.QuadPart, currTime.QuadPart, 0); \ - LOG_TIME_DELTA = (currTime.QuadPart - LOG_PREVIOUS_TIME.QuadPart) * LONGLONG(1000000000) / freq.QuadPart; \ - if (LOG_TIME_DELTA > LOG_TIME_PERIOD) InterlockedExchange64(&LOG_PREVIOUS_TIME.QuadPart, currTime.QuadPart); \ - } \ - if (LOG_TIME_DELTA > LOG_TIME_PERIOD) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity).stream() -#else -#define SOME_KIND_OF_LOG_EVERY_T(severity, seconds) \ - GLOG_CONSTEXPR google::int64 LOG_TIME_PERIOD(seconds * 1000000000); \ - static google::int64 LOG_PREVIOUS_TIME; \ - google::int64 LOG_TIME_DELTA = 0; \ - { \ - timespec currentTime = {}; \ - clock_gettime(CLOCK_MONOTONIC, ¤tTime); \ - LOG_TIME_DELTA = (currentTime.tv_sec * 1000000000 + currentTime.tv_nsec) - LOG_PREVIOUS_TIME; \ - } \ - if (LOG_TIME_DELTA > LOG_TIME_PERIOD) __sync_add_and_fetch(&LOG_PREVIOUS_TIME, LOG_TIME_DELTA); \ - if (LOG_TIME_DELTA > LOG_TIME_PERIOD) google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity).stream() -#endif +#define SOME_KIND_OF_LOG_EVERY_T(severity, seconds) \ + constexpr std::chrono::nanoseconds LOG_TIME_PERIOD = \ + std::chrono::duration_cast( \ + std::chrono::duration(seconds)); \ + static std::atomic LOG_PREVIOUS_TIME_RAW; \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_TIME_PERIOD, sizeof(google::int64), "")); \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_PREVIOUS_TIME_RAW, sizeof(google::int64), "")); \ + const auto LOG_CURRENT_TIME = \ + std::chrono::duration_cast( \ + std::chrono::steady_clock::now().time_since_epoch()); \ + const auto LOG_PREVIOUS_TIME = \ + LOG_PREVIOUS_TIME_RAW.load(std::memory_order_relaxed); \ + const auto LOG_TIME_DELTA = \ + LOG_CURRENT_TIME - std::chrono::nanoseconds(LOG_PREVIOUS_TIME); \ + if (LOG_TIME_DELTA > LOG_TIME_PERIOD) \ + LOG_PREVIOUS_TIME_RAW.store( \ + std::chrono::duration_cast(LOG_CURRENT_TIME) \ + .count(), \ + std::memory_order_relaxed); \ + if (LOG_TIME_DELTA > LOG_TIME_PERIOD) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_##severity).stream() -#if 1 && __cplusplus >= 201103L -#define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ +#define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ static std::atomic LOG_OCCURRENCES(0), LOG_OCCURRENCES_MOD_N(0); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES_MOD_N, sizeof(int), "")); \ - ++LOG_OCCURRENCES; \ - if (++LOG_OCCURRENCES_MOD_N > n) LOG_OCCURRENCES_MOD_N -= n; \ - if (LOG_OCCURRENCES_MOD_N == 1) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES_MOD_N, sizeof(int), "")); \ + ++LOG_OCCURRENCES; \ + if (++LOG_OCCURRENCES_MOD_N > n) LOG_OCCURRENCES_MOD_N -= n; \ + if (LOG_OCCURRENCES_MOD_N == 1) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + LOG_OCCURRENCES, &what_to_do) \ + .stream() -#define SOME_KIND_OF_LOG_IF_EVERY_N(severity, condition, n, what_to_do) \ +#define SOME_KIND_OF_LOG_IF_EVERY_N(severity, condition, n, what_to_do) \ + static std::atomic LOG_OCCURRENCES(0), LOG_OCCURRENCES_MOD_N(0); \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES_MOD_N, sizeof(int), "")); \ + ++LOG_OCCURRENCES; \ + if ((condition) && \ + ((LOG_OCCURRENCES_MOD_N = (LOG_OCCURRENCES_MOD_N + 1) % n) == (1 % n))) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + LOG_OCCURRENCES, &what_to_do) \ + .stream() + +#define SOME_KIND_OF_PLOG_EVERY_N(severity, n, what_to_do) \ static std::atomic LOG_OCCURRENCES(0), LOG_OCCURRENCES_MOD_N(0); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES_MOD_N, sizeof(int), "")); \ - ++LOG_OCCURRENCES; \ - if ((condition) && \ - ((LOG_OCCURRENCES_MOD_N=(LOG_OCCURRENCES_MOD_N + 1) % n) == (1 % n))) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES_MOD_N, sizeof(int), "")); \ + ++LOG_OCCURRENCES; \ + if (++LOG_OCCURRENCES_MOD_N > n) LOG_OCCURRENCES_MOD_N -= n; \ + if (LOG_OCCURRENCES_MOD_N == 1) \ + google::ErrnoLogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + LOG_OCCURRENCES, &what_to_do) \ + .stream() -#define SOME_KIND_OF_PLOG_EVERY_N(severity, n, what_to_do) \ - static std::atomic LOG_OCCURRENCES(0), LOG_OCCURRENCES_MOD_N(0); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES_MOD_N, sizeof(int), "")); \ - ++LOG_OCCURRENCES; \ - if (++LOG_OCCURRENCES_MOD_N > n) LOG_OCCURRENCES_MOD_N -= n; \ - if (LOG_OCCURRENCES_MOD_N == 1) \ - google::ErrnoLogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() +#define SOME_KIND_OF_LOG_FIRST_N(severity, n, what_to_do) \ + static std::atomic LOG_OCCURRENCES(0); \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ + if (LOG_OCCURRENCES <= n) ++LOG_OCCURRENCES; \ + if (LOG_OCCURRENCES <= n) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + LOG_OCCURRENCES, &what_to_do) \ + .stream() -#define SOME_KIND_OF_LOG_FIRST_N(severity, n, what_to_do) \ - static std::atomic LOG_OCCURRENCES(0); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ - if (LOG_OCCURRENCES <= n) \ - ++LOG_OCCURRENCES; \ - if (LOG_OCCURRENCES <= n) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#elif defined(GLOG_OS_WINDOWS) - -#define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ - static volatile unsigned LOG_OCCURRENCES = 0; \ - static volatile unsigned LOG_OCCURRENCES_MOD_N = 0; \ - InterlockedIncrement(&LOG_OCCURRENCES); \ - if (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) > n) \ - InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n); \ - if (LOG_OCCURRENCES_MOD_N == 1) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#define SOME_KIND_OF_LOG_IF_EVERY_N(severity, condition, n, what_to_do) \ - static volatile unsigned LOG_OCCURRENCES = 0; \ - static volatile unsigned LOG_OCCURRENCES_MOD_N = 0; \ - InterlockedIncrement(&LOG_OCCURRENCES); \ - if ((condition) && \ - ((InterlockedIncrement(&LOG_OCCURRENCES_MOD_N), \ - (LOG_OCCURRENCES_MOD_N > n && InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n))), \ - LOG_OCCURRENCES_MOD_N == 1)) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#define SOME_KIND_OF_PLOG_EVERY_N(severity, n, what_to_do) \ - static volatile unsigned LOG_OCCURRENCES = 0; \ - static volatile unsigned LOG_OCCURRENCES_MOD_N = 0; \ - InterlockedIncrement(&LOG_OCCURRENCES); \ - if (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) > n) \ - InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n); \ - if (LOG_OCCURRENCES_MOD_N == 1) \ - google::ErrnoLogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#define SOME_KIND_OF_LOG_FIRST_N(severity, n, what_to_do) \ - static volatile unsigned LOG_OCCURRENCES = 0; \ - if (LOG_OCCURRENCES <= n) \ - InterlockedIncrement(&LOG_OCCURRENCES); \ - if (LOG_OCCURRENCES <= n) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#else - -#define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ - static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ - __sync_add_and_fetch(&LOG_OCCURRENCES, 1); \ - if (__sync_add_and_fetch(&LOG_OCCURRENCES_MOD_N, 1) > n) \ - __sync_sub_and_fetch(&LOG_OCCURRENCES_MOD_N, n); \ - if (LOG_OCCURRENCES_MOD_N == 1) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#define SOME_KIND_OF_LOG_IF_EVERY_N(severity, condition, n, what_to_do) \ - static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ - __sync_add_and_fetch(&LOG_OCCURRENCES, 1); \ - if ((condition) && \ - (__sync_add_and_fetch(&LOG_OCCURRENCES_MOD_N, 1) || true) && \ - ((LOG_OCCURRENCES_MOD_N >= n && __sync_sub_and_fetch(&LOG_OCCURRENCES_MOD_N, n)) || true) && \ - LOG_OCCURRENCES_MOD_N == (1 % n)) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#define SOME_KIND_OF_PLOG_EVERY_N(severity, n, what_to_do) \ - static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ - __sync_add_and_fetch(&LOG_OCCURRENCES, 1); \ - if (__sync_add_and_fetch(&LOG_OCCURRENCES_MOD_N, 1) > n) \ - __sync_sub_and_fetch(&LOG_OCCURRENCES_MOD_N, n); \ - if (LOG_OCCURRENCES_MOD_N == 1) \ - google::ErrnoLogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#define SOME_KIND_OF_LOG_FIRST_N(severity, n, what_to_do) \ - static int LOG_OCCURRENCES = 0; \ - if (LOG_OCCURRENCES <= n) \ - __sync_add_and_fetch(&LOG_OCCURRENCES, 1); \ - if (LOG_OCCURRENCES <= n) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() -#endif - -namespace glog_internal_namespace_ { +namespace logging { +namespace internal { template -struct CompileAssert { -}; +struct CompileAssert {}; struct CrashReason; +} // namespace internal +} // namespace logging -// Returns true if FailureSignalHandler is installed. -// Needs to be exported since it's used by the signalhandler_unittest. -GLOG_EXPORT bool IsFailureSignalHandlerInstalled(); -} // namespace glog_internal_namespace_ - -#define LOG_EVERY_N(severity, n) \ +#define LOG_EVERY_N(severity, n) \ SOME_KIND_OF_LOG_EVERY_N(severity, (n), google::LogMessage::SendToLog) #define LOG_EVERY_T(severity, T) SOME_KIND_OF_LOG_EVERY_T(severity, (T)) -#define SYSLOG_EVERY_N(severity, n) \ - SOME_KIND_OF_LOG_EVERY_N(severity, (n), google::LogMessage::SendToSyslogAndLog) +#define SYSLOG_EVERY_N(severity, n) \ + SOME_KIND_OF_LOG_EVERY_N(severity, (n), \ + google::LogMessage::SendToSyslogAndLog) #define PLOG_EVERY_N(severity, n) \ SOME_KIND_OF_PLOG_EVERY_N(severity, (n), google::LogMessage::SendToLog) @@ -1271,146 +1023,157 @@ GLOG_EXPORT bool IsFailureSignalHandlerInstalled(); #define LOG_FIRST_N(severity, n) \ SOME_KIND_OF_LOG_FIRST_N(severity, (n), google::LogMessage::SendToLog) -#define LOG_IF_EVERY_N(severity, condition, n) \ - SOME_KIND_OF_LOG_IF_EVERY_N(severity, (condition), (n), google::LogMessage::SendToLog) +#define LOG_IF_EVERY_N(severity, condition, n) \ + SOME_KIND_OF_LOG_IF_EVERY_N(severity, (condition), (n), \ + google::LogMessage::SendToLog) // We want the special COUNTER value available for LOG_EVERY_X()'ed messages -enum PRIVATE_Counter {COUNTER}; +struct Counter_t {}; +GLOG_INLINE_VARIABLE constexpr Counter_t COUNTER{}; #ifdef GLOG_NO_ABBREVIATED_SEVERITIES // wingdi.h defines ERROR to be 0. When we call LOG(ERROR), it gets // substituted with 0, and it expands to COMPACT_GOOGLE_LOG_0. To allow us // to keep using this syntax, we define this macro to do the same thing // as COMPACT_GOOGLE_LOG_ERROR. -#define COMPACT_GOOGLE_LOG_0 COMPACT_GOOGLE_LOG_ERROR -#define SYSLOG_0 SYSLOG_ERROR -#define LOG_TO_STRING_0 LOG_TO_STRING_ERROR +# define COMPACT_GOOGLE_LOG_0 COMPACT_GOOGLE_LOG_ERROR +# define SYSLOG_0 SYSLOG_ERROR +# define LOG_TO_STRING_0 LOG_TO_STRING_ERROR // Needed for LOG_IS_ON(ERROR). -const LogSeverity GLOG_0 = GLOG_ERROR; +GLOG_INLINE_VARIABLE +constexpr LogSeverity GLOG_0 = GLOG_ERROR; #else // Users may include windows.h after logging.h without // GLOG_NO_ABBREVIATED_SEVERITIES nor WIN32_LEAN_AND_MEAN. // For this case, we cannot detect if ERROR is defined before users // actually use ERROR. Let's make an undefined symbol to warn users. -# define GLOG_ERROR_MSG ERROR_macro_is_defined_Define_GLOG_NO_ABBREVIATED_SEVERITIES_before_including_logging_h_See_the_document_for_detail -# define COMPACT_GOOGLE_LOG_0 GLOG_ERROR_MSG -# define SYSLOG_0 GLOG_ERROR_MSG -# define LOG_TO_STRING_0 GLOG_ERROR_MSG -# define GLOG_0 GLOG_ERROR_MSG +# define GLOG_ERROR_MSG \ + ERROR_macro_is_defined_Define_GLOG_NO_ABBREVIATED_SEVERITIES_before_including_logging_h_See_the_document_for_detail +# define COMPACT_GOOGLE_LOG_0 GLOG_ERROR_MSG +# define SYSLOG_0 GLOG_ERROR_MSG +# define LOG_TO_STRING_0 GLOG_ERROR_MSG +# define GLOG_0 GLOG_ERROR_MSG #endif // Plus some debug-logging macros that get compiled to nothing for production #if DCHECK_IS_ON() -#define DLOG(severity) LOG(severity) -#define DVLOG(verboselevel) VLOG(verboselevel) -#define DLOG_IF(severity, condition) LOG_IF(severity, condition) -#define DLOG_EVERY_N(severity, n) LOG_EVERY_N(severity, n) -#define DLOG_IF_EVERY_N(severity, condition, n) \ - LOG_IF_EVERY_N(severity, condition, n) -#define DLOG_ASSERT(condition) LOG_ASSERT(condition) +# define DLOG(severity) LOG(severity) +# define DVLOG(verboselevel) VLOG(verboselevel) +# define DLOG_IF(severity, condition) LOG_IF(severity, condition) +# define DLOG_EVERY_N(severity, n) LOG_EVERY_N(severity, n) +# define DLOG_IF_EVERY_N(severity, condition, n) \ + LOG_IF_EVERY_N(severity, condition, n) +# define DLOG_FIRST_N(severity, n) LOG_FIRST_N(severity, n) +# define DLOG_EVERY_T(severity, T) LOG_EVERY_T(severity, T) +# define DLOG_ASSERT(condition) LOG_ASSERT(condition) // debug-only checking. executed if DCHECK_IS_ON(). -#define DCHECK(condition) CHECK(condition) -#define DCHECK_EQ(val1, val2) CHECK_EQ(val1, val2) -#define DCHECK_NE(val1, val2) CHECK_NE(val1, val2) -#define DCHECK_LE(val1, val2) CHECK_LE(val1, val2) -#define DCHECK_LT(val1, val2) CHECK_LT(val1, val2) -#define DCHECK_GE(val1, val2) CHECK_GE(val1, val2) -#define DCHECK_GT(val1, val2) CHECK_GT(val1, val2) -#define DCHECK_NOTNULL(val) CHECK_NOTNULL(val) -#define DCHECK_STREQ(str1, str2) CHECK_STREQ(str1, str2) -#define DCHECK_STRCASEEQ(str1, str2) CHECK_STRCASEEQ(str1, str2) -#define DCHECK_STRNE(str1, str2) CHECK_STRNE(str1, str2) -#define DCHECK_STRCASENE(str1, str2) CHECK_STRCASENE(str1, str2) +# define DCHECK(condition) CHECK(condition) +# define DCHECK_EQ(val1, val2) CHECK_EQ(val1, val2) +# define DCHECK_NE(val1, val2) CHECK_NE(val1, val2) +# define DCHECK_LE(val1, val2) CHECK_LE(val1, val2) +# define DCHECK_LT(val1, val2) CHECK_LT(val1, val2) +# define DCHECK_GE(val1, val2) CHECK_GE(val1, val2) +# define DCHECK_GT(val1, val2) CHECK_GT(val1, val2) +# define DCHECK_NOTNULL(val) CHECK_NOTNULL(val) +# define DCHECK_STREQ(str1, str2) CHECK_STREQ(str1, str2) +# define DCHECK_STRCASEEQ(str1, str2) CHECK_STRCASEEQ(str1, str2) +# define DCHECK_STRNE(str1, str2) CHECK_STRNE(str1, str2) +# define DCHECK_STRCASENE(str1, str2) CHECK_STRCASENE(str1, str2) #else // !DCHECK_IS_ON() -#define DLOG(severity) \ - static_cast(0), \ - true ? (void) 0 : google::LogMessageVoidify() & LOG(severity) +# define DLOG(severity) \ + static_cast(0), \ + true ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) -#define DVLOG(verboselevel) \ - static_cast(0), \ - (true || !VLOG_IS_ON(verboselevel)) ? \ - (void) 0 : google::LogMessageVoidify() & LOG(INFO) +# define DVLOG(verboselevel) \ + static_cast(0), \ + (true || !VLOG_IS_ON(verboselevel)) \ + ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(INFO) -#define DLOG_IF(severity, condition) \ - static_cast(0), \ - (true || !(condition)) ? (void) 0 : google::LogMessageVoidify() & LOG(severity) +# define DLOG_IF(severity, condition) \ + static_cast(0), \ + (true || !(condition)) \ + ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) -#define DLOG_EVERY_N(severity, n) \ - static_cast(0), \ - true ? (void) 0 : google::LogMessageVoidify() & LOG(severity) +# define DLOG_EVERY_N(severity, n) \ + static_cast(0), \ + true ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) -#define DLOG_IF_EVERY_N(severity, condition, n) \ - static_cast(0), \ - (true || !(condition))? (void) 0 : google::LogMessageVoidify() & LOG(severity) +# define DLOG_IF_EVERY_N(severity, condition, n) \ + static_cast(0), \ + (true || !(condition)) \ + ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) -#define DLOG_ASSERT(condition) \ - static_cast(0), \ - true ? (void) 0 : LOG_ASSERT(condition) +# define DLOG_FIRST_N(severity, n) \ + static_cast(0), \ + true ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) + +# define DLOG_EVERY_T(severity, T) \ + static_cast(0), \ + true ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) + +# define DLOG_ASSERT(condition) \ + static_cast(0), true ? (void)0 : (LOG_ASSERT(condition)) // MSVC warning C4127: conditional expression is constant -#define DCHECK(condition) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK(condition) +# define DCHECK(condition) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK(condition) -#define DCHECK_EQ(val1, val2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_EQ(val1, val2) +# define DCHECK_EQ(val1, val2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_EQ(val1, val2) -#define DCHECK_NE(val1, val2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_NE(val1, val2) +# define DCHECK_NE(val1, val2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_NE(val1, val2) -#define DCHECK_LE(val1, val2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_LE(val1, val2) +# define DCHECK_LE(val1, val2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_LE(val1, val2) -#define DCHECK_LT(val1, val2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_LT(val1, val2) +# define DCHECK_LT(val1, val2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_LT(val1, val2) -#define DCHECK_GE(val1, val2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_GE(val1, val2) +# define DCHECK_GE(val1, val2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_GE(val1, val2) -#define DCHECK_GT(val1, val2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_GT(val1, val2) +# define DCHECK_GT(val1, val2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_GT(val1, val2) // You may see warnings in release mode if you don't use the return // value of DCHECK_NOTNULL. Please just use DCHECK for such cases. -#define DCHECK_NOTNULL(val) (val) +# define DCHECK_NOTNULL(val) (val) -#define DCHECK_STREQ(str1, str2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_STREQ(str1, str2) +# define DCHECK_STREQ(str1, str2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_STREQ(str1, str2) -#define DCHECK_STRCASEEQ(str1, str2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_STRCASEEQ(str1, str2) +# define DCHECK_STRCASEEQ(str1, str2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_STRCASEEQ(str1, str2) -#define DCHECK_STRNE(str1, str2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_STRNE(str1, str2) +# define DCHECK_STRNE(str1, str2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_STRNE(str1, str2) -#define DCHECK_STRCASENE(str1, str2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_STRCASENE(str1, str2) +# define DCHECK_STRCASENE(str1, str2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_STRCASENE(str1, str2) #endif // DCHECK_IS_ON() @@ -1435,14 +1198,10 @@ namespace base_logging { class GLOG_EXPORT LogStreamBuf : public std::streambuf { public: // REQUIREMENTS: "len" must be >= 2 to account for the '\n' and '\0'. - LogStreamBuf(char *buf, int len) { - setp(buf, buf + len - 2); - } + LogStreamBuf(char* buf, int len) { setp(buf, buf + len - 2); } // This effectively ignores overflow. - int_type overflow(int_type ch) { - return ch; - } + int_type overflow(int_type ch) { return ch; } // Legacy public ostrstream method. size_t pcount() const { return static_cast(pptr() - pbase()); } @@ -1451,6 +1210,12 @@ class GLOG_EXPORT LogStreamBuf : public std::streambuf { } // namespace base_logging +namespace logging { +namespace internal { +struct GLOG_NO_EXPORT LogMessageData; +} // namespace internal +} // namespace logging + // // This class more or less represents a particular log message. You // create an instance of LogMessage and then stream stuff to it. @@ -1461,7 +1226,7 @@ class GLOG_EXPORT LogStreamBuf : public std::streambuf { // though. You should use the LOG() macro (and variants thereof) // above. class GLOG_EXPORT LogMessage { -public: + public: enum { // Passing kNoLogPrefix for the line number disables the // log-message prefix. Useful for using the LogMessage @@ -1477,18 +1242,35 @@ public: // 2005 if you are deriving from a type in the Standard C++ Library" // http://msdn.microsoft.com/en-us/library/3tdb471s(VS.80).aspx // Let's just ignore the warning. -GLOG_MSVC_PUSH_DISABLE_WARNING(4275) + GLOG_MSVC_PUSH_DISABLE_WARNING(4275) class GLOG_EXPORT LogStream : public std::ostream { -GLOG_MSVC_POP_WARNING() - public: - LogStream(char *buf, int len, int64 ctr) - : std::ostream(NULL), - streambuf_(buf, len), - ctr_(ctr), + GLOG_MSVC_POP_WARNING() + public: + // In some cases, like when compiling glog as a static library with GCC and + // linking against a Clang-built executable, this constructor will be + // removed by the linker. We use this attribute to prevent the linker from + // discarding it. + GLOG_USED + LogStream(char* buf, int len, int64 ctr) + : std::ostream(nullptr), streambuf_(buf, len), ctr_(ctr), self_(this) { + rdbuf(&streambuf_); + } + + LogStream(LogStream&& other) noexcept + : std::ostream(nullptr), + streambuf_(std::move(other.streambuf_)), + ctr_(std::exchange(other.ctr_, 0)), self_(this) { rdbuf(&streambuf_); } + LogStream& operator=(LogStream&& other) noexcept { + streambuf_ = std::move(other.streambuf_); + ctr_ = std::exchange(other.ctr_, 0); + rdbuf(&streambuf_); + return *this; + } + int64 ctr() const { return ctr_; } void set_ctr(int64 ctr) { ctr_ = ctr; } LogStream* self() const { return self_; } @@ -1498,15 +1280,16 @@ GLOG_MSVC_POP_WARNING() char* pbase() const { return streambuf_.pbase(); } char* str() const { return pbase(); } - private: - LogStream(const LogStream&); - LogStream& operator=(const LogStream&); + LogStream(const LogStream&) = delete; + LogStream& operator=(const LogStream&) = delete; + + private: base_logging::LogStreamBuf streambuf_; - int64 ctr_; // Counter hack (for the LOG_EVERY_X() macro) - LogStream *self_; // Consistency check hack + int64 ctr_; // Counter hack (for the LOG_EVERY_X() macro) + LogStream* self_; // Consistency check hack }; -public: + public: // icc 8 requires this typedef to avoid an internal compiler error. typedef void (LogMessage::*SendMethod)(); @@ -1530,28 +1313,29 @@ public: // saves 17 bytes per call site. LogMessage(const char* file, int line, LogSeverity severity); - // Constructor to log this message to a specified sink (if not NULL). + // Constructor to log this message to a specified sink (if not nullptr). // Implied are: ctr = 0, send_method = &LogMessage::SendToSinkAndLog if // also_send_to_log is true, send_method = &LogMessage::SendToSink otherwise. LogMessage(const char* file, int line, LogSeverity severity, LogSink* sink, bool also_send_to_log); // Constructor where we also give a vector pointer - // for storing the messages (if the pointer is not NULL). + // for storing the messages (if the pointer is not nullptr). // Implied are: ctr = 0, send_method = &LogMessage::SaveOrSendToLog. LogMessage(const char* file, int line, LogSeverity severity, std::vector* outvec); // Constructor where we also give a string pointer for storing the - // message (if the pointer is not NULL). Implied are: ctr = 0, + // message (if the pointer is not nullptr). Implied are: ctr = 0, // send_method = &LogMessage::WriteToStringAndLog. LogMessage(const char* file, int line, LogSeverity severity, std::string* message); // A special constructor used for check failures - LogMessage(const char* file, int line, const CheckOpString& result); + LogMessage(const char* file, int line, + const logging::internal::CheckOpString& result); - ~LogMessage(); + ~LogMessage() noexcept(false); // Flush a buffered message to the sink set in the constructor. Always // called by the destructor, it may also be called from elsewhere if @@ -1562,13 +1346,13 @@ public: // is so that streaming can be done more efficiently. static const size_t kMaxLogMessageLen; - // Theses should not be called directly outside of logging.*, + // These should not be called directly outside of logging.*, // only passed as SendMethod arguments to other LogMessage methods: - void SendToLog(); // Actually dispatch to the logs + void SendToLog(); // Actually dispatch to the logs void SendToSyslogAndLog(); // Actually dispatch to syslog and the logs // Call abort() or similar to perform LOG(FATAL) crash. - static void __attribute__((noreturn)) Fail(); + [[noreturn]] static void Fail(); std::ostream& stream(); @@ -1577,14 +1361,25 @@ public: // Must be called without the log_mutex held. (L < log_mutex) static int64 num_messages(int severity); - const LogMessageTime& getLogMessageTime() const; + [[deprecated("Use LogMessage::time() instead.")]] const LogMessageTime& + getLogMessageTime() const { + return time(); + } - struct LogMessageData; + LogSeverity severity() const noexcept; + int line() const noexcept; + const std::thread::id& thread_id() const noexcept; + const char* fullname() const noexcept; + const char* basename() const noexcept; + const LogMessageTime& time() const noexcept; -private: + LogMessage(const LogMessage&) = delete; + LogMessage& operator=(const LogMessage&) = delete; + + private: // Fully internal SendMethod cases: void SendToSinkAndLog(); // Send to sink if provided and dispatch to the logs - void SendToSink(); // Send to sink if provided, do nothing otherwise. + void SendToSink(); // Send to sink if provided, do nothing otherwise. // Write to string if provided and dispatch to the logs. void WriteToStringAndLog(); @@ -1595,21 +1390,18 @@ private: void (LogMessage::*send_method)()); // Used to fill in crash information during LOG(FATAL) failures. - void RecordCrashReason(glog_internal_namespace_::CrashReason* reason); + void RecordCrashReason(logging::internal::CrashReason* reason); // Counts of messages sent at each priority: static int64 num_messages_[NUM_SEVERITIES]; // under log_mutex // We keep the data in a separate struct so that each instance of // LogMessage uses less stack space. - LogMessageData* allocated_; - LogMessageData* data_; - LogMessageTime logmsgtime_; + logging::internal::LogMessageData* allocated_; + logging::internal::LogMessageData* data_; + LogMessageTime time_; friend class LogDestination; - - LogMessage(const LogMessage&); - void operator=(const LogMessage&); }; // This class happens to be thread-hostile because all instances share @@ -1618,13 +1410,14 @@ private: class GLOG_EXPORT LogMessageFatal : public LogMessage { public: LogMessageFatal(const char* file, int line); - LogMessageFatal(const char* file, int line, const CheckOpString& result); - __attribute__((noreturn)) ~LogMessageFatal(); + LogMessageFatal(const char* file, int line, + const logging::internal::CheckOpString& result); + [[noreturn]] ~LogMessageFatal() noexcept(false); }; // A non-macro interface to the log facility; (useful // when the logging level is not a compile-time constant). -inline void LogAtLevel(int const severity, std::string const &msg) { +inline void LogAtLevel(LogSeverity severity, std::string const& msg) { LogMessage(__FILE__, __LINE__, severity).stream() << msg; } @@ -1632,53 +1425,13 @@ inline void LogAtLevel(int const severity, std::string const &msg) { // version since there are two advantages: 1. this version outputs the // file name and the line number where this macro is put like other // LOG macros, 2. this macro can be used as C++ stream. -#define LOG_AT_LEVEL(severity) google::LogMessage(__FILE__, __LINE__, severity).stream() - -// Check if it's compiled in C++11 mode. -// -// GXX_EXPERIMENTAL_CXX0X is defined by gcc and clang up to at least -// gcc-4.7 and clang-3.1 (2011-12-13). __cplusplus was defined to 1 -// in gcc before 4.7 (Crosstool 16) and clang before 3.1, but is -// defined according to the language version in effect thereafter. -// Microsoft Visual Studio 14 (2015) sets __cplusplus==199711 despite -// reasonably good C++11 support, so we set LANG_CXX for it and -// newer versions (_MSC_VER >= 1900). -#if (defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L || \ - (defined(_MSC_VER) && _MSC_VER >= 1900)) && !defined(__UCLIBCXX_MAJOR__) -// Helper for CHECK_NOTNULL(). -// -// In C++11, all cases can be handled by a single function. Since the value -// category of the argument is preserved (also for rvalue references), -// member initializer lists like the one below will compile correctly: -// -// Foo() -// : x_(CHECK_NOTNULL(MethodReturningUniquePtr())) {} -template -T CheckNotNull(const char* file, int line, const char* names, T&& t) { - if (t == nullptr) { - LogMessageFatal(file, line, new std::string(names)); - } - return std::forward(t); -} - -#else - -// A small helper for CHECK_NOTNULL(). -template -T* CheckNotNull(const char *file, int line, const char *names, T* t) { - if (t == NULL) { - LogMessageFatal(file, line, new std::string(names)); - } - return t; -} -#endif +#define LOG_AT_LEVEL(severity) \ + google::LogMessage(__FILE__, __LINE__, severity).stream() // Allow folks to put a counter in the LOG_EVERY_X()'ed messages. This // only works if ostream is a LogStream. If the ostream is not a // LogStream you'll get an assert saying as much at runtime. -GLOG_EXPORT std::ostream& operator<<(std::ostream &os, - const PRIVATE_Counter&); - +GLOG_EXPORT std::ostream& operator<<(std::ostream& os, const Counter_t&); // Derived class for PLOG*() above. class GLOG_EXPORT ErrnoLogMessage : public LogMessage { @@ -1694,19 +1447,37 @@ class GLOG_EXPORT ErrnoLogMessage : public LogMessage { void operator=(const ErrnoLogMessage&); }; - // This class is used to explicitly ignore values in the conditional // logging macros. This avoids compiler warnings like "value computed // is not used" and "statement has no effect". -class GLOG_EXPORT LogMessageVoidify { - public: - LogMessageVoidify() { } +namespace logging { +namespace internal { + +// Helper for CHECK_NOTNULL(). +// +// In C++11, all cases can be handled by a single function. Since the value +// category of the argument is preserved (also for rvalue references), +// member initializer lists like the one below will compile correctly: +// +// Foo() +// : x_(CHECK_NOTNULL(MethodReturningUniquePtr())) {} +template +T CheckNotNull(const char* file, int line, const char* names, T&& t) { + if (t == nullptr) { + LogMessageFatal(file, line, std::make_unique(names)); + } + return std::forward(t); +} + +struct LogMessageVoidify { // This has to be an operator with a precedence lower than << but // higher than ?: - void operator&(std::ostream&) { } + void operator&(std::ostream&) noexcept {} }; +} // namespace internal +} // namespace logging // Flushes all log files that contains messages that are at least of // the specified severity level. Thread-safe. @@ -1723,7 +1494,7 @@ GLOG_EXPORT void FlushLogFilesUnsafe(LogSeverity min_severity); // severity". Thread-safe. // GLOG_EXPORT void SetLogDestination(LogSeverity severity, - const char* base_filename); + const char* base_filename); // // Set the basename of the symlink to the latest log file at a given @@ -1732,7 +1503,7 @@ GLOG_EXPORT void SetLogDestination(LogSeverity severity, // invocation name of the program. Thread-safe. // GLOG_EXPORT void SetLogSymlink(LogSeverity severity, - const char* symlink_basename); + const char* symlink_basename); // // Used to send logs to some other kind of destination @@ -1748,7 +1519,7 @@ class GLOG_EXPORT LogSink { // during this call. virtual void send(LogSeverity severity, const char* full_filename, const char* base_filename, int line, - const LogMessageTime& logmsgtime, const char* message, + const LogMessageTime& time, const char* message, size_t message_len); // Provide an overload for compatibility purposes GLOG_DEPRECATED @@ -1774,13 +1545,13 @@ class GLOG_EXPORT LogSink { // Returns the normal text output of the log message. // Can be useful to implement send(). static std::string ToString(LogSeverity severity, const char* file, int line, - const LogMessageTime &logmsgtime, - const char* message, size_t message_len); + const LogMessageTime& time, const char* message, + size_t message_len); }; // Add or remove a LogSink as a consumer of logging data. Thread-safe. -GLOG_EXPORT void AddLogSink(LogSink *destination); -GLOG_EXPORT void RemoveLogSink(LogSink *destination); +GLOG_EXPORT void AddLogSink(LogSink* destination); +GLOG_EXPORT void RemoveLogSink(LogSink* destination); // // Specify an "extension" added to the filename specified via @@ -1788,8 +1559,7 @@ GLOG_EXPORT void RemoveLogSink(LogSink *destination); // often used to append the port we're listening on to the logfile // name. Thread-safe. // -GLOG_EXPORT void SetLogFilenameExtension( - const char* filename_extension); +GLOG_EXPORT void SetLogFilenameExtension(const char* filename_extension); // // Make it so that all log messages of at least a particular severity @@ -1810,26 +1580,15 @@ GLOG_EXPORT void LogToStderr(); // the email addresses to send to (separated by spaces, say). Thread-safe. // GLOG_EXPORT void SetEmailLogging(LogSeverity min_severity, - const char* addresses); + const char* addresses); -// A simple function that sends email. dest is a commma-separated -// list of addressess. Thread-safe. -GLOG_EXPORT bool SendEmail(const char *dest, - const char *subject, const char *body); +// A simple function that sends email. dest is a comma-separated +// list of addresses. Thread-safe. +GLOG_EXPORT bool SendEmail(const char* dest, const char* subject, + const char* body); GLOG_EXPORT const std::vector& GetLoggingDirectories(); -// For tests only: Clear the internal [cached] list of logging directories to -// force a refresh the next time GetLoggingDirectories is called. -// Thread-hostile. -void TestOnly_ClearLoggingDirectoriesList(); - -// Returns a set of existing temporary directories, which will be a -// subset of the directories returned by GetLoggingDirectories(). -// Thread-safe. -GLOG_EXPORT void GetExistingTempDirectories( - std::vector* list); - // Print any fatal message again -- useful to call from signal handler // so that the last thing in the output is the fatal message. // Thread-hostile, but a race is unlikely. @@ -1878,10 +1637,15 @@ class GLOG_EXPORT Logger { // appropriate by the higher level logging facility. For example, // textual log messages already contain timestamps, and the // file:linenumber header. + [[deprecated( + "Logger::Write accepting a std::time_t timestamp is provided for " + "compatibility purposes only. New code should implement the " + "std::chrono::system_clock::time_point overload.")]] virtual void + Write(bool force_flush, time_t timestamp, const char* message, + size_t message_len); virtual void Write(bool force_flush, - time_t timestamp, - const char* message, - size_t message_len) = 0; + const std::chrono::system_clock::time_point& timestamp, + const char* message, size_t message_len); // Flush any buffered messages virtual void Flush() = 0; @@ -1902,24 +1666,7 @@ extern GLOG_EXPORT Logger* GetLogger(LogSeverity level); // be deleted by the caller. Thread-safe. extern GLOG_EXPORT void SetLogger(LogSeverity level, Logger* logger); -} - -// glibc has traditionally implemented two incompatible versions of -// strerror_r(). There is a poorly defined convention for picking the -// version that we want, but it is not clear whether it even works with -// all versions of glibc. -// So, instead, we provide this wrapper that automatically detects the -// version that is in use, and then implements POSIX semantics. -// N.B. In addition to what POSIX says, we also guarantee that "buf" will -// be set to an empty string, if this function failed. This means, in most -// cases, you do not need to check the error code and you can directly -// use the value of "buf". It will never have an undefined value. -// DEPRECATED: Use StrError(int) instead. -GLOG_EXPORT int posix_strerror_r(int err, char *buf, size_t len); - -// A thread-safe replacement for strerror(). Returns a string describing the -// given POSIX error code. -GLOG_EXPORT std::string StrError(int err); +} // namespace base // A class for which we define operator<<, which does nothing. class GLOG_EXPORT NullStream : public LogMessage::LogStream { @@ -1928,16 +1675,16 @@ class GLOG_EXPORT NullStream : public LogMessage::LogStream { // (they'll never be actually displayed). This will be needed if a // NullStream& is implicitly converted to LogStream&, in which case // the overloaded NullStream::operator<< will not be invoked. - NullStream() : LogMessage::LogStream(message_buffer_, 1, 0) { } + NullStream(); NullStream(const char* /*file*/, int /*line*/, - const CheckOpString& /*result*/) : - LogMessage::LogStream(message_buffer_, 1, 0) { } - NullStream &stream() { return *this; } + const logging::internal::CheckOpString& /*result*/); + NullStream& stream(); + private: // A very short buffer for messages (which we discard anyway). This // will be needed if NullStream& converted to LogStream& (e.g. as a // result of a conditional expression). - char message_buffer_[2]; + char message_buffer_[3]; }; // Do nothing. This operator is inline, allowing the message to be @@ -1946,24 +1693,19 @@ class GLOG_EXPORT NullStream : public LogMessage::LogStream { // SKIP_LOG=WARNING. In those cases, NullStream will be implicitly // converted to LogStream and the message will be computed and then // quietly discarded. -template -inline NullStream& operator<<(NullStream &str, const T &) { return str; } +template +inline NullStream& operator<<(NullStream& str, const T&) { + return str; +} // Similar to NullStream, but aborts the program (without stack // trace), like LogMessageFatal. class GLOG_EXPORT NullStreamFatal : public NullStream { public: - NullStreamFatal() { } - NullStreamFatal(const char* file, int line, const CheckOpString& result) : - NullStream(file, line, result) { } -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable : 4722) -#endif // _MSC_VER - __attribute__((noreturn)) ~NullStreamFatal() throw () { _exit(EXIT_FAILURE); } -#if defined(_MSC_VER) -#pragma warning(pop) -#endif // _MSC_VER + using NullStream::NullStream; + [[noreturn]] + // Prevent the linker from discarding the destructor. + GLOG_USED ~NullStreamFatal(); }; // Install a signal handler that will dump signal information and a stack @@ -1984,19 +1726,19 @@ class GLOG_EXPORT NullStreamFatal : public NullStream { // words, stack traces of other threads won't be shown. GLOG_EXPORT void InstallFailureSignalHandler(); +// Returns true if FailureSignalHandler is installed. +GLOG_EXPORT bool IsFailureSignalHandlerInstalled(); + // Installs a function that is used for writing the failure dump. "data" // is the pointer to the beginning of a message to be written, and "size" // is the size of the message. You should not expect the data is // terminated with '\0'. -GLOG_EXPORT void InstallFailureWriter( - void (*writer)(const char* data, size_t size)); +GLOG_EXPORT void InstallFailureWriter(void (*writer)(const char* data, + size_t size)); -} +// Dump stack trace as a string. +GLOG_EXPORT std::string GetStackTrace(); -#pragma pop_macro("DECLARE_VARIABLE") -#pragma pop_macro("DECLARE_bool") -#pragma pop_macro("DECLARE_string") -#pragma pop_macro("DECLARE_int32") -#pragma pop_macro("DECLARE_uint32") +} // namespace google -#endif // GLOG_LOGGING_H +#endif // GLOG_LOGGING_H diff --git a/glog/arm64-v8a/include/glog/platform.h b/glog/arm64-v8a/include/glog/platform.h index e6144119..f118ca8d 100644 --- a/glog/arm64-v8a/include/glog/platform.h +++ b/glog/arm64-v8a/include/glog/platform.h @@ -1,4 +1,4 @@ -// Copyright (c) 2008, Google Inc. +// Copyright (c) 2024, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -35,24 +35,28 @@ #define GLOG_PLATFORM_H #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) -#define GLOG_OS_WINDOWS +# define GLOG_OS_WINDOWS #elif defined(__CYGWIN__) || defined(__CYGWIN32__) -#define GLOG_OS_CYGWIN +# define GLOG_OS_CYGWIN #elif defined(linux) || defined(__linux) || defined(__linux__) -#ifndef GLOG_OS_LINUX -#define GLOG_OS_LINUX -#endif +# ifndef GLOG_OS_LINUX +# define GLOG_OS_LINUX +# endif +# if defined(__ANDROID__) +# define GLOG_OS_ANDROID +# endif #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) -#define GLOG_OS_MACOSX +# define GLOG_OS_MACOSX #elif defined(__FreeBSD__) -#define GLOG_OS_FREEBSD +# define GLOG_OS_FREEBSD #elif defined(__NetBSD__) -#define GLOG_OS_NETBSD +# define GLOG_OS_NETBSD #elif defined(__OpenBSD__) -#define GLOG_OS_OPENBSD -#else +# define GLOG_OS_OPENBSD +#elif defined(__EMSCRIPTEN__) +# define GLOG_OS_EMSCRIPTEN // TODO(hamaji): Add other platforms. #error Platform not supported by glog. Please consider to contribute platform information by submitting a pull request on Github. #endif -#endif // GLOG_PLATFORM_H +#endif // GLOG_PLATFORM_H diff --git a/glog/arm64-v8a/include/glog/raw_logging.h b/glog/arm64-v8a/include/glog/raw_logging.h index eda5fb45..195a1b9c 100644 --- a/glog/arm64-v8a/include/glog/raw_logging.h +++ b/glog/arm64-v8a/include/glog/raw_logging.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006, Google Inc. +// Copyright (c) 2024, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -36,19 +36,19 @@ #ifndef GLOG_RAW_LOGGING_H #define GLOG_RAW_LOGGING_H -#include +#if defined(GLOG_USE_GLOG_EXPORT) +# include "glog/export.h" +#endif + +#if !defined(GLOG_EXPORT) +# error was not included correctly. See the documention for how to consume the library. +#endif + +#include "glog/log_severity.h" +#include "glog/vlog_is_on.h" namespace google { -#include -#include -#include - -#if defined(__GNUC__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wvariadic-macros" -#endif - // This is similar to LOG(severity) << format... and VLOG(level) << format.., // but // * it is to be used ONLY by low-level modules that can't use normal LOG() @@ -63,108 +63,101 @@ namespace google { // These will print an almost standard log lines like this to stderr only: // E20200821 211317 file.cc:123] RAW: Failed foo with 22: bad_file // I20200821 211317 file.cc:142] RAW: status is 20 -#define RAW_LOG(severity, ...) \ - do { \ - switch (google::GLOG_ ## severity) { \ - case 0: \ - RAW_LOG_INFO(__VA_ARGS__); \ - break; \ - case 1: \ - RAW_LOG_WARNING(__VA_ARGS__); \ - break; \ - case 2: \ - RAW_LOG_ERROR(__VA_ARGS__); \ - break; \ - case 3: \ - RAW_LOG_FATAL(__VA_ARGS__); \ - break; \ - default: \ - break; \ - } \ +#define RAW_LOG(severity, ...) \ + do { \ + switch (google::GLOG_##severity) { \ + case 0: \ + RAW_LOG_INFO(__VA_ARGS__); \ + break; \ + case 1: \ + RAW_LOG_WARNING(__VA_ARGS__); \ + break; \ + case 2: \ + RAW_LOG_ERROR(__VA_ARGS__); \ + break; \ + case 3: \ + RAW_LOG_FATAL(__VA_ARGS__); \ + break; \ + default: \ + break; \ + } \ } while (0) // The following STRIP_LOG testing is performed in the header file so that it's // possible to completely compile out the logging code and the log messages. #if !defined(STRIP_LOG) || STRIP_LOG == 0 -#define RAW_VLOG(verboselevel, ...) \ - do { \ - if (VLOG_IS_ON(verboselevel)) { \ - RAW_LOG_INFO(__VA_ARGS__); \ - } \ - } while (0) +# define RAW_VLOG(verboselevel, ...) \ + do { \ + if (VLOG_IS_ON(verboselevel)) { \ + RAW_LOG_INFO(__VA_ARGS__); \ + } \ + } while (0) #else -#define RAW_VLOG(verboselevel, ...) RawLogStub__(0, __VA_ARGS__) -#endif // STRIP_LOG == 0 +# define RAW_VLOG(verboselevel, ...) RawLogStub__(0, __VA_ARGS__) +#endif // STRIP_LOG == 0 #if !defined(STRIP_LOG) || STRIP_LOG == 0 -#define RAW_LOG_INFO(...) google::RawLog__(google::GLOG_INFO, \ - __FILE__, __LINE__, __VA_ARGS__) +# define RAW_LOG_INFO(...) \ + google::RawLog__(google::GLOG_INFO, __FILE__, __LINE__, __VA_ARGS__) #else -#define RAW_LOG_INFO(...) google::RawLogStub__(0, __VA_ARGS__) -#endif // STRIP_LOG == 0 +# define RAW_LOG_INFO(...) google::RawLogStub__(0, __VA_ARGS__) +#endif // STRIP_LOG == 0 #if !defined(STRIP_LOG) || STRIP_LOG <= 1 -#define RAW_LOG_WARNING(...) google::RawLog__(google::GLOG_WARNING, \ - __FILE__, __LINE__, __VA_ARGS__) +# define RAW_LOG_WARNING(...) \ + google::RawLog__(google::GLOG_WARNING, __FILE__, __LINE__, __VA_ARGS__) #else -#define RAW_LOG_WARNING(...) google::RawLogStub__(0, __VA_ARGS__) -#endif // STRIP_LOG <= 1 +# define RAW_LOG_WARNING(...) google::RawLogStub__(0, __VA_ARGS__) +#endif // STRIP_LOG <= 1 #if !defined(STRIP_LOG) || STRIP_LOG <= 2 -#define RAW_LOG_ERROR(...) google::RawLog__(google::GLOG_ERROR, \ - __FILE__, __LINE__, __VA_ARGS__) +# define RAW_LOG_ERROR(...) \ + google::RawLog__(google::GLOG_ERROR, __FILE__, __LINE__, __VA_ARGS__) #else -#define RAW_LOG_ERROR(...) google::RawLogStub__(0, __VA_ARGS__) -#endif // STRIP_LOG <= 2 +# define RAW_LOG_ERROR(...) google::RawLogStub__(0, __VA_ARGS__) +#endif // STRIP_LOG <= 2 #if !defined(STRIP_LOG) || STRIP_LOG <= 3 -#define RAW_LOG_FATAL(...) google::RawLog__(google::GLOG_FATAL, \ - __FILE__, __LINE__, __VA_ARGS__) +# define RAW_LOG_FATAL(...) \ + google::RawLog__(google::GLOG_FATAL, __FILE__, __LINE__, __VA_ARGS__) #else -#define RAW_LOG_FATAL(...) \ - do { \ - google::RawLogStub__(0, __VA_ARGS__); \ - exit(EXIT_FAILURE); \ - } while (0) -#endif // STRIP_LOG <= 3 +# define RAW_LOG_FATAL(...) \ + do { \ + google::RawLogStub__(0, __VA_ARGS__); \ + exit(EXIT_FAILURE); \ + } while (0) +#endif // STRIP_LOG <= 3 // Similar to CHECK(condition) << message, // but for low-level modules: we use only RAW_LOG that does not allocate memory. // We do not want to provide args list here to encourage this usage: // if (!cond) RAW_LOG(FATAL, "foo ...", hard_to_compute_args); // so that the args are not computed when not needed. -#define RAW_CHECK(condition, message) \ - do { \ - if (!(condition)) { \ - RAW_LOG(FATAL, "Check %s failed: %s", #condition, message); \ - } \ +#define RAW_CHECK(condition, message) \ + do { \ + if (!(condition)) { \ + RAW_LOG(FATAL, "Check %s failed: %s", #condition, message); \ + } \ } while (0) // Debug versions of RAW_LOG and RAW_CHECK #ifndef NDEBUG -#define RAW_DLOG(severity, ...) RAW_LOG(severity, __VA_ARGS__) -#define RAW_DCHECK(condition, message) RAW_CHECK(condition, message) +# define RAW_DLOG(severity, ...) RAW_LOG(severity, __VA_ARGS__) +# define RAW_DCHECK(condition, message) RAW_CHECK(condition, message) #else // NDEBUG -#define RAW_DLOG(severity, ...) \ - while (false) \ - RAW_LOG(severity, __VA_ARGS__) -#define RAW_DCHECK(condition, message) \ - while (false) \ - RAW_CHECK(condition, message) +# define RAW_DLOG(severity, ...) \ + while (false) RAW_LOG(severity, __VA_ARGS__) +# define RAW_DCHECK(condition, message) \ + while (false) RAW_CHECK(condition, message) #endif // NDEBUG -#if defined(__GNUC__) -#pragma GCC diagnostic pop -#endif - // Stub log function used to work around for unused variable warnings when // building with STRIP_LOG > 0. -static inline void RawLogStub__(int /* ignored */, ...) { -} +static inline void RawLogStub__(int /* ignored */, ...) {} // Helper function to implement RAW_LOG and RAW_VLOG // Logs format... at "severity" level, reporting it @@ -172,8 +165,12 @@ static inline void RawLogStub__(int /* ignored */, ...) { // This does not allocate memory or acquire locks. GLOG_EXPORT void RawLog__(LogSeverity severity, const char* file, int line, const char* format, ...) - __attribute__((__format__(__printf__, 4, 5))); - -} +#if defined(__has_attribute) +# if __has_attribute(used) + __attribute__((__format__(__printf__, 4, 5))) +# endif +#endif + ; +} // namespace google #endif // GLOG_RAW_LOGGING_H diff --git a/glog/arm64-v8a/include/glog/stl_logging.h b/glog/arm64-v8a/include/glog/stl_logging.h index ed200dd2..8dd7707e 100644 --- a/glog/arm64-v8a/include/glog/stl_logging.h +++ b/glog/arm64-v8a/include/glog/stl_logging.h @@ -1,4 +1,4 @@ -// Copyright (c) 2003, Google Inc. +// Copyright (c) 2023, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -35,140 +35,86 @@ // vector v1, v2; // CHECK_EQ(v1, v2); // -// If you want to use this header file with hash maps or slist, you -// need to define macros before including this file: -// -// - GLOG_STL_LOGGING_FOR_UNORDERED - and -// - GLOG_STL_LOGGING_FOR_TR1_UNORDERED - -// - GLOG_STL_LOGGING_FOR_EXT_HASH - -// - GLOG_STL_LOGGING_FOR_EXT_SLIST - -// -#ifndef UTIL_GTL_STL_LOGGING_INL_H_ -#define UTIL_GTL_STL_LOGGING_INL_H_ - -#if !1 -# error We do not support stl_logging for this compiler -#endif +#ifndef GLOG_STL_LOGGING_H +#define GLOG_STL_LOGGING_H #include #include #include #include #include +#include +#include #include #include -#if defined(GLOG_STL_LOGGING_FOR_UNORDERED) && __cplusplus >= 201103L -# include -# include -#endif - -#ifdef GLOG_STL_LOGGING_FOR_TR1_UNORDERED -# include -# include -#endif - -#ifdef GLOG_STL_LOGGING_FOR_EXT_HASH -# include -# include -#endif -#ifdef GLOG_STL_LOGGING_FOR_EXT_SLIST -# include -#endif - // Forward declare these two, and define them after all the container streams // operators so that we can recurse from pair -> container -> container -> pair // properly. -template +template std::ostream& operator<<(std::ostream& out, const std::pair& p); namespace google { -template +template void PrintSequence(std::ostream& out, Iter begin, Iter end); } - -#define OUTPUT_TWO_ARG_CONTAINER(Sequence) \ -template \ -inline std::ostream& operator<<(std::ostream& out, \ - const Sequence& seq) { \ - google::PrintSequence(out, seq.begin(), seq.end()); \ - return out; \ -} +#define OUTPUT_TWO_ARG_CONTAINER(Sequence) \ + template \ + inline std::ostream& operator<<(std::ostream& out, \ + const Sequence& seq) { \ + google::PrintSequence(out, seq.begin(), seq.end()); \ + return out; \ + } OUTPUT_TWO_ARG_CONTAINER(std::vector) OUTPUT_TWO_ARG_CONTAINER(std::deque) OUTPUT_TWO_ARG_CONTAINER(std::list) -#ifdef GLOG_STL_LOGGING_FOR_EXT_SLIST -OUTPUT_TWO_ARG_CONTAINER(__gnu_cxx::slist) -#endif - #undef OUTPUT_TWO_ARG_CONTAINER -#define OUTPUT_THREE_ARG_CONTAINER(Sequence) \ -template \ -inline std::ostream& operator<<(std::ostream& out, \ - const Sequence& seq) { \ - google::PrintSequence(out, seq.begin(), seq.end()); \ - return out; \ -} +#define OUTPUT_THREE_ARG_CONTAINER(Sequence) \ + template \ + inline std::ostream& operator<<(std::ostream& out, \ + const Sequence& seq) { \ + google::PrintSequence(out, seq.begin(), seq.end()); \ + return out; \ + } OUTPUT_THREE_ARG_CONTAINER(std::set) OUTPUT_THREE_ARG_CONTAINER(std::multiset) #undef OUTPUT_THREE_ARG_CONTAINER -#define OUTPUT_FOUR_ARG_CONTAINER(Sequence) \ -template \ -inline std::ostream& operator<<(std::ostream& out, \ - const Sequence& seq) { \ - google::PrintSequence(out, seq.begin(), seq.end()); \ - return out; \ -} +#define OUTPUT_FOUR_ARG_CONTAINER(Sequence) \ + template \ + inline std::ostream& operator<<(std::ostream& out, \ + const Sequence& seq) { \ + google::PrintSequence(out, seq.begin(), seq.end()); \ + return out; \ + } OUTPUT_FOUR_ARG_CONTAINER(std::map) OUTPUT_FOUR_ARG_CONTAINER(std::multimap) -#if defined(GLOG_STL_LOGGING_FOR_UNORDERED) && __cplusplus >= 201103L OUTPUT_FOUR_ARG_CONTAINER(std::unordered_set) OUTPUT_FOUR_ARG_CONTAINER(std::unordered_multiset) -#endif -#ifdef GLOG_STL_LOGGING_FOR_TR1_UNORDERED -OUTPUT_FOUR_ARG_CONTAINER(std::tr1::unordered_set) -OUTPUT_FOUR_ARG_CONTAINER(std::tr1::unordered_multiset) -#endif -#ifdef GLOG_STL_LOGGING_FOR_EXT_HASH -OUTPUT_FOUR_ARG_CONTAINER(__gnu_cxx::hash_set) -OUTPUT_FOUR_ARG_CONTAINER(__gnu_cxx::hash_multiset) -#endif - #undef OUTPUT_FOUR_ARG_CONTAINER -#define OUTPUT_FIVE_ARG_CONTAINER(Sequence) \ -template \ -inline std::ostream& operator<<(std::ostream& out, \ - const Sequence& seq) { \ - google::PrintSequence(out, seq.begin(), seq.end()); \ - return out; \ -} +#define OUTPUT_FIVE_ARG_CONTAINER(Sequence) \ + template \ + inline std::ostream& operator<<(std::ostream& out, \ + const Sequence& seq) { \ + google::PrintSequence(out, seq.begin(), seq.end()); \ + return out; \ + } -#if defined(GLOG_STL_LOGGING_FOR_UNORDERED) && __cplusplus >= 201103L OUTPUT_FIVE_ARG_CONTAINER(std::unordered_map) OUTPUT_FIVE_ARG_CONTAINER(std::unordered_multimap) -#endif -#ifdef GLOG_STL_LOGGING_FOR_TR1_UNORDERED -OUTPUT_FIVE_ARG_CONTAINER(std::tr1::unordered_map) -OUTPUT_FIVE_ARG_CONTAINER(std::tr1::unordered_multimap) -#endif -#ifdef GLOG_STL_LOGGING_FOR_EXT_HASH -OUTPUT_FIVE_ARG_CONTAINER(__gnu_cxx::hash_map) -OUTPUT_FIVE_ARG_CONTAINER(__gnu_cxx::hash_multimap) -#endif #undef OUTPUT_FIVE_ARG_CONTAINER -template +template inline std::ostream& operator<<(std::ostream& out, const std::pair& p) { out << '(' << p.first << ", " << p.second << ')'; @@ -177,7 +123,7 @@ inline std::ostream& operator<<(std::ostream& out, namespace google { -template +template inline void PrintSequence(std::ostream& out, Iter begin, Iter end) { // Output at most 100 elements -- appropriate if used for logging. for (int i = 0; begin != end && i < 100; ++i, ++begin) { @@ -189,7 +135,7 @@ inline void PrintSequence(std::ostream& out, Iter begin, Iter end) { } } -} +} // namespace google // Note that this is technically undefined behavior! We are adding things into // the std namespace for a reason though -- we are providing new operations on @@ -215,6 +161,8 @@ inline void PrintSequence(std::ostream& out, Iter begin, Iter end) { // move all of the *definitions* into namespace std, bet we need to ensure no // one references them first. This lets us take that step. We cannot define them // in both because that would create ambiguous overloads when both are found. -namespace std { using ::operator<<; } +namespace std { +using ::operator<<; +} -#endif // UTIL_GTL_STL_LOGGING_INL_H_ +#endif // GLOG_STL_LOGGING_H diff --git a/glog/arm64-v8a/include/glog/types.h b/glog/arm64-v8a/include/glog/types.h new file mode 100644 index 00000000..dca2f06f --- /dev/null +++ b/glog/arm64-v8a/include/glog/types.h @@ -0,0 +1,81 @@ + +// Copyright (c) 2024, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#ifndef GLOG_TYPES_H +#define GLOG_TYPES_H + +#include +#include + +namespace google { + +using int32 = std::int32_t; +using uint32 = std::uint32_t; +using int64 = std::int64_t; +using uint64 = std::uint64_t; + +} // namespace google + +#if defined(__has_feature) +# if __has_feature(thread_sanitizer) +# define GLOG_SANITIZE_THREAD 1 +# endif +#endif + +#if !defined(GLOG_SANITIZE_THREAD) && defined(__SANITIZE_THREAD__) && \ + __SANITIZE_THREAD__ +# define GLOG_SANITIZE_THREAD 1 +#endif + +#if defined(GLOG_SANITIZE_THREAD) +# define GLOG_IFDEF_THREAD_SANITIZER(X) X +#else +# define GLOG_IFDEF_THREAD_SANITIZER(X) +#endif + +#if defined(_MSC_VER) +# define GLOG_MSVC_PUSH_DISABLE_WARNING(n) \ + __pragma(warning(push)) __pragma(warning(disable : n)) +# define GLOG_MSVC_POP_WARNING() __pragma(warning(pop)) +#else +# define GLOG_MSVC_PUSH_DISABLE_WARNING(n) +# define GLOG_MSVC_POP_WARNING() +#endif + +#if defined(GLOG_SANITIZE_THREAD) +// We need to identify the static variables as "benign" races +// to avoid noisy reports from TSAN. +extern "C" void AnnotateBenignRaceSized(const char* file, int line, + const volatile void* mem, size_t size, + const char* description); +#endif // defined(GLOG_SANITIZE_THREAD) + +#endif // GLOG_TYPES_H diff --git a/glog/arm64-v8a/include/glog/vlog_is_on.h b/glog/arm64-v8a/include/glog/vlog_is_on.h index 52036b5e..f94b0fb8 100644 --- a/glog/arm64-v8a/include/glog/vlog_is_on.h +++ b/glog/arm64-v8a/include/glog/vlog_is_on.h @@ -1,4 +1,4 @@ -// Copyright (c) 1999, 2007, Google Inc. +// Copyright (c) 2024, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -58,10 +58,21 @@ // CAVEAT: --vmodule functionality is not available in non gcc compilers. // -#ifndef BASE_VLOG_IS_ON_H_ -#define BASE_VLOG_IS_ON_H_ +#ifndef GLOG_VLOG_IS_ON_H +#define GLOG_VLOG_IS_ON_H -#include +#include + +#if defined(GLOG_USE_GLOG_EXPORT) +# include "glog/export.h" +#endif + +#if !defined(GLOG_EXPORT) +# error was not included correctly. See the documention for how to consume the library. +#endif + +#include "glog/flags.h" +#include "glog/types.h" #if defined(__GNUC__) // We emit an anonymous static int* variable at every VLOG_IS_ON(n) site. @@ -70,19 +81,25 @@ // it's either FLAGS_v or an appropriate internal variable // matching the current source file that represents results of // parsing of --vmodule flag and/or SetVLOGLevel calls. -#define VLOG_IS_ON(verboselevel) \ - __extension__ \ - ({ static google::SiteFlag vlocal__ = {NULL, NULL, 0, NULL}; \ - google::int32 verbose_level__ = (verboselevel); \ - (vlocal__.level == NULL ? google::InitVLOG3__(&vlocal__, &FLAGS_v, \ - __FILE__, verbose_level__) : *vlocal__.level >= verbose_level__); \ - }) +# define VLOG_IS_ON(verboselevel) \ + __extension__({ \ + static google::SiteFlag vlocal__ = {nullptr, nullptr, 0, nullptr}; \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &vlocal__, sizeof(google::SiteFlag), "")); \ + google::int32 verbose_level__ = (verboselevel); \ + (vlocal__.level == nullptr \ + ? google::InitVLOG3__(&vlocal__, &FLAGS_v, __FILE__, \ + verbose_level__) \ + : *vlocal__.level >= verbose_level__); \ + }) #else // GNU extensions not available, so we do not support --vmodule. // Dynamic value of FLAGS_v always controls the logging level. -#define VLOG_IS_ON(verboselevel) (FLAGS_v >= (verboselevel)) +# define VLOG_IS_ON(verboselevel) (FLAGS_v >= (verboselevel)) #endif +namespace google { + // Set VLOG(_IS_ON) level for module_pattern to log_level. // This lets us dynamically control what is normally set by the --vmodule flag. // Returns the level that previously applied to module_pattern. @@ -96,13 +113,13 @@ extern GLOG_EXPORT int SetVLOGLevel(const char* module_pattern, int log_level); // Various declarations needed for VLOG_IS_ON above: ========================= struct SiteFlag { - google::int32* level; + int32* level; const char* base_name; - size_t base_len; + std::size_t base_len; SiteFlag* next; }; -// Helper routine which determines the logging info for a particalur VLOG site. +// Helper routine which determines the logging info for a particular VLOG site. // site_flag is the address of the site-local pointer to the controlling // verbosity level // site_default is the default to use for *site_flag @@ -110,9 +127,10 @@ struct SiteFlag { // verbose_level is the argument to VLOG_IS_ON // We will return the return value for VLOG_IS_ON // and if possible set *site_flag appropriately. -extern GLOG_EXPORT bool InitVLOG3__( - google::SiteFlag* site_flag, - google::int32* site_default, const char* fname, - google::int32 verbose_level); +extern GLOG_EXPORT bool InitVLOG3__(SiteFlag* site_flag, + int32* site_default, + const char* fname, + int32 verbose_level); +} // namespace google -#endif // BASE_VLOG_IS_ON_H_ +#endif // GLOG_VLOG_IS_ON_H diff --git a/glog/arm64-v8a/lib/cmake/glog/glog-config-version.cmake b/glog/arm64-v8a/lib/cmake/glog/glog-config-version.cmake index 47dc0585..1eba2de2 100644 --- a/glog/arm64-v8a/lib/cmake/glog/glog-config-version.cmake +++ b/glog/arm64-v8a/lib/cmake/glog/glog-config-version.cmake @@ -9,19 +9,19 @@ # The variable CVF_VERSION must be set before calling configure_file(). -set(PACKAGE_VERSION "0.6.0") +set(PACKAGE_VERSION "0.7.0") if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() - if("0.6.0" MATCHES "^([0-9]+)\\.") + if("0.7.0" MATCHES "^([0-9]+)\\.") set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}") if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0) string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}") endif() else() - set(CVF_VERSION_MAJOR "0.6.0") + set(CVF_VERSION_MAJOR "0.7.0") endif() if(PACKAGE_FIND_VERSION_RANGE) diff --git a/glog/arm64-v8a/lib/cmake/glog/glog-config.cmake b/glog/arm64-v8a/lib/cmake/glog/glog-config.cmake index 7f9d5702..d4fc7691 100644 --- a/glog/arm64-v8a/lib/cmake/glog/glog-config.cmake +++ b/glog/arm64-v8a/lib/cmake/glog/glog-config.cmake @@ -21,6 +21,8 @@ endmacro() include (CMakeFindDependencyMacro) include (${CMAKE_CURRENT_LIST_DIR}/glog-modules.cmake) +find_dependency (Threads) + diff --git a/glog/arm64-v8a/lib/cmake/glog/glog-targets.cmake b/glog/arm64-v8a/lib/cmake/glog/glog-targets.cmake index 7799b1fe..bfdb8034 100644 --- a/glog/arm64-v8a/lib/cmake/glog/glog-targets.cmake +++ b/glog/arm64-v8a/lib/cmake/glog/glog-targets.cmake @@ -54,9 +54,10 @@ endif() add_library(glog::glog STATIC IMPORTED) set_target_properties(glog::glog PROPERTIES - INTERFACE_COMPILE_DEFINITIONS "GLOG_CUSTOM_PREFIX_SUPPORT" + INTERFACE_COMPILE_DEFINITIONS "GLOG_USE_GLOG_EXPORT" + INTERFACE_COMPILE_FEATURES "cxx_std_14" INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" - INTERFACE_LINK_LIBRARIES "\$;\$" + INTERFACE_LINK_LIBRARIES "\$;\$" ) if(CMAKE_VERSION VERSION_LESS 2.8.12) diff --git a/glog/arm64-v8a/lib/libglog.a b/glog/arm64-v8a/lib/libglog.a index 402589be..f767301a 100644 Binary files a/glog/arm64-v8a/lib/libglog.a and b/glog/arm64-v8a/lib/libglog.a differ diff --git a/glog/armeabi-v7a/include/glog/flags.h b/glog/armeabi-v7a/include/glog/flags.h new file mode 100644 index 00000000..8349639a --- /dev/null +++ b/glog/armeabi-v7a/include/glog/flags.h @@ -0,0 +1,191 @@ +// Copyright (c) 2024, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#ifndef GLOG_FLAGS_H +#define GLOG_FLAGS_H + +#include + +#if defined(GLOG_USE_GFLAGS) +# include +#endif + +#if defined(GLOG_USE_GLOG_EXPORT) +# include "glog/export.h" +#endif + +#if !defined(GLOG_EXPORT) +# error was not included correctly. See the documention for how to consume the library. +#endif + +#include "glog/platform.h" +#include "glog/types.h" + +#pragma push_macro("DECLARE_VARIABLE") +#pragma push_macro("DECLARE_bool") +#pragma push_macro("DECLARE_string") +#pragma push_macro("DECLARE_int32") +#pragma push_macro("DECLARE_uint32") + +#ifdef DECLARE_VARIABLE +# undef DECLARE_VARIABLE +#endif + +#ifdef DECLARE_bool +# undef DECLARE_bool +#endif + +#ifdef DECLARE_string +# undef DECLARE_string +#endif + +#ifdef DECLARE_int32 +# undef DECLARE_int32 +#endif + +#ifdef DECLARE_uint32 +# undef DECLARE_uint32 +#endif + +#ifndef DECLARE_VARIABLE +# define DECLARE_VARIABLE(type, shorttype, name, tn) \ + namespace fL##shorttype { \ + extern GLOG_EXPORT type FLAGS_##name; \ + } \ + using fL##shorttype::FLAGS_##name + +// bool specialization +# define DECLARE_bool(name) DECLARE_VARIABLE(bool, B, name, bool) + +// int32 specialization +# define DECLARE_int32(name) DECLARE_VARIABLE(google::int32, I, name, int32) + +# if !defined(DECLARE_uint32) +// uint32 specialization +# define DECLARE_uint32(name) \ + DECLARE_VARIABLE(google::uint32, U, name, uint32) +# endif // !defined(DECLARE_uint32) && !defined(GLOG_USE_GFLAGS) + +// Special case for string, because we have to specify the namespace +// std::string, which doesn't play nicely with our FLAG__namespace hackery. +# define DECLARE_string(name) \ + namespace fLS { \ + extern GLOG_EXPORT std::string& FLAGS_##name; \ + } \ + using fLS::FLAGS_##name +#endif + +DECLARE_int32(logemaillevel); +DECLARE_int32(logcleansecs); + +#ifdef GLOG_OS_LINUX +DECLARE_bool(drop_log_memory); +#endif +DECLARE_string(alsologtoemail); +DECLARE_string(log_backtrace_at); + +// Set whether appending a timestamp to the log file name +DECLARE_bool(timestamp_in_logfile_name); + +// Set whether log messages go to stdout instead of logfiles +DECLARE_bool(logtostdout); + +// Set color messages logged to stdout (if supported by terminal). +DECLARE_bool(colorlogtostdout); + +// Set whether log messages go to stderr instead of logfiles +DECLARE_bool(logtostderr); + +// Set whether log messages go to stderr in addition to logfiles. +DECLARE_bool(alsologtostderr); + +// Set color messages logged to stderr (if supported by terminal). +DECLARE_bool(colorlogtostderr); + +// Log messages at a level >= this flag are automatically sent to +// stderr in addition to log files. +DECLARE_int32(stderrthreshold); + +// Set whether the log file header should be written upon creating a file. +DECLARE_bool(log_file_header); + +// Set whether the log prefix should be prepended to each line of output. +DECLARE_bool(log_prefix); + +// Set whether the year should be included in the log prefix. +DECLARE_bool(log_year_in_prefix); + +// Log messages at a level <= this flag are buffered. +// Log messages at a higher level are flushed immediately. +DECLARE_int32(logbuflevel); + +// Sets the maximum number of seconds which logs may be buffered for. +DECLARE_int32(logbufsecs); + +// Log suppression level: messages logged at a lower level than this +// are suppressed. +DECLARE_int32(minloglevel); + +// If specified, logfiles are written into this directory instead of the +// default logging directory. +DECLARE_string(log_dir); + +// Set the log file mode. +DECLARE_int32(logfile_mode); + +// Sets the path of the directory into which to put additional links +// to the log files. +DECLARE_string(log_link); + +DECLARE_int32(v); // in vlog_is_on.cc + +DECLARE_string(vmodule); // also in vlog_is_on.cc + +// Sets the maximum log file size (in MB). +DECLARE_uint32(max_log_size); + +// Sets whether to avoid logging to the disk if the disk is full. +DECLARE_bool(stop_logging_if_full_disk); + +// Use UTC time for logging +DECLARE_bool(log_utc_time); + +// Mailer used to send logging email +DECLARE_string(logmailer); + +DECLARE_bool(symbolize_stacktrace); + +#pragma pop_macro("DECLARE_VARIABLE") +#pragma pop_macro("DECLARE_bool") +#pragma pop_macro("DECLARE_string") +#pragma pop_macro("DECLARE_int32") +#pragma pop_macro("DECLARE_uint32") + +#endif // GLOG_FLAGS_H diff --git a/glog/armeabi-v7a/include/glog/log_severity.h b/glog/armeabi-v7a/include/glog/log_severity.h index aa48f531..1fb6a4c0 100644 --- a/glog/armeabi-v7a/include/glog/log_severity.h +++ b/glog/armeabi-v7a/include/glog/log_severity.h @@ -1,4 +1,4 @@ -// Copyright (c) 2007, Google Inc. +// Copyright (c) 2024, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -30,6 +30,16 @@ #ifndef BASE_LOG_SEVERITY_H__ #define BASE_LOG_SEVERITY_H__ +#if defined(GLOG_USE_GLOG_EXPORT) +# include "glog/export.h" +#endif + +#if !defined(GLOG_EXPORT) +# error was not included correctly. See the documention for how to consume the library. +#endif + +namespace google { + // The recommended semantics of the log levels are as follows: // // INFO: @@ -48,27 +58,43 @@ // Variables of type LogSeverity are widely taken to lie in the range // [0, NUM_SEVERITIES-1]. Be careful to preserve this assumption if // you ever need to change their values or add a new severity. -typedef int LogSeverity; -const int GLOG_INFO = 0, GLOG_WARNING = 1, GLOG_ERROR = 2, GLOG_FATAL = 3, - NUM_SEVERITIES = 4; +enum LogSeverity { + GLOG_INFO = 0, + GLOG_WARNING = 1, + GLOG_ERROR = 2, + GLOG_FATAL = 3, #ifndef GLOG_NO_ABBREVIATED_SEVERITIES -# ifdef ERROR +# ifdef ERROR # error ERROR macro is defined. Define GLOG_NO_ABBREVIATED_SEVERITIES before including logging.h. See the document for detail. -# endif -const int INFO = GLOG_INFO, WARNING = GLOG_WARNING, - ERROR = GLOG_ERROR, FATAL = GLOG_FATAL; +# endif + INFO = GLOG_INFO, + WARNING = GLOG_WARNING, + ERROR = GLOG_ERROR, + FATAL = GLOG_FATAL #endif +}; + +#if defined(__cpp_inline_variables) +# if (__cpp_inline_variables >= 201606L) +# define GLOG_INLINE_VARIABLE inline +# endif // (__cpp_inline_variables >= 201606L) +#endif // defined(__cpp_inline_variables) + +#if !defined(GLOG_INLINE_VARIABLE) +# define GLOG_INLINE_VARIABLE +#endif // !defined(GLOG_INLINE_VARIABLE) + +GLOG_INLINE_VARIABLE +constexpr int NUM_SEVERITIES = 4; // DFATAL is FATAL in debug mode, ERROR in normal mode #ifdef NDEBUG -#define DFATAL_LEVEL ERROR +# define DFATAL_LEVEL ERROR #else -#define DFATAL_LEVEL FATAL +# define DFATAL_LEVEL FATAL #endif -extern GLOG_EXPORT const char* const LogSeverityNames[NUM_SEVERITIES]; - // NDEBUG usage helpers related to (RAW_)DCHECK: // // DEBUG_MODE is for small !NDEBUG uses like @@ -89,10 +115,12 @@ extern GLOG_EXPORT const char* const LogSeverityNames[NUM_SEVERITIES]; // #ifdef NDEBUG enum { DEBUG_MODE = 0 }; -#define IF_DEBUG_MODE(x) +# define IF_DEBUG_MODE(x) #else enum { DEBUG_MODE = 1 }; -#define IF_DEBUG_MODE(x) x +# define IF_DEBUG_MODE(x) x #endif +} // namespace google + #endif // BASE_LOG_SEVERITY_H__ diff --git a/glog/armeabi-v7a/include/glog/logging.h b/glog/armeabi-v7a/include/glog/logging.h index af2219cc..9ab897e4 100644 --- a/glog/armeabi-v7a/include/glog/logging.h +++ b/glog/armeabi-v7a/include/glog/logging.h @@ -1,4 +1,4 @@ -// Copyright (c) 2022, Google Inc. +// Copyright (c) 2024, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -36,141 +36,104 @@ #ifndef GLOG_LOGGING_H #define GLOG_LOGGING_H -#if 1 && __cplusplus >= 201103L -#include -#endif - +#include #include +#include #include #include #include #include #include +#include #include #include #include -#if 1 -# include -#endif +#include +#include #include -#if defined(_MSC_VER) -#define GLOG_MSVC_PUSH_DISABLE_WARNING(n) __pragma(warning(push)) \ - __pragma(warning(disable:n)) -#define GLOG_MSVC_POP_WARNING() __pragma(warning(pop)) -#else -#define GLOG_MSVC_PUSH_DISABLE_WARNING(n) -#define GLOG_MSVC_POP_WARNING() +#if defined(GLOG_USE_GLOG_EXPORT) +# include "glog/export.h" #endif -#include - -#if 1 -#include +#if !defined(GLOG_EXPORT) || !defined(GLOG_NO_EXPORT) +# error was not included correctly. See the documention for how to consume the library. #endif -// We care a lot about number of bits things take up. Unfortunately, -// systems define their bit-specific ints in a lot of different ways. -// We use our own way, and have a typedef to get there. -// Note: these commands below may look like "#if 1" or "#if 0", but -// that's because they were constructed that way at ./configure time. -// Look at logging.h.in to see how they're calculated (based on your config). -#if 1 -#include // the normal place uint16_t is defined -#endif -#if 1 -#include // the normal place u_int16_t is defined -#endif -#if 1 -#include // a third place for uint16_t or u_int16_t -#endif +#include "glog/flags.h" +#include "glog/platform.h" +#include "glog/types.h" -#if 0 -#include -#endif +#if defined(__has_attribute) +# if __has_attribute(used) +# define GLOG_USED __attribute__((used)) +# endif // __has_attribute(used) +#endif // defined(__has_attribute) -#if 1 && __cplusplus >= 201103L -#include -#elif defined(GLOG_OS_WINDOWS) -#include -#endif +#if !defined(GLOG_USED) +# define GLOG_USED +#endif // !defined(GLOG_USED) + +#include "glog/log_severity.h" +#include "glog/vlog_is_on.h" namespace google { -#if 1 // the C99 format -typedef int32_t int32; -typedef uint32_t uint32; -typedef int64_t int64; -typedef uint64_t uint64; -#elif 1 // the BSD format -typedef int32_t int32; -typedef u_int32_t uint32; -typedef int64_t int64; -typedef u_int64_t uint64; -#elif 0 // the windows (vc7) format -typedef __int32 int32; -typedef unsigned __int32 uint32; -typedef __int64 int64; -typedef unsigned __int64 uint64; -#else -#error Do not know how to define a 32-bit integer quantity on your system -#endif - -typedef double WallTime; - struct GLOG_EXPORT LogMessageTime { LogMessageTime(); - LogMessageTime(std::tm t); - LogMessageTime(std::time_t timestamp, WallTime now); + explicit LogMessageTime(std::chrono::system_clock::time_point now); - const time_t& timestamp() const { return timestamp_; } - const int& sec() const { return time_struct_.tm_sec; } - const int32_t& usec() const { return usecs_; } - const int&(min)() const { return time_struct_.tm_min; } - const int& hour() const { return time_struct_.tm_hour; } - const int& day() const { return time_struct_.tm_mday; } - const int& month() const { return time_struct_.tm_mon; } - const int& year() const { return time_struct_.tm_year; } - const int& dayOfWeek() const { return time_struct_.tm_wday; } - const int& dayInYear() const { return time_struct_.tm_yday; } - const int& dst() const { return time_struct_.tm_isdst; } - const long int& gmtoff() const { return gmtoffset_; } - const std::tm& tm() const { return time_struct_; } + [[deprecated("Use LogMessageTime::when() instead.")]] std::time_t timestamp() + const noexcept { + return std::chrono::system_clock::to_time_t(when()); + } + const std::chrono::system_clock::time_point& when() const noexcept { + return timestamp_; + } + int sec() const noexcept { return tm_.tm_sec; } + long usec() const noexcept { return usecs_.count(); } + int(min)() const noexcept { return tm_.tm_min; } + int hour() const noexcept { return tm_.tm_hour; } + int day() const noexcept { return tm_.tm_mday; } + int month() const noexcept { return tm_.tm_mon; } + int year() const noexcept { return tm_.tm_year; } + int dayOfWeek() const noexcept { return tm_.tm_wday; } + int dayInYear() const noexcept { return tm_.tm_yday; } + int dst() const noexcept { return tm_.tm_isdst; } + [[deprecated("Use LogMessageTime::gmtoffset() instead.")]] long gmtoff() + const noexcept { + return gmtoffset_.count(); + } + std::chrono::seconds gmtoffset() const noexcept { return gmtoffset_; } + const std::tm& tm() const noexcept { return tm_; } private: - void init(const std::tm& t, std::time_t timestamp, WallTime now); - std::tm time_struct_; // Time of creation of LogMessage - time_t timestamp_; // Time of creation of LogMessage in seconds - int32_t usecs_; // Time of creation of LogMessage - microseconds part - long int gmtoffset_; - - void CalcGmtOffset(); + std::tm tm_{}; // Time of creation of LogMessage + std::chrono::system_clock::time_point + timestamp_; // Time of creation of LogMessage in seconds + std::chrono::microseconds usecs_; + std::chrono::seconds gmtoffset_; }; -#ifdef GLOG_CUSTOM_PREFIX_SUPPORT -struct LogMessageInfo { +struct [[deprecated("Use LogMessage instead.")]] LogMessageInfo { explicit LogMessageInfo(const char* const severity_, - const char* const filename_, - const int& line_number_, - const int& thread_id_, - const LogMessageTime& time_): - severity(severity_), filename(filename_), line_number(line_number_), - thread_id(thread_id_), time(time_) - {} + const char* const filename_, const int& line_number_, + std::thread::id thread_id_, + const LogMessageTime& time_) + : severity(severity_), + filename(filename_), + line_number(line_number_), + thread_id(thread_id_), + time(time_) {} const char* const severity; const char* const filename; - const int &line_number; - const int &thread_id; + const int& line_number; + std::thread::id thread_id; const LogMessageTime& time; }; -typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, void* data); - -#endif - -} - +} // namespace google // The global value of GOOGLE_STRIP_LOG. All the messages logged to // LOG(XXX) with severity less than GOOGLE_STRIP_LOG will not be displayed. @@ -182,7 +145,7 @@ typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, vo // file, add "#define GOOGLE_STRIP_LOG 1" to that file _before_ including // base/logging.h #ifndef GOOGLE_STRIP_LOG -#define GOOGLE_STRIP_LOG 0 +# define GOOGLE_STRIP_LOG 0 #endif // GCC can be told that a certain branch is not likely to be taken (for @@ -190,30 +153,48 @@ typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, vo // Giving it this information can help it optimize for the common case in // the absence of better information (ie. -fprofile-arcs). // -#ifndef GOOGLE_PREDICT_BRANCH_NOT_TAKEN -#if 1 -#define GOOGLE_PREDICT_BRANCH_NOT_TAKEN(x) (__builtin_expect(x, 0)) -#else -#define GOOGLE_PREDICT_BRANCH_NOT_TAKEN(x) x -#endif +#if defined(__has_builtin) +# if __has_builtin(__builtin_expect) +# define GLOG_BUILTIN_EXPECT_PRESENT +# endif #endif -#ifndef GOOGLE_PREDICT_FALSE -#if 1 -#define GOOGLE_PREDICT_FALSE(x) (__builtin_expect(x, 0)) -#else -#define GOOGLE_PREDICT_FALSE(x) x -#endif +#if !defined(GLOG_BUILTIN_EXPECT_PRESENT) && defined(__GNUG__) +// __has_builtin is not available prior to GCC 10 +# define GLOG_BUILTIN_EXPECT_PRESENT #endif -#ifndef GOOGLE_PREDICT_TRUE -#if 1 -#define GOOGLE_PREDICT_TRUE(x) (__builtin_expect(!!(x), 1)) +#if defined(GLOG_BUILTIN_EXPECT_PRESENT) + +# ifndef GOOGLE_PREDICT_BRANCH_NOT_TAKEN +# define GOOGLE_PREDICT_BRANCH_NOT_TAKEN(x) (__builtin_expect(x, 0)) +# endif + +# ifndef GOOGLE_PREDICT_FALSE +# define GOOGLE_PREDICT_FALSE(x) (__builtin_expect(x, 0)) +# endif + +# ifndef GOOGLE_PREDICT_TRUE +# define GOOGLE_PREDICT_TRUE(x) (__builtin_expect(!!(x), 1)) +# endif + #else -#define GOOGLE_PREDICT_TRUE(x) x -#endif + +# ifndef GOOGLE_PREDICT_BRANCH_NOT_TAKEN +# define GOOGLE_PREDICT_BRANCH_NOT_TAKEN(x) x +# endif + +# ifndef GOOGLE_PREDICT_TRUE +# define GOOGLE_PREDICT_FALSE(x) x +# endif + +# ifndef GOOGLE_PREDICT_TRUE +# define GOOGLE_PREDICT_TRUE(x) x +# endif + #endif +#undef GLOG_BUILTIN_EXPECT_PRESENT // Make a bunch of macros for logging. The way to log things is to stream // things to LOG(). E.g., @@ -226,7 +207,7 @@ typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, vo // vector errors; // LOG_STRING(ERROR, &errors) << "Couldn't parse cookie #" << cookie_num; // -// This pushes back the new error onto 'errors'; if given a NULL pointer, +// This pushes back the new error onto 'errors'; if given a nullptr pointer, // it reports the error via LOG(ERROR). // // You can also do conditional logging: @@ -311,11 +292,11 @@ typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, vo // "program with --v=1 or more"; // VLOG_EVERY_N(1, 10) // << "I'm printed every 10th occurrence, and when you run the program " -// "with --v=1 or more. Present occurence is " << google::COUNTER; +// "with --v=1 or more. Present occurrence is " << google::COUNTER; // VLOG_IF_EVERY_N(1, (size > 1024), 10) -// << "I'm printed on every 10th occurence of case when size is more " +// << "I'm printed on every 10th occurrence of case when size is more " // " than 1024, when you run the program with --v=1 or more. "; -// "Present occurence is " << google::COUNTER; +// "Present occurrence is " << google::COUNTER; // // The supported severity levels for macros that allow you to specify one // are (in increasing order of severity) INFO, WARNING, ERROR, and FATAL. @@ -369,234 +350,119 @@ typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, vo // synchronized. Hence, use caution when comparing the low bits of // timestamps from different machines. -#pragma push_macro("DECLARE_VARIABLE") -#pragma push_macro("DECLARE_bool") -#pragma push_macro("DECLARE_string") -#pragma push_macro("DECLARE_int32") -#pragma push_macro("DECLARE_uint32") - -#ifdef DECLARE_VARIABLE -#undef DECLARE_VARIABLE -#endif - -#ifdef DECLARE_bool -#undef DECLARE_bool -#endif - -#ifdef DECLARE_string -#undef DECLARE_string -#endif - -#ifdef DECLARE_int32 -#undef DECLARE_int32 -#endif - -#ifdef DECLARE_uint32 -#undef DECLARE_uint32 -#endif - -#ifndef DECLARE_VARIABLE -#define DECLARE_VARIABLE(type, shorttype, name, tn) \ - namespace fL##shorttype { \ - extern GLOG_EXPORT type FLAGS_##name; \ - } \ - using fL##shorttype::FLAGS_##name - -// bool specialization -#define DECLARE_bool(name) \ - DECLARE_VARIABLE(bool, B, name, bool) - -// int32 specialization -#define DECLARE_int32(name) \ - DECLARE_VARIABLE(google::int32, I, name, int32) - -#if !defined(DECLARE_uint32) -// uint32 specialization -#define DECLARE_uint32(name) \ - DECLARE_VARIABLE(google::uint32, U, name, uint32) -#endif // !defined(DECLARE_uint32) && !(0) - -// Special case for string, because we have to specify the namespace -// std::string, which doesn't play nicely with our FLAG__namespace hackery. -#define DECLARE_string(name) \ - namespace fLS { \ - extern GLOG_EXPORT std::string& FLAGS_##name; \ - } \ - using fLS::FLAGS_##name -#endif - -// Set whether appending a timestamp to the log file name -DECLARE_bool(timestamp_in_logfile_name); - -// Set whether log messages go to stdout instead of logfiles -DECLARE_bool(logtostdout); - -// Set color messages logged to stdout (if supported by terminal). -DECLARE_bool(colorlogtostdout); - -// Set whether log messages go to stderr instead of logfiles -DECLARE_bool(logtostderr); - -// Set whether log messages go to stderr in addition to logfiles. -DECLARE_bool(alsologtostderr); - -// Set color messages logged to stderr (if supported by terminal). -DECLARE_bool(colorlogtostderr); - -// Log messages at a level >= this flag are automatically sent to -// stderr in addition to log files. -DECLARE_int32(stderrthreshold); - -// Set whether the log prefix should be prepended to each line of output. -DECLARE_bool(log_prefix); - -// Set whether the year should be included in the log prefix. -DECLARE_bool(log_year_in_prefix); - -// Log messages at a level <= this flag are buffered. -// Log messages at a higher level are flushed immediately. -DECLARE_int32(logbuflevel); - -// Sets the maximum number of seconds which logs may be buffered for. -DECLARE_int32(logbufsecs); - -// Log suppression level: messages logged at a lower level than this -// are suppressed. -DECLARE_int32(minloglevel); - -// If specified, logfiles are written into this directory instead of the -// default logging directory. -DECLARE_string(log_dir); - -// Set the log file mode. -DECLARE_int32(logfile_mode); - -// Sets the path of the directory into which to put additional links -// to the log files. -DECLARE_string(log_link); - -DECLARE_int32(v); // in vlog_is_on.cc - -DECLARE_string(vmodule); // also in vlog_is_on.cc - -// Sets the maximum log file size (in MB). -DECLARE_uint32(max_log_size); - -// Sets whether to avoid logging to the disk if the disk is full. -DECLARE_bool(stop_logging_if_full_disk); - -// Use UTC time for logging -DECLARE_bool(log_utc_time); - // Log messages below the GOOGLE_STRIP_LOG level will be compiled away for -// security reasons. See LOG(severtiy) below. +// security reasons. See LOG(severity) below. // A few definitions of macros that don't generate much code. Since // LOG(INFO) and its ilk are used all over our code, it's // better to have compact code for these operations. #if GOOGLE_STRIP_LOG == 0 -#define COMPACT_GOOGLE_LOG_INFO google::LogMessage( \ - __FILE__, __LINE__) -#define LOG_TO_STRING_INFO(message) google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_INFO, message) +# define COMPACT_GOOGLE_LOG_INFO google::LogMessage(__FILE__, __LINE__) +# define LOG_TO_STRING_INFO(message) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_INFO, message) #else -#define COMPACT_GOOGLE_LOG_INFO google::NullStream() -#define LOG_TO_STRING_INFO(message) google::NullStream() +# define COMPACT_GOOGLE_LOG_INFO google::NullStream() +# define LOG_TO_STRING_INFO(message) google::NullStream() #endif #if GOOGLE_STRIP_LOG <= 1 -#define COMPACT_GOOGLE_LOG_WARNING google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_WARNING) -#define LOG_TO_STRING_WARNING(message) google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_WARNING, message) +# define COMPACT_GOOGLE_LOG_WARNING \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_WARNING) +# define LOG_TO_STRING_WARNING(message) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_WARNING, message) #else -#define COMPACT_GOOGLE_LOG_WARNING google::NullStream() -#define LOG_TO_STRING_WARNING(message) google::NullStream() +# define COMPACT_GOOGLE_LOG_WARNING google::NullStream() +# define LOG_TO_STRING_WARNING(message) google::NullStream() #endif #if GOOGLE_STRIP_LOG <= 2 -#define COMPACT_GOOGLE_LOG_ERROR google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ERROR) -#define LOG_TO_STRING_ERROR(message) google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ERROR, message) +# define COMPACT_GOOGLE_LOG_ERROR \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_ERROR) +# define LOG_TO_STRING_ERROR(message) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_ERROR, message) #else -#define COMPACT_GOOGLE_LOG_ERROR google::NullStream() -#define LOG_TO_STRING_ERROR(message) google::NullStream() +# define COMPACT_GOOGLE_LOG_ERROR google::NullStream() +# define LOG_TO_STRING_ERROR(message) google::NullStream() #endif #if GOOGLE_STRIP_LOG <= 3 -#define COMPACT_GOOGLE_LOG_FATAL google::LogMessageFatal( \ - __FILE__, __LINE__) -#define LOG_TO_STRING_FATAL(message) google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_FATAL, message) +# define COMPACT_GOOGLE_LOG_FATAL google::LogMessageFatal(__FILE__, __LINE__) +# define LOG_TO_STRING_FATAL(message) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_FATAL, message) #else -#define COMPACT_GOOGLE_LOG_FATAL google::NullStreamFatal() -#define LOG_TO_STRING_FATAL(message) google::NullStreamFatal() +# define COMPACT_GOOGLE_LOG_FATAL google::NullStreamFatal() +# define LOG_TO_STRING_FATAL(message) google::NullStreamFatal() #endif #if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON) -#define DCHECK_IS_ON() 0 +# define DCHECK_IS_ON() 0 #else -#define DCHECK_IS_ON() 1 +# define DCHECK_IS_ON() 1 #endif // For DFATAL, we want to use LogMessage (as opposed to // LogMessageFatal), to be consistent with the original behavior. #if !DCHECK_IS_ON() -#define COMPACT_GOOGLE_LOG_DFATAL COMPACT_GOOGLE_LOG_ERROR +# define COMPACT_GOOGLE_LOG_DFATAL COMPACT_GOOGLE_LOG_ERROR #elif GOOGLE_STRIP_LOG <= 3 -#define COMPACT_GOOGLE_LOG_DFATAL google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_FATAL) +# define COMPACT_GOOGLE_LOG_DFATAL \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_FATAL) #else -#define COMPACT_GOOGLE_LOG_DFATAL google::NullStreamFatal() +# define COMPACT_GOOGLE_LOG_DFATAL google::NullStreamFatal() #endif -#define GOOGLE_LOG_INFO(counter) google::LogMessage(__FILE__, __LINE__, google::GLOG_INFO, counter, &google::LogMessage::SendToLog) -#define SYSLOG_INFO(counter) \ +#define GOOGLE_LOG_INFO(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_INFO, counter, \ - &google::LogMessage::SendToSyslogAndLog) -#define GOOGLE_LOG_WARNING(counter) \ + &google::LogMessage::SendToLog) +#define SYSLOG_INFO(counter) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_INFO, counter, \ + &google::LogMessage::SendToSyslogAndLog) +#define GOOGLE_LOG_WARNING(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_WARNING, counter, \ - &google::LogMessage::SendToLog) -#define SYSLOG_WARNING(counter) \ + &google::LogMessage::SendToLog) +#define SYSLOG_WARNING(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_WARNING, counter, \ - &google::LogMessage::SendToSyslogAndLog) -#define GOOGLE_LOG_ERROR(counter) \ + &google::LogMessage::SendToSyslogAndLog) +#define GOOGLE_LOG_ERROR(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_ERROR, counter, \ - &google::LogMessage::SendToLog) -#define SYSLOG_ERROR(counter) \ + &google::LogMessage::SendToLog) +#define SYSLOG_ERROR(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_ERROR, counter, \ - &google::LogMessage::SendToSyslogAndLog) -#define GOOGLE_LOG_FATAL(counter) \ + &google::LogMessage::SendToSyslogAndLog) +#define GOOGLE_LOG_FATAL(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_FATAL, counter, \ - &google::LogMessage::SendToLog) -#define SYSLOG_FATAL(counter) \ + &google::LogMessage::SendToLog) +#define SYSLOG_FATAL(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_FATAL, counter, \ - &google::LogMessage::SendToSyslogAndLog) -#define GOOGLE_LOG_DFATAL(counter) \ + &google::LogMessage::SendToSyslogAndLog) +#define GOOGLE_LOG_DFATAL(counter) \ google::LogMessage(__FILE__, __LINE__, google::DFATAL_LEVEL, counter, \ - &google::LogMessage::SendToLog) -#define SYSLOG_DFATAL(counter) \ + &google::LogMessage::SendToLog) +#define SYSLOG_DFATAL(counter) \ google::LogMessage(__FILE__, __LINE__, google::DFATAL_LEVEL, counter, \ - &google::LogMessage::SendToSyslogAndLog) + &google::LogMessage::SendToSyslogAndLog) -#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) || defined(__CYGWIN32__) +#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || \ + defined(__CYGWIN__) || defined(__CYGWIN32__) // A very useful logging macro to log windows errors: -#define LOG_SYSRESULT(result) \ - if (FAILED(HRESULT_FROM_WIN32(result))) { \ - LPSTR message = NULL; \ - LPSTR msg = reinterpret_cast(&message); \ - DWORD message_length = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | \ - FORMAT_MESSAGE_FROM_SYSTEM, \ - 0, result, 0, msg, 100, NULL); \ - if (message_length > 0) { \ - google::LogMessage(__FILE__, __LINE__, google::GLOG_ERROR, 0, \ - &google::LogMessage::SendToLog).stream() \ - << reinterpret_cast(message); \ - LocalFree(message); \ - } \ - } +# define LOG_SYSRESULT(result) \ + if (FAILED(HRESULT_FROM_WIN32(result))) { \ + LPSTR message = nullptr; \ + LPSTR msg = reinterpret_cast(&message); \ + DWORD message_length = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | \ + FORMAT_MESSAGE_FROM_SYSTEM | \ + FORMAT_MESSAGE_IGNORE_INSERTS, \ + 0, result, 0, msg, 100, nullptr); \ + std::unique_ptr release{message, \ + &LocalFree}; \ + if (message_length > 0) { \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_ERROR, 0, \ + &google::LogMessage::SendToLog) \ + .stream() \ + << reinterpret_cast(message); \ + } \ + } #endif // We use the preprocessor's merging operator, "##", so that, e.g., @@ -607,24 +473,35 @@ DECLARE_bool(log_utc_time); // impossible to stream something like a string directly to an unnamed // ostream. We employ a neat hack by calling the stream() member // function of LogMessage which seems to avoid the problem. -#define LOG(severity) COMPACT_GOOGLE_LOG_ ## severity.stream() -#define SYSLOG(severity) SYSLOG_ ## severity(0).stream() +#define LOG(severity) COMPACT_GOOGLE_LOG_##severity.stream() +#define SYSLOG(severity) SYSLOG_##severity(0).stream() namespace google { -// They need the definitions of integer types. -#include -#include - // Initialize google's logging library. You will see the program name // specified by argv0 in log outputs. GLOG_EXPORT void InitGoogleLogging(const char* argv0); -#ifdef GLOG_CUSTOM_PREFIX_SUPPORT -GLOG_EXPORT void InitGoogleLogging(const char* argv0, - CustomPrefixCallback prefix_callback, - void* prefix_callback_data = NULL); -#endif +class LogMessage; + +#if defined(__GNUG__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#elif defined(_MSC_VER) +# pragma warning(push) +# pragma warning(disable : 4996) +#endif // __GNUG__ +using CustomPrefixCallback + [[deprecated("Use PrefixFormatterCallback instead.")]] = + void (*)(std::ostream&, const LogMessageInfo&, void*); +#if defined(__GNUG__) +# pragma GCC diagnostic pop +#elif defined(_MSC_VER) +# pragma warning(pop) +#endif // __GNUG__ +[[deprecated("Use InstallPrefixFormatter instead.")]] GLOG_EXPORT void +InitGoogleLogging(const char* argv0, CustomPrefixCallback prefix_callback, + void* prefix_callback_data = nullptr); // Check if google's logging library has been initialized. GLOG_EXPORT bool IsGoogleLoggingInitialized(); @@ -638,67 +515,81 @@ typedef void (*logging_fail_func_t)() __attribute__((noreturn)); typedef void (*logging_fail_func_t)(); #endif -// Install a function which will be called after LOG(FATAL). -GLOG_EXPORT void InstallFailureFunction(logging_fail_func_t fail_func); +using PrefixFormatterCallback = void (*)(std::ostream&, const LogMessage&, + void*); +GLOG_EXPORT void InstallPrefixFormatter(PrefixFormatterCallback callback, + void* data = nullptr); + +// Install a function which will be called after LOG(FATAL). Returns the +// previously set function. +GLOG_EXPORT logging_fail_func_t +InstallFailureFunction(logging_fail_func_t fail_func); + +[[deprecated( + "Use the type-safe std::chrono::minutes EnableLogCleaner overload " + "instead.")]] GLOG_EXPORT void +EnableLogCleaner(unsigned int overdue_days); // Enable/Disable old log cleaner. -GLOG_EXPORT void EnableLogCleaner(unsigned int overdue_days); +GLOG_EXPORT void EnableLogCleaner(const std::chrono::minutes& overdue); GLOG_EXPORT void DisableLogCleaner(); GLOG_EXPORT void SetApplicationFingerprint(const std::string& fingerprint); class LogSink; // defined below -// If a non-NULL sink pointer is given, we push this message to that sink. +// If a non-nullptr sink pointer is given, we push this message to that sink. // For LOG_TO_SINK we then do normal LOG(severity) logging as well. // This is useful for capturing messages and passing/storing them // somewhere more specific than the global log of the process. // Argument types: // LogSink* sink; // LogSeverity severity; -// The cast is to disambiguate NULL arguments. -#define LOG_TO_SINK(sink, severity) \ - google::LogMessage( \ - __FILE__, __LINE__, \ - google::GLOG_ ## severity, \ - static_cast(sink), true).stream() -#define LOG_TO_SINK_BUT_NOT_TO_LOGFILE(sink, severity) \ - google::LogMessage( \ - __FILE__, __LINE__, \ - google::GLOG_ ## severity, \ - static_cast(sink), false).stream() +// The cast is to disambiguate nullptr arguments. +#define LOG_TO_SINK(sink, severity) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + static_cast(sink), true) \ + .stream() +#define LOG_TO_SINK_BUT_NOT_TO_LOGFILE(sink, severity) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + static_cast(sink), false) \ + .stream() -// If a non-NULL string pointer is given, we write this message to that string. -// We then do normal LOG(severity) logging as well. -// This is useful for capturing messages and storing them somewhere more -// specific than the global log of the process. -// Argument types: +// If a non-nullptr string pointer is given, we write this message to that +// string. We then do normal LOG(severity) logging as well. This is useful for +// capturing messages and storing them somewhere more specific than the global +// log of the process. Argument types: // string* message; // LogSeverity severity; -// The cast is to disambiguate NULL arguments. +// The cast is to disambiguate nullptr arguments. // NOTE: LOG(severity) expands to LogMessage().stream() for the specified // severity. #define LOG_TO_STRING(severity, message) \ LOG_TO_STRING_##severity(static_cast(message)).stream() -// If a non-NULL pointer is given, we push the message onto the end +// If a non-nullptr pointer is given, we push the message onto the end // of a vector of strings; otherwise, we report it with LOG(severity). // This is handy for capturing messages and perhaps passing them back // to the caller, rather than reporting them immediately. // Argument types: // LogSeverity severity; // vector *outvec; -// The cast is to disambiguate NULL arguments. -#define LOG_STRING(severity, outvec) \ - LOG_TO_STRING_##severity(static_cast*>(outvec)).stream() +// The cast is to disambiguate nullptr arguments. +#define LOG_STRING(severity, outvec) \ + LOG_TO_STRING_##severity(static_cast*>(outvec)) \ + .stream() #define LOG_IF(severity, condition) \ static_cast(0), \ - !(condition) ? (void) 0 : google::LogMessageVoidify() & LOG(severity) + !(condition) \ + ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) #define SYSLOG_IF(severity, condition) \ static_cast(0), \ - !(condition) ? (void) 0 : google::LogMessageVoidify() & SYSLOG(severity) + !(condition) \ + ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & SYSLOG(severity) -#define LOG_ASSERT(condition) \ +#define LOG_ASSERT(condition) \ LOG_IF(FATAL, !(condition)) << "Assert failed: " #condition #define SYSLOG_ASSERT(condition) \ SYSLOG_IF(FATAL, !(condition)) << "Assert failed: " #condition @@ -707,58 +598,55 @@ class LogSink; // defined below // controlled by DCHECK_IS_ON(), so the check will be executed regardless of // compilation mode. Therefore, it is safe to do things like: // CHECK(fp->Write(x) == 4) -#define CHECK(condition) \ - LOG_IF(FATAL, GOOGLE_PREDICT_BRANCH_NOT_TAKEN(!(condition))) \ - << "Check failed: " #condition " " +#define CHECK(condition) \ + LOG_IF(FATAL, GOOGLE_PREDICT_BRANCH_NOT_TAKEN(!(condition))) \ + << "Check failed: " #condition " " + +namespace logging { +namespace internal { // A container for a string pointer which can be evaluated to a bool - -// true iff the pointer is NULL. +// true iff the pointer is nullptr. struct CheckOpString { - CheckOpString(std::string* str) : str_(str) { } - // No destructor: if str_ is non-NULL, we're about to LOG(FATAL), - // so there's no point in cleaning up str_. - operator bool() const { - return GOOGLE_PREDICT_BRANCH_NOT_TAKEN(str_ != NULL); + CheckOpString(std::unique_ptr str) : str_(std::move(str)) {} + explicit operator bool() const noexcept { + return GOOGLE_PREDICT_BRANCH_NOT_TAKEN(str_ != nullptr); } - std::string* str_; + std::unique_ptr str_; }; // Function is overloaded for integral types to allow static const // integrals declared in classes and not defined to be used as arguments to // CHECK* macros. It's not encouraged though. template -inline const T& GetReferenceableValue(const T& t) { return t; } -inline char GetReferenceableValue(char t) { return t; } -inline unsigned char GetReferenceableValue(unsigned char t) { return t; } -inline signed char GetReferenceableValue(signed char t) { return t; } -inline short GetReferenceableValue(short t) { return t; } -inline unsigned short GetReferenceableValue(unsigned short t) { return t; } -inline int GetReferenceableValue(int t) { return t; } -inline unsigned int GetReferenceableValue(unsigned int t) { return t; } -inline long GetReferenceableValue(long t) { return t; } -inline unsigned long GetReferenceableValue(unsigned long t) { return t; } -#if __cplusplus >= 201103L -inline long long GetReferenceableValue(long long t) { return t; } +inline const T& GetReferenceableValue(const T& t) { + return t; +} +inline char GetReferenceableValue(char t) { return t; } +inline unsigned char GetReferenceableValue(unsigned char t) { return t; } +inline signed char GetReferenceableValue(signed char t) { return t; } +inline short GetReferenceableValue(short t) { return t; } +inline unsigned short GetReferenceableValue(unsigned short t) { return t; } +inline int GetReferenceableValue(int t) { return t; } +inline unsigned int GetReferenceableValue(unsigned int t) { return t; } +inline long GetReferenceableValue(long t) { return t; } +inline unsigned long GetReferenceableValue(unsigned long t) { return t; } +inline long long GetReferenceableValue(long long t) { return t; } inline unsigned long long GetReferenceableValue(unsigned long long t) { return t; } -#endif // This is a dummy class to define the following operator. struct DummyClassToDefineOperator {}; -} - // Define global operator<< to declare using ::operator<<. // This declaration will allow use to use CHECK macros for user // defined classes which have operator<< (e.g., stl_logging.h). -inline std::ostream& operator<<( - std::ostream& out, const google::DummyClassToDefineOperator&) { +inline std::ostream& operator<<(std::ostream& out, + const DummyClassToDefineOperator&) { return out; } -namespace google { - // This formats a value for a failing CHECK_XX statement. Ordinarily, // it uses the definition for operator<<, with a few special cases below. template @@ -768,34 +656,29 @@ inline void MakeCheckOpValueString(std::ostream* os, const T& v) { // Overrides for char types provide readable values for unprintable // characters. -template <> GLOG_EXPORT -void MakeCheckOpValueString(std::ostream* os, const char& v); -template <> GLOG_EXPORT -void MakeCheckOpValueString(std::ostream* os, const signed char& v); -template <> GLOG_EXPORT -void MakeCheckOpValueString(std::ostream* os, const unsigned char& v); +template <> +GLOG_EXPORT void MakeCheckOpValueString(std::ostream* os, const char& v); +template <> +GLOG_EXPORT void MakeCheckOpValueString(std::ostream* os, const signed char& v); +template <> +GLOG_EXPORT void MakeCheckOpValueString(std::ostream* os, + const unsigned char& v); -// This is required because nullptr is only present in c++ 11 and later. -#if 1 && __cplusplus >= 201103L // Provide printable value for nullptr_t -template <> GLOG_EXPORT -void MakeCheckOpValueString(std::ostream* os, const std::nullptr_t& v); -#endif +template <> +GLOG_EXPORT void MakeCheckOpValueString(std::ostream* os, + const std::nullptr_t& v); // Build the error message string. Specify no inlining for code size. template -std::string* MakeCheckOpString(const T1& v1, const T2& v2, const char* exprtext) - __attribute__((noinline)); - -namespace base { -namespace internal { - -// If "s" is less than base_logging::INFO, returns base_logging::INFO. -// If "s" is greater than base_logging::FATAL, returns -// base_logging::ERROR. Otherwise, returns "s". -LogSeverity NormalizeSeverity(LogSeverity s); - -} // namespace internal +std::unique_ptr MakeCheckOpString(const T1& v1, const T2& v2, + const char* exprtext) +#if defined(__has_attribute) +# if __has_attribute(used) + __attribute__((noinline)) +# endif +#endif + ; // A helper class for formatting "expr (V1 vs. V2)" in a CHECK_XX // statement. See MakeCheckOpString for sample usage. Other @@ -806,7 +689,7 @@ LogSeverity NormalizeSeverity(LogSeverity s); class GLOG_EXPORT CheckOpMessageBuilder { public: // Inserts "exprtext" and " (" to the stream. - explicit CheckOpMessageBuilder(const char *exprtext); + explicit CheckOpMessageBuilder(const char* exprtext); // Deletes "stream_". ~CheckOpMessageBuilder(); // For inserting the first variable. @@ -814,17 +697,16 @@ class GLOG_EXPORT CheckOpMessageBuilder { // For inserting the second variable (adds an intermediate " vs. "). std::ostream* ForVar2(); // Get the result (inserts the closing ")"). - std::string* NewString(); + std::unique_ptr NewString(); private: - std::ostringstream *stream_; + std::ostringstream* stream_; }; -} // namespace base - template -std::string* MakeCheckOpString(const T1& v1, const T2& v2, const char* exprtext) { - base::CheckOpMessageBuilder comb(exprtext); +std::unique_ptr MakeCheckOpString(const T1& v1, const T2& v2, + const char* exprtext) { + CheckOpMessageBuilder comb(exprtext); MakeCheckOpValueString(comb.ForVar1(), v1); MakeCheckOpValueString(comb.ForVar2(), v2); return comb.NewString(); @@ -834,27 +716,31 @@ std::string* MakeCheckOpString(const T1& v1, const T2& v2, const char* exprtext) // The (int, int) specialization works around the issue that the compiler // will not instantiate the template version of the function on values of // unnamed enum type - see comment below. -#define DEFINE_CHECK_OP_IMPL(name, op) \ - template \ - inline std::string* name##Impl(const T1& v1, const T2& v2, \ - const char* exprtext) { \ - if (GOOGLE_PREDICT_TRUE(v1 op v2)) return NULL; \ - else return MakeCheckOpString(v1, v2, exprtext); \ - } \ - inline std::string* name##Impl(int v1, int v2, const char* exprtext) { \ - return name##Impl(v1, v2, exprtext); \ +#define DEFINE_CHECK_OP_IMPL(name, op) \ + template \ + inline std::unique_ptr name##Impl(const T1& v1, const T2& v2, \ + const char* exprtext) { \ + if (GOOGLE_PREDICT_TRUE(v1 op v2)) { \ + return nullptr; \ + } \ + return MakeCheckOpString(v1, v2, exprtext); \ + } \ + inline std::unique_ptr name##Impl(int v1, int v2, \ + const char* exprtext) { \ + return name##Impl(v1, v2, exprtext); \ } // We use the full name Check_EQ, Check_NE, etc. in case the file including // base/logging.h provides its own #defines for the simpler names EQ, NE, etc. // This happens if, for example, those are used as token names in a // yacc grammar. -DEFINE_CHECK_OP_IMPL(Check_EQ, ==) // Compilation error with CHECK_EQ(NULL, x)? -DEFINE_CHECK_OP_IMPL(Check_NE, !=) // Use CHECK(x == NULL) instead. +DEFINE_CHECK_OP_IMPL(Check_EQ, ==) +DEFINE_CHECK_OP_IMPL(Check_NE, !=) DEFINE_CHECK_OP_IMPL(Check_LE, <=) -DEFINE_CHECK_OP_IMPL(Check_LT, < ) +DEFINE_CHECK_OP_IMPL(Check_LT, <) DEFINE_CHECK_OP_IMPL(Check_GE, >=) -DEFINE_CHECK_OP_IMPL(Check_GT, > ) +DEFINE_CHECK_OP_IMPL(Check_GT, >) + #undef DEFINE_CHECK_OP_IMPL // Helper macro for binary operators. @@ -862,10 +748,10 @@ DEFINE_CHECK_OP_IMPL(Check_GT, > ) #if defined(STATIC_ANALYSIS) // Only for static analysis tool to know that it is equivalent to assert -#define CHECK_OP_LOG(name, op, val1, val2, log) CHECK((val1) op (val2)) +# define CHECK_OP_LOG(name, op, val1, val2, log) CHECK((val1)op(val2)) #elif DCHECK_IS_ON() // In debug mode, avoid constructing CheckOpStrings if possible, -// to reduce the overhead of CHECK statments by 2x. +// to reduce the overhead of CHECK statements by 2x. // Real DCHECK-heavy tests have seen 1.5x speedups. // The meaning of "string" might be different between now and @@ -873,34 +759,35 @@ DEFINE_CHECK_OP_IMPL(Check_GT, > ) // with other string implementations that get defined after this // file is included). Save the current meaning now and use it // in the macro. -typedef std::string _Check_string; -#define CHECK_OP_LOG(name, op, val1, val2, log) \ - while (google::_Check_string* _result = \ - google::Check##name##Impl( \ - google::GetReferenceableValue(val1), \ - google::GetReferenceableValue(val2), \ - #val1 " " #op " " #val2)) \ - log(__FILE__, __LINE__, \ - google::CheckOpString(_result)).stream() +using _Check_string = std::string; +# define CHECK_OP_LOG(name, op, val1, val2, log) \ + while (std::unique_ptr _result = \ + google::logging::internal::Check##name##Impl( \ + google::logging::internal::GetReferenceableValue(val1), \ + google::logging::internal::GetReferenceableValue(val2), \ + #val1 " " #op " " #val2)) \ + log(__FILE__, __LINE__, \ + google::logging::internal::CheckOpString(std::move(_result))) \ + .stream() #else // In optimized mode, use CheckOpString to hint to compiler that // the while condition is unlikely. -#define CHECK_OP_LOG(name, op, val1, val2, log) \ - while (google::CheckOpString _result = \ - google::Check##name##Impl( \ - google::GetReferenceableValue(val1), \ - google::GetReferenceableValue(val2), \ - #val1 " " #op " " #val2)) \ +# define CHECK_OP_LOG(name, op, val1, val2, log) \ + while (google::logging::internal::CheckOpString _result = \ + google::logging::internal::Check##name##Impl( \ + google::logging::internal::GetReferenceableValue(val1), \ + google::logging::internal::GetReferenceableValue(val2), \ + #val1 " " #op " " #val2)) \ log(__FILE__, __LINE__, _result).stream() #endif // STATIC_ANALYSIS, DCHECK_IS_ON() #if GOOGLE_STRIP_LOG <= 3 -#define CHECK_OP(name, op, val1, val2) \ - CHECK_OP_LOG(name, op, val1, val2, google::LogMessageFatal) +# define CHECK_OP(name, op, val1, val2) \ + CHECK_OP_LOG(name, op, val1, val2, google::LogMessageFatal) #else -#define CHECK_OP(name, op, val1, val2) \ - CHECK_OP_LOG(name, op, val1, val2, google::NullStreamFatal) -#endif // STRIP_LOG <= 3 +# define CHECK_OP(name, op, val1, val2) \ + CHECK_OP_LOG(name, op, val1, val2, google::NullStreamFatal) +#endif // STRIP_LOG <= 3 // Equality/Inequality checks - compare two values, and log a FATAL message // including the two values when the result is not as expected. The values @@ -917,41 +804,46 @@ typedef std::string _Check_string; // CHECK_EQ(string("abc")[1], 'b'); // // WARNING: These don't compile correctly if one of the arguments is a pointer -// and the other is NULL. To work around this, simply static_cast NULL to the -// type of the desired pointer. +// and the other is nullptr. To work around this, simply static_cast nullptr to +// the type of the desired pointer. #define CHECK_EQ(val1, val2) CHECK_OP(_EQ, ==, val1, val2) #define CHECK_NE(val1, val2) CHECK_OP(_NE, !=, val1, val2) #define CHECK_LE(val1, val2) CHECK_OP(_LE, <=, val1, val2) -#define CHECK_LT(val1, val2) CHECK_OP(_LT, < , val1, val2) +#define CHECK_LT(val1, val2) CHECK_OP(_LT, <, val1, val2) #define CHECK_GE(val1, val2) CHECK_OP(_GE, >=, val1, val2) -#define CHECK_GT(val1, val2) CHECK_OP(_GT, > , val1, val2) +#define CHECK_GT(val1, val2) CHECK_OP(_GT, >, val1, val2) -// Check that the input is non NULL. This very useful in constructor +// Check that the input is non nullptr. This very useful in constructor // initializer lists. -#define CHECK_NOTNULL(val) \ - google::CheckNotNull(__FILE__, __LINE__, "'" #val "' Must be non NULL", (val)) +#define CHECK_NOTNULL(val) \ + google::logging::internal::CheckNotNull( \ + __FILE__, __LINE__, "'" #val "' Must be non nullptr", (val)) // Helper functions for string comparisons. // To avoid bloat, the definitions are in logging.cc. -#define DECLARE_CHECK_STROP_IMPL(func, expected) \ - GLOG_EXPORT std::string* Check##func##expected##Impl( \ +#define DECLARE_CHECK_STROP_IMPL(func, expected) \ + GLOG_EXPORT std::unique_ptr Check##func##expected##Impl( \ const char* s1, const char* s2, const char* names); + DECLARE_CHECK_STROP_IMPL(strcmp, true) DECLARE_CHECK_STROP_IMPL(strcmp, false) DECLARE_CHECK_STROP_IMPL(strcasecmp, true) DECLARE_CHECK_STROP_IMPL(strcasecmp, false) + +} // namespace internal +} // namespace logging + #undef DECLARE_CHECK_STROP_IMPL // Helper macro for string comparisons. // Don't use this macro directly in your code, use CHECK_STREQ et al below. -#define CHECK_STROP(func, op, expected, s1, s2) \ - while (google::CheckOpString _result = \ - google::Check##func##expected##Impl((s1), (s2), \ - #s1 " " #op " " #s2)) \ - LOG(FATAL) << *_result.str_ - +#define CHECK_STROP(func, op, expected, s1, s2) \ + while (google::logging::internal::CheckOpString _result = \ + google::logging::internal::Check##func##expected##Impl( \ + (s1), (s2), #s1 " " #op " " #s2)) \ + LOG(FATAL) << (*_result.str_) // String (char*) equality/inequality checks. // CASE versions are case-insensitive. @@ -965,19 +857,19 @@ DECLARE_CHECK_STROP_IMPL(strcasecmp, false) #define CHECK_STRCASEEQ(s1, s2) CHECK_STROP(strcasecmp, ==, true, s1, s2) #define CHECK_STRCASENE(s1, s2) CHECK_STROP(strcasecmp, !=, false, s1, s2) -#define CHECK_INDEX(I,A) CHECK(I < (sizeof(A)/sizeof(A[0]))) -#define CHECK_BOUND(B,A) CHECK(B <= (sizeof(A)/sizeof(A[0]))) +#define CHECK_INDEX(I, A) CHECK(I < (sizeof(A) / sizeof(A[0]))) +#define CHECK_BOUND(B, A) CHECK(B <= (sizeof(A) / sizeof(A[0]))) -#define CHECK_DOUBLE_EQ(val1, val2) \ - do { \ - CHECK_LE((val1), (val2)+0.000000000000001L); \ - CHECK_GE((val1), (val2)-0.000000000000001L); \ +#define CHECK_DOUBLE_EQ(val1, val2) \ + do { \ + CHECK_LE((val1), (val2) + 0.000000000000001L); \ + CHECK_GE((val1), (val2)-0.000000000000001L); \ } while (0) -#define CHECK_NEAR(val1, val2, margin) \ - do { \ - CHECK_LE((val1), (val2)+(margin)); \ - CHECK_GE((val1), (val2)-(margin)); \ +#define CHECK_NEAR(val1, val2, margin) \ + do { \ + CHECK_LE((val1), (val2) + (margin)); \ + CHECK_GE((val1), (val2) - (margin)); \ } while (0) // perror()..googly style! @@ -988,21 +880,22 @@ DECLARE_CHECK_STROP_IMPL(strcasecmp, false) #define PLOG(severity) GOOGLE_PLOG(severity, 0).stream() -#define GOOGLE_PLOG(severity, counter) \ - google::ErrnoLogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, counter, \ - &google::LogMessage::SendToLog) +#define GOOGLE_PLOG(severity, counter) \ + google::ErrnoLogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + counter, &google::LogMessage::SendToLog) #define PLOG_IF(severity, condition) \ static_cast(0), \ - !(condition) ? (void) 0 : google::LogMessageVoidify() & PLOG(severity) + !(condition) \ + ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & PLOG(severity) // A CHECK() macro that postpends errno if the condition is false. E.g. // // if (poll(fds, nfds, timeout) == -1) { PCHECK(errno == EINTR); ... } -#define PCHECK(condition) \ - PLOG_IF(FATAL, GOOGLE_PREDICT_BRANCH_NOT_TAKEN(!(condition))) \ - << "Check failed: " #condition " " +#define PCHECK(condition) \ + PLOG_IF(FATAL, GOOGLE_PREDICT_BRANCH_NOT_TAKEN(!(condition))) \ + << "Check failed: " #condition " " // A CHECK() macro that lets you assert the success of a function that // returns -1 and sets errno in case of an error. E.g. @@ -1012,258 +905,117 @@ DECLARE_CHECK_STROP_IMPL(strcasecmp, false) // or // // int fd = open(filename, flags); CHECK_ERR(fd) << ": open " << filename; -#define CHECK_ERR(invocation) \ -PLOG_IF(FATAL, GOOGLE_PREDICT_BRANCH_NOT_TAKEN((invocation) == -1)) \ - << #invocation +#define CHECK_ERR(invocation) \ + PLOG_IF(FATAL, GOOGLE_PREDICT_BRANCH_NOT_TAKEN((invocation) == -1)) \ + << #invocation // Use macro expansion to create, for each use of LOG_EVERY_N(), static // variables with the __LINE__ expansion as part of the variable name. #define LOG_EVERY_N_VARNAME(base, line) LOG_EVERY_N_VARNAME_CONCAT(base, line) -#define LOG_EVERY_N_VARNAME_CONCAT(base, line) base ## line +#define LOG_EVERY_N_VARNAME_CONCAT(base, line) base##line #define LOG_OCCURRENCES LOG_EVERY_N_VARNAME(occurrences_, __LINE__) #define LOG_OCCURRENCES_MOD_N LOG_EVERY_N_VARNAME(occurrences_mod_n_, __LINE__) -#if 1 && __cplusplus >= 201103L -#define GLOG_CONSTEXPR constexpr -#else -#define GLOG_CONSTEXPR const -#endif - #define LOG_TIME_PERIOD LOG_EVERY_N_VARNAME(timePeriod_, __LINE__) #define LOG_PREVIOUS_TIME_RAW LOG_EVERY_N_VARNAME(previousTimeRaw_, __LINE__) #define LOG_TIME_DELTA LOG_EVERY_N_VARNAME(deltaTime_, __LINE__) #define LOG_CURRENT_TIME LOG_EVERY_N_VARNAME(currentTime_, __LINE__) #define LOG_PREVIOUS_TIME LOG_EVERY_N_VARNAME(previousTime_, __LINE__) -#if defined(__has_feature) -# if __has_feature(thread_sanitizer) -# define GLOG_SANITIZE_THREAD 1 -# endif -#endif - -#if !defined(GLOG_SANITIZE_THREAD) && defined(__SANITIZE_THREAD__) && __SANITIZE_THREAD__ -# define GLOG_SANITIZE_THREAD 1 -#endif - -#if defined(GLOG_SANITIZE_THREAD) -#define GLOG_IFDEF_THREAD_SANITIZER(X) X -#else -#define GLOG_IFDEF_THREAD_SANITIZER(X) -#endif - -#if defined(GLOG_SANITIZE_THREAD) -} // namespace google - -// We need to identify the static variables as "benign" races -// to avoid noisy reports from TSAN. -extern "C" void AnnotateBenignRaceSized( - const char *file, - int line, - const volatile void *mem, - size_t size, - const char *description); +} // namespace google namespace google { -#endif -#if __cplusplus >= 201103L && 1 && 1 // Have and -#define SOME_KIND_OF_LOG_EVERY_T(severity, seconds) \ - GLOG_CONSTEXPR std::chrono::nanoseconds LOG_TIME_PERIOD = std::chrono::duration_cast(std::chrono::duration(seconds)); \ - static std::atomic LOG_PREVIOUS_TIME_RAW; \ - GLOG_IFDEF_THREAD_SANITIZER( \ - AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_TIME_PERIOD, sizeof(google::int64), "")); \ - GLOG_IFDEF_THREAD_SANITIZER( \ - AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_PREVIOUS_TIME_RAW, sizeof(google::int64), "")); \ - const auto LOG_CURRENT_TIME = std::chrono::duration_cast(std::chrono::steady_clock::now().time_since_epoch()); \ - const auto LOG_PREVIOUS_TIME = LOG_PREVIOUS_TIME_RAW.load(std::memory_order_relaxed); \ - const auto LOG_TIME_DELTA = LOG_CURRENT_TIME - std::chrono::nanoseconds(LOG_PREVIOUS_TIME); \ - if (LOG_TIME_DELTA > LOG_TIME_PERIOD) \ - LOG_PREVIOUS_TIME_RAW.store(std::chrono::duration_cast(LOG_CURRENT_TIME).count(), std::memory_order_relaxed); \ - if (LOG_TIME_DELTA > LOG_TIME_PERIOD) google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity).stream() -#elif defined(GLOG_OS_WINDOWS) -#define SOME_KIND_OF_LOG_EVERY_T(severity, seconds) \ - GLOG_CONSTEXPR LONGLONG LOG_TIME_PERIOD = (seconds) * LONGLONG(1000000000); \ - static LARGE_INTEGER LOG_PREVIOUS_TIME; \ - LONGLONG LOG_TIME_DELTA; \ - { \ - LARGE_INTEGER currTime; \ - LARGE_INTEGER freq; \ - QueryPerformanceCounter(&currTime); \ - QueryPerformanceFrequency(&freq); \ - InterlockedCompareExchange64(&LOG_PREVIOUS_TIME.QuadPart, currTime.QuadPart, 0); \ - LOG_TIME_DELTA = (currTime.QuadPart - LOG_PREVIOUS_TIME.QuadPart) * LONGLONG(1000000000) / freq.QuadPart; \ - if (LOG_TIME_DELTA > LOG_TIME_PERIOD) InterlockedExchange64(&LOG_PREVIOUS_TIME.QuadPart, currTime.QuadPart); \ - } \ - if (LOG_TIME_DELTA > LOG_TIME_PERIOD) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity).stream() -#else -#define SOME_KIND_OF_LOG_EVERY_T(severity, seconds) \ - GLOG_CONSTEXPR google::int64 LOG_TIME_PERIOD(seconds * 1000000000); \ - static google::int64 LOG_PREVIOUS_TIME; \ - google::int64 LOG_TIME_DELTA = 0; \ - { \ - timespec currentTime = {}; \ - clock_gettime(CLOCK_MONOTONIC, ¤tTime); \ - LOG_TIME_DELTA = (currentTime.tv_sec * 1000000000 + currentTime.tv_nsec) - LOG_PREVIOUS_TIME; \ - } \ - if (LOG_TIME_DELTA > LOG_TIME_PERIOD) __sync_add_and_fetch(&LOG_PREVIOUS_TIME, LOG_TIME_DELTA); \ - if (LOG_TIME_DELTA > LOG_TIME_PERIOD) google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity).stream() -#endif +#define SOME_KIND_OF_LOG_EVERY_T(severity, seconds) \ + constexpr std::chrono::nanoseconds LOG_TIME_PERIOD = \ + std::chrono::duration_cast( \ + std::chrono::duration(seconds)); \ + static std::atomic LOG_PREVIOUS_TIME_RAW; \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_TIME_PERIOD, sizeof(google::int64), "")); \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_PREVIOUS_TIME_RAW, sizeof(google::int64), "")); \ + const auto LOG_CURRENT_TIME = \ + std::chrono::duration_cast( \ + std::chrono::steady_clock::now().time_since_epoch()); \ + const auto LOG_PREVIOUS_TIME = \ + LOG_PREVIOUS_TIME_RAW.load(std::memory_order_relaxed); \ + const auto LOG_TIME_DELTA = \ + LOG_CURRENT_TIME - std::chrono::nanoseconds(LOG_PREVIOUS_TIME); \ + if (LOG_TIME_DELTA > LOG_TIME_PERIOD) \ + LOG_PREVIOUS_TIME_RAW.store( \ + std::chrono::duration_cast(LOG_CURRENT_TIME) \ + .count(), \ + std::memory_order_relaxed); \ + if (LOG_TIME_DELTA > LOG_TIME_PERIOD) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_##severity).stream() -#if 1 && __cplusplus >= 201103L -#define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ +#define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ static std::atomic LOG_OCCURRENCES(0), LOG_OCCURRENCES_MOD_N(0); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES_MOD_N, sizeof(int), "")); \ - ++LOG_OCCURRENCES; \ - if (++LOG_OCCURRENCES_MOD_N > n) LOG_OCCURRENCES_MOD_N -= n; \ - if (LOG_OCCURRENCES_MOD_N == 1) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES_MOD_N, sizeof(int), "")); \ + ++LOG_OCCURRENCES; \ + if (++LOG_OCCURRENCES_MOD_N > n) LOG_OCCURRENCES_MOD_N -= n; \ + if (LOG_OCCURRENCES_MOD_N == 1) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + LOG_OCCURRENCES, &what_to_do) \ + .stream() -#define SOME_KIND_OF_LOG_IF_EVERY_N(severity, condition, n, what_to_do) \ +#define SOME_KIND_OF_LOG_IF_EVERY_N(severity, condition, n, what_to_do) \ + static std::atomic LOG_OCCURRENCES(0), LOG_OCCURRENCES_MOD_N(0); \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES_MOD_N, sizeof(int), "")); \ + ++LOG_OCCURRENCES; \ + if ((condition) && \ + ((LOG_OCCURRENCES_MOD_N = (LOG_OCCURRENCES_MOD_N + 1) % n) == (1 % n))) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + LOG_OCCURRENCES, &what_to_do) \ + .stream() + +#define SOME_KIND_OF_PLOG_EVERY_N(severity, n, what_to_do) \ static std::atomic LOG_OCCURRENCES(0), LOG_OCCURRENCES_MOD_N(0); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES_MOD_N, sizeof(int), "")); \ - ++LOG_OCCURRENCES; \ - if ((condition) && \ - ((LOG_OCCURRENCES_MOD_N=(LOG_OCCURRENCES_MOD_N + 1) % n) == (1 % n))) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES_MOD_N, sizeof(int), "")); \ + ++LOG_OCCURRENCES; \ + if (++LOG_OCCURRENCES_MOD_N > n) LOG_OCCURRENCES_MOD_N -= n; \ + if (LOG_OCCURRENCES_MOD_N == 1) \ + google::ErrnoLogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + LOG_OCCURRENCES, &what_to_do) \ + .stream() -#define SOME_KIND_OF_PLOG_EVERY_N(severity, n, what_to_do) \ - static std::atomic LOG_OCCURRENCES(0), LOG_OCCURRENCES_MOD_N(0); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES_MOD_N, sizeof(int), "")); \ - ++LOG_OCCURRENCES; \ - if (++LOG_OCCURRENCES_MOD_N > n) LOG_OCCURRENCES_MOD_N -= n; \ - if (LOG_OCCURRENCES_MOD_N == 1) \ - google::ErrnoLogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() +#define SOME_KIND_OF_LOG_FIRST_N(severity, n, what_to_do) \ + static std::atomic LOG_OCCURRENCES(0); \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ + if (LOG_OCCURRENCES <= n) ++LOG_OCCURRENCES; \ + if (LOG_OCCURRENCES <= n) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + LOG_OCCURRENCES, &what_to_do) \ + .stream() -#define SOME_KIND_OF_LOG_FIRST_N(severity, n, what_to_do) \ - static std::atomic LOG_OCCURRENCES(0); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ - if (LOG_OCCURRENCES <= n) \ - ++LOG_OCCURRENCES; \ - if (LOG_OCCURRENCES <= n) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#elif defined(GLOG_OS_WINDOWS) - -#define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ - static volatile unsigned LOG_OCCURRENCES = 0; \ - static volatile unsigned LOG_OCCURRENCES_MOD_N = 0; \ - InterlockedIncrement(&LOG_OCCURRENCES); \ - if (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) > n) \ - InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n); \ - if (LOG_OCCURRENCES_MOD_N == 1) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#define SOME_KIND_OF_LOG_IF_EVERY_N(severity, condition, n, what_to_do) \ - static volatile unsigned LOG_OCCURRENCES = 0; \ - static volatile unsigned LOG_OCCURRENCES_MOD_N = 0; \ - InterlockedIncrement(&LOG_OCCURRENCES); \ - if ((condition) && \ - ((InterlockedIncrement(&LOG_OCCURRENCES_MOD_N), \ - (LOG_OCCURRENCES_MOD_N > n && InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n))), \ - LOG_OCCURRENCES_MOD_N == 1)) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#define SOME_KIND_OF_PLOG_EVERY_N(severity, n, what_to_do) \ - static volatile unsigned LOG_OCCURRENCES = 0; \ - static volatile unsigned LOG_OCCURRENCES_MOD_N = 0; \ - InterlockedIncrement(&LOG_OCCURRENCES); \ - if (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) > n) \ - InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n); \ - if (LOG_OCCURRENCES_MOD_N == 1) \ - google::ErrnoLogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#define SOME_KIND_OF_LOG_FIRST_N(severity, n, what_to_do) \ - static volatile unsigned LOG_OCCURRENCES = 0; \ - if (LOG_OCCURRENCES <= n) \ - InterlockedIncrement(&LOG_OCCURRENCES); \ - if (LOG_OCCURRENCES <= n) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#else - -#define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ - static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ - __sync_add_and_fetch(&LOG_OCCURRENCES, 1); \ - if (__sync_add_and_fetch(&LOG_OCCURRENCES_MOD_N, 1) > n) \ - __sync_sub_and_fetch(&LOG_OCCURRENCES_MOD_N, n); \ - if (LOG_OCCURRENCES_MOD_N == 1) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#define SOME_KIND_OF_LOG_IF_EVERY_N(severity, condition, n, what_to_do) \ - static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ - __sync_add_and_fetch(&LOG_OCCURRENCES, 1); \ - if ((condition) && \ - (__sync_add_and_fetch(&LOG_OCCURRENCES_MOD_N, 1) || true) && \ - ((LOG_OCCURRENCES_MOD_N >= n && __sync_sub_and_fetch(&LOG_OCCURRENCES_MOD_N, n)) || true) && \ - LOG_OCCURRENCES_MOD_N == (1 % n)) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#define SOME_KIND_OF_PLOG_EVERY_N(severity, n, what_to_do) \ - static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ - __sync_add_and_fetch(&LOG_OCCURRENCES, 1); \ - if (__sync_add_and_fetch(&LOG_OCCURRENCES_MOD_N, 1) > n) \ - __sync_sub_and_fetch(&LOG_OCCURRENCES_MOD_N, n); \ - if (LOG_OCCURRENCES_MOD_N == 1) \ - google::ErrnoLogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#define SOME_KIND_OF_LOG_FIRST_N(severity, n, what_to_do) \ - static int LOG_OCCURRENCES = 0; \ - if (LOG_OCCURRENCES <= n) \ - __sync_add_and_fetch(&LOG_OCCURRENCES, 1); \ - if (LOG_OCCURRENCES <= n) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() -#endif - -namespace glog_internal_namespace_ { +namespace logging { +namespace internal { template -struct CompileAssert { -}; +struct CompileAssert {}; struct CrashReason; +} // namespace internal +} // namespace logging -// Returns true if FailureSignalHandler is installed. -// Needs to be exported since it's used by the signalhandler_unittest. -GLOG_EXPORT bool IsFailureSignalHandlerInstalled(); -} // namespace glog_internal_namespace_ - -#define LOG_EVERY_N(severity, n) \ +#define LOG_EVERY_N(severity, n) \ SOME_KIND_OF_LOG_EVERY_N(severity, (n), google::LogMessage::SendToLog) #define LOG_EVERY_T(severity, T) SOME_KIND_OF_LOG_EVERY_T(severity, (T)) -#define SYSLOG_EVERY_N(severity, n) \ - SOME_KIND_OF_LOG_EVERY_N(severity, (n), google::LogMessage::SendToSyslogAndLog) +#define SYSLOG_EVERY_N(severity, n) \ + SOME_KIND_OF_LOG_EVERY_N(severity, (n), \ + google::LogMessage::SendToSyslogAndLog) #define PLOG_EVERY_N(severity, n) \ SOME_KIND_OF_PLOG_EVERY_N(severity, (n), google::LogMessage::SendToLog) @@ -1271,146 +1023,157 @@ GLOG_EXPORT bool IsFailureSignalHandlerInstalled(); #define LOG_FIRST_N(severity, n) \ SOME_KIND_OF_LOG_FIRST_N(severity, (n), google::LogMessage::SendToLog) -#define LOG_IF_EVERY_N(severity, condition, n) \ - SOME_KIND_OF_LOG_IF_EVERY_N(severity, (condition), (n), google::LogMessage::SendToLog) +#define LOG_IF_EVERY_N(severity, condition, n) \ + SOME_KIND_OF_LOG_IF_EVERY_N(severity, (condition), (n), \ + google::LogMessage::SendToLog) // We want the special COUNTER value available for LOG_EVERY_X()'ed messages -enum PRIVATE_Counter {COUNTER}; +struct Counter_t {}; +GLOG_INLINE_VARIABLE constexpr Counter_t COUNTER{}; #ifdef GLOG_NO_ABBREVIATED_SEVERITIES // wingdi.h defines ERROR to be 0. When we call LOG(ERROR), it gets // substituted with 0, and it expands to COMPACT_GOOGLE_LOG_0. To allow us // to keep using this syntax, we define this macro to do the same thing // as COMPACT_GOOGLE_LOG_ERROR. -#define COMPACT_GOOGLE_LOG_0 COMPACT_GOOGLE_LOG_ERROR -#define SYSLOG_0 SYSLOG_ERROR -#define LOG_TO_STRING_0 LOG_TO_STRING_ERROR +# define COMPACT_GOOGLE_LOG_0 COMPACT_GOOGLE_LOG_ERROR +# define SYSLOG_0 SYSLOG_ERROR +# define LOG_TO_STRING_0 LOG_TO_STRING_ERROR // Needed for LOG_IS_ON(ERROR). -const LogSeverity GLOG_0 = GLOG_ERROR; +GLOG_INLINE_VARIABLE +constexpr LogSeverity GLOG_0 = GLOG_ERROR; #else // Users may include windows.h after logging.h without // GLOG_NO_ABBREVIATED_SEVERITIES nor WIN32_LEAN_AND_MEAN. // For this case, we cannot detect if ERROR is defined before users // actually use ERROR. Let's make an undefined symbol to warn users. -# define GLOG_ERROR_MSG ERROR_macro_is_defined_Define_GLOG_NO_ABBREVIATED_SEVERITIES_before_including_logging_h_See_the_document_for_detail -# define COMPACT_GOOGLE_LOG_0 GLOG_ERROR_MSG -# define SYSLOG_0 GLOG_ERROR_MSG -# define LOG_TO_STRING_0 GLOG_ERROR_MSG -# define GLOG_0 GLOG_ERROR_MSG +# define GLOG_ERROR_MSG \ + ERROR_macro_is_defined_Define_GLOG_NO_ABBREVIATED_SEVERITIES_before_including_logging_h_See_the_document_for_detail +# define COMPACT_GOOGLE_LOG_0 GLOG_ERROR_MSG +# define SYSLOG_0 GLOG_ERROR_MSG +# define LOG_TO_STRING_0 GLOG_ERROR_MSG +# define GLOG_0 GLOG_ERROR_MSG #endif // Plus some debug-logging macros that get compiled to nothing for production #if DCHECK_IS_ON() -#define DLOG(severity) LOG(severity) -#define DVLOG(verboselevel) VLOG(verboselevel) -#define DLOG_IF(severity, condition) LOG_IF(severity, condition) -#define DLOG_EVERY_N(severity, n) LOG_EVERY_N(severity, n) -#define DLOG_IF_EVERY_N(severity, condition, n) \ - LOG_IF_EVERY_N(severity, condition, n) -#define DLOG_ASSERT(condition) LOG_ASSERT(condition) +# define DLOG(severity) LOG(severity) +# define DVLOG(verboselevel) VLOG(verboselevel) +# define DLOG_IF(severity, condition) LOG_IF(severity, condition) +# define DLOG_EVERY_N(severity, n) LOG_EVERY_N(severity, n) +# define DLOG_IF_EVERY_N(severity, condition, n) \ + LOG_IF_EVERY_N(severity, condition, n) +# define DLOG_FIRST_N(severity, n) LOG_FIRST_N(severity, n) +# define DLOG_EVERY_T(severity, T) LOG_EVERY_T(severity, T) +# define DLOG_ASSERT(condition) LOG_ASSERT(condition) // debug-only checking. executed if DCHECK_IS_ON(). -#define DCHECK(condition) CHECK(condition) -#define DCHECK_EQ(val1, val2) CHECK_EQ(val1, val2) -#define DCHECK_NE(val1, val2) CHECK_NE(val1, val2) -#define DCHECK_LE(val1, val2) CHECK_LE(val1, val2) -#define DCHECK_LT(val1, val2) CHECK_LT(val1, val2) -#define DCHECK_GE(val1, val2) CHECK_GE(val1, val2) -#define DCHECK_GT(val1, val2) CHECK_GT(val1, val2) -#define DCHECK_NOTNULL(val) CHECK_NOTNULL(val) -#define DCHECK_STREQ(str1, str2) CHECK_STREQ(str1, str2) -#define DCHECK_STRCASEEQ(str1, str2) CHECK_STRCASEEQ(str1, str2) -#define DCHECK_STRNE(str1, str2) CHECK_STRNE(str1, str2) -#define DCHECK_STRCASENE(str1, str2) CHECK_STRCASENE(str1, str2) +# define DCHECK(condition) CHECK(condition) +# define DCHECK_EQ(val1, val2) CHECK_EQ(val1, val2) +# define DCHECK_NE(val1, val2) CHECK_NE(val1, val2) +# define DCHECK_LE(val1, val2) CHECK_LE(val1, val2) +# define DCHECK_LT(val1, val2) CHECK_LT(val1, val2) +# define DCHECK_GE(val1, val2) CHECK_GE(val1, val2) +# define DCHECK_GT(val1, val2) CHECK_GT(val1, val2) +# define DCHECK_NOTNULL(val) CHECK_NOTNULL(val) +# define DCHECK_STREQ(str1, str2) CHECK_STREQ(str1, str2) +# define DCHECK_STRCASEEQ(str1, str2) CHECK_STRCASEEQ(str1, str2) +# define DCHECK_STRNE(str1, str2) CHECK_STRNE(str1, str2) +# define DCHECK_STRCASENE(str1, str2) CHECK_STRCASENE(str1, str2) #else // !DCHECK_IS_ON() -#define DLOG(severity) \ - static_cast(0), \ - true ? (void) 0 : google::LogMessageVoidify() & LOG(severity) +# define DLOG(severity) \ + static_cast(0), \ + true ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) -#define DVLOG(verboselevel) \ - static_cast(0), \ - (true || !VLOG_IS_ON(verboselevel)) ? \ - (void) 0 : google::LogMessageVoidify() & LOG(INFO) +# define DVLOG(verboselevel) \ + static_cast(0), \ + (true || !VLOG_IS_ON(verboselevel)) \ + ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(INFO) -#define DLOG_IF(severity, condition) \ - static_cast(0), \ - (true || !(condition)) ? (void) 0 : google::LogMessageVoidify() & LOG(severity) +# define DLOG_IF(severity, condition) \ + static_cast(0), \ + (true || !(condition)) \ + ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) -#define DLOG_EVERY_N(severity, n) \ - static_cast(0), \ - true ? (void) 0 : google::LogMessageVoidify() & LOG(severity) +# define DLOG_EVERY_N(severity, n) \ + static_cast(0), \ + true ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) -#define DLOG_IF_EVERY_N(severity, condition, n) \ - static_cast(0), \ - (true || !(condition))? (void) 0 : google::LogMessageVoidify() & LOG(severity) +# define DLOG_IF_EVERY_N(severity, condition, n) \ + static_cast(0), \ + (true || !(condition)) \ + ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) -#define DLOG_ASSERT(condition) \ - static_cast(0), \ - true ? (void) 0 : LOG_ASSERT(condition) +# define DLOG_FIRST_N(severity, n) \ + static_cast(0), \ + true ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) + +# define DLOG_EVERY_T(severity, T) \ + static_cast(0), \ + true ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) + +# define DLOG_ASSERT(condition) \ + static_cast(0), true ? (void)0 : (LOG_ASSERT(condition)) // MSVC warning C4127: conditional expression is constant -#define DCHECK(condition) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK(condition) +# define DCHECK(condition) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK(condition) -#define DCHECK_EQ(val1, val2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_EQ(val1, val2) +# define DCHECK_EQ(val1, val2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_EQ(val1, val2) -#define DCHECK_NE(val1, val2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_NE(val1, val2) +# define DCHECK_NE(val1, val2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_NE(val1, val2) -#define DCHECK_LE(val1, val2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_LE(val1, val2) +# define DCHECK_LE(val1, val2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_LE(val1, val2) -#define DCHECK_LT(val1, val2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_LT(val1, val2) +# define DCHECK_LT(val1, val2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_LT(val1, val2) -#define DCHECK_GE(val1, val2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_GE(val1, val2) +# define DCHECK_GE(val1, val2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_GE(val1, val2) -#define DCHECK_GT(val1, val2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_GT(val1, val2) +# define DCHECK_GT(val1, val2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_GT(val1, val2) // You may see warnings in release mode if you don't use the return // value of DCHECK_NOTNULL. Please just use DCHECK for such cases. -#define DCHECK_NOTNULL(val) (val) +# define DCHECK_NOTNULL(val) (val) -#define DCHECK_STREQ(str1, str2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_STREQ(str1, str2) +# define DCHECK_STREQ(str1, str2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_STREQ(str1, str2) -#define DCHECK_STRCASEEQ(str1, str2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_STRCASEEQ(str1, str2) +# define DCHECK_STRCASEEQ(str1, str2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_STRCASEEQ(str1, str2) -#define DCHECK_STRNE(str1, str2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_STRNE(str1, str2) +# define DCHECK_STRNE(str1, str2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_STRNE(str1, str2) -#define DCHECK_STRCASENE(str1, str2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_STRCASENE(str1, str2) +# define DCHECK_STRCASENE(str1, str2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_STRCASENE(str1, str2) #endif // DCHECK_IS_ON() @@ -1435,14 +1198,10 @@ namespace base_logging { class GLOG_EXPORT LogStreamBuf : public std::streambuf { public: // REQUIREMENTS: "len" must be >= 2 to account for the '\n' and '\0'. - LogStreamBuf(char *buf, int len) { - setp(buf, buf + len - 2); - } + LogStreamBuf(char* buf, int len) { setp(buf, buf + len - 2); } // This effectively ignores overflow. - int_type overflow(int_type ch) { - return ch; - } + int_type overflow(int_type ch) { return ch; } // Legacy public ostrstream method. size_t pcount() const { return static_cast(pptr() - pbase()); } @@ -1451,6 +1210,12 @@ class GLOG_EXPORT LogStreamBuf : public std::streambuf { } // namespace base_logging +namespace logging { +namespace internal { +struct GLOG_NO_EXPORT LogMessageData; +} // namespace internal +} // namespace logging + // // This class more or less represents a particular log message. You // create an instance of LogMessage and then stream stuff to it. @@ -1461,7 +1226,7 @@ class GLOG_EXPORT LogStreamBuf : public std::streambuf { // though. You should use the LOG() macro (and variants thereof) // above. class GLOG_EXPORT LogMessage { -public: + public: enum { // Passing kNoLogPrefix for the line number disables the // log-message prefix. Useful for using the LogMessage @@ -1477,18 +1242,35 @@ public: // 2005 if you are deriving from a type in the Standard C++ Library" // http://msdn.microsoft.com/en-us/library/3tdb471s(VS.80).aspx // Let's just ignore the warning. -GLOG_MSVC_PUSH_DISABLE_WARNING(4275) + GLOG_MSVC_PUSH_DISABLE_WARNING(4275) class GLOG_EXPORT LogStream : public std::ostream { -GLOG_MSVC_POP_WARNING() - public: - LogStream(char *buf, int len, int64 ctr) - : std::ostream(NULL), - streambuf_(buf, len), - ctr_(ctr), + GLOG_MSVC_POP_WARNING() + public: + // In some cases, like when compiling glog as a static library with GCC and + // linking against a Clang-built executable, this constructor will be + // removed by the linker. We use this attribute to prevent the linker from + // discarding it. + GLOG_USED + LogStream(char* buf, int len, int64 ctr) + : std::ostream(nullptr), streambuf_(buf, len), ctr_(ctr), self_(this) { + rdbuf(&streambuf_); + } + + LogStream(LogStream&& other) noexcept + : std::ostream(nullptr), + streambuf_(std::move(other.streambuf_)), + ctr_(std::exchange(other.ctr_, 0)), self_(this) { rdbuf(&streambuf_); } + LogStream& operator=(LogStream&& other) noexcept { + streambuf_ = std::move(other.streambuf_); + ctr_ = std::exchange(other.ctr_, 0); + rdbuf(&streambuf_); + return *this; + } + int64 ctr() const { return ctr_; } void set_ctr(int64 ctr) { ctr_ = ctr; } LogStream* self() const { return self_; } @@ -1498,15 +1280,16 @@ GLOG_MSVC_POP_WARNING() char* pbase() const { return streambuf_.pbase(); } char* str() const { return pbase(); } - private: - LogStream(const LogStream&); - LogStream& operator=(const LogStream&); + LogStream(const LogStream&) = delete; + LogStream& operator=(const LogStream&) = delete; + + private: base_logging::LogStreamBuf streambuf_; - int64 ctr_; // Counter hack (for the LOG_EVERY_X() macro) - LogStream *self_; // Consistency check hack + int64 ctr_; // Counter hack (for the LOG_EVERY_X() macro) + LogStream* self_; // Consistency check hack }; -public: + public: // icc 8 requires this typedef to avoid an internal compiler error. typedef void (LogMessage::*SendMethod)(); @@ -1530,28 +1313,29 @@ public: // saves 17 bytes per call site. LogMessage(const char* file, int line, LogSeverity severity); - // Constructor to log this message to a specified sink (if not NULL). + // Constructor to log this message to a specified sink (if not nullptr). // Implied are: ctr = 0, send_method = &LogMessage::SendToSinkAndLog if // also_send_to_log is true, send_method = &LogMessage::SendToSink otherwise. LogMessage(const char* file, int line, LogSeverity severity, LogSink* sink, bool also_send_to_log); // Constructor where we also give a vector pointer - // for storing the messages (if the pointer is not NULL). + // for storing the messages (if the pointer is not nullptr). // Implied are: ctr = 0, send_method = &LogMessage::SaveOrSendToLog. LogMessage(const char* file, int line, LogSeverity severity, std::vector* outvec); // Constructor where we also give a string pointer for storing the - // message (if the pointer is not NULL). Implied are: ctr = 0, + // message (if the pointer is not nullptr). Implied are: ctr = 0, // send_method = &LogMessage::WriteToStringAndLog. LogMessage(const char* file, int line, LogSeverity severity, std::string* message); // A special constructor used for check failures - LogMessage(const char* file, int line, const CheckOpString& result); + LogMessage(const char* file, int line, + const logging::internal::CheckOpString& result); - ~LogMessage(); + ~LogMessage() noexcept(false); // Flush a buffered message to the sink set in the constructor. Always // called by the destructor, it may also be called from elsewhere if @@ -1562,13 +1346,13 @@ public: // is so that streaming can be done more efficiently. static const size_t kMaxLogMessageLen; - // Theses should not be called directly outside of logging.*, + // These should not be called directly outside of logging.*, // only passed as SendMethod arguments to other LogMessage methods: - void SendToLog(); // Actually dispatch to the logs + void SendToLog(); // Actually dispatch to the logs void SendToSyslogAndLog(); // Actually dispatch to syslog and the logs // Call abort() or similar to perform LOG(FATAL) crash. - static void __attribute__((noreturn)) Fail(); + [[noreturn]] static void Fail(); std::ostream& stream(); @@ -1577,14 +1361,25 @@ public: // Must be called without the log_mutex held. (L < log_mutex) static int64 num_messages(int severity); - const LogMessageTime& getLogMessageTime() const; + [[deprecated("Use LogMessage::time() instead.")]] const LogMessageTime& + getLogMessageTime() const { + return time(); + } - struct LogMessageData; + LogSeverity severity() const noexcept; + int line() const noexcept; + const std::thread::id& thread_id() const noexcept; + const char* fullname() const noexcept; + const char* basename() const noexcept; + const LogMessageTime& time() const noexcept; -private: + LogMessage(const LogMessage&) = delete; + LogMessage& operator=(const LogMessage&) = delete; + + private: // Fully internal SendMethod cases: void SendToSinkAndLog(); // Send to sink if provided and dispatch to the logs - void SendToSink(); // Send to sink if provided, do nothing otherwise. + void SendToSink(); // Send to sink if provided, do nothing otherwise. // Write to string if provided and dispatch to the logs. void WriteToStringAndLog(); @@ -1595,21 +1390,18 @@ private: void (LogMessage::*send_method)()); // Used to fill in crash information during LOG(FATAL) failures. - void RecordCrashReason(glog_internal_namespace_::CrashReason* reason); + void RecordCrashReason(logging::internal::CrashReason* reason); // Counts of messages sent at each priority: static int64 num_messages_[NUM_SEVERITIES]; // under log_mutex // We keep the data in a separate struct so that each instance of // LogMessage uses less stack space. - LogMessageData* allocated_; - LogMessageData* data_; - LogMessageTime logmsgtime_; + logging::internal::LogMessageData* allocated_; + logging::internal::LogMessageData* data_; + LogMessageTime time_; friend class LogDestination; - - LogMessage(const LogMessage&); - void operator=(const LogMessage&); }; // This class happens to be thread-hostile because all instances share @@ -1618,13 +1410,14 @@ private: class GLOG_EXPORT LogMessageFatal : public LogMessage { public: LogMessageFatal(const char* file, int line); - LogMessageFatal(const char* file, int line, const CheckOpString& result); - __attribute__((noreturn)) ~LogMessageFatal(); + LogMessageFatal(const char* file, int line, + const logging::internal::CheckOpString& result); + [[noreturn]] ~LogMessageFatal() noexcept(false); }; // A non-macro interface to the log facility; (useful // when the logging level is not a compile-time constant). -inline void LogAtLevel(int const severity, std::string const &msg) { +inline void LogAtLevel(LogSeverity severity, std::string const& msg) { LogMessage(__FILE__, __LINE__, severity).stream() << msg; } @@ -1632,53 +1425,13 @@ inline void LogAtLevel(int const severity, std::string const &msg) { // version since there are two advantages: 1. this version outputs the // file name and the line number where this macro is put like other // LOG macros, 2. this macro can be used as C++ stream. -#define LOG_AT_LEVEL(severity) google::LogMessage(__FILE__, __LINE__, severity).stream() - -// Check if it's compiled in C++11 mode. -// -// GXX_EXPERIMENTAL_CXX0X is defined by gcc and clang up to at least -// gcc-4.7 and clang-3.1 (2011-12-13). __cplusplus was defined to 1 -// in gcc before 4.7 (Crosstool 16) and clang before 3.1, but is -// defined according to the language version in effect thereafter. -// Microsoft Visual Studio 14 (2015) sets __cplusplus==199711 despite -// reasonably good C++11 support, so we set LANG_CXX for it and -// newer versions (_MSC_VER >= 1900). -#if (defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L || \ - (defined(_MSC_VER) && _MSC_VER >= 1900)) && !defined(__UCLIBCXX_MAJOR__) -// Helper for CHECK_NOTNULL(). -// -// In C++11, all cases can be handled by a single function. Since the value -// category of the argument is preserved (also for rvalue references), -// member initializer lists like the one below will compile correctly: -// -// Foo() -// : x_(CHECK_NOTNULL(MethodReturningUniquePtr())) {} -template -T CheckNotNull(const char* file, int line, const char* names, T&& t) { - if (t == nullptr) { - LogMessageFatal(file, line, new std::string(names)); - } - return std::forward(t); -} - -#else - -// A small helper for CHECK_NOTNULL(). -template -T* CheckNotNull(const char *file, int line, const char *names, T* t) { - if (t == NULL) { - LogMessageFatal(file, line, new std::string(names)); - } - return t; -} -#endif +#define LOG_AT_LEVEL(severity) \ + google::LogMessage(__FILE__, __LINE__, severity).stream() // Allow folks to put a counter in the LOG_EVERY_X()'ed messages. This // only works if ostream is a LogStream. If the ostream is not a // LogStream you'll get an assert saying as much at runtime. -GLOG_EXPORT std::ostream& operator<<(std::ostream &os, - const PRIVATE_Counter&); - +GLOG_EXPORT std::ostream& operator<<(std::ostream& os, const Counter_t&); // Derived class for PLOG*() above. class GLOG_EXPORT ErrnoLogMessage : public LogMessage { @@ -1694,19 +1447,37 @@ class GLOG_EXPORT ErrnoLogMessage : public LogMessage { void operator=(const ErrnoLogMessage&); }; - // This class is used to explicitly ignore values in the conditional // logging macros. This avoids compiler warnings like "value computed // is not used" and "statement has no effect". -class GLOG_EXPORT LogMessageVoidify { - public: - LogMessageVoidify() { } +namespace logging { +namespace internal { + +// Helper for CHECK_NOTNULL(). +// +// In C++11, all cases can be handled by a single function. Since the value +// category of the argument is preserved (also for rvalue references), +// member initializer lists like the one below will compile correctly: +// +// Foo() +// : x_(CHECK_NOTNULL(MethodReturningUniquePtr())) {} +template +T CheckNotNull(const char* file, int line, const char* names, T&& t) { + if (t == nullptr) { + LogMessageFatal(file, line, std::make_unique(names)); + } + return std::forward(t); +} + +struct LogMessageVoidify { // This has to be an operator with a precedence lower than << but // higher than ?: - void operator&(std::ostream&) { } + void operator&(std::ostream&) noexcept {} }; +} // namespace internal +} // namespace logging // Flushes all log files that contains messages that are at least of // the specified severity level. Thread-safe. @@ -1723,7 +1494,7 @@ GLOG_EXPORT void FlushLogFilesUnsafe(LogSeverity min_severity); // severity". Thread-safe. // GLOG_EXPORT void SetLogDestination(LogSeverity severity, - const char* base_filename); + const char* base_filename); // // Set the basename of the symlink to the latest log file at a given @@ -1732,7 +1503,7 @@ GLOG_EXPORT void SetLogDestination(LogSeverity severity, // invocation name of the program. Thread-safe. // GLOG_EXPORT void SetLogSymlink(LogSeverity severity, - const char* symlink_basename); + const char* symlink_basename); // // Used to send logs to some other kind of destination @@ -1748,7 +1519,7 @@ class GLOG_EXPORT LogSink { // during this call. virtual void send(LogSeverity severity, const char* full_filename, const char* base_filename, int line, - const LogMessageTime& logmsgtime, const char* message, + const LogMessageTime& time, const char* message, size_t message_len); // Provide an overload for compatibility purposes GLOG_DEPRECATED @@ -1774,13 +1545,13 @@ class GLOG_EXPORT LogSink { // Returns the normal text output of the log message. // Can be useful to implement send(). static std::string ToString(LogSeverity severity, const char* file, int line, - const LogMessageTime &logmsgtime, - const char* message, size_t message_len); + const LogMessageTime& time, const char* message, + size_t message_len); }; // Add or remove a LogSink as a consumer of logging data. Thread-safe. -GLOG_EXPORT void AddLogSink(LogSink *destination); -GLOG_EXPORT void RemoveLogSink(LogSink *destination); +GLOG_EXPORT void AddLogSink(LogSink* destination); +GLOG_EXPORT void RemoveLogSink(LogSink* destination); // // Specify an "extension" added to the filename specified via @@ -1788,8 +1559,7 @@ GLOG_EXPORT void RemoveLogSink(LogSink *destination); // often used to append the port we're listening on to the logfile // name. Thread-safe. // -GLOG_EXPORT void SetLogFilenameExtension( - const char* filename_extension); +GLOG_EXPORT void SetLogFilenameExtension(const char* filename_extension); // // Make it so that all log messages of at least a particular severity @@ -1810,26 +1580,15 @@ GLOG_EXPORT void LogToStderr(); // the email addresses to send to (separated by spaces, say). Thread-safe. // GLOG_EXPORT void SetEmailLogging(LogSeverity min_severity, - const char* addresses); + const char* addresses); -// A simple function that sends email. dest is a commma-separated -// list of addressess. Thread-safe. -GLOG_EXPORT bool SendEmail(const char *dest, - const char *subject, const char *body); +// A simple function that sends email. dest is a comma-separated +// list of addresses. Thread-safe. +GLOG_EXPORT bool SendEmail(const char* dest, const char* subject, + const char* body); GLOG_EXPORT const std::vector& GetLoggingDirectories(); -// For tests only: Clear the internal [cached] list of logging directories to -// force a refresh the next time GetLoggingDirectories is called. -// Thread-hostile. -void TestOnly_ClearLoggingDirectoriesList(); - -// Returns a set of existing temporary directories, which will be a -// subset of the directories returned by GetLoggingDirectories(). -// Thread-safe. -GLOG_EXPORT void GetExistingTempDirectories( - std::vector* list); - // Print any fatal message again -- useful to call from signal handler // so that the last thing in the output is the fatal message. // Thread-hostile, but a race is unlikely. @@ -1878,10 +1637,15 @@ class GLOG_EXPORT Logger { // appropriate by the higher level logging facility. For example, // textual log messages already contain timestamps, and the // file:linenumber header. + [[deprecated( + "Logger::Write accepting a std::time_t timestamp is provided for " + "compatibility purposes only. New code should implement the " + "std::chrono::system_clock::time_point overload.")]] virtual void + Write(bool force_flush, time_t timestamp, const char* message, + size_t message_len); virtual void Write(bool force_flush, - time_t timestamp, - const char* message, - size_t message_len) = 0; + const std::chrono::system_clock::time_point& timestamp, + const char* message, size_t message_len); // Flush any buffered messages virtual void Flush() = 0; @@ -1902,24 +1666,7 @@ extern GLOG_EXPORT Logger* GetLogger(LogSeverity level); // be deleted by the caller. Thread-safe. extern GLOG_EXPORT void SetLogger(LogSeverity level, Logger* logger); -} - -// glibc has traditionally implemented two incompatible versions of -// strerror_r(). There is a poorly defined convention for picking the -// version that we want, but it is not clear whether it even works with -// all versions of glibc. -// So, instead, we provide this wrapper that automatically detects the -// version that is in use, and then implements POSIX semantics. -// N.B. In addition to what POSIX says, we also guarantee that "buf" will -// be set to an empty string, if this function failed. This means, in most -// cases, you do not need to check the error code and you can directly -// use the value of "buf". It will never have an undefined value. -// DEPRECATED: Use StrError(int) instead. -GLOG_EXPORT int posix_strerror_r(int err, char *buf, size_t len); - -// A thread-safe replacement for strerror(). Returns a string describing the -// given POSIX error code. -GLOG_EXPORT std::string StrError(int err); +} // namespace base // A class for which we define operator<<, which does nothing. class GLOG_EXPORT NullStream : public LogMessage::LogStream { @@ -1928,16 +1675,16 @@ class GLOG_EXPORT NullStream : public LogMessage::LogStream { // (they'll never be actually displayed). This will be needed if a // NullStream& is implicitly converted to LogStream&, in which case // the overloaded NullStream::operator<< will not be invoked. - NullStream() : LogMessage::LogStream(message_buffer_, 1, 0) { } + NullStream(); NullStream(const char* /*file*/, int /*line*/, - const CheckOpString& /*result*/) : - LogMessage::LogStream(message_buffer_, 1, 0) { } - NullStream &stream() { return *this; } + const logging::internal::CheckOpString& /*result*/); + NullStream& stream(); + private: // A very short buffer for messages (which we discard anyway). This // will be needed if NullStream& converted to LogStream& (e.g. as a // result of a conditional expression). - char message_buffer_[2]; + char message_buffer_[3]; }; // Do nothing. This operator is inline, allowing the message to be @@ -1946,24 +1693,19 @@ class GLOG_EXPORT NullStream : public LogMessage::LogStream { // SKIP_LOG=WARNING. In those cases, NullStream will be implicitly // converted to LogStream and the message will be computed and then // quietly discarded. -template -inline NullStream& operator<<(NullStream &str, const T &) { return str; } +template +inline NullStream& operator<<(NullStream& str, const T&) { + return str; +} // Similar to NullStream, but aborts the program (without stack // trace), like LogMessageFatal. class GLOG_EXPORT NullStreamFatal : public NullStream { public: - NullStreamFatal() { } - NullStreamFatal(const char* file, int line, const CheckOpString& result) : - NullStream(file, line, result) { } -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable : 4722) -#endif // _MSC_VER - __attribute__((noreturn)) ~NullStreamFatal() throw () { _exit(EXIT_FAILURE); } -#if defined(_MSC_VER) -#pragma warning(pop) -#endif // _MSC_VER + using NullStream::NullStream; + [[noreturn]] + // Prevent the linker from discarding the destructor. + GLOG_USED ~NullStreamFatal(); }; // Install a signal handler that will dump signal information and a stack @@ -1984,19 +1726,19 @@ class GLOG_EXPORT NullStreamFatal : public NullStream { // words, stack traces of other threads won't be shown. GLOG_EXPORT void InstallFailureSignalHandler(); +// Returns true if FailureSignalHandler is installed. +GLOG_EXPORT bool IsFailureSignalHandlerInstalled(); + // Installs a function that is used for writing the failure dump. "data" // is the pointer to the beginning of a message to be written, and "size" // is the size of the message. You should not expect the data is // terminated with '\0'. -GLOG_EXPORT void InstallFailureWriter( - void (*writer)(const char* data, size_t size)); +GLOG_EXPORT void InstallFailureWriter(void (*writer)(const char* data, + size_t size)); -} +// Dump stack trace as a string. +GLOG_EXPORT std::string GetStackTrace(); -#pragma pop_macro("DECLARE_VARIABLE") -#pragma pop_macro("DECLARE_bool") -#pragma pop_macro("DECLARE_string") -#pragma pop_macro("DECLARE_int32") -#pragma pop_macro("DECLARE_uint32") +} // namespace google -#endif // GLOG_LOGGING_H +#endif // GLOG_LOGGING_H diff --git a/glog/armeabi-v7a/include/glog/platform.h b/glog/armeabi-v7a/include/glog/platform.h index e6144119..f118ca8d 100644 --- a/glog/armeabi-v7a/include/glog/platform.h +++ b/glog/armeabi-v7a/include/glog/platform.h @@ -1,4 +1,4 @@ -// Copyright (c) 2008, Google Inc. +// Copyright (c) 2024, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -35,24 +35,28 @@ #define GLOG_PLATFORM_H #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) -#define GLOG_OS_WINDOWS +# define GLOG_OS_WINDOWS #elif defined(__CYGWIN__) || defined(__CYGWIN32__) -#define GLOG_OS_CYGWIN +# define GLOG_OS_CYGWIN #elif defined(linux) || defined(__linux) || defined(__linux__) -#ifndef GLOG_OS_LINUX -#define GLOG_OS_LINUX -#endif +# ifndef GLOG_OS_LINUX +# define GLOG_OS_LINUX +# endif +# if defined(__ANDROID__) +# define GLOG_OS_ANDROID +# endif #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) -#define GLOG_OS_MACOSX +# define GLOG_OS_MACOSX #elif defined(__FreeBSD__) -#define GLOG_OS_FREEBSD +# define GLOG_OS_FREEBSD #elif defined(__NetBSD__) -#define GLOG_OS_NETBSD +# define GLOG_OS_NETBSD #elif defined(__OpenBSD__) -#define GLOG_OS_OPENBSD -#else +# define GLOG_OS_OPENBSD +#elif defined(__EMSCRIPTEN__) +# define GLOG_OS_EMSCRIPTEN // TODO(hamaji): Add other platforms. #error Platform not supported by glog. Please consider to contribute platform information by submitting a pull request on Github. #endif -#endif // GLOG_PLATFORM_H +#endif // GLOG_PLATFORM_H diff --git a/glog/armeabi-v7a/include/glog/raw_logging.h b/glog/armeabi-v7a/include/glog/raw_logging.h index eda5fb45..195a1b9c 100644 --- a/glog/armeabi-v7a/include/glog/raw_logging.h +++ b/glog/armeabi-v7a/include/glog/raw_logging.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006, Google Inc. +// Copyright (c) 2024, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -36,19 +36,19 @@ #ifndef GLOG_RAW_LOGGING_H #define GLOG_RAW_LOGGING_H -#include +#if defined(GLOG_USE_GLOG_EXPORT) +# include "glog/export.h" +#endif + +#if !defined(GLOG_EXPORT) +# error was not included correctly. See the documention for how to consume the library. +#endif + +#include "glog/log_severity.h" +#include "glog/vlog_is_on.h" namespace google { -#include -#include -#include - -#if defined(__GNUC__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wvariadic-macros" -#endif - // This is similar to LOG(severity) << format... and VLOG(level) << format.., // but // * it is to be used ONLY by low-level modules that can't use normal LOG() @@ -63,108 +63,101 @@ namespace google { // These will print an almost standard log lines like this to stderr only: // E20200821 211317 file.cc:123] RAW: Failed foo with 22: bad_file // I20200821 211317 file.cc:142] RAW: status is 20 -#define RAW_LOG(severity, ...) \ - do { \ - switch (google::GLOG_ ## severity) { \ - case 0: \ - RAW_LOG_INFO(__VA_ARGS__); \ - break; \ - case 1: \ - RAW_LOG_WARNING(__VA_ARGS__); \ - break; \ - case 2: \ - RAW_LOG_ERROR(__VA_ARGS__); \ - break; \ - case 3: \ - RAW_LOG_FATAL(__VA_ARGS__); \ - break; \ - default: \ - break; \ - } \ +#define RAW_LOG(severity, ...) \ + do { \ + switch (google::GLOG_##severity) { \ + case 0: \ + RAW_LOG_INFO(__VA_ARGS__); \ + break; \ + case 1: \ + RAW_LOG_WARNING(__VA_ARGS__); \ + break; \ + case 2: \ + RAW_LOG_ERROR(__VA_ARGS__); \ + break; \ + case 3: \ + RAW_LOG_FATAL(__VA_ARGS__); \ + break; \ + default: \ + break; \ + } \ } while (0) // The following STRIP_LOG testing is performed in the header file so that it's // possible to completely compile out the logging code and the log messages. #if !defined(STRIP_LOG) || STRIP_LOG == 0 -#define RAW_VLOG(verboselevel, ...) \ - do { \ - if (VLOG_IS_ON(verboselevel)) { \ - RAW_LOG_INFO(__VA_ARGS__); \ - } \ - } while (0) +# define RAW_VLOG(verboselevel, ...) \ + do { \ + if (VLOG_IS_ON(verboselevel)) { \ + RAW_LOG_INFO(__VA_ARGS__); \ + } \ + } while (0) #else -#define RAW_VLOG(verboselevel, ...) RawLogStub__(0, __VA_ARGS__) -#endif // STRIP_LOG == 0 +# define RAW_VLOG(verboselevel, ...) RawLogStub__(0, __VA_ARGS__) +#endif // STRIP_LOG == 0 #if !defined(STRIP_LOG) || STRIP_LOG == 0 -#define RAW_LOG_INFO(...) google::RawLog__(google::GLOG_INFO, \ - __FILE__, __LINE__, __VA_ARGS__) +# define RAW_LOG_INFO(...) \ + google::RawLog__(google::GLOG_INFO, __FILE__, __LINE__, __VA_ARGS__) #else -#define RAW_LOG_INFO(...) google::RawLogStub__(0, __VA_ARGS__) -#endif // STRIP_LOG == 0 +# define RAW_LOG_INFO(...) google::RawLogStub__(0, __VA_ARGS__) +#endif // STRIP_LOG == 0 #if !defined(STRIP_LOG) || STRIP_LOG <= 1 -#define RAW_LOG_WARNING(...) google::RawLog__(google::GLOG_WARNING, \ - __FILE__, __LINE__, __VA_ARGS__) +# define RAW_LOG_WARNING(...) \ + google::RawLog__(google::GLOG_WARNING, __FILE__, __LINE__, __VA_ARGS__) #else -#define RAW_LOG_WARNING(...) google::RawLogStub__(0, __VA_ARGS__) -#endif // STRIP_LOG <= 1 +# define RAW_LOG_WARNING(...) google::RawLogStub__(0, __VA_ARGS__) +#endif // STRIP_LOG <= 1 #if !defined(STRIP_LOG) || STRIP_LOG <= 2 -#define RAW_LOG_ERROR(...) google::RawLog__(google::GLOG_ERROR, \ - __FILE__, __LINE__, __VA_ARGS__) +# define RAW_LOG_ERROR(...) \ + google::RawLog__(google::GLOG_ERROR, __FILE__, __LINE__, __VA_ARGS__) #else -#define RAW_LOG_ERROR(...) google::RawLogStub__(0, __VA_ARGS__) -#endif // STRIP_LOG <= 2 +# define RAW_LOG_ERROR(...) google::RawLogStub__(0, __VA_ARGS__) +#endif // STRIP_LOG <= 2 #if !defined(STRIP_LOG) || STRIP_LOG <= 3 -#define RAW_LOG_FATAL(...) google::RawLog__(google::GLOG_FATAL, \ - __FILE__, __LINE__, __VA_ARGS__) +# define RAW_LOG_FATAL(...) \ + google::RawLog__(google::GLOG_FATAL, __FILE__, __LINE__, __VA_ARGS__) #else -#define RAW_LOG_FATAL(...) \ - do { \ - google::RawLogStub__(0, __VA_ARGS__); \ - exit(EXIT_FAILURE); \ - } while (0) -#endif // STRIP_LOG <= 3 +# define RAW_LOG_FATAL(...) \ + do { \ + google::RawLogStub__(0, __VA_ARGS__); \ + exit(EXIT_FAILURE); \ + } while (0) +#endif // STRIP_LOG <= 3 // Similar to CHECK(condition) << message, // but for low-level modules: we use only RAW_LOG that does not allocate memory. // We do not want to provide args list here to encourage this usage: // if (!cond) RAW_LOG(FATAL, "foo ...", hard_to_compute_args); // so that the args are not computed when not needed. -#define RAW_CHECK(condition, message) \ - do { \ - if (!(condition)) { \ - RAW_LOG(FATAL, "Check %s failed: %s", #condition, message); \ - } \ +#define RAW_CHECK(condition, message) \ + do { \ + if (!(condition)) { \ + RAW_LOG(FATAL, "Check %s failed: %s", #condition, message); \ + } \ } while (0) // Debug versions of RAW_LOG and RAW_CHECK #ifndef NDEBUG -#define RAW_DLOG(severity, ...) RAW_LOG(severity, __VA_ARGS__) -#define RAW_DCHECK(condition, message) RAW_CHECK(condition, message) +# define RAW_DLOG(severity, ...) RAW_LOG(severity, __VA_ARGS__) +# define RAW_DCHECK(condition, message) RAW_CHECK(condition, message) #else // NDEBUG -#define RAW_DLOG(severity, ...) \ - while (false) \ - RAW_LOG(severity, __VA_ARGS__) -#define RAW_DCHECK(condition, message) \ - while (false) \ - RAW_CHECK(condition, message) +# define RAW_DLOG(severity, ...) \ + while (false) RAW_LOG(severity, __VA_ARGS__) +# define RAW_DCHECK(condition, message) \ + while (false) RAW_CHECK(condition, message) #endif // NDEBUG -#if defined(__GNUC__) -#pragma GCC diagnostic pop -#endif - // Stub log function used to work around for unused variable warnings when // building with STRIP_LOG > 0. -static inline void RawLogStub__(int /* ignored */, ...) { -} +static inline void RawLogStub__(int /* ignored */, ...) {} // Helper function to implement RAW_LOG and RAW_VLOG // Logs format... at "severity" level, reporting it @@ -172,8 +165,12 @@ static inline void RawLogStub__(int /* ignored */, ...) { // This does not allocate memory or acquire locks. GLOG_EXPORT void RawLog__(LogSeverity severity, const char* file, int line, const char* format, ...) - __attribute__((__format__(__printf__, 4, 5))); - -} +#if defined(__has_attribute) +# if __has_attribute(used) + __attribute__((__format__(__printf__, 4, 5))) +# endif +#endif + ; +} // namespace google #endif // GLOG_RAW_LOGGING_H diff --git a/glog/armeabi-v7a/include/glog/stl_logging.h b/glog/armeabi-v7a/include/glog/stl_logging.h index ed200dd2..8dd7707e 100644 --- a/glog/armeabi-v7a/include/glog/stl_logging.h +++ b/glog/armeabi-v7a/include/glog/stl_logging.h @@ -1,4 +1,4 @@ -// Copyright (c) 2003, Google Inc. +// Copyright (c) 2023, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -35,140 +35,86 @@ // vector v1, v2; // CHECK_EQ(v1, v2); // -// If you want to use this header file with hash maps or slist, you -// need to define macros before including this file: -// -// - GLOG_STL_LOGGING_FOR_UNORDERED - and -// - GLOG_STL_LOGGING_FOR_TR1_UNORDERED - -// - GLOG_STL_LOGGING_FOR_EXT_HASH - -// - GLOG_STL_LOGGING_FOR_EXT_SLIST - -// -#ifndef UTIL_GTL_STL_LOGGING_INL_H_ -#define UTIL_GTL_STL_LOGGING_INL_H_ - -#if !1 -# error We do not support stl_logging for this compiler -#endif +#ifndef GLOG_STL_LOGGING_H +#define GLOG_STL_LOGGING_H #include #include #include #include #include +#include +#include #include #include -#if defined(GLOG_STL_LOGGING_FOR_UNORDERED) && __cplusplus >= 201103L -# include -# include -#endif - -#ifdef GLOG_STL_LOGGING_FOR_TR1_UNORDERED -# include -# include -#endif - -#ifdef GLOG_STL_LOGGING_FOR_EXT_HASH -# include -# include -#endif -#ifdef GLOG_STL_LOGGING_FOR_EXT_SLIST -# include -#endif - // Forward declare these two, and define them after all the container streams // operators so that we can recurse from pair -> container -> container -> pair // properly. -template +template std::ostream& operator<<(std::ostream& out, const std::pair& p); namespace google { -template +template void PrintSequence(std::ostream& out, Iter begin, Iter end); } - -#define OUTPUT_TWO_ARG_CONTAINER(Sequence) \ -template \ -inline std::ostream& operator<<(std::ostream& out, \ - const Sequence& seq) { \ - google::PrintSequence(out, seq.begin(), seq.end()); \ - return out; \ -} +#define OUTPUT_TWO_ARG_CONTAINER(Sequence) \ + template \ + inline std::ostream& operator<<(std::ostream& out, \ + const Sequence& seq) { \ + google::PrintSequence(out, seq.begin(), seq.end()); \ + return out; \ + } OUTPUT_TWO_ARG_CONTAINER(std::vector) OUTPUT_TWO_ARG_CONTAINER(std::deque) OUTPUT_TWO_ARG_CONTAINER(std::list) -#ifdef GLOG_STL_LOGGING_FOR_EXT_SLIST -OUTPUT_TWO_ARG_CONTAINER(__gnu_cxx::slist) -#endif - #undef OUTPUT_TWO_ARG_CONTAINER -#define OUTPUT_THREE_ARG_CONTAINER(Sequence) \ -template \ -inline std::ostream& operator<<(std::ostream& out, \ - const Sequence& seq) { \ - google::PrintSequence(out, seq.begin(), seq.end()); \ - return out; \ -} +#define OUTPUT_THREE_ARG_CONTAINER(Sequence) \ + template \ + inline std::ostream& operator<<(std::ostream& out, \ + const Sequence& seq) { \ + google::PrintSequence(out, seq.begin(), seq.end()); \ + return out; \ + } OUTPUT_THREE_ARG_CONTAINER(std::set) OUTPUT_THREE_ARG_CONTAINER(std::multiset) #undef OUTPUT_THREE_ARG_CONTAINER -#define OUTPUT_FOUR_ARG_CONTAINER(Sequence) \ -template \ -inline std::ostream& operator<<(std::ostream& out, \ - const Sequence& seq) { \ - google::PrintSequence(out, seq.begin(), seq.end()); \ - return out; \ -} +#define OUTPUT_FOUR_ARG_CONTAINER(Sequence) \ + template \ + inline std::ostream& operator<<(std::ostream& out, \ + const Sequence& seq) { \ + google::PrintSequence(out, seq.begin(), seq.end()); \ + return out; \ + } OUTPUT_FOUR_ARG_CONTAINER(std::map) OUTPUT_FOUR_ARG_CONTAINER(std::multimap) -#if defined(GLOG_STL_LOGGING_FOR_UNORDERED) && __cplusplus >= 201103L OUTPUT_FOUR_ARG_CONTAINER(std::unordered_set) OUTPUT_FOUR_ARG_CONTAINER(std::unordered_multiset) -#endif -#ifdef GLOG_STL_LOGGING_FOR_TR1_UNORDERED -OUTPUT_FOUR_ARG_CONTAINER(std::tr1::unordered_set) -OUTPUT_FOUR_ARG_CONTAINER(std::tr1::unordered_multiset) -#endif -#ifdef GLOG_STL_LOGGING_FOR_EXT_HASH -OUTPUT_FOUR_ARG_CONTAINER(__gnu_cxx::hash_set) -OUTPUT_FOUR_ARG_CONTAINER(__gnu_cxx::hash_multiset) -#endif - #undef OUTPUT_FOUR_ARG_CONTAINER -#define OUTPUT_FIVE_ARG_CONTAINER(Sequence) \ -template \ -inline std::ostream& operator<<(std::ostream& out, \ - const Sequence& seq) { \ - google::PrintSequence(out, seq.begin(), seq.end()); \ - return out; \ -} +#define OUTPUT_FIVE_ARG_CONTAINER(Sequence) \ + template \ + inline std::ostream& operator<<(std::ostream& out, \ + const Sequence& seq) { \ + google::PrintSequence(out, seq.begin(), seq.end()); \ + return out; \ + } -#if defined(GLOG_STL_LOGGING_FOR_UNORDERED) && __cplusplus >= 201103L OUTPUT_FIVE_ARG_CONTAINER(std::unordered_map) OUTPUT_FIVE_ARG_CONTAINER(std::unordered_multimap) -#endif -#ifdef GLOG_STL_LOGGING_FOR_TR1_UNORDERED -OUTPUT_FIVE_ARG_CONTAINER(std::tr1::unordered_map) -OUTPUT_FIVE_ARG_CONTAINER(std::tr1::unordered_multimap) -#endif -#ifdef GLOG_STL_LOGGING_FOR_EXT_HASH -OUTPUT_FIVE_ARG_CONTAINER(__gnu_cxx::hash_map) -OUTPUT_FIVE_ARG_CONTAINER(__gnu_cxx::hash_multimap) -#endif #undef OUTPUT_FIVE_ARG_CONTAINER -template +template inline std::ostream& operator<<(std::ostream& out, const std::pair& p) { out << '(' << p.first << ", " << p.second << ')'; @@ -177,7 +123,7 @@ inline std::ostream& operator<<(std::ostream& out, namespace google { -template +template inline void PrintSequence(std::ostream& out, Iter begin, Iter end) { // Output at most 100 elements -- appropriate if used for logging. for (int i = 0; begin != end && i < 100; ++i, ++begin) { @@ -189,7 +135,7 @@ inline void PrintSequence(std::ostream& out, Iter begin, Iter end) { } } -} +} // namespace google // Note that this is technically undefined behavior! We are adding things into // the std namespace for a reason though -- we are providing new operations on @@ -215,6 +161,8 @@ inline void PrintSequence(std::ostream& out, Iter begin, Iter end) { // move all of the *definitions* into namespace std, bet we need to ensure no // one references them first. This lets us take that step. We cannot define them // in both because that would create ambiguous overloads when both are found. -namespace std { using ::operator<<; } +namespace std { +using ::operator<<; +} -#endif // UTIL_GTL_STL_LOGGING_INL_H_ +#endif // GLOG_STL_LOGGING_H diff --git a/glog/armeabi-v7a/include/glog/types.h b/glog/armeabi-v7a/include/glog/types.h new file mode 100644 index 00000000..dca2f06f --- /dev/null +++ b/glog/armeabi-v7a/include/glog/types.h @@ -0,0 +1,81 @@ + +// Copyright (c) 2024, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#ifndef GLOG_TYPES_H +#define GLOG_TYPES_H + +#include +#include + +namespace google { + +using int32 = std::int32_t; +using uint32 = std::uint32_t; +using int64 = std::int64_t; +using uint64 = std::uint64_t; + +} // namespace google + +#if defined(__has_feature) +# if __has_feature(thread_sanitizer) +# define GLOG_SANITIZE_THREAD 1 +# endif +#endif + +#if !defined(GLOG_SANITIZE_THREAD) && defined(__SANITIZE_THREAD__) && \ + __SANITIZE_THREAD__ +# define GLOG_SANITIZE_THREAD 1 +#endif + +#if defined(GLOG_SANITIZE_THREAD) +# define GLOG_IFDEF_THREAD_SANITIZER(X) X +#else +# define GLOG_IFDEF_THREAD_SANITIZER(X) +#endif + +#if defined(_MSC_VER) +# define GLOG_MSVC_PUSH_DISABLE_WARNING(n) \ + __pragma(warning(push)) __pragma(warning(disable : n)) +# define GLOG_MSVC_POP_WARNING() __pragma(warning(pop)) +#else +# define GLOG_MSVC_PUSH_DISABLE_WARNING(n) +# define GLOG_MSVC_POP_WARNING() +#endif + +#if defined(GLOG_SANITIZE_THREAD) +// We need to identify the static variables as "benign" races +// to avoid noisy reports from TSAN. +extern "C" void AnnotateBenignRaceSized(const char* file, int line, + const volatile void* mem, size_t size, + const char* description); +#endif // defined(GLOG_SANITIZE_THREAD) + +#endif // GLOG_TYPES_H diff --git a/glog/armeabi-v7a/include/glog/vlog_is_on.h b/glog/armeabi-v7a/include/glog/vlog_is_on.h index 52036b5e..f94b0fb8 100644 --- a/glog/armeabi-v7a/include/glog/vlog_is_on.h +++ b/glog/armeabi-v7a/include/glog/vlog_is_on.h @@ -1,4 +1,4 @@ -// Copyright (c) 1999, 2007, Google Inc. +// Copyright (c) 2024, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -58,10 +58,21 @@ // CAVEAT: --vmodule functionality is not available in non gcc compilers. // -#ifndef BASE_VLOG_IS_ON_H_ -#define BASE_VLOG_IS_ON_H_ +#ifndef GLOG_VLOG_IS_ON_H +#define GLOG_VLOG_IS_ON_H -#include +#include + +#if defined(GLOG_USE_GLOG_EXPORT) +# include "glog/export.h" +#endif + +#if !defined(GLOG_EXPORT) +# error was not included correctly. See the documention for how to consume the library. +#endif + +#include "glog/flags.h" +#include "glog/types.h" #if defined(__GNUC__) // We emit an anonymous static int* variable at every VLOG_IS_ON(n) site. @@ -70,19 +81,25 @@ // it's either FLAGS_v or an appropriate internal variable // matching the current source file that represents results of // parsing of --vmodule flag and/or SetVLOGLevel calls. -#define VLOG_IS_ON(verboselevel) \ - __extension__ \ - ({ static google::SiteFlag vlocal__ = {NULL, NULL, 0, NULL}; \ - google::int32 verbose_level__ = (verboselevel); \ - (vlocal__.level == NULL ? google::InitVLOG3__(&vlocal__, &FLAGS_v, \ - __FILE__, verbose_level__) : *vlocal__.level >= verbose_level__); \ - }) +# define VLOG_IS_ON(verboselevel) \ + __extension__({ \ + static google::SiteFlag vlocal__ = {nullptr, nullptr, 0, nullptr}; \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &vlocal__, sizeof(google::SiteFlag), "")); \ + google::int32 verbose_level__ = (verboselevel); \ + (vlocal__.level == nullptr \ + ? google::InitVLOG3__(&vlocal__, &FLAGS_v, __FILE__, \ + verbose_level__) \ + : *vlocal__.level >= verbose_level__); \ + }) #else // GNU extensions not available, so we do not support --vmodule. // Dynamic value of FLAGS_v always controls the logging level. -#define VLOG_IS_ON(verboselevel) (FLAGS_v >= (verboselevel)) +# define VLOG_IS_ON(verboselevel) (FLAGS_v >= (verboselevel)) #endif +namespace google { + // Set VLOG(_IS_ON) level for module_pattern to log_level. // This lets us dynamically control what is normally set by the --vmodule flag. // Returns the level that previously applied to module_pattern. @@ -96,13 +113,13 @@ extern GLOG_EXPORT int SetVLOGLevel(const char* module_pattern, int log_level); // Various declarations needed for VLOG_IS_ON above: ========================= struct SiteFlag { - google::int32* level; + int32* level; const char* base_name; - size_t base_len; + std::size_t base_len; SiteFlag* next; }; -// Helper routine which determines the logging info for a particalur VLOG site. +// Helper routine which determines the logging info for a particular VLOG site. // site_flag is the address of the site-local pointer to the controlling // verbosity level // site_default is the default to use for *site_flag @@ -110,9 +127,10 @@ struct SiteFlag { // verbose_level is the argument to VLOG_IS_ON // We will return the return value for VLOG_IS_ON // and if possible set *site_flag appropriately. -extern GLOG_EXPORT bool InitVLOG3__( - google::SiteFlag* site_flag, - google::int32* site_default, const char* fname, - google::int32 verbose_level); +extern GLOG_EXPORT bool InitVLOG3__(SiteFlag* site_flag, + int32* site_default, + const char* fname, + int32 verbose_level); +} // namespace google -#endif // BASE_VLOG_IS_ON_H_ +#endif // GLOG_VLOG_IS_ON_H diff --git a/glog/armeabi-v7a/lib/cmake/glog/glog-config-version.cmake b/glog/armeabi-v7a/lib/cmake/glog/glog-config-version.cmake index 3eaebcd4..42739797 100644 --- a/glog/armeabi-v7a/lib/cmake/glog/glog-config-version.cmake +++ b/glog/armeabi-v7a/lib/cmake/glog/glog-config-version.cmake @@ -9,19 +9,19 @@ # The variable CVF_VERSION must be set before calling configure_file(). -set(PACKAGE_VERSION "0.6.0") +set(PACKAGE_VERSION "0.7.0") if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() - if("0.6.0" MATCHES "^([0-9]+)\\.") + if("0.7.0" MATCHES "^([0-9]+)\\.") set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}") if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0) string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}") endif() else() - set(CVF_VERSION_MAJOR "0.6.0") + set(CVF_VERSION_MAJOR "0.7.0") endif() if(PACKAGE_FIND_VERSION_RANGE) diff --git a/glog/armeabi-v7a/lib/cmake/glog/glog-config.cmake b/glog/armeabi-v7a/lib/cmake/glog/glog-config.cmake index 7f9d5702..d4fc7691 100644 --- a/glog/armeabi-v7a/lib/cmake/glog/glog-config.cmake +++ b/glog/armeabi-v7a/lib/cmake/glog/glog-config.cmake @@ -21,6 +21,8 @@ endmacro() include (CMakeFindDependencyMacro) include (${CMAKE_CURRENT_LIST_DIR}/glog-modules.cmake) +find_dependency (Threads) + diff --git a/glog/armeabi-v7a/lib/cmake/glog/glog-targets.cmake b/glog/armeabi-v7a/lib/cmake/glog/glog-targets.cmake index 7799b1fe..bfdb8034 100644 --- a/glog/armeabi-v7a/lib/cmake/glog/glog-targets.cmake +++ b/glog/armeabi-v7a/lib/cmake/glog/glog-targets.cmake @@ -54,9 +54,10 @@ endif() add_library(glog::glog STATIC IMPORTED) set_target_properties(glog::glog PROPERTIES - INTERFACE_COMPILE_DEFINITIONS "GLOG_CUSTOM_PREFIX_SUPPORT" + INTERFACE_COMPILE_DEFINITIONS "GLOG_USE_GLOG_EXPORT" + INTERFACE_COMPILE_FEATURES "cxx_std_14" INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" - INTERFACE_LINK_LIBRARIES "\$;\$" + INTERFACE_LINK_LIBRARIES "\$;\$" ) if(CMAKE_VERSION VERSION_LESS 2.8.12) diff --git a/glog/armeabi-v7a/lib/libglog.a b/glog/armeabi-v7a/lib/libglog.a index e15eb9d8..ca53d3b2 100644 Binary files a/glog/armeabi-v7a/lib/libglog.a and b/glog/armeabi-v7a/lib/libglog.a differ diff --git a/glog/x86/include/glog/flags.h b/glog/x86/include/glog/flags.h new file mode 100644 index 00000000..8349639a --- /dev/null +++ b/glog/x86/include/glog/flags.h @@ -0,0 +1,191 @@ +// Copyright (c) 2024, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#ifndef GLOG_FLAGS_H +#define GLOG_FLAGS_H + +#include + +#if defined(GLOG_USE_GFLAGS) +# include +#endif + +#if defined(GLOG_USE_GLOG_EXPORT) +# include "glog/export.h" +#endif + +#if !defined(GLOG_EXPORT) +# error was not included correctly. See the documention for how to consume the library. +#endif + +#include "glog/platform.h" +#include "glog/types.h" + +#pragma push_macro("DECLARE_VARIABLE") +#pragma push_macro("DECLARE_bool") +#pragma push_macro("DECLARE_string") +#pragma push_macro("DECLARE_int32") +#pragma push_macro("DECLARE_uint32") + +#ifdef DECLARE_VARIABLE +# undef DECLARE_VARIABLE +#endif + +#ifdef DECLARE_bool +# undef DECLARE_bool +#endif + +#ifdef DECLARE_string +# undef DECLARE_string +#endif + +#ifdef DECLARE_int32 +# undef DECLARE_int32 +#endif + +#ifdef DECLARE_uint32 +# undef DECLARE_uint32 +#endif + +#ifndef DECLARE_VARIABLE +# define DECLARE_VARIABLE(type, shorttype, name, tn) \ + namespace fL##shorttype { \ + extern GLOG_EXPORT type FLAGS_##name; \ + } \ + using fL##shorttype::FLAGS_##name + +// bool specialization +# define DECLARE_bool(name) DECLARE_VARIABLE(bool, B, name, bool) + +// int32 specialization +# define DECLARE_int32(name) DECLARE_VARIABLE(google::int32, I, name, int32) + +# if !defined(DECLARE_uint32) +// uint32 specialization +# define DECLARE_uint32(name) \ + DECLARE_VARIABLE(google::uint32, U, name, uint32) +# endif // !defined(DECLARE_uint32) && !defined(GLOG_USE_GFLAGS) + +// Special case for string, because we have to specify the namespace +// std::string, which doesn't play nicely with our FLAG__namespace hackery. +# define DECLARE_string(name) \ + namespace fLS { \ + extern GLOG_EXPORT std::string& FLAGS_##name; \ + } \ + using fLS::FLAGS_##name +#endif + +DECLARE_int32(logemaillevel); +DECLARE_int32(logcleansecs); + +#ifdef GLOG_OS_LINUX +DECLARE_bool(drop_log_memory); +#endif +DECLARE_string(alsologtoemail); +DECLARE_string(log_backtrace_at); + +// Set whether appending a timestamp to the log file name +DECLARE_bool(timestamp_in_logfile_name); + +// Set whether log messages go to stdout instead of logfiles +DECLARE_bool(logtostdout); + +// Set color messages logged to stdout (if supported by terminal). +DECLARE_bool(colorlogtostdout); + +// Set whether log messages go to stderr instead of logfiles +DECLARE_bool(logtostderr); + +// Set whether log messages go to stderr in addition to logfiles. +DECLARE_bool(alsologtostderr); + +// Set color messages logged to stderr (if supported by terminal). +DECLARE_bool(colorlogtostderr); + +// Log messages at a level >= this flag are automatically sent to +// stderr in addition to log files. +DECLARE_int32(stderrthreshold); + +// Set whether the log file header should be written upon creating a file. +DECLARE_bool(log_file_header); + +// Set whether the log prefix should be prepended to each line of output. +DECLARE_bool(log_prefix); + +// Set whether the year should be included in the log prefix. +DECLARE_bool(log_year_in_prefix); + +// Log messages at a level <= this flag are buffered. +// Log messages at a higher level are flushed immediately. +DECLARE_int32(logbuflevel); + +// Sets the maximum number of seconds which logs may be buffered for. +DECLARE_int32(logbufsecs); + +// Log suppression level: messages logged at a lower level than this +// are suppressed. +DECLARE_int32(minloglevel); + +// If specified, logfiles are written into this directory instead of the +// default logging directory. +DECLARE_string(log_dir); + +// Set the log file mode. +DECLARE_int32(logfile_mode); + +// Sets the path of the directory into which to put additional links +// to the log files. +DECLARE_string(log_link); + +DECLARE_int32(v); // in vlog_is_on.cc + +DECLARE_string(vmodule); // also in vlog_is_on.cc + +// Sets the maximum log file size (in MB). +DECLARE_uint32(max_log_size); + +// Sets whether to avoid logging to the disk if the disk is full. +DECLARE_bool(stop_logging_if_full_disk); + +// Use UTC time for logging +DECLARE_bool(log_utc_time); + +// Mailer used to send logging email +DECLARE_string(logmailer); + +DECLARE_bool(symbolize_stacktrace); + +#pragma pop_macro("DECLARE_VARIABLE") +#pragma pop_macro("DECLARE_bool") +#pragma pop_macro("DECLARE_string") +#pragma pop_macro("DECLARE_int32") +#pragma pop_macro("DECLARE_uint32") + +#endif // GLOG_FLAGS_H diff --git a/glog/x86/include/glog/log_severity.h b/glog/x86/include/glog/log_severity.h index aa48f531..1fb6a4c0 100644 --- a/glog/x86/include/glog/log_severity.h +++ b/glog/x86/include/glog/log_severity.h @@ -1,4 +1,4 @@ -// Copyright (c) 2007, Google Inc. +// Copyright (c) 2024, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -30,6 +30,16 @@ #ifndef BASE_LOG_SEVERITY_H__ #define BASE_LOG_SEVERITY_H__ +#if defined(GLOG_USE_GLOG_EXPORT) +# include "glog/export.h" +#endif + +#if !defined(GLOG_EXPORT) +# error was not included correctly. See the documention for how to consume the library. +#endif + +namespace google { + // The recommended semantics of the log levels are as follows: // // INFO: @@ -48,27 +58,43 @@ // Variables of type LogSeverity are widely taken to lie in the range // [0, NUM_SEVERITIES-1]. Be careful to preserve this assumption if // you ever need to change their values or add a new severity. -typedef int LogSeverity; -const int GLOG_INFO = 0, GLOG_WARNING = 1, GLOG_ERROR = 2, GLOG_FATAL = 3, - NUM_SEVERITIES = 4; +enum LogSeverity { + GLOG_INFO = 0, + GLOG_WARNING = 1, + GLOG_ERROR = 2, + GLOG_FATAL = 3, #ifndef GLOG_NO_ABBREVIATED_SEVERITIES -# ifdef ERROR +# ifdef ERROR # error ERROR macro is defined. Define GLOG_NO_ABBREVIATED_SEVERITIES before including logging.h. See the document for detail. -# endif -const int INFO = GLOG_INFO, WARNING = GLOG_WARNING, - ERROR = GLOG_ERROR, FATAL = GLOG_FATAL; +# endif + INFO = GLOG_INFO, + WARNING = GLOG_WARNING, + ERROR = GLOG_ERROR, + FATAL = GLOG_FATAL #endif +}; + +#if defined(__cpp_inline_variables) +# if (__cpp_inline_variables >= 201606L) +# define GLOG_INLINE_VARIABLE inline +# endif // (__cpp_inline_variables >= 201606L) +#endif // defined(__cpp_inline_variables) + +#if !defined(GLOG_INLINE_VARIABLE) +# define GLOG_INLINE_VARIABLE +#endif // !defined(GLOG_INLINE_VARIABLE) + +GLOG_INLINE_VARIABLE +constexpr int NUM_SEVERITIES = 4; // DFATAL is FATAL in debug mode, ERROR in normal mode #ifdef NDEBUG -#define DFATAL_LEVEL ERROR +# define DFATAL_LEVEL ERROR #else -#define DFATAL_LEVEL FATAL +# define DFATAL_LEVEL FATAL #endif -extern GLOG_EXPORT const char* const LogSeverityNames[NUM_SEVERITIES]; - // NDEBUG usage helpers related to (RAW_)DCHECK: // // DEBUG_MODE is for small !NDEBUG uses like @@ -89,10 +115,12 @@ extern GLOG_EXPORT const char* const LogSeverityNames[NUM_SEVERITIES]; // #ifdef NDEBUG enum { DEBUG_MODE = 0 }; -#define IF_DEBUG_MODE(x) +# define IF_DEBUG_MODE(x) #else enum { DEBUG_MODE = 1 }; -#define IF_DEBUG_MODE(x) x +# define IF_DEBUG_MODE(x) x #endif +} // namespace google + #endif // BASE_LOG_SEVERITY_H__ diff --git a/glog/x86/include/glog/logging.h b/glog/x86/include/glog/logging.h index af2219cc..9ab897e4 100644 --- a/glog/x86/include/glog/logging.h +++ b/glog/x86/include/glog/logging.h @@ -1,4 +1,4 @@ -// Copyright (c) 2022, Google Inc. +// Copyright (c) 2024, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -36,141 +36,104 @@ #ifndef GLOG_LOGGING_H #define GLOG_LOGGING_H -#if 1 && __cplusplus >= 201103L -#include -#endif - +#include #include +#include #include #include #include #include #include +#include #include #include #include -#if 1 -# include -#endif +#include +#include #include -#if defined(_MSC_VER) -#define GLOG_MSVC_PUSH_DISABLE_WARNING(n) __pragma(warning(push)) \ - __pragma(warning(disable:n)) -#define GLOG_MSVC_POP_WARNING() __pragma(warning(pop)) -#else -#define GLOG_MSVC_PUSH_DISABLE_WARNING(n) -#define GLOG_MSVC_POP_WARNING() +#if defined(GLOG_USE_GLOG_EXPORT) +# include "glog/export.h" #endif -#include - -#if 1 -#include +#if !defined(GLOG_EXPORT) || !defined(GLOG_NO_EXPORT) +# error was not included correctly. See the documention for how to consume the library. #endif -// We care a lot about number of bits things take up. Unfortunately, -// systems define their bit-specific ints in a lot of different ways. -// We use our own way, and have a typedef to get there. -// Note: these commands below may look like "#if 1" or "#if 0", but -// that's because they were constructed that way at ./configure time. -// Look at logging.h.in to see how they're calculated (based on your config). -#if 1 -#include // the normal place uint16_t is defined -#endif -#if 1 -#include // the normal place u_int16_t is defined -#endif -#if 1 -#include // a third place for uint16_t or u_int16_t -#endif +#include "glog/flags.h" +#include "glog/platform.h" +#include "glog/types.h" -#if 0 -#include -#endif +#if defined(__has_attribute) +# if __has_attribute(used) +# define GLOG_USED __attribute__((used)) +# endif // __has_attribute(used) +#endif // defined(__has_attribute) -#if 1 && __cplusplus >= 201103L -#include -#elif defined(GLOG_OS_WINDOWS) -#include -#endif +#if !defined(GLOG_USED) +# define GLOG_USED +#endif // !defined(GLOG_USED) + +#include "glog/log_severity.h" +#include "glog/vlog_is_on.h" namespace google { -#if 1 // the C99 format -typedef int32_t int32; -typedef uint32_t uint32; -typedef int64_t int64; -typedef uint64_t uint64; -#elif 1 // the BSD format -typedef int32_t int32; -typedef u_int32_t uint32; -typedef int64_t int64; -typedef u_int64_t uint64; -#elif 0 // the windows (vc7) format -typedef __int32 int32; -typedef unsigned __int32 uint32; -typedef __int64 int64; -typedef unsigned __int64 uint64; -#else -#error Do not know how to define a 32-bit integer quantity on your system -#endif - -typedef double WallTime; - struct GLOG_EXPORT LogMessageTime { LogMessageTime(); - LogMessageTime(std::tm t); - LogMessageTime(std::time_t timestamp, WallTime now); + explicit LogMessageTime(std::chrono::system_clock::time_point now); - const time_t& timestamp() const { return timestamp_; } - const int& sec() const { return time_struct_.tm_sec; } - const int32_t& usec() const { return usecs_; } - const int&(min)() const { return time_struct_.tm_min; } - const int& hour() const { return time_struct_.tm_hour; } - const int& day() const { return time_struct_.tm_mday; } - const int& month() const { return time_struct_.tm_mon; } - const int& year() const { return time_struct_.tm_year; } - const int& dayOfWeek() const { return time_struct_.tm_wday; } - const int& dayInYear() const { return time_struct_.tm_yday; } - const int& dst() const { return time_struct_.tm_isdst; } - const long int& gmtoff() const { return gmtoffset_; } - const std::tm& tm() const { return time_struct_; } + [[deprecated("Use LogMessageTime::when() instead.")]] std::time_t timestamp() + const noexcept { + return std::chrono::system_clock::to_time_t(when()); + } + const std::chrono::system_clock::time_point& when() const noexcept { + return timestamp_; + } + int sec() const noexcept { return tm_.tm_sec; } + long usec() const noexcept { return usecs_.count(); } + int(min)() const noexcept { return tm_.tm_min; } + int hour() const noexcept { return tm_.tm_hour; } + int day() const noexcept { return tm_.tm_mday; } + int month() const noexcept { return tm_.tm_mon; } + int year() const noexcept { return tm_.tm_year; } + int dayOfWeek() const noexcept { return tm_.tm_wday; } + int dayInYear() const noexcept { return tm_.tm_yday; } + int dst() const noexcept { return tm_.tm_isdst; } + [[deprecated("Use LogMessageTime::gmtoffset() instead.")]] long gmtoff() + const noexcept { + return gmtoffset_.count(); + } + std::chrono::seconds gmtoffset() const noexcept { return gmtoffset_; } + const std::tm& tm() const noexcept { return tm_; } private: - void init(const std::tm& t, std::time_t timestamp, WallTime now); - std::tm time_struct_; // Time of creation of LogMessage - time_t timestamp_; // Time of creation of LogMessage in seconds - int32_t usecs_; // Time of creation of LogMessage - microseconds part - long int gmtoffset_; - - void CalcGmtOffset(); + std::tm tm_{}; // Time of creation of LogMessage + std::chrono::system_clock::time_point + timestamp_; // Time of creation of LogMessage in seconds + std::chrono::microseconds usecs_; + std::chrono::seconds gmtoffset_; }; -#ifdef GLOG_CUSTOM_PREFIX_SUPPORT -struct LogMessageInfo { +struct [[deprecated("Use LogMessage instead.")]] LogMessageInfo { explicit LogMessageInfo(const char* const severity_, - const char* const filename_, - const int& line_number_, - const int& thread_id_, - const LogMessageTime& time_): - severity(severity_), filename(filename_), line_number(line_number_), - thread_id(thread_id_), time(time_) - {} + const char* const filename_, const int& line_number_, + std::thread::id thread_id_, + const LogMessageTime& time_) + : severity(severity_), + filename(filename_), + line_number(line_number_), + thread_id(thread_id_), + time(time_) {} const char* const severity; const char* const filename; - const int &line_number; - const int &thread_id; + const int& line_number; + std::thread::id thread_id; const LogMessageTime& time; }; -typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, void* data); - -#endif - -} - +} // namespace google // The global value of GOOGLE_STRIP_LOG. All the messages logged to // LOG(XXX) with severity less than GOOGLE_STRIP_LOG will not be displayed. @@ -182,7 +145,7 @@ typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, vo // file, add "#define GOOGLE_STRIP_LOG 1" to that file _before_ including // base/logging.h #ifndef GOOGLE_STRIP_LOG -#define GOOGLE_STRIP_LOG 0 +# define GOOGLE_STRIP_LOG 0 #endif // GCC can be told that a certain branch is not likely to be taken (for @@ -190,30 +153,48 @@ typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, vo // Giving it this information can help it optimize for the common case in // the absence of better information (ie. -fprofile-arcs). // -#ifndef GOOGLE_PREDICT_BRANCH_NOT_TAKEN -#if 1 -#define GOOGLE_PREDICT_BRANCH_NOT_TAKEN(x) (__builtin_expect(x, 0)) -#else -#define GOOGLE_PREDICT_BRANCH_NOT_TAKEN(x) x -#endif +#if defined(__has_builtin) +# if __has_builtin(__builtin_expect) +# define GLOG_BUILTIN_EXPECT_PRESENT +# endif #endif -#ifndef GOOGLE_PREDICT_FALSE -#if 1 -#define GOOGLE_PREDICT_FALSE(x) (__builtin_expect(x, 0)) -#else -#define GOOGLE_PREDICT_FALSE(x) x -#endif +#if !defined(GLOG_BUILTIN_EXPECT_PRESENT) && defined(__GNUG__) +// __has_builtin is not available prior to GCC 10 +# define GLOG_BUILTIN_EXPECT_PRESENT #endif -#ifndef GOOGLE_PREDICT_TRUE -#if 1 -#define GOOGLE_PREDICT_TRUE(x) (__builtin_expect(!!(x), 1)) +#if defined(GLOG_BUILTIN_EXPECT_PRESENT) + +# ifndef GOOGLE_PREDICT_BRANCH_NOT_TAKEN +# define GOOGLE_PREDICT_BRANCH_NOT_TAKEN(x) (__builtin_expect(x, 0)) +# endif + +# ifndef GOOGLE_PREDICT_FALSE +# define GOOGLE_PREDICT_FALSE(x) (__builtin_expect(x, 0)) +# endif + +# ifndef GOOGLE_PREDICT_TRUE +# define GOOGLE_PREDICT_TRUE(x) (__builtin_expect(!!(x), 1)) +# endif + #else -#define GOOGLE_PREDICT_TRUE(x) x -#endif + +# ifndef GOOGLE_PREDICT_BRANCH_NOT_TAKEN +# define GOOGLE_PREDICT_BRANCH_NOT_TAKEN(x) x +# endif + +# ifndef GOOGLE_PREDICT_TRUE +# define GOOGLE_PREDICT_FALSE(x) x +# endif + +# ifndef GOOGLE_PREDICT_TRUE +# define GOOGLE_PREDICT_TRUE(x) x +# endif + #endif +#undef GLOG_BUILTIN_EXPECT_PRESENT // Make a bunch of macros for logging. The way to log things is to stream // things to LOG(). E.g., @@ -226,7 +207,7 @@ typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, vo // vector errors; // LOG_STRING(ERROR, &errors) << "Couldn't parse cookie #" << cookie_num; // -// This pushes back the new error onto 'errors'; if given a NULL pointer, +// This pushes back the new error onto 'errors'; if given a nullptr pointer, // it reports the error via LOG(ERROR). // // You can also do conditional logging: @@ -311,11 +292,11 @@ typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, vo // "program with --v=1 or more"; // VLOG_EVERY_N(1, 10) // << "I'm printed every 10th occurrence, and when you run the program " -// "with --v=1 or more. Present occurence is " << google::COUNTER; +// "with --v=1 or more. Present occurrence is " << google::COUNTER; // VLOG_IF_EVERY_N(1, (size > 1024), 10) -// << "I'm printed on every 10th occurence of case when size is more " +// << "I'm printed on every 10th occurrence of case when size is more " // " than 1024, when you run the program with --v=1 or more. "; -// "Present occurence is " << google::COUNTER; +// "Present occurrence is " << google::COUNTER; // // The supported severity levels for macros that allow you to specify one // are (in increasing order of severity) INFO, WARNING, ERROR, and FATAL. @@ -369,234 +350,119 @@ typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, vo // synchronized. Hence, use caution when comparing the low bits of // timestamps from different machines. -#pragma push_macro("DECLARE_VARIABLE") -#pragma push_macro("DECLARE_bool") -#pragma push_macro("DECLARE_string") -#pragma push_macro("DECLARE_int32") -#pragma push_macro("DECLARE_uint32") - -#ifdef DECLARE_VARIABLE -#undef DECLARE_VARIABLE -#endif - -#ifdef DECLARE_bool -#undef DECLARE_bool -#endif - -#ifdef DECLARE_string -#undef DECLARE_string -#endif - -#ifdef DECLARE_int32 -#undef DECLARE_int32 -#endif - -#ifdef DECLARE_uint32 -#undef DECLARE_uint32 -#endif - -#ifndef DECLARE_VARIABLE -#define DECLARE_VARIABLE(type, shorttype, name, tn) \ - namespace fL##shorttype { \ - extern GLOG_EXPORT type FLAGS_##name; \ - } \ - using fL##shorttype::FLAGS_##name - -// bool specialization -#define DECLARE_bool(name) \ - DECLARE_VARIABLE(bool, B, name, bool) - -// int32 specialization -#define DECLARE_int32(name) \ - DECLARE_VARIABLE(google::int32, I, name, int32) - -#if !defined(DECLARE_uint32) -// uint32 specialization -#define DECLARE_uint32(name) \ - DECLARE_VARIABLE(google::uint32, U, name, uint32) -#endif // !defined(DECLARE_uint32) && !(0) - -// Special case for string, because we have to specify the namespace -// std::string, which doesn't play nicely with our FLAG__namespace hackery. -#define DECLARE_string(name) \ - namespace fLS { \ - extern GLOG_EXPORT std::string& FLAGS_##name; \ - } \ - using fLS::FLAGS_##name -#endif - -// Set whether appending a timestamp to the log file name -DECLARE_bool(timestamp_in_logfile_name); - -// Set whether log messages go to stdout instead of logfiles -DECLARE_bool(logtostdout); - -// Set color messages logged to stdout (if supported by terminal). -DECLARE_bool(colorlogtostdout); - -// Set whether log messages go to stderr instead of logfiles -DECLARE_bool(logtostderr); - -// Set whether log messages go to stderr in addition to logfiles. -DECLARE_bool(alsologtostderr); - -// Set color messages logged to stderr (if supported by terminal). -DECLARE_bool(colorlogtostderr); - -// Log messages at a level >= this flag are automatically sent to -// stderr in addition to log files. -DECLARE_int32(stderrthreshold); - -// Set whether the log prefix should be prepended to each line of output. -DECLARE_bool(log_prefix); - -// Set whether the year should be included in the log prefix. -DECLARE_bool(log_year_in_prefix); - -// Log messages at a level <= this flag are buffered. -// Log messages at a higher level are flushed immediately. -DECLARE_int32(logbuflevel); - -// Sets the maximum number of seconds which logs may be buffered for. -DECLARE_int32(logbufsecs); - -// Log suppression level: messages logged at a lower level than this -// are suppressed. -DECLARE_int32(minloglevel); - -// If specified, logfiles are written into this directory instead of the -// default logging directory. -DECLARE_string(log_dir); - -// Set the log file mode. -DECLARE_int32(logfile_mode); - -// Sets the path of the directory into which to put additional links -// to the log files. -DECLARE_string(log_link); - -DECLARE_int32(v); // in vlog_is_on.cc - -DECLARE_string(vmodule); // also in vlog_is_on.cc - -// Sets the maximum log file size (in MB). -DECLARE_uint32(max_log_size); - -// Sets whether to avoid logging to the disk if the disk is full. -DECLARE_bool(stop_logging_if_full_disk); - -// Use UTC time for logging -DECLARE_bool(log_utc_time); - // Log messages below the GOOGLE_STRIP_LOG level will be compiled away for -// security reasons. See LOG(severtiy) below. +// security reasons. See LOG(severity) below. // A few definitions of macros that don't generate much code. Since // LOG(INFO) and its ilk are used all over our code, it's // better to have compact code for these operations. #if GOOGLE_STRIP_LOG == 0 -#define COMPACT_GOOGLE_LOG_INFO google::LogMessage( \ - __FILE__, __LINE__) -#define LOG_TO_STRING_INFO(message) google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_INFO, message) +# define COMPACT_GOOGLE_LOG_INFO google::LogMessage(__FILE__, __LINE__) +# define LOG_TO_STRING_INFO(message) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_INFO, message) #else -#define COMPACT_GOOGLE_LOG_INFO google::NullStream() -#define LOG_TO_STRING_INFO(message) google::NullStream() +# define COMPACT_GOOGLE_LOG_INFO google::NullStream() +# define LOG_TO_STRING_INFO(message) google::NullStream() #endif #if GOOGLE_STRIP_LOG <= 1 -#define COMPACT_GOOGLE_LOG_WARNING google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_WARNING) -#define LOG_TO_STRING_WARNING(message) google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_WARNING, message) +# define COMPACT_GOOGLE_LOG_WARNING \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_WARNING) +# define LOG_TO_STRING_WARNING(message) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_WARNING, message) #else -#define COMPACT_GOOGLE_LOG_WARNING google::NullStream() -#define LOG_TO_STRING_WARNING(message) google::NullStream() +# define COMPACT_GOOGLE_LOG_WARNING google::NullStream() +# define LOG_TO_STRING_WARNING(message) google::NullStream() #endif #if GOOGLE_STRIP_LOG <= 2 -#define COMPACT_GOOGLE_LOG_ERROR google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ERROR) -#define LOG_TO_STRING_ERROR(message) google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ERROR, message) +# define COMPACT_GOOGLE_LOG_ERROR \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_ERROR) +# define LOG_TO_STRING_ERROR(message) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_ERROR, message) #else -#define COMPACT_GOOGLE_LOG_ERROR google::NullStream() -#define LOG_TO_STRING_ERROR(message) google::NullStream() +# define COMPACT_GOOGLE_LOG_ERROR google::NullStream() +# define LOG_TO_STRING_ERROR(message) google::NullStream() #endif #if GOOGLE_STRIP_LOG <= 3 -#define COMPACT_GOOGLE_LOG_FATAL google::LogMessageFatal( \ - __FILE__, __LINE__) -#define LOG_TO_STRING_FATAL(message) google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_FATAL, message) +# define COMPACT_GOOGLE_LOG_FATAL google::LogMessageFatal(__FILE__, __LINE__) +# define LOG_TO_STRING_FATAL(message) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_FATAL, message) #else -#define COMPACT_GOOGLE_LOG_FATAL google::NullStreamFatal() -#define LOG_TO_STRING_FATAL(message) google::NullStreamFatal() +# define COMPACT_GOOGLE_LOG_FATAL google::NullStreamFatal() +# define LOG_TO_STRING_FATAL(message) google::NullStreamFatal() #endif #if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON) -#define DCHECK_IS_ON() 0 +# define DCHECK_IS_ON() 0 #else -#define DCHECK_IS_ON() 1 +# define DCHECK_IS_ON() 1 #endif // For DFATAL, we want to use LogMessage (as opposed to // LogMessageFatal), to be consistent with the original behavior. #if !DCHECK_IS_ON() -#define COMPACT_GOOGLE_LOG_DFATAL COMPACT_GOOGLE_LOG_ERROR +# define COMPACT_GOOGLE_LOG_DFATAL COMPACT_GOOGLE_LOG_ERROR #elif GOOGLE_STRIP_LOG <= 3 -#define COMPACT_GOOGLE_LOG_DFATAL google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_FATAL) +# define COMPACT_GOOGLE_LOG_DFATAL \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_FATAL) #else -#define COMPACT_GOOGLE_LOG_DFATAL google::NullStreamFatal() +# define COMPACT_GOOGLE_LOG_DFATAL google::NullStreamFatal() #endif -#define GOOGLE_LOG_INFO(counter) google::LogMessage(__FILE__, __LINE__, google::GLOG_INFO, counter, &google::LogMessage::SendToLog) -#define SYSLOG_INFO(counter) \ +#define GOOGLE_LOG_INFO(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_INFO, counter, \ - &google::LogMessage::SendToSyslogAndLog) -#define GOOGLE_LOG_WARNING(counter) \ + &google::LogMessage::SendToLog) +#define SYSLOG_INFO(counter) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_INFO, counter, \ + &google::LogMessage::SendToSyslogAndLog) +#define GOOGLE_LOG_WARNING(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_WARNING, counter, \ - &google::LogMessage::SendToLog) -#define SYSLOG_WARNING(counter) \ + &google::LogMessage::SendToLog) +#define SYSLOG_WARNING(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_WARNING, counter, \ - &google::LogMessage::SendToSyslogAndLog) -#define GOOGLE_LOG_ERROR(counter) \ + &google::LogMessage::SendToSyslogAndLog) +#define GOOGLE_LOG_ERROR(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_ERROR, counter, \ - &google::LogMessage::SendToLog) -#define SYSLOG_ERROR(counter) \ + &google::LogMessage::SendToLog) +#define SYSLOG_ERROR(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_ERROR, counter, \ - &google::LogMessage::SendToSyslogAndLog) -#define GOOGLE_LOG_FATAL(counter) \ + &google::LogMessage::SendToSyslogAndLog) +#define GOOGLE_LOG_FATAL(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_FATAL, counter, \ - &google::LogMessage::SendToLog) -#define SYSLOG_FATAL(counter) \ + &google::LogMessage::SendToLog) +#define SYSLOG_FATAL(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_FATAL, counter, \ - &google::LogMessage::SendToSyslogAndLog) -#define GOOGLE_LOG_DFATAL(counter) \ + &google::LogMessage::SendToSyslogAndLog) +#define GOOGLE_LOG_DFATAL(counter) \ google::LogMessage(__FILE__, __LINE__, google::DFATAL_LEVEL, counter, \ - &google::LogMessage::SendToLog) -#define SYSLOG_DFATAL(counter) \ + &google::LogMessage::SendToLog) +#define SYSLOG_DFATAL(counter) \ google::LogMessage(__FILE__, __LINE__, google::DFATAL_LEVEL, counter, \ - &google::LogMessage::SendToSyslogAndLog) + &google::LogMessage::SendToSyslogAndLog) -#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) || defined(__CYGWIN32__) +#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || \ + defined(__CYGWIN__) || defined(__CYGWIN32__) // A very useful logging macro to log windows errors: -#define LOG_SYSRESULT(result) \ - if (FAILED(HRESULT_FROM_WIN32(result))) { \ - LPSTR message = NULL; \ - LPSTR msg = reinterpret_cast(&message); \ - DWORD message_length = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | \ - FORMAT_MESSAGE_FROM_SYSTEM, \ - 0, result, 0, msg, 100, NULL); \ - if (message_length > 0) { \ - google::LogMessage(__FILE__, __LINE__, google::GLOG_ERROR, 0, \ - &google::LogMessage::SendToLog).stream() \ - << reinterpret_cast(message); \ - LocalFree(message); \ - } \ - } +# define LOG_SYSRESULT(result) \ + if (FAILED(HRESULT_FROM_WIN32(result))) { \ + LPSTR message = nullptr; \ + LPSTR msg = reinterpret_cast(&message); \ + DWORD message_length = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | \ + FORMAT_MESSAGE_FROM_SYSTEM | \ + FORMAT_MESSAGE_IGNORE_INSERTS, \ + 0, result, 0, msg, 100, nullptr); \ + std::unique_ptr release{message, \ + &LocalFree}; \ + if (message_length > 0) { \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_ERROR, 0, \ + &google::LogMessage::SendToLog) \ + .stream() \ + << reinterpret_cast(message); \ + } \ + } #endif // We use the preprocessor's merging operator, "##", so that, e.g., @@ -607,24 +473,35 @@ DECLARE_bool(log_utc_time); // impossible to stream something like a string directly to an unnamed // ostream. We employ a neat hack by calling the stream() member // function of LogMessage which seems to avoid the problem. -#define LOG(severity) COMPACT_GOOGLE_LOG_ ## severity.stream() -#define SYSLOG(severity) SYSLOG_ ## severity(0).stream() +#define LOG(severity) COMPACT_GOOGLE_LOG_##severity.stream() +#define SYSLOG(severity) SYSLOG_##severity(0).stream() namespace google { -// They need the definitions of integer types. -#include -#include - // Initialize google's logging library. You will see the program name // specified by argv0 in log outputs. GLOG_EXPORT void InitGoogleLogging(const char* argv0); -#ifdef GLOG_CUSTOM_PREFIX_SUPPORT -GLOG_EXPORT void InitGoogleLogging(const char* argv0, - CustomPrefixCallback prefix_callback, - void* prefix_callback_data = NULL); -#endif +class LogMessage; + +#if defined(__GNUG__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#elif defined(_MSC_VER) +# pragma warning(push) +# pragma warning(disable : 4996) +#endif // __GNUG__ +using CustomPrefixCallback + [[deprecated("Use PrefixFormatterCallback instead.")]] = + void (*)(std::ostream&, const LogMessageInfo&, void*); +#if defined(__GNUG__) +# pragma GCC diagnostic pop +#elif defined(_MSC_VER) +# pragma warning(pop) +#endif // __GNUG__ +[[deprecated("Use InstallPrefixFormatter instead.")]] GLOG_EXPORT void +InitGoogleLogging(const char* argv0, CustomPrefixCallback prefix_callback, + void* prefix_callback_data = nullptr); // Check if google's logging library has been initialized. GLOG_EXPORT bool IsGoogleLoggingInitialized(); @@ -638,67 +515,81 @@ typedef void (*logging_fail_func_t)() __attribute__((noreturn)); typedef void (*logging_fail_func_t)(); #endif -// Install a function which will be called after LOG(FATAL). -GLOG_EXPORT void InstallFailureFunction(logging_fail_func_t fail_func); +using PrefixFormatterCallback = void (*)(std::ostream&, const LogMessage&, + void*); +GLOG_EXPORT void InstallPrefixFormatter(PrefixFormatterCallback callback, + void* data = nullptr); + +// Install a function which will be called after LOG(FATAL). Returns the +// previously set function. +GLOG_EXPORT logging_fail_func_t +InstallFailureFunction(logging_fail_func_t fail_func); + +[[deprecated( + "Use the type-safe std::chrono::minutes EnableLogCleaner overload " + "instead.")]] GLOG_EXPORT void +EnableLogCleaner(unsigned int overdue_days); // Enable/Disable old log cleaner. -GLOG_EXPORT void EnableLogCleaner(unsigned int overdue_days); +GLOG_EXPORT void EnableLogCleaner(const std::chrono::minutes& overdue); GLOG_EXPORT void DisableLogCleaner(); GLOG_EXPORT void SetApplicationFingerprint(const std::string& fingerprint); class LogSink; // defined below -// If a non-NULL sink pointer is given, we push this message to that sink. +// If a non-nullptr sink pointer is given, we push this message to that sink. // For LOG_TO_SINK we then do normal LOG(severity) logging as well. // This is useful for capturing messages and passing/storing them // somewhere more specific than the global log of the process. // Argument types: // LogSink* sink; // LogSeverity severity; -// The cast is to disambiguate NULL arguments. -#define LOG_TO_SINK(sink, severity) \ - google::LogMessage( \ - __FILE__, __LINE__, \ - google::GLOG_ ## severity, \ - static_cast(sink), true).stream() -#define LOG_TO_SINK_BUT_NOT_TO_LOGFILE(sink, severity) \ - google::LogMessage( \ - __FILE__, __LINE__, \ - google::GLOG_ ## severity, \ - static_cast(sink), false).stream() +// The cast is to disambiguate nullptr arguments. +#define LOG_TO_SINK(sink, severity) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + static_cast(sink), true) \ + .stream() +#define LOG_TO_SINK_BUT_NOT_TO_LOGFILE(sink, severity) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + static_cast(sink), false) \ + .stream() -// If a non-NULL string pointer is given, we write this message to that string. -// We then do normal LOG(severity) logging as well. -// This is useful for capturing messages and storing them somewhere more -// specific than the global log of the process. -// Argument types: +// If a non-nullptr string pointer is given, we write this message to that +// string. We then do normal LOG(severity) logging as well. This is useful for +// capturing messages and storing them somewhere more specific than the global +// log of the process. Argument types: // string* message; // LogSeverity severity; -// The cast is to disambiguate NULL arguments. +// The cast is to disambiguate nullptr arguments. // NOTE: LOG(severity) expands to LogMessage().stream() for the specified // severity. #define LOG_TO_STRING(severity, message) \ LOG_TO_STRING_##severity(static_cast(message)).stream() -// If a non-NULL pointer is given, we push the message onto the end +// If a non-nullptr pointer is given, we push the message onto the end // of a vector of strings; otherwise, we report it with LOG(severity). // This is handy for capturing messages and perhaps passing them back // to the caller, rather than reporting them immediately. // Argument types: // LogSeverity severity; // vector *outvec; -// The cast is to disambiguate NULL arguments. -#define LOG_STRING(severity, outvec) \ - LOG_TO_STRING_##severity(static_cast*>(outvec)).stream() +// The cast is to disambiguate nullptr arguments. +#define LOG_STRING(severity, outvec) \ + LOG_TO_STRING_##severity(static_cast*>(outvec)) \ + .stream() #define LOG_IF(severity, condition) \ static_cast(0), \ - !(condition) ? (void) 0 : google::LogMessageVoidify() & LOG(severity) + !(condition) \ + ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) #define SYSLOG_IF(severity, condition) \ static_cast(0), \ - !(condition) ? (void) 0 : google::LogMessageVoidify() & SYSLOG(severity) + !(condition) \ + ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & SYSLOG(severity) -#define LOG_ASSERT(condition) \ +#define LOG_ASSERT(condition) \ LOG_IF(FATAL, !(condition)) << "Assert failed: " #condition #define SYSLOG_ASSERT(condition) \ SYSLOG_IF(FATAL, !(condition)) << "Assert failed: " #condition @@ -707,58 +598,55 @@ class LogSink; // defined below // controlled by DCHECK_IS_ON(), so the check will be executed regardless of // compilation mode. Therefore, it is safe to do things like: // CHECK(fp->Write(x) == 4) -#define CHECK(condition) \ - LOG_IF(FATAL, GOOGLE_PREDICT_BRANCH_NOT_TAKEN(!(condition))) \ - << "Check failed: " #condition " " +#define CHECK(condition) \ + LOG_IF(FATAL, GOOGLE_PREDICT_BRANCH_NOT_TAKEN(!(condition))) \ + << "Check failed: " #condition " " + +namespace logging { +namespace internal { // A container for a string pointer which can be evaluated to a bool - -// true iff the pointer is NULL. +// true iff the pointer is nullptr. struct CheckOpString { - CheckOpString(std::string* str) : str_(str) { } - // No destructor: if str_ is non-NULL, we're about to LOG(FATAL), - // so there's no point in cleaning up str_. - operator bool() const { - return GOOGLE_PREDICT_BRANCH_NOT_TAKEN(str_ != NULL); + CheckOpString(std::unique_ptr str) : str_(std::move(str)) {} + explicit operator bool() const noexcept { + return GOOGLE_PREDICT_BRANCH_NOT_TAKEN(str_ != nullptr); } - std::string* str_; + std::unique_ptr str_; }; // Function is overloaded for integral types to allow static const // integrals declared in classes and not defined to be used as arguments to // CHECK* macros. It's not encouraged though. template -inline const T& GetReferenceableValue(const T& t) { return t; } -inline char GetReferenceableValue(char t) { return t; } -inline unsigned char GetReferenceableValue(unsigned char t) { return t; } -inline signed char GetReferenceableValue(signed char t) { return t; } -inline short GetReferenceableValue(short t) { return t; } -inline unsigned short GetReferenceableValue(unsigned short t) { return t; } -inline int GetReferenceableValue(int t) { return t; } -inline unsigned int GetReferenceableValue(unsigned int t) { return t; } -inline long GetReferenceableValue(long t) { return t; } -inline unsigned long GetReferenceableValue(unsigned long t) { return t; } -#if __cplusplus >= 201103L -inline long long GetReferenceableValue(long long t) { return t; } +inline const T& GetReferenceableValue(const T& t) { + return t; +} +inline char GetReferenceableValue(char t) { return t; } +inline unsigned char GetReferenceableValue(unsigned char t) { return t; } +inline signed char GetReferenceableValue(signed char t) { return t; } +inline short GetReferenceableValue(short t) { return t; } +inline unsigned short GetReferenceableValue(unsigned short t) { return t; } +inline int GetReferenceableValue(int t) { return t; } +inline unsigned int GetReferenceableValue(unsigned int t) { return t; } +inline long GetReferenceableValue(long t) { return t; } +inline unsigned long GetReferenceableValue(unsigned long t) { return t; } +inline long long GetReferenceableValue(long long t) { return t; } inline unsigned long long GetReferenceableValue(unsigned long long t) { return t; } -#endif // This is a dummy class to define the following operator. struct DummyClassToDefineOperator {}; -} - // Define global operator<< to declare using ::operator<<. // This declaration will allow use to use CHECK macros for user // defined classes which have operator<< (e.g., stl_logging.h). -inline std::ostream& operator<<( - std::ostream& out, const google::DummyClassToDefineOperator&) { +inline std::ostream& operator<<(std::ostream& out, + const DummyClassToDefineOperator&) { return out; } -namespace google { - // This formats a value for a failing CHECK_XX statement. Ordinarily, // it uses the definition for operator<<, with a few special cases below. template @@ -768,34 +656,29 @@ inline void MakeCheckOpValueString(std::ostream* os, const T& v) { // Overrides for char types provide readable values for unprintable // characters. -template <> GLOG_EXPORT -void MakeCheckOpValueString(std::ostream* os, const char& v); -template <> GLOG_EXPORT -void MakeCheckOpValueString(std::ostream* os, const signed char& v); -template <> GLOG_EXPORT -void MakeCheckOpValueString(std::ostream* os, const unsigned char& v); +template <> +GLOG_EXPORT void MakeCheckOpValueString(std::ostream* os, const char& v); +template <> +GLOG_EXPORT void MakeCheckOpValueString(std::ostream* os, const signed char& v); +template <> +GLOG_EXPORT void MakeCheckOpValueString(std::ostream* os, + const unsigned char& v); -// This is required because nullptr is only present in c++ 11 and later. -#if 1 && __cplusplus >= 201103L // Provide printable value for nullptr_t -template <> GLOG_EXPORT -void MakeCheckOpValueString(std::ostream* os, const std::nullptr_t& v); -#endif +template <> +GLOG_EXPORT void MakeCheckOpValueString(std::ostream* os, + const std::nullptr_t& v); // Build the error message string. Specify no inlining for code size. template -std::string* MakeCheckOpString(const T1& v1, const T2& v2, const char* exprtext) - __attribute__((noinline)); - -namespace base { -namespace internal { - -// If "s" is less than base_logging::INFO, returns base_logging::INFO. -// If "s" is greater than base_logging::FATAL, returns -// base_logging::ERROR. Otherwise, returns "s". -LogSeverity NormalizeSeverity(LogSeverity s); - -} // namespace internal +std::unique_ptr MakeCheckOpString(const T1& v1, const T2& v2, + const char* exprtext) +#if defined(__has_attribute) +# if __has_attribute(used) + __attribute__((noinline)) +# endif +#endif + ; // A helper class for formatting "expr (V1 vs. V2)" in a CHECK_XX // statement. See MakeCheckOpString for sample usage. Other @@ -806,7 +689,7 @@ LogSeverity NormalizeSeverity(LogSeverity s); class GLOG_EXPORT CheckOpMessageBuilder { public: // Inserts "exprtext" and " (" to the stream. - explicit CheckOpMessageBuilder(const char *exprtext); + explicit CheckOpMessageBuilder(const char* exprtext); // Deletes "stream_". ~CheckOpMessageBuilder(); // For inserting the first variable. @@ -814,17 +697,16 @@ class GLOG_EXPORT CheckOpMessageBuilder { // For inserting the second variable (adds an intermediate " vs. "). std::ostream* ForVar2(); // Get the result (inserts the closing ")"). - std::string* NewString(); + std::unique_ptr NewString(); private: - std::ostringstream *stream_; + std::ostringstream* stream_; }; -} // namespace base - template -std::string* MakeCheckOpString(const T1& v1, const T2& v2, const char* exprtext) { - base::CheckOpMessageBuilder comb(exprtext); +std::unique_ptr MakeCheckOpString(const T1& v1, const T2& v2, + const char* exprtext) { + CheckOpMessageBuilder comb(exprtext); MakeCheckOpValueString(comb.ForVar1(), v1); MakeCheckOpValueString(comb.ForVar2(), v2); return comb.NewString(); @@ -834,27 +716,31 @@ std::string* MakeCheckOpString(const T1& v1, const T2& v2, const char* exprtext) // The (int, int) specialization works around the issue that the compiler // will not instantiate the template version of the function on values of // unnamed enum type - see comment below. -#define DEFINE_CHECK_OP_IMPL(name, op) \ - template \ - inline std::string* name##Impl(const T1& v1, const T2& v2, \ - const char* exprtext) { \ - if (GOOGLE_PREDICT_TRUE(v1 op v2)) return NULL; \ - else return MakeCheckOpString(v1, v2, exprtext); \ - } \ - inline std::string* name##Impl(int v1, int v2, const char* exprtext) { \ - return name##Impl(v1, v2, exprtext); \ +#define DEFINE_CHECK_OP_IMPL(name, op) \ + template \ + inline std::unique_ptr name##Impl(const T1& v1, const T2& v2, \ + const char* exprtext) { \ + if (GOOGLE_PREDICT_TRUE(v1 op v2)) { \ + return nullptr; \ + } \ + return MakeCheckOpString(v1, v2, exprtext); \ + } \ + inline std::unique_ptr name##Impl(int v1, int v2, \ + const char* exprtext) { \ + return name##Impl(v1, v2, exprtext); \ } // We use the full name Check_EQ, Check_NE, etc. in case the file including // base/logging.h provides its own #defines for the simpler names EQ, NE, etc. // This happens if, for example, those are used as token names in a // yacc grammar. -DEFINE_CHECK_OP_IMPL(Check_EQ, ==) // Compilation error with CHECK_EQ(NULL, x)? -DEFINE_CHECK_OP_IMPL(Check_NE, !=) // Use CHECK(x == NULL) instead. +DEFINE_CHECK_OP_IMPL(Check_EQ, ==) +DEFINE_CHECK_OP_IMPL(Check_NE, !=) DEFINE_CHECK_OP_IMPL(Check_LE, <=) -DEFINE_CHECK_OP_IMPL(Check_LT, < ) +DEFINE_CHECK_OP_IMPL(Check_LT, <) DEFINE_CHECK_OP_IMPL(Check_GE, >=) -DEFINE_CHECK_OP_IMPL(Check_GT, > ) +DEFINE_CHECK_OP_IMPL(Check_GT, >) + #undef DEFINE_CHECK_OP_IMPL // Helper macro for binary operators. @@ -862,10 +748,10 @@ DEFINE_CHECK_OP_IMPL(Check_GT, > ) #if defined(STATIC_ANALYSIS) // Only for static analysis tool to know that it is equivalent to assert -#define CHECK_OP_LOG(name, op, val1, val2, log) CHECK((val1) op (val2)) +# define CHECK_OP_LOG(name, op, val1, val2, log) CHECK((val1)op(val2)) #elif DCHECK_IS_ON() // In debug mode, avoid constructing CheckOpStrings if possible, -// to reduce the overhead of CHECK statments by 2x. +// to reduce the overhead of CHECK statements by 2x. // Real DCHECK-heavy tests have seen 1.5x speedups. // The meaning of "string" might be different between now and @@ -873,34 +759,35 @@ DEFINE_CHECK_OP_IMPL(Check_GT, > ) // with other string implementations that get defined after this // file is included). Save the current meaning now and use it // in the macro. -typedef std::string _Check_string; -#define CHECK_OP_LOG(name, op, val1, val2, log) \ - while (google::_Check_string* _result = \ - google::Check##name##Impl( \ - google::GetReferenceableValue(val1), \ - google::GetReferenceableValue(val2), \ - #val1 " " #op " " #val2)) \ - log(__FILE__, __LINE__, \ - google::CheckOpString(_result)).stream() +using _Check_string = std::string; +# define CHECK_OP_LOG(name, op, val1, val2, log) \ + while (std::unique_ptr _result = \ + google::logging::internal::Check##name##Impl( \ + google::logging::internal::GetReferenceableValue(val1), \ + google::logging::internal::GetReferenceableValue(val2), \ + #val1 " " #op " " #val2)) \ + log(__FILE__, __LINE__, \ + google::logging::internal::CheckOpString(std::move(_result))) \ + .stream() #else // In optimized mode, use CheckOpString to hint to compiler that // the while condition is unlikely. -#define CHECK_OP_LOG(name, op, val1, val2, log) \ - while (google::CheckOpString _result = \ - google::Check##name##Impl( \ - google::GetReferenceableValue(val1), \ - google::GetReferenceableValue(val2), \ - #val1 " " #op " " #val2)) \ +# define CHECK_OP_LOG(name, op, val1, val2, log) \ + while (google::logging::internal::CheckOpString _result = \ + google::logging::internal::Check##name##Impl( \ + google::logging::internal::GetReferenceableValue(val1), \ + google::logging::internal::GetReferenceableValue(val2), \ + #val1 " " #op " " #val2)) \ log(__FILE__, __LINE__, _result).stream() #endif // STATIC_ANALYSIS, DCHECK_IS_ON() #if GOOGLE_STRIP_LOG <= 3 -#define CHECK_OP(name, op, val1, val2) \ - CHECK_OP_LOG(name, op, val1, val2, google::LogMessageFatal) +# define CHECK_OP(name, op, val1, val2) \ + CHECK_OP_LOG(name, op, val1, val2, google::LogMessageFatal) #else -#define CHECK_OP(name, op, val1, val2) \ - CHECK_OP_LOG(name, op, val1, val2, google::NullStreamFatal) -#endif // STRIP_LOG <= 3 +# define CHECK_OP(name, op, val1, val2) \ + CHECK_OP_LOG(name, op, val1, val2, google::NullStreamFatal) +#endif // STRIP_LOG <= 3 // Equality/Inequality checks - compare two values, and log a FATAL message // including the two values when the result is not as expected. The values @@ -917,41 +804,46 @@ typedef std::string _Check_string; // CHECK_EQ(string("abc")[1], 'b'); // // WARNING: These don't compile correctly if one of the arguments is a pointer -// and the other is NULL. To work around this, simply static_cast NULL to the -// type of the desired pointer. +// and the other is nullptr. To work around this, simply static_cast nullptr to +// the type of the desired pointer. #define CHECK_EQ(val1, val2) CHECK_OP(_EQ, ==, val1, val2) #define CHECK_NE(val1, val2) CHECK_OP(_NE, !=, val1, val2) #define CHECK_LE(val1, val2) CHECK_OP(_LE, <=, val1, val2) -#define CHECK_LT(val1, val2) CHECK_OP(_LT, < , val1, val2) +#define CHECK_LT(val1, val2) CHECK_OP(_LT, <, val1, val2) #define CHECK_GE(val1, val2) CHECK_OP(_GE, >=, val1, val2) -#define CHECK_GT(val1, val2) CHECK_OP(_GT, > , val1, val2) +#define CHECK_GT(val1, val2) CHECK_OP(_GT, >, val1, val2) -// Check that the input is non NULL. This very useful in constructor +// Check that the input is non nullptr. This very useful in constructor // initializer lists. -#define CHECK_NOTNULL(val) \ - google::CheckNotNull(__FILE__, __LINE__, "'" #val "' Must be non NULL", (val)) +#define CHECK_NOTNULL(val) \ + google::logging::internal::CheckNotNull( \ + __FILE__, __LINE__, "'" #val "' Must be non nullptr", (val)) // Helper functions for string comparisons. // To avoid bloat, the definitions are in logging.cc. -#define DECLARE_CHECK_STROP_IMPL(func, expected) \ - GLOG_EXPORT std::string* Check##func##expected##Impl( \ +#define DECLARE_CHECK_STROP_IMPL(func, expected) \ + GLOG_EXPORT std::unique_ptr Check##func##expected##Impl( \ const char* s1, const char* s2, const char* names); + DECLARE_CHECK_STROP_IMPL(strcmp, true) DECLARE_CHECK_STROP_IMPL(strcmp, false) DECLARE_CHECK_STROP_IMPL(strcasecmp, true) DECLARE_CHECK_STROP_IMPL(strcasecmp, false) + +} // namespace internal +} // namespace logging + #undef DECLARE_CHECK_STROP_IMPL // Helper macro for string comparisons. // Don't use this macro directly in your code, use CHECK_STREQ et al below. -#define CHECK_STROP(func, op, expected, s1, s2) \ - while (google::CheckOpString _result = \ - google::Check##func##expected##Impl((s1), (s2), \ - #s1 " " #op " " #s2)) \ - LOG(FATAL) << *_result.str_ - +#define CHECK_STROP(func, op, expected, s1, s2) \ + while (google::logging::internal::CheckOpString _result = \ + google::logging::internal::Check##func##expected##Impl( \ + (s1), (s2), #s1 " " #op " " #s2)) \ + LOG(FATAL) << (*_result.str_) // String (char*) equality/inequality checks. // CASE versions are case-insensitive. @@ -965,19 +857,19 @@ DECLARE_CHECK_STROP_IMPL(strcasecmp, false) #define CHECK_STRCASEEQ(s1, s2) CHECK_STROP(strcasecmp, ==, true, s1, s2) #define CHECK_STRCASENE(s1, s2) CHECK_STROP(strcasecmp, !=, false, s1, s2) -#define CHECK_INDEX(I,A) CHECK(I < (sizeof(A)/sizeof(A[0]))) -#define CHECK_BOUND(B,A) CHECK(B <= (sizeof(A)/sizeof(A[0]))) +#define CHECK_INDEX(I, A) CHECK(I < (sizeof(A) / sizeof(A[0]))) +#define CHECK_BOUND(B, A) CHECK(B <= (sizeof(A) / sizeof(A[0]))) -#define CHECK_DOUBLE_EQ(val1, val2) \ - do { \ - CHECK_LE((val1), (val2)+0.000000000000001L); \ - CHECK_GE((val1), (val2)-0.000000000000001L); \ +#define CHECK_DOUBLE_EQ(val1, val2) \ + do { \ + CHECK_LE((val1), (val2) + 0.000000000000001L); \ + CHECK_GE((val1), (val2)-0.000000000000001L); \ } while (0) -#define CHECK_NEAR(val1, val2, margin) \ - do { \ - CHECK_LE((val1), (val2)+(margin)); \ - CHECK_GE((val1), (val2)-(margin)); \ +#define CHECK_NEAR(val1, val2, margin) \ + do { \ + CHECK_LE((val1), (val2) + (margin)); \ + CHECK_GE((val1), (val2) - (margin)); \ } while (0) // perror()..googly style! @@ -988,21 +880,22 @@ DECLARE_CHECK_STROP_IMPL(strcasecmp, false) #define PLOG(severity) GOOGLE_PLOG(severity, 0).stream() -#define GOOGLE_PLOG(severity, counter) \ - google::ErrnoLogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, counter, \ - &google::LogMessage::SendToLog) +#define GOOGLE_PLOG(severity, counter) \ + google::ErrnoLogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + counter, &google::LogMessage::SendToLog) #define PLOG_IF(severity, condition) \ static_cast(0), \ - !(condition) ? (void) 0 : google::LogMessageVoidify() & PLOG(severity) + !(condition) \ + ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & PLOG(severity) // A CHECK() macro that postpends errno if the condition is false. E.g. // // if (poll(fds, nfds, timeout) == -1) { PCHECK(errno == EINTR); ... } -#define PCHECK(condition) \ - PLOG_IF(FATAL, GOOGLE_PREDICT_BRANCH_NOT_TAKEN(!(condition))) \ - << "Check failed: " #condition " " +#define PCHECK(condition) \ + PLOG_IF(FATAL, GOOGLE_PREDICT_BRANCH_NOT_TAKEN(!(condition))) \ + << "Check failed: " #condition " " // A CHECK() macro that lets you assert the success of a function that // returns -1 and sets errno in case of an error. E.g. @@ -1012,258 +905,117 @@ DECLARE_CHECK_STROP_IMPL(strcasecmp, false) // or // // int fd = open(filename, flags); CHECK_ERR(fd) << ": open " << filename; -#define CHECK_ERR(invocation) \ -PLOG_IF(FATAL, GOOGLE_PREDICT_BRANCH_NOT_TAKEN((invocation) == -1)) \ - << #invocation +#define CHECK_ERR(invocation) \ + PLOG_IF(FATAL, GOOGLE_PREDICT_BRANCH_NOT_TAKEN((invocation) == -1)) \ + << #invocation // Use macro expansion to create, for each use of LOG_EVERY_N(), static // variables with the __LINE__ expansion as part of the variable name. #define LOG_EVERY_N_VARNAME(base, line) LOG_EVERY_N_VARNAME_CONCAT(base, line) -#define LOG_EVERY_N_VARNAME_CONCAT(base, line) base ## line +#define LOG_EVERY_N_VARNAME_CONCAT(base, line) base##line #define LOG_OCCURRENCES LOG_EVERY_N_VARNAME(occurrences_, __LINE__) #define LOG_OCCURRENCES_MOD_N LOG_EVERY_N_VARNAME(occurrences_mod_n_, __LINE__) -#if 1 && __cplusplus >= 201103L -#define GLOG_CONSTEXPR constexpr -#else -#define GLOG_CONSTEXPR const -#endif - #define LOG_TIME_PERIOD LOG_EVERY_N_VARNAME(timePeriod_, __LINE__) #define LOG_PREVIOUS_TIME_RAW LOG_EVERY_N_VARNAME(previousTimeRaw_, __LINE__) #define LOG_TIME_DELTA LOG_EVERY_N_VARNAME(deltaTime_, __LINE__) #define LOG_CURRENT_TIME LOG_EVERY_N_VARNAME(currentTime_, __LINE__) #define LOG_PREVIOUS_TIME LOG_EVERY_N_VARNAME(previousTime_, __LINE__) -#if defined(__has_feature) -# if __has_feature(thread_sanitizer) -# define GLOG_SANITIZE_THREAD 1 -# endif -#endif - -#if !defined(GLOG_SANITIZE_THREAD) && defined(__SANITIZE_THREAD__) && __SANITIZE_THREAD__ -# define GLOG_SANITIZE_THREAD 1 -#endif - -#if defined(GLOG_SANITIZE_THREAD) -#define GLOG_IFDEF_THREAD_SANITIZER(X) X -#else -#define GLOG_IFDEF_THREAD_SANITIZER(X) -#endif - -#if defined(GLOG_SANITIZE_THREAD) -} // namespace google - -// We need to identify the static variables as "benign" races -// to avoid noisy reports from TSAN. -extern "C" void AnnotateBenignRaceSized( - const char *file, - int line, - const volatile void *mem, - size_t size, - const char *description); +} // namespace google namespace google { -#endif -#if __cplusplus >= 201103L && 1 && 1 // Have and -#define SOME_KIND_OF_LOG_EVERY_T(severity, seconds) \ - GLOG_CONSTEXPR std::chrono::nanoseconds LOG_TIME_PERIOD = std::chrono::duration_cast(std::chrono::duration(seconds)); \ - static std::atomic LOG_PREVIOUS_TIME_RAW; \ - GLOG_IFDEF_THREAD_SANITIZER( \ - AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_TIME_PERIOD, sizeof(google::int64), "")); \ - GLOG_IFDEF_THREAD_SANITIZER( \ - AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_PREVIOUS_TIME_RAW, sizeof(google::int64), "")); \ - const auto LOG_CURRENT_TIME = std::chrono::duration_cast(std::chrono::steady_clock::now().time_since_epoch()); \ - const auto LOG_PREVIOUS_TIME = LOG_PREVIOUS_TIME_RAW.load(std::memory_order_relaxed); \ - const auto LOG_TIME_DELTA = LOG_CURRENT_TIME - std::chrono::nanoseconds(LOG_PREVIOUS_TIME); \ - if (LOG_TIME_DELTA > LOG_TIME_PERIOD) \ - LOG_PREVIOUS_TIME_RAW.store(std::chrono::duration_cast(LOG_CURRENT_TIME).count(), std::memory_order_relaxed); \ - if (LOG_TIME_DELTA > LOG_TIME_PERIOD) google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity).stream() -#elif defined(GLOG_OS_WINDOWS) -#define SOME_KIND_OF_LOG_EVERY_T(severity, seconds) \ - GLOG_CONSTEXPR LONGLONG LOG_TIME_PERIOD = (seconds) * LONGLONG(1000000000); \ - static LARGE_INTEGER LOG_PREVIOUS_TIME; \ - LONGLONG LOG_TIME_DELTA; \ - { \ - LARGE_INTEGER currTime; \ - LARGE_INTEGER freq; \ - QueryPerformanceCounter(&currTime); \ - QueryPerformanceFrequency(&freq); \ - InterlockedCompareExchange64(&LOG_PREVIOUS_TIME.QuadPart, currTime.QuadPart, 0); \ - LOG_TIME_DELTA = (currTime.QuadPart - LOG_PREVIOUS_TIME.QuadPart) * LONGLONG(1000000000) / freq.QuadPart; \ - if (LOG_TIME_DELTA > LOG_TIME_PERIOD) InterlockedExchange64(&LOG_PREVIOUS_TIME.QuadPart, currTime.QuadPart); \ - } \ - if (LOG_TIME_DELTA > LOG_TIME_PERIOD) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity).stream() -#else -#define SOME_KIND_OF_LOG_EVERY_T(severity, seconds) \ - GLOG_CONSTEXPR google::int64 LOG_TIME_PERIOD(seconds * 1000000000); \ - static google::int64 LOG_PREVIOUS_TIME; \ - google::int64 LOG_TIME_DELTA = 0; \ - { \ - timespec currentTime = {}; \ - clock_gettime(CLOCK_MONOTONIC, ¤tTime); \ - LOG_TIME_DELTA = (currentTime.tv_sec * 1000000000 + currentTime.tv_nsec) - LOG_PREVIOUS_TIME; \ - } \ - if (LOG_TIME_DELTA > LOG_TIME_PERIOD) __sync_add_and_fetch(&LOG_PREVIOUS_TIME, LOG_TIME_DELTA); \ - if (LOG_TIME_DELTA > LOG_TIME_PERIOD) google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity).stream() -#endif +#define SOME_KIND_OF_LOG_EVERY_T(severity, seconds) \ + constexpr std::chrono::nanoseconds LOG_TIME_PERIOD = \ + std::chrono::duration_cast( \ + std::chrono::duration(seconds)); \ + static std::atomic LOG_PREVIOUS_TIME_RAW; \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_TIME_PERIOD, sizeof(google::int64), "")); \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_PREVIOUS_TIME_RAW, sizeof(google::int64), "")); \ + const auto LOG_CURRENT_TIME = \ + std::chrono::duration_cast( \ + std::chrono::steady_clock::now().time_since_epoch()); \ + const auto LOG_PREVIOUS_TIME = \ + LOG_PREVIOUS_TIME_RAW.load(std::memory_order_relaxed); \ + const auto LOG_TIME_DELTA = \ + LOG_CURRENT_TIME - std::chrono::nanoseconds(LOG_PREVIOUS_TIME); \ + if (LOG_TIME_DELTA > LOG_TIME_PERIOD) \ + LOG_PREVIOUS_TIME_RAW.store( \ + std::chrono::duration_cast(LOG_CURRENT_TIME) \ + .count(), \ + std::memory_order_relaxed); \ + if (LOG_TIME_DELTA > LOG_TIME_PERIOD) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_##severity).stream() -#if 1 && __cplusplus >= 201103L -#define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ +#define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ static std::atomic LOG_OCCURRENCES(0), LOG_OCCURRENCES_MOD_N(0); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES_MOD_N, sizeof(int), "")); \ - ++LOG_OCCURRENCES; \ - if (++LOG_OCCURRENCES_MOD_N > n) LOG_OCCURRENCES_MOD_N -= n; \ - if (LOG_OCCURRENCES_MOD_N == 1) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES_MOD_N, sizeof(int), "")); \ + ++LOG_OCCURRENCES; \ + if (++LOG_OCCURRENCES_MOD_N > n) LOG_OCCURRENCES_MOD_N -= n; \ + if (LOG_OCCURRENCES_MOD_N == 1) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + LOG_OCCURRENCES, &what_to_do) \ + .stream() -#define SOME_KIND_OF_LOG_IF_EVERY_N(severity, condition, n, what_to_do) \ +#define SOME_KIND_OF_LOG_IF_EVERY_N(severity, condition, n, what_to_do) \ + static std::atomic LOG_OCCURRENCES(0), LOG_OCCURRENCES_MOD_N(0); \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES_MOD_N, sizeof(int), "")); \ + ++LOG_OCCURRENCES; \ + if ((condition) && \ + ((LOG_OCCURRENCES_MOD_N = (LOG_OCCURRENCES_MOD_N + 1) % n) == (1 % n))) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + LOG_OCCURRENCES, &what_to_do) \ + .stream() + +#define SOME_KIND_OF_PLOG_EVERY_N(severity, n, what_to_do) \ static std::atomic LOG_OCCURRENCES(0), LOG_OCCURRENCES_MOD_N(0); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES_MOD_N, sizeof(int), "")); \ - ++LOG_OCCURRENCES; \ - if ((condition) && \ - ((LOG_OCCURRENCES_MOD_N=(LOG_OCCURRENCES_MOD_N + 1) % n) == (1 % n))) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES_MOD_N, sizeof(int), "")); \ + ++LOG_OCCURRENCES; \ + if (++LOG_OCCURRENCES_MOD_N > n) LOG_OCCURRENCES_MOD_N -= n; \ + if (LOG_OCCURRENCES_MOD_N == 1) \ + google::ErrnoLogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + LOG_OCCURRENCES, &what_to_do) \ + .stream() -#define SOME_KIND_OF_PLOG_EVERY_N(severity, n, what_to_do) \ - static std::atomic LOG_OCCURRENCES(0), LOG_OCCURRENCES_MOD_N(0); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES_MOD_N, sizeof(int), "")); \ - ++LOG_OCCURRENCES; \ - if (++LOG_OCCURRENCES_MOD_N > n) LOG_OCCURRENCES_MOD_N -= n; \ - if (LOG_OCCURRENCES_MOD_N == 1) \ - google::ErrnoLogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() +#define SOME_KIND_OF_LOG_FIRST_N(severity, n, what_to_do) \ + static std::atomic LOG_OCCURRENCES(0); \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ + if (LOG_OCCURRENCES <= n) ++LOG_OCCURRENCES; \ + if (LOG_OCCURRENCES <= n) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + LOG_OCCURRENCES, &what_to_do) \ + .stream() -#define SOME_KIND_OF_LOG_FIRST_N(severity, n, what_to_do) \ - static std::atomic LOG_OCCURRENCES(0); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ - if (LOG_OCCURRENCES <= n) \ - ++LOG_OCCURRENCES; \ - if (LOG_OCCURRENCES <= n) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#elif defined(GLOG_OS_WINDOWS) - -#define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ - static volatile unsigned LOG_OCCURRENCES = 0; \ - static volatile unsigned LOG_OCCURRENCES_MOD_N = 0; \ - InterlockedIncrement(&LOG_OCCURRENCES); \ - if (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) > n) \ - InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n); \ - if (LOG_OCCURRENCES_MOD_N == 1) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#define SOME_KIND_OF_LOG_IF_EVERY_N(severity, condition, n, what_to_do) \ - static volatile unsigned LOG_OCCURRENCES = 0; \ - static volatile unsigned LOG_OCCURRENCES_MOD_N = 0; \ - InterlockedIncrement(&LOG_OCCURRENCES); \ - if ((condition) && \ - ((InterlockedIncrement(&LOG_OCCURRENCES_MOD_N), \ - (LOG_OCCURRENCES_MOD_N > n && InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n))), \ - LOG_OCCURRENCES_MOD_N == 1)) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#define SOME_KIND_OF_PLOG_EVERY_N(severity, n, what_to_do) \ - static volatile unsigned LOG_OCCURRENCES = 0; \ - static volatile unsigned LOG_OCCURRENCES_MOD_N = 0; \ - InterlockedIncrement(&LOG_OCCURRENCES); \ - if (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) > n) \ - InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n); \ - if (LOG_OCCURRENCES_MOD_N == 1) \ - google::ErrnoLogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#define SOME_KIND_OF_LOG_FIRST_N(severity, n, what_to_do) \ - static volatile unsigned LOG_OCCURRENCES = 0; \ - if (LOG_OCCURRENCES <= n) \ - InterlockedIncrement(&LOG_OCCURRENCES); \ - if (LOG_OCCURRENCES <= n) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#else - -#define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ - static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ - __sync_add_and_fetch(&LOG_OCCURRENCES, 1); \ - if (__sync_add_and_fetch(&LOG_OCCURRENCES_MOD_N, 1) > n) \ - __sync_sub_and_fetch(&LOG_OCCURRENCES_MOD_N, n); \ - if (LOG_OCCURRENCES_MOD_N == 1) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#define SOME_KIND_OF_LOG_IF_EVERY_N(severity, condition, n, what_to_do) \ - static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ - __sync_add_and_fetch(&LOG_OCCURRENCES, 1); \ - if ((condition) && \ - (__sync_add_and_fetch(&LOG_OCCURRENCES_MOD_N, 1) || true) && \ - ((LOG_OCCURRENCES_MOD_N >= n && __sync_sub_and_fetch(&LOG_OCCURRENCES_MOD_N, n)) || true) && \ - LOG_OCCURRENCES_MOD_N == (1 % n)) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#define SOME_KIND_OF_PLOG_EVERY_N(severity, n, what_to_do) \ - static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ - __sync_add_and_fetch(&LOG_OCCURRENCES, 1); \ - if (__sync_add_and_fetch(&LOG_OCCURRENCES_MOD_N, 1) > n) \ - __sync_sub_and_fetch(&LOG_OCCURRENCES_MOD_N, n); \ - if (LOG_OCCURRENCES_MOD_N == 1) \ - google::ErrnoLogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#define SOME_KIND_OF_LOG_FIRST_N(severity, n, what_to_do) \ - static int LOG_OCCURRENCES = 0; \ - if (LOG_OCCURRENCES <= n) \ - __sync_add_and_fetch(&LOG_OCCURRENCES, 1); \ - if (LOG_OCCURRENCES <= n) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() -#endif - -namespace glog_internal_namespace_ { +namespace logging { +namespace internal { template -struct CompileAssert { -}; +struct CompileAssert {}; struct CrashReason; +} // namespace internal +} // namespace logging -// Returns true if FailureSignalHandler is installed. -// Needs to be exported since it's used by the signalhandler_unittest. -GLOG_EXPORT bool IsFailureSignalHandlerInstalled(); -} // namespace glog_internal_namespace_ - -#define LOG_EVERY_N(severity, n) \ +#define LOG_EVERY_N(severity, n) \ SOME_KIND_OF_LOG_EVERY_N(severity, (n), google::LogMessage::SendToLog) #define LOG_EVERY_T(severity, T) SOME_KIND_OF_LOG_EVERY_T(severity, (T)) -#define SYSLOG_EVERY_N(severity, n) \ - SOME_KIND_OF_LOG_EVERY_N(severity, (n), google::LogMessage::SendToSyslogAndLog) +#define SYSLOG_EVERY_N(severity, n) \ + SOME_KIND_OF_LOG_EVERY_N(severity, (n), \ + google::LogMessage::SendToSyslogAndLog) #define PLOG_EVERY_N(severity, n) \ SOME_KIND_OF_PLOG_EVERY_N(severity, (n), google::LogMessage::SendToLog) @@ -1271,146 +1023,157 @@ GLOG_EXPORT bool IsFailureSignalHandlerInstalled(); #define LOG_FIRST_N(severity, n) \ SOME_KIND_OF_LOG_FIRST_N(severity, (n), google::LogMessage::SendToLog) -#define LOG_IF_EVERY_N(severity, condition, n) \ - SOME_KIND_OF_LOG_IF_EVERY_N(severity, (condition), (n), google::LogMessage::SendToLog) +#define LOG_IF_EVERY_N(severity, condition, n) \ + SOME_KIND_OF_LOG_IF_EVERY_N(severity, (condition), (n), \ + google::LogMessage::SendToLog) // We want the special COUNTER value available for LOG_EVERY_X()'ed messages -enum PRIVATE_Counter {COUNTER}; +struct Counter_t {}; +GLOG_INLINE_VARIABLE constexpr Counter_t COUNTER{}; #ifdef GLOG_NO_ABBREVIATED_SEVERITIES // wingdi.h defines ERROR to be 0. When we call LOG(ERROR), it gets // substituted with 0, and it expands to COMPACT_GOOGLE_LOG_0. To allow us // to keep using this syntax, we define this macro to do the same thing // as COMPACT_GOOGLE_LOG_ERROR. -#define COMPACT_GOOGLE_LOG_0 COMPACT_GOOGLE_LOG_ERROR -#define SYSLOG_0 SYSLOG_ERROR -#define LOG_TO_STRING_0 LOG_TO_STRING_ERROR +# define COMPACT_GOOGLE_LOG_0 COMPACT_GOOGLE_LOG_ERROR +# define SYSLOG_0 SYSLOG_ERROR +# define LOG_TO_STRING_0 LOG_TO_STRING_ERROR // Needed for LOG_IS_ON(ERROR). -const LogSeverity GLOG_0 = GLOG_ERROR; +GLOG_INLINE_VARIABLE +constexpr LogSeverity GLOG_0 = GLOG_ERROR; #else // Users may include windows.h after logging.h without // GLOG_NO_ABBREVIATED_SEVERITIES nor WIN32_LEAN_AND_MEAN. // For this case, we cannot detect if ERROR is defined before users // actually use ERROR. Let's make an undefined symbol to warn users. -# define GLOG_ERROR_MSG ERROR_macro_is_defined_Define_GLOG_NO_ABBREVIATED_SEVERITIES_before_including_logging_h_See_the_document_for_detail -# define COMPACT_GOOGLE_LOG_0 GLOG_ERROR_MSG -# define SYSLOG_0 GLOG_ERROR_MSG -# define LOG_TO_STRING_0 GLOG_ERROR_MSG -# define GLOG_0 GLOG_ERROR_MSG +# define GLOG_ERROR_MSG \ + ERROR_macro_is_defined_Define_GLOG_NO_ABBREVIATED_SEVERITIES_before_including_logging_h_See_the_document_for_detail +# define COMPACT_GOOGLE_LOG_0 GLOG_ERROR_MSG +# define SYSLOG_0 GLOG_ERROR_MSG +# define LOG_TO_STRING_0 GLOG_ERROR_MSG +# define GLOG_0 GLOG_ERROR_MSG #endif // Plus some debug-logging macros that get compiled to nothing for production #if DCHECK_IS_ON() -#define DLOG(severity) LOG(severity) -#define DVLOG(verboselevel) VLOG(verboselevel) -#define DLOG_IF(severity, condition) LOG_IF(severity, condition) -#define DLOG_EVERY_N(severity, n) LOG_EVERY_N(severity, n) -#define DLOG_IF_EVERY_N(severity, condition, n) \ - LOG_IF_EVERY_N(severity, condition, n) -#define DLOG_ASSERT(condition) LOG_ASSERT(condition) +# define DLOG(severity) LOG(severity) +# define DVLOG(verboselevel) VLOG(verboselevel) +# define DLOG_IF(severity, condition) LOG_IF(severity, condition) +# define DLOG_EVERY_N(severity, n) LOG_EVERY_N(severity, n) +# define DLOG_IF_EVERY_N(severity, condition, n) \ + LOG_IF_EVERY_N(severity, condition, n) +# define DLOG_FIRST_N(severity, n) LOG_FIRST_N(severity, n) +# define DLOG_EVERY_T(severity, T) LOG_EVERY_T(severity, T) +# define DLOG_ASSERT(condition) LOG_ASSERT(condition) // debug-only checking. executed if DCHECK_IS_ON(). -#define DCHECK(condition) CHECK(condition) -#define DCHECK_EQ(val1, val2) CHECK_EQ(val1, val2) -#define DCHECK_NE(val1, val2) CHECK_NE(val1, val2) -#define DCHECK_LE(val1, val2) CHECK_LE(val1, val2) -#define DCHECK_LT(val1, val2) CHECK_LT(val1, val2) -#define DCHECK_GE(val1, val2) CHECK_GE(val1, val2) -#define DCHECK_GT(val1, val2) CHECK_GT(val1, val2) -#define DCHECK_NOTNULL(val) CHECK_NOTNULL(val) -#define DCHECK_STREQ(str1, str2) CHECK_STREQ(str1, str2) -#define DCHECK_STRCASEEQ(str1, str2) CHECK_STRCASEEQ(str1, str2) -#define DCHECK_STRNE(str1, str2) CHECK_STRNE(str1, str2) -#define DCHECK_STRCASENE(str1, str2) CHECK_STRCASENE(str1, str2) +# define DCHECK(condition) CHECK(condition) +# define DCHECK_EQ(val1, val2) CHECK_EQ(val1, val2) +# define DCHECK_NE(val1, val2) CHECK_NE(val1, val2) +# define DCHECK_LE(val1, val2) CHECK_LE(val1, val2) +# define DCHECK_LT(val1, val2) CHECK_LT(val1, val2) +# define DCHECK_GE(val1, val2) CHECK_GE(val1, val2) +# define DCHECK_GT(val1, val2) CHECK_GT(val1, val2) +# define DCHECK_NOTNULL(val) CHECK_NOTNULL(val) +# define DCHECK_STREQ(str1, str2) CHECK_STREQ(str1, str2) +# define DCHECK_STRCASEEQ(str1, str2) CHECK_STRCASEEQ(str1, str2) +# define DCHECK_STRNE(str1, str2) CHECK_STRNE(str1, str2) +# define DCHECK_STRCASENE(str1, str2) CHECK_STRCASENE(str1, str2) #else // !DCHECK_IS_ON() -#define DLOG(severity) \ - static_cast(0), \ - true ? (void) 0 : google::LogMessageVoidify() & LOG(severity) +# define DLOG(severity) \ + static_cast(0), \ + true ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) -#define DVLOG(verboselevel) \ - static_cast(0), \ - (true || !VLOG_IS_ON(verboselevel)) ? \ - (void) 0 : google::LogMessageVoidify() & LOG(INFO) +# define DVLOG(verboselevel) \ + static_cast(0), \ + (true || !VLOG_IS_ON(verboselevel)) \ + ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(INFO) -#define DLOG_IF(severity, condition) \ - static_cast(0), \ - (true || !(condition)) ? (void) 0 : google::LogMessageVoidify() & LOG(severity) +# define DLOG_IF(severity, condition) \ + static_cast(0), \ + (true || !(condition)) \ + ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) -#define DLOG_EVERY_N(severity, n) \ - static_cast(0), \ - true ? (void) 0 : google::LogMessageVoidify() & LOG(severity) +# define DLOG_EVERY_N(severity, n) \ + static_cast(0), \ + true ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) -#define DLOG_IF_EVERY_N(severity, condition, n) \ - static_cast(0), \ - (true || !(condition))? (void) 0 : google::LogMessageVoidify() & LOG(severity) +# define DLOG_IF_EVERY_N(severity, condition, n) \ + static_cast(0), \ + (true || !(condition)) \ + ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) -#define DLOG_ASSERT(condition) \ - static_cast(0), \ - true ? (void) 0 : LOG_ASSERT(condition) +# define DLOG_FIRST_N(severity, n) \ + static_cast(0), \ + true ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) + +# define DLOG_EVERY_T(severity, T) \ + static_cast(0), \ + true ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) + +# define DLOG_ASSERT(condition) \ + static_cast(0), true ? (void)0 : (LOG_ASSERT(condition)) // MSVC warning C4127: conditional expression is constant -#define DCHECK(condition) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK(condition) +# define DCHECK(condition) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK(condition) -#define DCHECK_EQ(val1, val2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_EQ(val1, val2) +# define DCHECK_EQ(val1, val2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_EQ(val1, val2) -#define DCHECK_NE(val1, val2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_NE(val1, val2) +# define DCHECK_NE(val1, val2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_NE(val1, val2) -#define DCHECK_LE(val1, val2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_LE(val1, val2) +# define DCHECK_LE(val1, val2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_LE(val1, val2) -#define DCHECK_LT(val1, val2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_LT(val1, val2) +# define DCHECK_LT(val1, val2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_LT(val1, val2) -#define DCHECK_GE(val1, val2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_GE(val1, val2) +# define DCHECK_GE(val1, val2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_GE(val1, val2) -#define DCHECK_GT(val1, val2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_GT(val1, val2) +# define DCHECK_GT(val1, val2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_GT(val1, val2) // You may see warnings in release mode if you don't use the return // value of DCHECK_NOTNULL. Please just use DCHECK for such cases. -#define DCHECK_NOTNULL(val) (val) +# define DCHECK_NOTNULL(val) (val) -#define DCHECK_STREQ(str1, str2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_STREQ(str1, str2) +# define DCHECK_STREQ(str1, str2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_STREQ(str1, str2) -#define DCHECK_STRCASEEQ(str1, str2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_STRCASEEQ(str1, str2) +# define DCHECK_STRCASEEQ(str1, str2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_STRCASEEQ(str1, str2) -#define DCHECK_STRNE(str1, str2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_STRNE(str1, str2) +# define DCHECK_STRNE(str1, str2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_STRNE(str1, str2) -#define DCHECK_STRCASENE(str1, str2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_STRCASENE(str1, str2) +# define DCHECK_STRCASENE(str1, str2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_STRCASENE(str1, str2) #endif // DCHECK_IS_ON() @@ -1435,14 +1198,10 @@ namespace base_logging { class GLOG_EXPORT LogStreamBuf : public std::streambuf { public: // REQUIREMENTS: "len" must be >= 2 to account for the '\n' and '\0'. - LogStreamBuf(char *buf, int len) { - setp(buf, buf + len - 2); - } + LogStreamBuf(char* buf, int len) { setp(buf, buf + len - 2); } // This effectively ignores overflow. - int_type overflow(int_type ch) { - return ch; - } + int_type overflow(int_type ch) { return ch; } // Legacy public ostrstream method. size_t pcount() const { return static_cast(pptr() - pbase()); } @@ -1451,6 +1210,12 @@ class GLOG_EXPORT LogStreamBuf : public std::streambuf { } // namespace base_logging +namespace logging { +namespace internal { +struct GLOG_NO_EXPORT LogMessageData; +} // namespace internal +} // namespace logging + // // This class more or less represents a particular log message. You // create an instance of LogMessage and then stream stuff to it. @@ -1461,7 +1226,7 @@ class GLOG_EXPORT LogStreamBuf : public std::streambuf { // though. You should use the LOG() macro (and variants thereof) // above. class GLOG_EXPORT LogMessage { -public: + public: enum { // Passing kNoLogPrefix for the line number disables the // log-message prefix. Useful for using the LogMessage @@ -1477,18 +1242,35 @@ public: // 2005 if you are deriving from a type in the Standard C++ Library" // http://msdn.microsoft.com/en-us/library/3tdb471s(VS.80).aspx // Let's just ignore the warning. -GLOG_MSVC_PUSH_DISABLE_WARNING(4275) + GLOG_MSVC_PUSH_DISABLE_WARNING(4275) class GLOG_EXPORT LogStream : public std::ostream { -GLOG_MSVC_POP_WARNING() - public: - LogStream(char *buf, int len, int64 ctr) - : std::ostream(NULL), - streambuf_(buf, len), - ctr_(ctr), + GLOG_MSVC_POP_WARNING() + public: + // In some cases, like when compiling glog as a static library with GCC and + // linking against a Clang-built executable, this constructor will be + // removed by the linker. We use this attribute to prevent the linker from + // discarding it. + GLOG_USED + LogStream(char* buf, int len, int64 ctr) + : std::ostream(nullptr), streambuf_(buf, len), ctr_(ctr), self_(this) { + rdbuf(&streambuf_); + } + + LogStream(LogStream&& other) noexcept + : std::ostream(nullptr), + streambuf_(std::move(other.streambuf_)), + ctr_(std::exchange(other.ctr_, 0)), self_(this) { rdbuf(&streambuf_); } + LogStream& operator=(LogStream&& other) noexcept { + streambuf_ = std::move(other.streambuf_); + ctr_ = std::exchange(other.ctr_, 0); + rdbuf(&streambuf_); + return *this; + } + int64 ctr() const { return ctr_; } void set_ctr(int64 ctr) { ctr_ = ctr; } LogStream* self() const { return self_; } @@ -1498,15 +1280,16 @@ GLOG_MSVC_POP_WARNING() char* pbase() const { return streambuf_.pbase(); } char* str() const { return pbase(); } - private: - LogStream(const LogStream&); - LogStream& operator=(const LogStream&); + LogStream(const LogStream&) = delete; + LogStream& operator=(const LogStream&) = delete; + + private: base_logging::LogStreamBuf streambuf_; - int64 ctr_; // Counter hack (for the LOG_EVERY_X() macro) - LogStream *self_; // Consistency check hack + int64 ctr_; // Counter hack (for the LOG_EVERY_X() macro) + LogStream* self_; // Consistency check hack }; -public: + public: // icc 8 requires this typedef to avoid an internal compiler error. typedef void (LogMessage::*SendMethod)(); @@ -1530,28 +1313,29 @@ public: // saves 17 bytes per call site. LogMessage(const char* file, int line, LogSeverity severity); - // Constructor to log this message to a specified sink (if not NULL). + // Constructor to log this message to a specified sink (if not nullptr). // Implied are: ctr = 0, send_method = &LogMessage::SendToSinkAndLog if // also_send_to_log is true, send_method = &LogMessage::SendToSink otherwise. LogMessage(const char* file, int line, LogSeverity severity, LogSink* sink, bool also_send_to_log); // Constructor where we also give a vector pointer - // for storing the messages (if the pointer is not NULL). + // for storing the messages (if the pointer is not nullptr). // Implied are: ctr = 0, send_method = &LogMessage::SaveOrSendToLog. LogMessage(const char* file, int line, LogSeverity severity, std::vector* outvec); // Constructor where we also give a string pointer for storing the - // message (if the pointer is not NULL). Implied are: ctr = 0, + // message (if the pointer is not nullptr). Implied are: ctr = 0, // send_method = &LogMessage::WriteToStringAndLog. LogMessage(const char* file, int line, LogSeverity severity, std::string* message); // A special constructor used for check failures - LogMessage(const char* file, int line, const CheckOpString& result); + LogMessage(const char* file, int line, + const logging::internal::CheckOpString& result); - ~LogMessage(); + ~LogMessage() noexcept(false); // Flush a buffered message to the sink set in the constructor. Always // called by the destructor, it may also be called from elsewhere if @@ -1562,13 +1346,13 @@ public: // is so that streaming can be done more efficiently. static const size_t kMaxLogMessageLen; - // Theses should not be called directly outside of logging.*, + // These should not be called directly outside of logging.*, // only passed as SendMethod arguments to other LogMessage methods: - void SendToLog(); // Actually dispatch to the logs + void SendToLog(); // Actually dispatch to the logs void SendToSyslogAndLog(); // Actually dispatch to syslog and the logs // Call abort() or similar to perform LOG(FATAL) crash. - static void __attribute__((noreturn)) Fail(); + [[noreturn]] static void Fail(); std::ostream& stream(); @@ -1577,14 +1361,25 @@ public: // Must be called without the log_mutex held. (L < log_mutex) static int64 num_messages(int severity); - const LogMessageTime& getLogMessageTime() const; + [[deprecated("Use LogMessage::time() instead.")]] const LogMessageTime& + getLogMessageTime() const { + return time(); + } - struct LogMessageData; + LogSeverity severity() const noexcept; + int line() const noexcept; + const std::thread::id& thread_id() const noexcept; + const char* fullname() const noexcept; + const char* basename() const noexcept; + const LogMessageTime& time() const noexcept; -private: + LogMessage(const LogMessage&) = delete; + LogMessage& operator=(const LogMessage&) = delete; + + private: // Fully internal SendMethod cases: void SendToSinkAndLog(); // Send to sink if provided and dispatch to the logs - void SendToSink(); // Send to sink if provided, do nothing otherwise. + void SendToSink(); // Send to sink if provided, do nothing otherwise. // Write to string if provided and dispatch to the logs. void WriteToStringAndLog(); @@ -1595,21 +1390,18 @@ private: void (LogMessage::*send_method)()); // Used to fill in crash information during LOG(FATAL) failures. - void RecordCrashReason(glog_internal_namespace_::CrashReason* reason); + void RecordCrashReason(logging::internal::CrashReason* reason); // Counts of messages sent at each priority: static int64 num_messages_[NUM_SEVERITIES]; // under log_mutex // We keep the data in a separate struct so that each instance of // LogMessage uses less stack space. - LogMessageData* allocated_; - LogMessageData* data_; - LogMessageTime logmsgtime_; + logging::internal::LogMessageData* allocated_; + logging::internal::LogMessageData* data_; + LogMessageTime time_; friend class LogDestination; - - LogMessage(const LogMessage&); - void operator=(const LogMessage&); }; // This class happens to be thread-hostile because all instances share @@ -1618,13 +1410,14 @@ private: class GLOG_EXPORT LogMessageFatal : public LogMessage { public: LogMessageFatal(const char* file, int line); - LogMessageFatal(const char* file, int line, const CheckOpString& result); - __attribute__((noreturn)) ~LogMessageFatal(); + LogMessageFatal(const char* file, int line, + const logging::internal::CheckOpString& result); + [[noreturn]] ~LogMessageFatal() noexcept(false); }; // A non-macro interface to the log facility; (useful // when the logging level is not a compile-time constant). -inline void LogAtLevel(int const severity, std::string const &msg) { +inline void LogAtLevel(LogSeverity severity, std::string const& msg) { LogMessage(__FILE__, __LINE__, severity).stream() << msg; } @@ -1632,53 +1425,13 @@ inline void LogAtLevel(int const severity, std::string const &msg) { // version since there are two advantages: 1. this version outputs the // file name and the line number where this macro is put like other // LOG macros, 2. this macro can be used as C++ stream. -#define LOG_AT_LEVEL(severity) google::LogMessage(__FILE__, __LINE__, severity).stream() - -// Check if it's compiled in C++11 mode. -// -// GXX_EXPERIMENTAL_CXX0X is defined by gcc and clang up to at least -// gcc-4.7 and clang-3.1 (2011-12-13). __cplusplus was defined to 1 -// in gcc before 4.7 (Crosstool 16) and clang before 3.1, but is -// defined according to the language version in effect thereafter. -// Microsoft Visual Studio 14 (2015) sets __cplusplus==199711 despite -// reasonably good C++11 support, so we set LANG_CXX for it and -// newer versions (_MSC_VER >= 1900). -#if (defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L || \ - (defined(_MSC_VER) && _MSC_VER >= 1900)) && !defined(__UCLIBCXX_MAJOR__) -// Helper for CHECK_NOTNULL(). -// -// In C++11, all cases can be handled by a single function. Since the value -// category of the argument is preserved (also for rvalue references), -// member initializer lists like the one below will compile correctly: -// -// Foo() -// : x_(CHECK_NOTNULL(MethodReturningUniquePtr())) {} -template -T CheckNotNull(const char* file, int line, const char* names, T&& t) { - if (t == nullptr) { - LogMessageFatal(file, line, new std::string(names)); - } - return std::forward(t); -} - -#else - -// A small helper for CHECK_NOTNULL(). -template -T* CheckNotNull(const char *file, int line, const char *names, T* t) { - if (t == NULL) { - LogMessageFatal(file, line, new std::string(names)); - } - return t; -} -#endif +#define LOG_AT_LEVEL(severity) \ + google::LogMessage(__FILE__, __LINE__, severity).stream() // Allow folks to put a counter in the LOG_EVERY_X()'ed messages. This // only works if ostream is a LogStream. If the ostream is not a // LogStream you'll get an assert saying as much at runtime. -GLOG_EXPORT std::ostream& operator<<(std::ostream &os, - const PRIVATE_Counter&); - +GLOG_EXPORT std::ostream& operator<<(std::ostream& os, const Counter_t&); // Derived class for PLOG*() above. class GLOG_EXPORT ErrnoLogMessage : public LogMessage { @@ -1694,19 +1447,37 @@ class GLOG_EXPORT ErrnoLogMessage : public LogMessage { void operator=(const ErrnoLogMessage&); }; - // This class is used to explicitly ignore values in the conditional // logging macros. This avoids compiler warnings like "value computed // is not used" and "statement has no effect". -class GLOG_EXPORT LogMessageVoidify { - public: - LogMessageVoidify() { } +namespace logging { +namespace internal { + +// Helper for CHECK_NOTNULL(). +// +// In C++11, all cases can be handled by a single function. Since the value +// category of the argument is preserved (also for rvalue references), +// member initializer lists like the one below will compile correctly: +// +// Foo() +// : x_(CHECK_NOTNULL(MethodReturningUniquePtr())) {} +template +T CheckNotNull(const char* file, int line, const char* names, T&& t) { + if (t == nullptr) { + LogMessageFatal(file, line, std::make_unique(names)); + } + return std::forward(t); +} + +struct LogMessageVoidify { // This has to be an operator with a precedence lower than << but // higher than ?: - void operator&(std::ostream&) { } + void operator&(std::ostream&) noexcept {} }; +} // namespace internal +} // namespace logging // Flushes all log files that contains messages that are at least of // the specified severity level. Thread-safe. @@ -1723,7 +1494,7 @@ GLOG_EXPORT void FlushLogFilesUnsafe(LogSeverity min_severity); // severity". Thread-safe. // GLOG_EXPORT void SetLogDestination(LogSeverity severity, - const char* base_filename); + const char* base_filename); // // Set the basename of the symlink to the latest log file at a given @@ -1732,7 +1503,7 @@ GLOG_EXPORT void SetLogDestination(LogSeverity severity, // invocation name of the program. Thread-safe. // GLOG_EXPORT void SetLogSymlink(LogSeverity severity, - const char* symlink_basename); + const char* symlink_basename); // // Used to send logs to some other kind of destination @@ -1748,7 +1519,7 @@ class GLOG_EXPORT LogSink { // during this call. virtual void send(LogSeverity severity, const char* full_filename, const char* base_filename, int line, - const LogMessageTime& logmsgtime, const char* message, + const LogMessageTime& time, const char* message, size_t message_len); // Provide an overload for compatibility purposes GLOG_DEPRECATED @@ -1774,13 +1545,13 @@ class GLOG_EXPORT LogSink { // Returns the normal text output of the log message. // Can be useful to implement send(). static std::string ToString(LogSeverity severity, const char* file, int line, - const LogMessageTime &logmsgtime, - const char* message, size_t message_len); + const LogMessageTime& time, const char* message, + size_t message_len); }; // Add or remove a LogSink as a consumer of logging data. Thread-safe. -GLOG_EXPORT void AddLogSink(LogSink *destination); -GLOG_EXPORT void RemoveLogSink(LogSink *destination); +GLOG_EXPORT void AddLogSink(LogSink* destination); +GLOG_EXPORT void RemoveLogSink(LogSink* destination); // // Specify an "extension" added to the filename specified via @@ -1788,8 +1559,7 @@ GLOG_EXPORT void RemoveLogSink(LogSink *destination); // often used to append the port we're listening on to the logfile // name. Thread-safe. // -GLOG_EXPORT void SetLogFilenameExtension( - const char* filename_extension); +GLOG_EXPORT void SetLogFilenameExtension(const char* filename_extension); // // Make it so that all log messages of at least a particular severity @@ -1810,26 +1580,15 @@ GLOG_EXPORT void LogToStderr(); // the email addresses to send to (separated by spaces, say). Thread-safe. // GLOG_EXPORT void SetEmailLogging(LogSeverity min_severity, - const char* addresses); + const char* addresses); -// A simple function that sends email. dest is a commma-separated -// list of addressess. Thread-safe. -GLOG_EXPORT bool SendEmail(const char *dest, - const char *subject, const char *body); +// A simple function that sends email. dest is a comma-separated +// list of addresses. Thread-safe. +GLOG_EXPORT bool SendEmail(const char* dest, const char* subject, + const char* body); GLOG_EXPORT const std::vector& GetLoggingDirectories(); -// For tests only: Clear the internal [cached] list of logging directories to -// force a refresh the next time GetLoggingDirectories is called. -// Thread-hostile. -void TestOnly_ClearLoggingDirectoriesList(); - -// Returns a set of existing temporary directories, which will be a -// subset of the directories returned by GetLoggingDirectories(). -// Thread-safe. -GLOG_EXPORT void GetExistingTempDirectories( - std::vector* list); - // Print any fatal message again -- useful to call from signal handler // so that the last thing in the output is the fatal message. // Thread-hostile, but a race is unlikely. @@ -1878,10 +1637,15 @@ class GLOG_EXPORT Logger { // appropriate by the higher level logging facility. For example, // textual log messages already contain timestamps, and the // file:linenumber header. + [[deprecated( + "Logger::Write accepting a std::time_t timestamp is provided for " + "compatibility purposes only. New code should implement the " + "std::chrono::system_clock::time_point overload.")]] virtual void + Write(bool force_flush, time_t timestamp, const char* message, + size_t message_len); virtual void Write(bool force_flush, - time_t timestamp, - const char* message, - size_t message_len) = 0; + const std::chrono::system_clock::time_point& timestamp, + const char* message, size_t message_len); // Flush any buffered messages virtual void Flush() = 0; @@ -1902,24 +1666,7 @@ extern GLOG_EXPORT Logger* GetLogger(LogSeverity level); // be deleted by the caller. Thread-safe. extern GLOG_EXPORT void SetLogger(LogSeverity level, Logger* logger); -} - -// glibc has traditionally implemented two incompatible versions of -// strerror_r(). There is a poorly defined convention for picking the -// version that we want, but it is not clear whether it even works with -// all versions of glibc. -// So, instead, we provide this wrapper that automatically detects the -// version that is in use, and then implements POSIX semantics. -// N.B. In addition to what POSIX says, we also guarantee that "buf" will -// be set to an empty string, if this function failed. This means, in most -// cases, you do not need to check the error code and you can directly -// use the value of "buf". It will never have an undefined value. -// DEPRECATED: Use StrError(int) instead. -GLOG_EXPORT int posix_strerror_r(int err, char *buf, size_t len); - -// A thread-safe replacement for strerror(). Returns a string describing the -// given POSIX error code. -GLOG_EXPORT std::string StrError(int err); +} // namespace base // A class for which we define operator<<, which does nothing. class GLOG_EXPORT NullStream : public LogMessage::LogStream { @@ -1928,16 +1675,16 @@ class GLOG_EXPORT NullStream : public LogMessage::LogStream { // (they'll never be actually displayed). This will be needed if a // NullStream& is implicitly converted to LogStream&, in which case // the overloaded NullStream::operator<< will not be invoked. - NullStream() : LogMessage::LogStream(message_buffer_, 1, 0) { } + NullStream(); NullStream(const char* /*file*/, int /*line*/, - const CheckOpString& /*result*/) : - LogMessage::LogStream(message_buffer_, 1, 0) { } - NullStream &stream() { return *this; } + const logging::internal::CheckOpString& /*result*/); + NullStream& stream(); + private: // A very short buffer for messages (which we discard anyway). This // will be needed if NullStream& converted to LogStream& (e.g. as a // result of a conditional expression). - char message_buffer_[2]; + char message_buffer_[3]; }; // Do nothing. This operator is inline, allowing the message to be @@ -1946,24 +1693,19 @@ class GLOG_EXPORT NullStream : public LogMessage::LogStream { // SKIP_LOG=WARNING. In those cases, NullStream will be implicitly // converted to LogStream and the message will be computed and then // quietly discarded. -template -inline NullStream& operator<<(NullStream &str, const T &) { return str; } +template +inline NullStream& operator<<(NullStream& str, const T&) { + return str; +} // Similar to NullStream, but aborts the program (without stack // trace), like LogMessageFatal. class GLOG_EXPORT NullStreamFatal : public NullStream { public: - NullStreamFatal() { } - NullStreamFatal(const char* file, int line, const CheckOpString& result) : - NullStream(file, line, result) { } -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable : 4722) -#endif // _MSC_VER - __attribute__((noreturn)) ~NullStreamFatal() throw () { _exit(EXIT_FAILURE); } -#if defined(_MSC_VER) -#pragma warning(pop) -#endif // _MSC_VER + using NullStream::NullStream; + [[noreturn]] + // Prevent the linker from discarding the destructor. + GLOG_USED ~NullStreamFatal(); }; // Install a signal handler that will dump signal information and a stack @@ -1984,19 +1726,19 @@ class GLOG_EXPORT NullStreamFatal : public NullStream { // words, stack traces of other threads won't be shown. GLOG_EXPORT void InstallFailureSignalHandler(); +// Returns true if FailureSignalHandler is installed. +GLOG_EXPORT bool IsFailureSignalHandlerInstalled(); + // Installs a function that is used for writing the failure dump. "data" // is the pointer to the beginning of a message to be written, and "size" // is the size of the message. You should not expect the data is // terminated with '\0'. -GLOG_EXPORT void InstallFailureWriter( - void (*writer)(const char* data, size_t size)); +GLOG_EXPORT void InstallFailureWriter(void (*writer)(const char* data, + size_t size)); -} +// Dump stack trace as a string. +GLOG_EXPORT std::string GetStackTrace(); -#pragma pop_macro("DECLARE_VARIABLE") -#pragma pop_macro("DECLARE_bool") -#pragma pop_macro("DECLARE_string") -#pragma pop_macro("DECLARE_int32") -#pragma pop_macro("DECLARE_uint32") +} // namespace google -#endif // GLOG_LOGGING_H +#endif // GLOG_LOGGING_H diff --git a/glog/x86/include/glog/platform.h b/glog/x86/include/glog/platform.h index e6144119..f118ca8d 100644 --- a/glog/x86/include/glog/platform.h +++ b/glog/x86/include/glog/platform.h @@ -1,4 +1,4 @@ -// Copyright (c) 2008, Google Inc. +// Copyright (c) 2024, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -35,24 +35,28 @@ #define GLOG_PLATFORM_H #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) -#define GLOG_OS_WINDOWS +# define GLOG_OS_WINDOWS #elif defined(__CYGWIN__) || defined(__CYGWIN32__) -#define GLOG_OS_CYGWIN +# define GLOG_OS_CYGWIN #elif defined(linux) || defined(__linux) || defined(__linux__) -#ifndef GLOG_OS_LINUX -#define GLOG_OS_LINUX -#endif +# ifndef GLOG_OS_LINUX +# define GLOG_OS_LINUX +# endif +# if defined(__ANDROID__) +# define GLOG_OS_ANDROID +# endif #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) -#define GLOG_OS_MACOSX +# define GLOG_OS_MACOSX #elif defined(__FreeBSD__) -#define GLOG_OS_FREEBSD +# define GLOG_OS_FREEBSD #elif defined(__NetBSD__) -#define GLOG_OS_NETBSD +# define GLOG_OS_NETBSD #elif defined(__OpenBSD__) -#define GLOG_OS_OPENBSD -#else +# define GLOG_OS_OPENBSD +#elif defined(__EMSCRIPTEN__) +# define GLOG_OS_EMSCRIPTEN // TODO(hamaji): Add other platforms. #error Platform not supported by glog. Please consider to contribute platform information by submitting a pull request on Github. #endif -#endif // GLOG_PLATFORM_H +#endif // GLOG_PLATFORM_H diff --git a/glog/x86/include/glog/raw_logging.h b/glog/x86/include/glog/raw_logging.h index eda5fb45..195a1b9c 100644 --- a/glog/x86/include/glog/raw_logging.h +++ b/glog/x86/include/glog/raw_logging.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006, Google Inc. +// Copyright (c) 2024, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -36,19 +36,19 @@ #ifndef GLOG_RAW_LOGGING_H #define GLOG_RAW_LOGGING_H -#include +#if defined(GLOG_USE_GLOG_EXPORT) +# include "glog/export.h" +#endif + +#if !defined(GLOG_EXPORT) +# error was not included correctly. See the documention for how to consume the library. +#endif + +#include "glog/log_severity.h" +#include "glog/vlog_is_on.h" namespace google { -#include -#include -#include - -#if defined(__GNUC__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wvariadic-macros" -#endif - // This is similar to LOG(severity) << format... and VLOG(level) << format.., // but // * it is to be used ONLY by low-level modules that can't use normal LOG() @@ -63,108 +63,101 @@ namespace google { // These will print an almost standard log lines like this to stderr only: // E20200821 211317 file.cc:123] RAW: Failed foo with 22: bad_file // I20200821 211317 file.cc:142] RAW: status is 20 -#define RAW_LOG(severity, ...) \ - do { \ - switch (google::GLOG_ ## severity) { \ - case 0: \ - RAW_LOG_INFO(__VA_ARGS__); \ - break; \ - case 1: \ - RAW_LOG_WARNING(__VA_ARGS__); \ - break; \ - case 2: \ - RAW_LOG_ERROR(__VA_ARGS__); \ - break; \ - case 3: \ - RAW_LOG_FATAL(__VA_ARGS__); \ - break; \ - default: \ - break; \ - } \ +#define RAW_LOG(severity, ...) \ + do { \ + switch (google::GLOG_##severity) { \ + case 0: \ + RAW_LOG_INFO(__VA_ARGS__); \ + break; \ + case 1: \ + RAW_LOG_WARNING(__VA_ARGS__); \ + break; \ + case 2: \ + RAW_LOG_ERROR(__VA_ARGS__); \ + break; \ + case 3: \ + RAW_LOG_FATAL(__VA_ARGS__); \ + break; \ + default: \ + break; \ + } \ } while (0) // The following STRIP_LOG testing is performed in the header file so that it's // possible to completely compile out the logging code and the log messages. #if !defined(STRIP_LOG) || STRIP_LOG == 0 -#define RAW_VLOG(verboselevel, ...) \ - do { \ - if (VLOG_IS_ON(verboselevel)) { \ - RAW_LOG_INFO(__VA_ARGS__); \ - } \ - } while (0) +# define RAW_VLOG(verboselevel, ...) \ + do { \ + if (VLOG_IS_ON(verboselevel)) { \ + RAW_LOG_INFO(__VA_ARGS__); \ + } \ + } while (0) #else -#define RAW_VLOG(verboselevel, ...) RawLogStub__(0, __VA_ARGS__) -#endif // STRIP_LOG == 0 +# define RAW_VLOG(verboselevel, ...) RawLogStub__(0, __VA_ARGS__) +#endif // STRIP_LOG == 0 #if !defined(STRIP_LOG) || STRIP_LOG == 0 -#define RAW_LOG_INFO(...) google::RawLog__(google::GLOG_INFO, \ - __FILE__, __LINE__, __VA_ARGS__) +# define RAW_LOG_INFO(...) \ + google::RawLog__(google::GLOG_INFO, __FILE__, __LINE__, __VA_ARGS__) #else -#define RAW_LOG_INFO(...) google::RawLogStub__(0, __VA_ARGS__) -#endif // STRIP_LOG == 0 +# define RAW_LOG_INFO(...) google::RawLogStub__(0, __VA_ARGS__) +#endif // STRIP_LOG == 0 #if !defined(STRIP_LOG) || STRIP_LOG <= 1 -#define RAW_LOG_WARNING(...) google::RawLog__(google::GLOG_WARNING, \ - __FILE__, __LINE__, __VA_ARGS__) +# define RAW_LOG_WARNING(...) \ + google::RawLog__(google::GLOG_WARNING, __FILE__, __LINE__, __VA_ARGS__) #else -#define RAW_LOG_WARNING(...) google::RawLogStub__(0, __VA_ARGS__) -#endif // STRIP_LOG <= 1 +# define RAW_LOG_WARNING(...) google::RawLogStub__(0, __VA_ARGS__) +#endif // STRIP_LOG <= 1 #if !defined(STRIP_LOG) || STRIP_LOG <= 2 -#define RAW_LOG_ERROR(...) google::RawLog__(google::GLOG_ERROR, \ - __FILE__, __LINE__, __VA_ARGS__) +# define RAW_LOG_ERROR(...) \ + google::RawLog__(google::GLOG_ERROR, __FILE__, __LINE__, __VA_ARGS__) #else -#define RAW_LOG_ERROR(...) google::RawLogStub__(0, __VA_ARGS__) -#endif // STRIP_LOG <= 2 +# define RAW_LOG_ERROR(...) google::RawLogStub__(0, __VA_ARGS__) +#endif // STRIP_LOG <= 2 #if !defined(STRIP_LOG) || STRIP_LOG <= 3 -#define RAW_LOG_FATAL(...) google::RawLog__(google::GLOG_FATAL, \ - __FILE__, __LINE__, __VA_ARGS__) +# define RAW_LOG_FATAL(...) \ + google::RawLog__(google::GLOG_FATAL, __FILE__, __LINE__, __VA_ARGS__) #else -#define RAW_LOG_FATAL(...) \ - do { \ - google::RawLogStub__(0, __VA_ARGS__); \ - exit(EXIT_FAILURE); \ - } while (0) -#endif // STRIP_LOG <= 3 +# define RAW_LOG_FATAL(...) \ + do { \ + google::RawLogStub__(0, __VA_ARGS__); \ + exit(EXIT_FAILURE); \ + } while (0) +#endif // STRIP_LOG <= 3 // Similar to CHECK(condition) << message, // but for low-level modules: we use only RAW_LOG that does not allocate memory. // We do not want to provide args list here to encourage this usage: // if (!cond) RAW_LOG(FATAL, "foo ...", hard_to_compute_args); // so that the args are not computed when not needed. -#define RAW_CHECK(condition, message) \ - do { \ - if (!(condition)) { \ - RAW_LOG(FATAL, "Check %s failed: %s", #condition, message); \ - } \ +#define RAW_CHECK(condition, message) \ + do { \ + if (!(condition)) { \ + RAW_LOG(FATAL, "Check %s failed: %s", #condition, message); \ + } \ } while (0) // Debug versions of RAW_LOG and RAW_CHECK #ifndef NDEBUG -#define RAW_DLOG(severity, ...) RAW_LOG(severity, __VA_ARGS__) -#define RAW_DCHECK(condition, message) RAW_CHECK(condition, message) +# define RAW_DLOG(severity, ...) RAW_LOG(severity, __VA_ARGS__) +# define RAW_DCHECK(condition, message) RAW_CHECK(condition, message) #else // NDEBUG -#define RAW_DLOG(severity, ...) \ - while (false) \ - RAW_LOG(severity, __VA_ARGS__) -#define RAW_DCHECK(condition, message) \ - while (false) \ - RAW_CHECK(condition, message) +# define RAW_DLOG(severity, ...) \ + while (false) RAW_LOG(severity, __VA_ARGS__) +# define RAW_DCHECK(condition, message) \ + while (false) RAW_CHECK(condition, message) #endif // NDEBUG -#if defined(__GNUC__) -#pragma GCC diagnostic pop -#endif - // Stub log function used to work around for unused variable warnings when // building with STRIP_LOG > 0. -static inline void RawLogStub__(int /* ignored */, ...) { -} +static inline void RawLogStub__(int /* ignored */, ...) {} // Helper function to implement RAW_LOG and RAW_VLOG // Logs format... at "severity" level, reporting it @@ -172,8 +165,12 @@ static inline void RawLogStub__(int /* ignored */, ...) { // This does not allocate memory or acquire locks. GLOG_EXPORT void RawLog__(LogSeverity severity, const char* file, int line, const char* format, ...) - __attribute__((__format__(__printf__, 4, 5))); - -} +#if defined(__has_attribute) +# if __has_attribute(used) + __attribute__((__format__(__printf__, 4, 5))) +# endif +#endif + ; +} // namespace google #endif // GLOG_RAW_LOGGING_H diff --git a/glog/x86/include/glog/stl_logging.h b/glog/x86/include/glog/stl_logging.h index ed200dd2..8dd7707e 100644 --- a/glog/x86/include/glog/stl_logging.h +++ b/glog/x86/include/glog/stl_logging.h @@ -1,4 +1,4 @@ -// Copyright (c) 2003, Google Inc. +// Copyright (c) 2023, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -35,140 +35,86 @@ // vector v1, v2; // CHECK_EQ(v1, v2); // -// If you want to use this header file with hash maps or slist, you -// need to define macros before including this file: -// -// - GLOG_STL_LOGGING_FOR_UNORDERED - and -// - GLOG_STL_LOGGING_FOR_TR1_UNORDERED - -// - GLOG_STL_LOGGING_FOR_EXT_HASH - -// - GLOG_STL_LOGGING_FOR_EXT_SLIST - -// -#ifndef UTIL_GTL_STL_LOGGING_INL_H_ -#define UTIL_GTL_STL_LOGGING_INL_H_ - -#if !1 -# error We do not support stl_logging for this compiler -#endif +#ifndef GLOG_STL_LOGGING_H +#define GLOG_STL_LOGGING_H #include #include #include #include #include +#include +#include #include #include -#if defined(GLOG_STL_LOGGING_FOR_UNORDERED) && __cplusplus >= 201103L -# include -# include -#endif - -#ifdef GLOG_STL_LOGGING_FOR_TR1_UNORDERED -# include -# include -#endif - -#ifdef GLOG_STL_LOGGING_FOR_EXT_HASH -# include -# include -#endif -#ifdef GLOG_STL_LOGGING_FOR_EXT_SLIST -# include -#endif - // Forward declare these two, and define them after all the container streams // operators so that we can recurse from pair -> container -> container -> pair // properly. -template +template std::ostream& operator<<(std::ostream& out, const std::pair& p); namespace google { -template +template void PrintSequence(std::ostream& out, Iter begin, Iter end); } - -#define OUTPUT_TWO_ARG_CONTAINER(Sequence) \ -template \ -inline std::ostream& operator<<(std::ostream& out, \ - const Sequence& seq) { \ - google::PrintSequence(out, seq.begin(), seq.end()); \ - return out; \ -} +#define OUTPUT_TWO_ARG_CONTAINER(Sequence) \ + template \ + inline std::ostream& operator<<(std::ostream& out, \ + const Sequence& seq) { \ + google::PrintSequence(out, seq.begin(), seq.end()); \ + return out; \ + } OUTPUT_TWO_ARG_CONTAINER(std::vector) OUTPUT_TWO_ARG_CONTAINER(std::deque) OUTPUT_TWO_ARG_CONTAINER(std::list) -#ifdef GLOG_STL_LOGGING_FOR_EXT_SLIST -OUTPUT_TWO_ARG_CONTAINER(__gnu_cxx::slist) -#endif - #undef OUTPUT_TWO_ARG_CONTAINER -#define OUTPUT_THREE_ARG_CONTAINER(Sequence) \ -template \ -inline std::ostream& operator<<(std::ostream& out, \ - const Sequence& seq) { \ - google::PrintSequence(out, seq.begin(), seq.end()); \ - return out; \ -} +#define OUTPUT_THREE_ARG_CONTAINER(Sequence) \ + template \ + inline std::ostream& operator<<(std::ostream& out, \ + const Sequence& seq) { \ + google::PrintSequence(out, seq.begin(), seq.end()); \ + return out; \ + } OUTPUT_THREE_ARG_CONTAINER(std::set) OUTPUT_THREE_ARG_CONTAINER(std::multiset) #undef OUTPUT_THREE_ARG_CONTAINER -#define OUTPUT_FOUR_ARG_CONTAINER(Sequence) \ -template \ -inline std::ostream& operator<<(std::ostream& out, \ - const Sequence& seq) { \ - google::PrintSequence(out, seq.begin(), seq.end()); \ - return out; \ -} +#define OUTPUT_FOUR_ARG_CONTAINER(Sequence) \ + template \ + inline std::ostream& operator<<(std::ostream& out, \ + const Sequence& seq) { \ + google::PrintSequence(out, seq.begin(), seq.end()); \ + return out; \ + } OUTPUT_FOUR_ARG_CONTAINER(std::map) OUTPUT_FOUR_ARG_CONTAINER(std::multimap) -#if defined(GLOG_STL_LOGGING_FOR_UNORDERED) && __cplusplus >= 201103L OUTPUT_FOUR_ARG_CONTAINER(std::unordered_set) OUTPUT_FOUR_ARG_CONTAINER(std::unordered_multiset) -#endif -#ifdef GLOG_STL_LOGGING_FOR_TR1_UNORDERED -OUTPUT_FOUR_ARG_CONTAINER(std::tr1::unordered_set) -OUTPUT_FOUR_ARG_CONTAINER(std::tr1::unordered_multiset) -#endif -#ifdef GLOG_STL_LOGGING_FOR_EXT_HASH -OUTPUT_FOUR_ARG_CONTAINER(__gnu_cxx::hash_set) -OUTPUT_FOUR_ARG_CONTAINER(__gnu_cxx::hash_multiset) -#endif - #undef OUTPUT_FOUR_ARG_CONTAINER -#define OUTPUT_FIVE_ARG_CONTAINER(Sequence) \ -template \ -inline std::ostream& operator<<(std::ostream& out, \ - const Sequence& seq) { \ - google::PrintSequence(out, seq.begin(), seq.end()); \ - return out; \ -} +#define OUTPUT_FIVE_ARG_CONTAINER(Sequence) \ + template \ + inline std::ostream& operator<<(std::ostream& out, \ + const Sequence& seq) { \ + google::PrintSequence(out, seq.begin(), seq.end()); \ + return out; \ + } -#if defined(GLOG_STL_LOGGING_FOR_UNORDERED) && __cplusplus >= 201103L OUTPUT_FIVE_ARG_CONTAINER(std::unordered_map) OUTPUT_FIVE_ARG_CONTAINER(std::unordered_multimap) -#endif -#ifdef GLOG_STL_LOGGING_FOR_TR1_UNORDERED -OUTPUT_FIVE_ARG_CONTAINER(std::tr1::unordered_map) -OUTPUT_FIVE_ARG_CONTAINER(std::tr1::unordered_multimap) -#endif -#ifdef GLOG_STL_LOGGING_FOR_EXT_HASH -OUTPUT_FIVE_ARG_CONTAINER(__gnu_cxx::hash_map) -OUTPUT_FIVE_ARG_CONTAINER(__gnu_cxx::hash_multimap) -#endif #undef OUTPUT_FIVE_ARG_CONTAINER -template +template inline std::ostream& operator<<(std::ostream& out, const std::pair& p) { out << '(' << p.first << ", " << p.second << ')'; @@ -177,7 +123,7 @@ inline std::ostream& operator<<(std::ostream& out, namespace google { -template +template inline void PrintSequence(std::ostream& out, Iter begin, Iter end) { // Output at most 100 elements -- appropriate if used for logging. for (int i = 0; begin != end && i < 100; ++i, ++begin) { @@ -189,7 +135,7 @@ inline void PrintSequence(std::ostream& out, Iter begin, Iter end) { } } -} +} // namespace google // Note that this is technically undefined behavior! We are adding things into // the std namespace for a reason though -- we are providing new operations on @@ -215,6 +161,8 @@ inline void PrintSequence(std::ostream& out, Iter begin, Iter end) { // move all of the *definitions* into namespace std, bet we need to ensure no // one references them first. This lets us take that step. We cannot define them // in both because that would create ambiguous overloads when both are found. -namespace std { using ::operator<<; } +namespace std { +using ::operator<<; +} -#endif // UTIL_GTL_STL_LOGGING_INL_H_ +#endif // GLOG_STL_LOGGING_H diff --git a/glog/x86/include/glog/types.h b/glog/x86/include/glog/types.h new file mode 100644 index 00000000..dca2f06f --- /dev/null +++ b/glog/x86/include/glog/types.h @@ -0,0 +1,81 @@ + +// Copyright (c) 2024, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#ifndef GLOG_TYPES_H +#define GLOG_TYPES_H + +#include +#include + +namespace google { + +using int32 = std::int32_t; +using uint32 = std::uint32_t; +using int64 = std::int64_t; +using uint64 = std::uint64_t; + +} // namespace google + +#if defined(__has_feature) +# if __has_feature(thread_sanitizer) +# define GLOG_SANITIZE_THREAD 1 +# endif +#endif + +#if !defined(GLOG_SANITIZE_THREAD) && defined(__SANITIZE_THREAD__) && \ + __SANITIZE_THREAD__ +# define GLOG_SANITIZE_THREAD 1 +#endif + +#if defined(GLOG_SANITIZE_THREAD) +# define GLOG_IFDEF_THREAD_SANITIZER(X) X +#else +# define GLOG_IFDEF_THREAD_SANITIZER(X) +#endif + +#if defined(_MSC_VER) +# define GLOG_MSVC_PUSH_DISABLE_WARNING(n) \ + __pragma(warning(push)) __pragma(warning(disable : n)) +# define GLOG_MSVC_POP_WARNING() __pragma(warning(pop)) +#else +# define GLOG_MSVC_PUSH_DISABLE_WARNING(n) +# define GLOG_MSVC_POP_WARNING() +#endif + +#if defined(GLOG_SANITIZE_THREAD) +// We need to identify the static variables as "benign" races +// to avoid noisy reports from TSAN. +extern "C" void AnnotateBenignRaceSized(const char* file, int line, + const volatile void* mem, size_t size, + const char* description); +#endif // defined(GLOG_SANITIZE_THREAD) + +#endif // GLOG_TYPES_H diff --git a/glog/x86/include/glog/vlog_is_on.h b/glog/x86/include/glog/vlog_is_on.h index 52036b5e..f94b0fb8 100644 --- a/glog/x86/include/glog/vlog_is_on.h +++ b/glog/x86/include/glog/vlog_is_on.h @@ -1,4 +1,4 @@ -// Copyright (c) 1999, 2007, Google Inc. +// Copyright (c) 2024, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -58,10 +58,21 @@ // CAVEAT: --vmodule functionality is not available in non gcc compilers. // -#ifndef BASE_VLOG_IS_ON_H_ -#define BASE_VLOG_IS_ON_H_ +#ifndef GLOG_VLOG_IS_ON_H +#define GLOG_VLOG_IS_ON_H -#include +#include + +#if defined(GLOG_USE_GLOG_EXPORT) +# include "glog/export.h" +#endif + +#if !defined(GLOG_EXPORT) +# error was not included correctly. See the documention for how to consume the library. +#endif + +#include "glog/flags.h" +#include "glog/types.h" #if defined(__GNUC__) // We emit an anonymous static int* variable at every VLOG_IS_ON(n) site. @@ -70,19 +81,25 @@ // it's either FLAGS_v or an appropriate internal variable // matching the current source file that represents results of // parsing of --vmodule flag and/or SetVLOGLevel calls. -#define VLOG_IS_ON(verboselevel) \ - __extension__ \ - ({ static google::SiteFlag vlocal__ = {NULL, NULL, 0, NULL}; \ - google::int32 verbose_level__ = (verboselevel); \ - (vlocal__.level == NULL ? google::InitVLOG3__(&vlocal__, &FLAGS_v, \ - __FILE__, verbose_level__) : *vlocal__.level >= verbose_level__); \ - }) +# define VLOG_IS_ON(verboselevel) \ + __extension__({ \ + static google::SiteFlag vlocal__ = {nullptr, nullptr, 0, nullptr}; \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &vlocal__, sizeof(google::SiteFlag), "")); \ + google::int32 verbose_level__ = (verboselevel); \ + (vlocal__.level == nullptr \ + ? google::InitVLOG3__(&vlocal__, &FLAGS_v, __FILE__, \ + verbose_level__) \ + : *vlocal__.level >= verbose_level__); \ + }) #else // GNU extensions not available, so we do not support --vmodule. // Dynamic value of FLAGS_v always controls the logging level. -#define VLOG_IS_ON(verboselevel) (FLAGS_v >= (verboselevel)) +# define VLOG_IS_ON(verboselevel) (FLAGS_v >= (verboselevel)) #endif +namespace google { + // Set VLOG(_IS_ON) level for module_pattern to log_level. // This lets us dynamically control what is normally set by the --vmodule flag. // Returns the level that previously applied to module_pattern. @@ -96,13 +113,13 @@ extern GLOG_EXPORT int SetVLOGLevel(const char* module_pattern, int log_level); // Various declarations needed for VLOG_IS_ON above: ========================= struct SiteFlag { - google::int32* level; + int32* level; const char* base_name; - size_t base_len; + std::size_t base_len; SiteFlag* next; }; -// Helper routine which determines the logging info for a particalur VLOG site. +// Helper routine which determines the logging info for a particular VLOG site. // site_flag is the address of the site-local pointer to the controlling // verbosity level // site_default is the default to use for *site_flag @@ -110,9 +127,10 @@ struct SiteFlag { // verbose_level is the argument to VLOG_IS_ON // We will return the return value for VLOG_IS_ON // and if possible set *site_flag appropriately. -extern GLOG_EXPORT bool InitVLOG3__( - google::SiteFlag* site_flag, - google::int32* site_default, const char* fname, - google::int32 verbose_level); +extern GLOG_EXPORT bool InitVLOG3__(SiteFlag* site_flag, + int32* site_default, + const char* fname, + int32 verbose_level); +} // namespace google -#endif // BASE_VLOG_IS_ON_H_ +#endif // GLOG_VLOG_IS_ON_H diff --git a/glog/x86/lib/cmake/glog/glog-config-version.cmake b/glog/x86/lib/cmake/glog/glog-config-version.cmake index 3eaebcd4..42739797 100644 --- a/glog/x86/lib/cmake/glog/glog-config-version.cmake +++ b/glog/x86/lib/cmake/glog/glog-config-version.cmake @@ -9,19 +9,19 @@ # The variable CVF_VERSION must be set before calling configure_file(). -set(PACKAGE_VERSION "0.6.0") +set(PACKAGE_VERSION "0.7.0") if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() - if("0.6.0" MATCHES "^([0-9]+)\\.") + if("0.7.0" MATCHES "^([0-9]+)\\.") set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}") if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0) string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}") endif() else() - set(CVF_VERSION_MAJOR "0.6.0") + set(CVF_VERSION_MAJOR "0.7.0") endif() if(PACKAGE_FIND_VERSION_RANGE) diff --git a/glog/x86/lib/cmake/glog/glog-config.cmake b/glog/x86/lib/cmake/glog/glog-config.cmake index 7f9d5702..d4fc7691 100644 --- a/glog/x86/lib/cmake/glog/glog-config.cmake +++ b/glog/x86/lib/cmake/glog/glog-config.cmake @@ -21,6 +21,8 @@ endmacro() include (CMakeFindDependencyMacro) include (${CMAKE_CURRENT_LIST_DIR}/glog-modules.cmake) +find_dependency (Threads) + diff --git a/glog/x86/lib/cmake/glog/glog-targets.cmake b/glog/x86/lib/cmake/glog/glog-targets.cmake index 7799b1fe..bfdb8034 100644 --- a/glog/x86/lib/cmake/glog/glog-targets.cmake +++ b/glog/x86/lib/cmake/glog/glog-targets.cmake @@ -54,9 +54,10 @@ endif() add_library(glog::glog STATIC IMPORTED) set_target_properties(glog::glog PROPERTIES - INTERFACE_COMPILE_DEFINITIONS "GLOG_CUSTOM_PREFIX_SUPPORT" + INTERFACE_COMPILE_DEFINITIONS "GLOG_USE_GLOG_EXPORT" + INTERFACE_COMPILE_FEATURES "cxx_std_14" INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" - INTERFACE_LINK_LIBRARIES "\$;\$" + INTERFACE_LINK_LIBRARIES "\$;\$" ) if(CMAKE_VERSION VERSION_LESS 2.8.12) diff --git a/glog/x86/lib/libglog.a b/glog/x86/lib/libglog.a index 4fa49c5f..3859e405 100644 Binary files a/glog/x86/lib/libglog.a and b/glog/x86/lib/libglog.a differ diff --git a/glog/x86_64/include/glog/flags.h b/glog/x86_64/include/glog/flags.h new file mode 100644 index 00000000..8349639a --- /dev/null +++ b/glog/x86_64/include/glog/flags.h @@ -0,0 +1,191 @@ +// Copyright (c) 2024, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#ifndef GLOG_FLAGS_H +#define GLOG_FLAGS_H + +#include + +#if defined(GLOG_USE_GFLAGS) +# include +#endif + +#if defined(GLOG_USE_GLOG_EXPORT) +# include "glog/export.h" +#endif + +#if !defined(GLOG_EXPORT) +# error was not included correctly. See the documention for how to consume the library. +#endif + +#include "glog/platform.h" +#include "glog/types.h" + +#pragma push_macro("DECLARE_VARIABLE") +#pragma push_macro("DECLARE_bool") +#pragma push_macro("DECLARE_string") +#pragma push_macro("DECLARE_int32") +#pragma push_macro("DECLARE_uint32") + +#ifdef DECLARE_VARIABLE +# undef DECLARE_VARIABLE +#endif + +#ifdef DECLARE_bool +# undef DECLARE_bool +#endif + +#ifdef DECLARE_string +# undef DECLARE_string +#endif + +#ifdef DECLARE_int32 +# undef DECLARE_int32 +#endif + +#ifdef DECLARE_uint32 +# undef DECLARE_uint32 +#endif + +#ifndef DECLARE_VARIABLE +# define DECLARE_VARIABLE(type, shorttype, name, tn) \ + namespace fL##shorttype { \ + extern GLOG_EXPORT type FLAGS_##name; \ + } \ + using fL##shorttype::FLAGS_##name + +// bool specialization +# define DECLARE_bool(name) DECLARE_VARIABLE(bool, B, name, bool) + +// int32 specialization +# define DECLARE_int32(name) DECLARE_VARIABLE(google::int32, I, name, int32) + +# if !defined(DECLARE_uint32) +// uint32 specialization +# define DECLARE_uint32(name) \ + DECLARE_VARIABLE(google::uint32, U, name, uint32) +# endif // !defined(DECLARE_uint32) && !defined(GLOG_USE_GFLAGS) + +// Special case for string, because we have to specify the namespace +// std::string, which doesn't play nicely with our FLAG__namespace hackery. +# define DECLARE_string(name) \ + namespace fLS { \ + extern GLOG_EXPORT std::string& FLAGS_##name; \ + } \ + using fLS::FLAGS_##name +#endif + +DECLARE_int32(logemaillevel); +DECLARE_int32(logcleansecs); + +#ifdef GLOG_OS_LINUX +DECLARE_bool(drop_log_memory); +#endif +DECLARE_string(alsologtoemail); +DECLARE_string(log_backtrace_at); + +// Set whether appending a timestamp to the log file name +DECLARE_bool(timestamp_in_logfile_name); + +// Set whether log messages go to stdout instead of logfiles +DECLARE_bool(logtostdout); + +// Set color messages logged to stdout (if supported by terminal). +DECLARE_bool(colorlogtostdout); + +// Set whether log messages go to stderr instead of logfiles +DECLARE_bool(logtostderr); + +// Set whether log messages go to stderr in addition to logfiles. +DECLARE_bool(alsologtostderr); + +// Set color messages logged to stderr (if supported by terminal). +DECLARE_bool(colorlogtostderr); + +// Log messages at a level >= this flag are automatically sent to +// stderr in addition to log files. +DECLARE_int32(stderrthreshold); + +// Set whether the log file header should be written upon creating a file. +DECLARE_bool(log_file_header); + +// Set whether the log prefix should be prepended to each line of output. +DECLARE_bool(log_prefix); + +// Set whether the year should be included in the log prefix. +DECLARE_bool(log_year_in_prefix); + +// Log messages at a level <= this flag are buffered. +// Log messages at a higher level are flushed immediately. +DECLARE_int32(logbuflevel); + +// Sets the maximum number of seconds which logs may be buffered for. +DECLARE_int32(logbufsecs); + +// Log suppression level: messages logged at a lower level than this +// are suppressed. +DECLARE_int32(minloglevel); + +// If specified, logfiles are written into this directory instead of the +// default logging directory. +DECLARE_string(log_dir); + +// Set the log file mode. +DECLARE_int32(logfile_mode); + +// Sets the path of the directory into which to put additional links +// to the log files. +DECLARE_string(log_link); + +DECLARE_int32(v); // in vlog_is_on.cc + +DECLARE_string(vmodule); // also in vlog_is_on.cc + +// Sets the maximum log file size (in MB). +DECLARE_uint32(max_log_size); + +// Sets whether to avoid logging to the disk if the disk is full. +DECLARE_bool(stop_logging_if_full_disk); + +// Use UTC time for logging +DECLARE_bool(log_utc_time); + +// Mailer used to send logging email +DECLARE_string(logmailer); + +DECLARE_bool(symbolize_stacktrace); + +#pragma pop_macro("DECLARE_VARIABLE") +#pragma pop_macro("DECLARE_bool") +#pragma pop_macro("DECLARE_string") +#pragma pop_macro("DECLARE_int32") +#pragma pop_macro("DECLARE_uint32") + +#endif // GLOG_FLAGS_H diff --git a/glog/x86_64/include/glog/log_severity.h b/glog/x86_64/include/glog/log_severity.h index aa48f531..1fb6a4c0 100644 --- a/glog/x86_64/include/glog/log_severity.h +++ b/glog/x86_64/include/glog/log_severity.h @@ -1,4 +1,4 @@ -// Copyright (c) 2007, Google Inc. +// Copyright (c) 2024, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -30,6 +30,16 @@ #ifndef BASE_LOG_SEVERITY_H__ #define BASE_LOG_SEVERITY_H__ +#if defined(GLOG_USE_GLOG_EXPORT) +# include "glog/export.h" +#endif + +#if !defined(GLOG_EXPORT) +# error was not included correctly. See the documention for how to consume the library. +#endif + +namespace google { + // The recommended semantics of the log levels are as follows: // // INFO: @@ -48,27 +58,43 @@ // Variables of type LogSeverity are widely taken to lie in the range // [0, NUM_SEVERITIES-1]. Be careful to preserve this assumption if // you ever need to change their values or add a new severity. -typedef int LogSeverity; -const int GLOG_INFO = 0, GLOG_WARNING = 1, GLOG_ERROR = 2, GLOG_FATAL = 3, - NUM_SEVERITIES = 4; +enum LogSeverity { + GLOG_INFO = 0, + GLOG_WARNING = 1, + GLOG_ERROR = 2, + GLOG_FATAL = 3, #ifndef GLOG_NO_ABBREVIATED_SEVERITIES -# ifdef ERROR +# ifdef ERROR # error ERROR macro is defined. Define GLOG_NO_ABBREVIATED_SEVERITIES before including logging.h. See the document for detail. -# endif -const int INFO = GLOG_INFO, WARNING = GLOG_WARNING, - ERROR = GLOG_ERROR, FATAL = GLOG_FATAL; +# endif + INFO = GLOG_INFO, + WARNING = GLOG_WARNING, + ERROR = GLOG_ERROR, + FATAL = GLOG_FATAL #endif +}; + +#if defined(__cpp_inline_variables) +# if (__cpp_inline_variables >= 201606L) +# define GLOG_INLINE_VARIABLE inline +# endif // (__cpp_inline_variables >= 201606L) +#endif // defined(__cpp_inline_variables) + +#if !defined(GLOG_INLINE_VARIABLE) +# define GLOG_INLINE_VARIABLE +#endif // !defined(GLOG_INLINE_VARIABLE) + +GLOG_INLINE_VARIABLE +constexpr int NUM_SEVERITIES = 4; // DFATAL is FATAL in debug mode, ERROR in normal mode #ifdef NDEBUG -#define DFATAL_LEVEL ERROR +# define DFATAL_LEVEL ERROR #else -#define DFATAL_LEVEL FATAL +# define DFATAL_LEVEL FATAL #endif -extern GLOG_EXPORT const char* const LogSeverityNames[NUM_SEVERITIES]; - // NDEBUG usage helpers related to (RAW_)DCHECK: // // DEBUG_MODE is for small !NDEBUG uses like @@ -89,10 +115,12 @@ extern GLOG_EXPORT const char* const LogSeverityNames[NUM_SEVERITIES]; // #ifdef NDEBUG enum { DEBUG_MODE = 0 }; -#define IF_DEBUG_MODE(x) +# define IF_DEBUG_MODE(x) #else enum { DEBUG_MODE = 1 }; -#define IF_DEBUG_MODE(x) x +# define IF_DEBUG_MODE(x) x #endif +} // namespace google + #endif // BASE_LOG_SEVERITY_H__ diff --git a/glog/x86_64/include/glog/logging.h b/glog/x86_64/include/glog/logging.h index af2219cc..9ab897e4 100644 --- a/glog/x86_64/include/glog/logging.h +++ b/glog/x86_64/include/glog/logging.h @@ -1,4 +1,4 @@ -// Copyright (c) 2022, Google Inc. +// Copyright (c) 2024, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -36,141 +36,104 @@ #ifndef GLOG_LOGGING_H #define GLOG_LOGGING_H -#if 1 && __cplusplus >= 201103L -#include -#endif - +#include #include +#include #include #include #include #include #include +#include #include #include #include -#if 1 -# include -#endif +#include +#include #include -#if defined(_MSC_VER) -#define GLOG_MSVC_PUSH_DISABLE_WARNING(n) __pragma(warning(push)) \ - __pragma(warning(disable:n)) -#define GLOG_MSVC_POP_WARNING() __pragma(warning(pop)) -#else -#define GLOG_MSVC_PUSH_DISABLE_WARNING(n) -#define GLOG_MSVC_POP_WARNING() +#if defined(GLOG_USE_GLOG_EXPORT) +# include "glog/export.h" #endif -#include - -#if 1 -#include +#if !defined(GLOG_EXPORT) || !defined(GLOG_NO_EXPORT) +# error was not included correctly. See the documention for how to consume the library. #endif -// We care a lot about number of bits things take up. Unfortunately, -// systems define their bit-specific ints in a lot of different ways. -// We use our own way, and have a typedef to get there. -// Note: these commands below may look like "#if 1" or "#if 0", but -// that's because they were constructed that way at ./configure time. -// Look at logging.h.in to see how they're calculated (based on your config). -#if 1 -#include // the normal place uint16_t is defined -#endif -#if 1 -#include // the normal place u_int16_t is defined -#endif -#if 1 -#include // a third place for uint16_t or u_int16_t -#endif +#include "glog/flags.h" +#include "glog/platform.h" +#include "glog/types.h" -#if 0 -#include -#endif +#if defined(__has_attribute) +# if __has_attribute(used) +# define GLOG_USED __attribute__((used)) +# endif // __has_attribute(used) +#endif // defined(__has_attribute) -#if 1 && __cplusplus >= 201103L -#include -#elif defined(GLOG_OS_WINDOWS) -#include -#endif +#if !defined(GLOG_USED) +# define GLOG_USED +#endif // !defined(GLOG_USED) + +#include "glog/log_severity.h" +#include "glog/vlog_is_on.h" namespace google { -#if 1 // the C99 format -typedef int32_t int32; -typedef uint32_t uint32; -typedef int64_t int64; -typedef uint64_t uint64; -#elif 1 // the BSD format -typedef int32_t int32; -typedef u_int32_t uint32; -typedef int64_t int64; -typedef u_int64_t uint64; -#elif 0 // the windows (vc7) format -typedef __int32 int32; -typedef unsigned __int32 uint32; -typedef __int64 int64; -typedef unsigned __int64 uint64; -#else -#error Do not know how to define a 32-bit integer quantity on your system -#endif - -typedef double WallTime; - struct GLOG_EXPORT LogMessageTime { LogMessageTime(); - LogMessageTime(std::tm t); - LogMessageTime(std::time_t timestamp, WallTime now); + explicit LogMessageTime(std::chrono::system_clock::time_point now); - const time_t& timestamp() const { return timestamp_; } - const int& sec() const { return time_struct_.tm_sec; } - const int32_t& usec() const { return usecs_; } - const int&(min)() const { return time_struct_.tm_min; } - const int& hour() const { return time_struct_.tm_hour; } - const int& day() const { return time_struct_.tm_mday; } - const int& month() const { return time_struct_.tm_mon; } - const int& year() const { return time_struct_.tm_year; } - const int& dayOfWeek() const { return time_struct_.tm_wday; } - const int& dayInYear() const { return time_struct_.tm_yday; } - const int& dst() const { return time_struct_.tm_isdst; } - const long int& gmtoff() const { return gmtoffset_; } - const std::tm& tm() const { return time_struct_; } + [[deprecated("Use LogMessageTime::when() instead.")]] std::time_t timestamp() + const noexcept { + return std::chrono::system_clock::to_time_t(when()); + } + const std::chrono::system_clock::time_point& when() const noexcept { + return timestamp_; + } + int sec() const noexcept { return tm_.tm_sec; } + long usec() const noexcept { return usecs_.count(); } + int(min)() const noexcept { return tm_.tm_min; } + int hour() const noexcept { return tm_.tm_hour; } + int day() const noexcept { return tm_.tm_mday; } + int month() const noexcept { return tm_.tm_mon; } + int year() const noexcept { return tm_.tm_year; } + int dayOfWeek() const noexcept { return tm_.tm_wday; } + int dayInYear() const noexcept { return tm_.tm_yday; } + int dst() const noexcept { return tm_.tm_isdst; } + [[deprecated("Use LogMessageTime::gmtoffset() instead.")]] long gmtoff() + const noexcept { + return gmtoffset_.count(); + } + std::chrono::seconds gmtoffset() const noexcept { return gmtoffset_; } + const std::tm& tm() const noexcept { return tm_; } private: - void init(const std::tm& t, std::time_t timestamp, WallTime now); - std::tm time_struct_; // Time of creation of LogMessage - time_t timestamp_; // Time of creation of LogMessage in seconds - int32_t usecs_; // Time of creation of LogMessage - microseconds part - long int gmtoffset_; - - void CalcGmtOffset(); + std::tm tm_{}; // Time of creation of LogMessage + std::chrono::system_clock::time_point + timestamp_; // Time of creation of LogMessage in seconds + std::chrono::microseconds usecs_; + std::chrono::seconds gmtoffset_; }; -#ifdef GLOG_CUSTOM_PREFIX_SUPPORT -struct LogMessageInfo { +struct [[deprecated("Use LogMessage instead.")]] LogMessageInfo { explicit LogMessageInfo(const char* const severity_, - const char* const filename_, - const int& line_number_, - const int& thread_id_, - const LogMessageTime& time_): - severity(severity_), filename(filename_), line_number(line_number_), - thread_id(thread_id_), time(time_) - {} + const char* const filename_, const int& line_number_, + std::thread::id thread_id_, + const LogMessageTime& time_) + : severity(severity_), + filename(filename_), + line_number(line_number_), + thread_id(thread_id_), + time(time_) {} const char* const severity; const char* const filename; - const int &line_number; - const int &thread_id; + const int& line_number; + std::thread::id thread_id; const LogMessageTime& time; }; -typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, void* data); - -#endif - -} - +} // namespace google // The global value of GOOGLE_STRIP_LOG. All the messages logged to // LOG(XXX) with severity less than GOOGLE_STRIP_LOG will not be displayed. @@ -182,7 +145,7 @@ typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, vo // file, add "#define GOOGLE_STRIP_LOG 1" to that file _before_ including // base/logging.h #ifndef GOOGLE_STRIP_LOG -#define GOOGLE_STRIP_LOG 0 +# define GOOGLE_STRIP_LOG 0 #endif // GCC can be told that a certain branch is not likely to be taken (for @@ -190,30 +153,48 @@ typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, vo // Giving it this information can help it optimize for the common case in // the absence of better information (ie. -fprofile-arcs). // -#ifndef GOOGLE_PREDICT_BRANCH_NOT_TAKEN -#if 1 -#define GOOGLE_PREDICT_BRANCH_NOT_TAKEN(x) (__builtin_expect(x, 0)) -#else -#define GOOGLE_PREDICT_BRANCH_NOT_TAKEN(x) x -#endif +#if defined(__has_builtin) +# if __has_builtin(__builtin_expect) +# define GLOG_BUILTIN_EXPECT_PRESENT +# endif #endif -#ifndef GOOGLE_PREDICT_FALSE -#if 1 -#define GOOGLE_PREDICT_FALSE(x) (__builtin_expect(x, 0)) -#else -#define GOOGLE_PREDICT_FALSE(x) x -#endif +#if !defined(GLOG_BUILTIN_EXPECT_PRESENT) && defined(__GNUG__) +// __has_builtin is not available prior to GCC 10 +# define GLOG_BUILTIN_EXPECT_PRESENT #endif -#ifndef GOOGLE_PREDICT_TRUE -#if 1 -#define GOOGLE_PREDICT_TRUE(x) (__builtin_expect(!!(x), 1)) +#if defined(GLOG_BUILTIN_EXPECT_PRESENT) + +# ifndef GOOGLE_PREDICT_BRANCH_NOT_TAKEN +# define GOOGLE_PREDICT_BRANCH_NOT_TAKEN(x) (__builtin_expect(x, 0)) +# endif + +# ifndef GOOGLE_PREDICT_FALSE +# define GOOGLE_PREDICT_FALSE(x) (__builtin_expect(x, 0)) +# endif + +# ifndef GOOGLE_PREDICT_TRUE +# define GOOGLE_PREDICT_TRUE(x) (__builtin_expect(!!(x), 1)) +# endif + #else -#define GOOGLE_PREDICT_TRUE(x) x -#endif + +# ifndef GOOGLE_PREDICT_BRANCH_NOT_TAKEN +# define GOOGLE_PREDICT_BRANCH_NOT_TAKEN(x) x +# endif + +# ifndef GOOGLE_PREDICT_TRUE +# define GOOGLE_PREDICT_FALSE(x) x +# endif + +# ifndef GOOGLE_PREDICT_TRUE +# define GOOGLE_PREDICT_TRUE(x) x +# endif + #endif +#undef GLOG_BUILTIN_EXPECT_PRESENT // Make a bunch of macros for logging. The way to log things is to stream // things to LOG(). E.g., @@ -226,7 +207,7 @@ typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, vo // vector errors; // LOG_STRING(ERROR, &errors) << "Couldn't parse cookie #" << cookie_num; // -// This pushes back the new error onto 'errors'; if given a NULL pointer, +// This pushes back the new error onto 'errors'; if given a nullptr pointer, // it reports the error via LOG(ERROR). // // You can also do conditional logging: @@ -311,11 +292,11 @@ typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, vo // "program with --v=1 or more"; // VLOG_EVERY_N(1, 10) // << "I'm printed every 10th occurrence, and when you run the program " -// "with --v=1 or more. Present occurence is " << google::COUNTER; +// "with --v=1 or more. Present occurrence is " << google::COUNTER; // VLOG_IF_EVERY_N(1, (size > 1024), 10) -// << "I'm printed on every 10th occurence of case when size is more " +// << "I'm printed on every 10th occurrence of case when size is more " // " than 1024, when you run the program with --v=1 or more. "; -// "Present occurence is " << google::COUNTER; +// "Present occurrence is " << google::COUNTER; // // The supported severity levels for macros that allow you to specify one // are (in increasing order of severity) INFO, WARNING, ERROR, and FATAL. @@ -369,234 +350,119 @@ typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, vo // synchronized. Hence, use caution when comparing the low bits of // timestamps from different machines. -#pragma push_macro("DECLARE_VARIABLE") -#pragma push_macro("DECLARE_bool") -#pragma push_macro("DECLARE_string") -#pragma push_macro("DECLARE_int32") -#pragma push_macro("DECLARE_uint32") - -#ifdef DECLARE_VARIABLE -#undef DECLARE_VARIABLE -#endif - -#ifdef DECLARE_bool -#undef DECLARE_bool -#endif - -#ifdef DECLARE_string -#undef DECLARE_string -#endif - -#ifdef DECLARE_int32 -#undef DECLARE_int32 -#endif - -#ifdef DECLARE_uint32 -#undef DECLARE_uint32 -#endif - -#ifndef DECLARE_VARIABLE -#define DECLARE_VARIABLE(type, shorttype, name, tn) \ - namespace fL##shorttype { \ - extern GLOG_EXPORT type FLAGS_##name; \ - } \ - using fL##shorttype::FLAGS_##name - -// bool specialization -#define DECLARE_bool(name) \ - DECLARE_VARIABLE(bool, B, name, bool) - -// int32 specialization -#define DECLARE_int32(name) \ - DECLARE_VARIABLE(google::int32, I, name, int32) - -#if !defined(DECLARE_uint32) -// uint32 specialization -#define DECLARE_uint32(name) \ - DECLARE_VARIABLE(google::uint32, U, name, uint32) -#endif // !defined(DECLARE_uint32) && !(0) - -// Special case for string, because we have to specify the namespace -// std::string, which doesn't play nicely with our FLAG__namespace hackery. -#define DECLARE_string(name) \ - namespace fLS { \ - extern GLOG_EXPORT std::string& FLAGS_##name; \ - } \ - using fLS::FLAGS_##name -#endif - -// Set whether appending a timestamp to the log file name -DECLARE_bool(timestamp_in_logfile_name); - -// Set whether log messages go to stdout instead of logfiles -DECLARE_bool(logtostdout); - -// Set color messages logged to stdout (if supported by terminal). -DECLARE_bool(colorlogtostdout); - -// Set whether log messages go to stderr instead of logfiles -DECLARE_bool(logtostderr); - -// Set whether log messages go to stderr in addition to logfiles. -DECLARE_bool(alsologtostderr); - -// Set color messages logged to stderr (if supported by terminal). -DECLARE_bool(colorlogtostderr); - -// Log messages at a level >= this flag are automatically sent to -// stderr in addition to log files. -DECLARE_int32(stderrthreshold); - -// Set whether the log prefix should be prepended to each line of output. -DECLARE_bool(log_prefix); - -// Set whether the year should be included in the log prefix. -DECLARE_bool(log_year_in_prefix); - -// Log messages at a level <= this flag are buffered. -// Log messages at a higher level are flushed immediately. -DECLARE_int32(logbuflevel); - -// Sets the maximum number of seconds which logs may be buffered for. -DECLARE_int32(logbufsecs); - -// Log suppression level: messages logged at a lower level than this -// are suppressed. -DECLARE_int32(minloglevel); - -// If specified, logfiles are written into this directory instead of the -// default logging directory. -DECLARE_string(log_dir); - -// Set the log file mode. -DECLARE_int32(logfile_mode); - -// Sets the path of the directory into which to put additional links -// to the log files. -DECLARE_string(log_link); - -DECLARE_int32(v); // in vlog_is_on.cc - -DECLARE_string(vmodule); // also in vlog_is_on.cc - -// Sets the maximum log file size (in MB). -DECLARE_uint32(max_log_size); - -// Sets whether to avoid logging to the disk if the disk is full. -DECLARE_bool(stop_logging_if_full_disk); - -// Use UTC time for logging -DECLARE_bool(log_utc_time); - // Log messages below the GOOGLE_STRIP_LOG level will be compiled away for -// security reasons. See LOG(severtiy) below. +// security reasons. See LOG(severity) below. // A few definitions of macros that don't generate much code. Since // LOG(INFO) and its ilk are used all over our code, it's // better to have compact code for these operations. #if GOOGLE_STRIP_LOG == 0 -#define COMPACT_GOOGLE_LOG_INFO google::LogMessage( \ - __FILE__, __LINE__) -#define LOG_TO_STRING_INFO(message) google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_INFO, message) +# define COMPACT_GOOGLE_LOG_INFO google::LogMessage(__FILE__, __LINE__) +# define LOG_TO_STRING_INFO(message) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_INFO, message) #else -#define COMPACT_GOOGLE_LOG_INFO google::NullStream() -#define LOG_TO_STRING_INFO(message) google::NullStream() +# define COMPACT_GOOGLE_LOG_INFO google::NullStream() +# define LOG_TO_STRING_INFO(message) google::NullStream() #endif #if GOOGLE_STRIP_LOG <= 1 -#define COMPACT_GOOGLE_LOG_WARNING google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_WARNING) -#define LOG_TO_STRING_WARNING(message) google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_WARNING, message) +# define COMPACT_GOOGLE_LOG_WARNING \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_WARNING) +# define LOG_TO_STRING_WARNING(message) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_WARNING, message) #else -#define COMPACT_GOOGLE_LOG_WARNING google::NullStream() -#define LOG_TO_STRING_WARNING(message) google::NullStream() +# define COMPACT_GOOGLE_LOG_WARNING google::NullStream() +# define LOG_TO_STRING_WARNING(message) google::NullStream() #endif #if GOOGLE_STRIP_LOG <= 2 -#define COMPACT_GOOGLE_LOG_ERROR google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ERROR) -#define LOG_TO_STRING_ERROR(message) google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ERROR, message) +# define COMPACT_GOOGLE_LOG_ERROR \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_ERROR) +# define LOG_TO_STRING_ERROR(message) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_ERROR, message) #else -#define COMPACT_GOOGLE_LOG_ERROR google::NullStream() -#define LOG_TO_STRING_ERROR(message) google::NullStream() +# define COMPACT_GOOGLE_LOG_ERROR google::NullStream() +# define LOG_TO_STRING_ERROR(message) google::NullStream() #endif #if GOOGLE_STRIP_LOG <= 3 -#define COMPACT_GOOGLE_LOG_FATAL google::LogMessageFatal( \ - __FILE__, __LINE__) -#define LOG_TO_STRING_FATAL(message) google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_FATAL, message) +# define COMPACT_GOOGLE_LOG_FATAL google::LogMessageFatal(__FILE__, __LINE__) +# define LOG_TO_STRING_FATAL(message) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_FATAL, message) #else -#define COMPACT_GOOGLE_LOG_FATAL google::NullStreamFatal() -#define LOG_TO_STRING_FATAL(message) google::NullStreamFatal() +# define COMPACT_GOOGLE_LOG_FATAL google::NullStreamFatal() +# define LOG_TO_STRING_FATAL(message) google::NullStreamFatal() #endif #if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON) -#define DCHECK_IS_ON() 0 +# define DCHECK_IS_ON() 0 #else -#define DCHECK_IS_ON() 1 +# define DCHECK_IS_ON() 1 #endif // For DFATAL, we want to use LogMessage (as opposed to // LogMessageFatal), to be consistent with the original behavior. #if !DCHECK_IS_ON() -#define COMPACT_GOOGLE_LOG_DFATAL COMPACT_GOOGLE_LOG_ERROR +# define COMPACT_GOOGLE_LOG_DFATAL COMPACT_GOOGLE_LOG_ERROR #elif GOOGLE_STRIP_LOG <= 3 -#define COMPACT_GOOGLE_LOG_DFATAL google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_FATAL) +# define COMPACT_GOOGLE_LOG_DFATAL \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_FATAL) #else -#define COMPACT_GOOGLE_LOG_DFATAL google::NullStreamFatal() +# define COMPACT_GOOGLE_LOG_DFATAL google::NullStreamFatal() #endif -#define GOOGLE_LOG_INFO(counter) google::LogMessage(__FILE__, __LINE__, google::GLOG_INFO, counter, &google::LogMessage::SendToLog) -#define SYSLOG_INFO(counter) \ +#define GOOGLE_LOG_INFO(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_INFO, counter, \ - &google::LogMessage::SendToSyslogAndLog) -#define GOOGLE_LOG_WARNING(counter) \ + &google::LogMessage::SendToLog) +#define SYSLOG_INFO(counter) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_INFO, counter, \ + &google::LogMessage::SendToSyslogAndLog) +#define GOOGLE_LOG_WARNING(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_WARNING, counter, \ - &google::LogMessage::SendToLog) -#define SYSLOG_WARNING(counter) \ + &google::LogMessage::SendToLog) +#define SYSLOG_WARNING(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_WARNING, counter, \ - &google::LogMessage::SendToSyslogAndLog) -#define GOOGLE_LOG_ERROR(counter) \ + &google::LogMessage::SendToSyslogAndLog) +#define GOOGLE_LOG_ERROR(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_ERROR, counter, \ - &google::LogMessage::SendToLog) -#define SYSLOG_ERROR(counter) \ + &google::LogMessage::SendToLog) +#define SYSLOG_ERROR(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_ERROR, counter, \ - &google::LogMessage::SendToSyslogAndLog) -#define GOOGLE_LOG_FATAL(counter) \ + &google::LogMessage::SendToSyslogAndLog) +#define GOOGLE_LOG_FATAL(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_FATAL, counter, \ - &google::LogMessage::SendToLog) -#define SYSLOG_FATAL(counter) \ + &google::LogMessage::SendToLog) +#define SYSLOG_FATAL(counter) \ google::LogMessage(__FILE__, __LINE__, google::GLOG_FATAL, counter, \ - &google::LogMessage::SendToSyslogAndLog) -#define GOOGLE_LOG_DFATAL(counter) \ + &google::LogMessage::SendToSyslogAndLog) +#define GOOGLE_LOG_DFATAL(counter) \ google::LogMessage(__FILE__, __LINE__, google::DFATAL_LEVEL, counter, \ - &google::LogMessage::SendToLog) -#define SYSLOG_DFATAL(counter) \ + &google::LogMessage::SendToLog) +#define SYSLOG_DFATAL(counter) \ google::LogMessage(__FILE__, __LINE__, google::DFATAL_LEVEL, counter, \ - &google::LogMessage::SendToSyslogAndLog) + &google::LogMessage::SendToSyslogAndLog) -#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) || defined(__CYGWIN32__) +#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || \ + defined(__CYGWIN__) || defined(__CYGWIN32__) // A very useful logging macro to log windows errors: -#define LOG_SYSRESULT(result) \ - if (FAILED(HRESULT_FROM_WIN32(result))) { \ - LPSTR message = NULL; \ - LPSTR msg = reinterpret_cast(&message); \ - DWORD message_length = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | \ - FORMAT_MESSAGE_FROM_SYSTEM, \ - 0, result, 0, msg, 100, NULL); \ - if (message_length > 0) { \ - google::LogMessage(__FILE__, __LINE__, google::GLOG_ERROR, 0, \ - &google::LogMessage::SendToLog).stream() \ - << reinterpret_cast(message); \ - LocalFree(message); \ - } \ - } +# define LOG_SYSRESULT(result) \ + if (FAILED(HRESULT_FROM_WIN32(result))) { \ + LPSTR message = nullptr; \ + LPSTR msg = reinterpret_cast(&message); \ + DWORD message_length = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | \ + FORMAT_MESSAGE_FROM_SYSTEM | \ + FORMAT_MESSAGE_IGNORE_INSERTS, \ + 0, result, 0, msg, 100, nullptr); \ + std::unique_ptr release{message, \ + &LocalFree}; \ + if (message_length > 0) { \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_ERROR, 0, \ + &google::LogMessage::SendToLog) \ + .stream() \ + << reinterpret_cast(message); \ + } \ + } #endif // We use the preprocessor's merging operator, "##", so that, e.g., @@ -607,24 +473,35 @@ DECLARE_bool(log_utc_time); // impossible to stream something like a string directly to an unnamed // ostream. We employ a neat hack by calling the stream() member // function of LogMessage which seems to avoid the problem. -#define LOG(severity) COMPACT_GOOGLE_LOG_ ## severity.stream() -#define SYSLOG(severity) SYSLOG_ ## severity(0).stream() +#define LOG(severity) COMPACT_GOOGLE_LOG_##severity.stream() +#define SYSLOG(severity) SYSLOG_##severity(0).stream() namespace google { -// They need the definitions of integer types. -#include -#include - // Initialize google's logging library. You will see the program name // specified by argv0 in log outputs. GLOG_EXPORT void InitGoogleLogging(const char* argv0); -#ifdef GLOG_CUSTOM_PREFIX_SUPPORT -GLOG_EXPORT void InitGoogleLogging(const char* argv0, - CustomPrefixCallback prefix_callback, - void* prefix_callback_data = NULL); -#endif +class LogMessage; + +#if defined(__GNUG__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#elif defined(_MSC_VER) +# pragma warning(push) +# pragma warning(disable : 4996) +#endif // __GNUG__ +using CustomPrefixCallback + [[deprecated("Use PrefixFormatterCallback instead.")]] = + void (*)(std::ostream&, const LogMessageInfo&, void*); +#if defined(__GNUG__) +# pragma GCC diagnostic pop +#elif defined(_MSC_VER) +# pragma warning(pop) +#endif // __GNUG__ +[[deprecated("Use InstallPrefixFormatter instead.")]] GLOG_EXPORT void +InitGoogleLogging(const char* argv0, CustomPrefixCallback prefix_callback, + void* prefix_callback_data = nullptr); // Check if google's logging library has been initialized. GLOG_EXPORT bool IsGoogleLoggingInitialized(); @@ -638,67 +515,81 @@ typedef void (*logging_fail_func_t)() __attribute__((noreturn)); typedef void (*logging_fail_func_t)(); #endif -// Install a function which will be called after LOG(FATAL). -GLOG_EXPORT void InstallFailureFunction(logging_fail_func_t fail_func); +using PrefixFormatterCallback = void (*)(std::ostream&, const LogMessage&, + void*); +GLOG_EXPORT void InstallPrefixFormatter(PrefixFormatterCallback callback, + void* data = nullptr); + +// Install a function which will be called after LOG(FATAL). Returns the +// previously set function. +GLOG_EXPORT logging_fail_func_t +InstallFailureFunction(logging_fail_func_t fail_func); + +[[deprecated( + "Use the type-safe std::chrono::minutes EnableLogCleaner overload " + "instead.")]] GLOG_EXPORT void +EnableLogCleaner(unsigned int overdue_days); // Enable/Disable old log cleaner. -GLOG_EXPORT void EnableLogCleaner(unsigned int overdue_days); +GLOG_EXPORT void EnableLogCleaner(const std::chrono::minutes& overdue); GLOG_EXPORT void DisableLogCleaner(); GLOG_EXPORT void SetApplicationFingerprint(const std::string& fingerprint); class LogSink; // defined below -// If a non-NULL sink pointer is given, we push this message to that sink. +// If a non-nullptr sink pointer is given, we push this message to that sink. // For LOG_TO_SINK we then do normal LOG(severity) logging as well. // This is useful for capturing messages and passing/storing them // somewhere more specific than the global log of the process. // Argument types: // LogSink* sink; // LogSeverity severity; -// The cast is to disambiguate NULL arguments. -#define LOG_TO_SINK(sink, severity) \ - google::LogMessage( \ - __FILE__, __LINE__, \ - google::GLOG_ ## severity, \ - static_cast(sink), true).stream() -#define LOG_TO_SINK_BUT_NOT_TO_LOGFILE(sink, severity) \ - google::LogMessage( \ - __FILE__, __LINE__, \ - google::GLOG_ ## severity, \ - static_cast(sink), false).stream() +// The cast is to disambiguate nullptr arguments. +#define LOG_TO_SINK(sink, severity) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + static_cast(sink), true) \ + .stream() +#define LOG_TO_SINK_BUT_NOT_TO_LOGFILE(sink, severity) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + static_cast(sink), false) \ + .stream() -// If a non-NULL string pointer is given, we write this message to that string. -// We then do normal LOG(severity) logging as well. -// This is useful for capturing messages and storing them somewhere more -// specific than the global log of the process. -// Argument types: +// If a non-nullptr string pointer is given, we write this message to that +// string. We then do normal LOG(severity) logging as well. This is useful for +// capturing messages and storing them somewhere more specific than the global +// log of the process. Argument types: // string* message; // LogSeverity severity; -// The cast is to disambiguate NULL arguments. +// The cast is to disambiguate nullptr arguments. // NOTE: LOG(severity) expands to LogMessage().stream() for the specified // severity. #define LOG_TO_STRING(severity, message) \ LOG_TO_STRING_##severity(static_cast(message)).stream() -// If a non-NULL pointer is given, we push the message onto the end +// If a non-nullptr pointer is given, we push the message onto the end // of a vector of strings; otherwise, we report it with LOG(severity). // This is handy for capturing messages and perhaps passing them back // to the caller, rather than reporting them immediately. // Argument types: // LogSeverity severity; // vector *outvec; -// The cast is to disambiguate NULL arguments. -#define LOG_STRING(severity, outvec) \ - LOG_TO_STRING_##severity(static_cast*>(outvec)).stream() +// The cast is to disambiguate nullptr arguments. +#define LOG_STRING(severity, outvec) \ + LOG_TO_STRING_##severity(static_cast*>(outvec)) \ + .stream() #define LOG_IF(severity, condition) \ static_cast(0), \ - !(condition) ? (void) 0 : google::LogMessageVoidify() & LOG(severity) + !(condition) \ + ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) #define SYSLOG_IF(severity, condition) \ static_cast(0), \ - !(condition) ? (void) 0 : google::LogMessageVoidify() & SYSLOG(severity) + !(condition) \ + ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & SYSLOG(severity) -#define LOG_ASSERT(condition) \ +#define LOG_ASSERT(condition) \ LOG_IF(FATAL, !(condition)) << "Assert failed: " #condition #define SYSLOG_ASSERT(condition) \ SYSLOG_IF(FATAL, !(condition)) << "Assert failed: " #condition @@ -707,58 +598,55 @@ class LogSink; // defined below // controlled by DCHECK_IS_ON(), so the check will be executed regardless of // compilation mode. Therefore, it is safe to do things like: // CHECK(fp->Write(x) == 4) -#define CHECK(condition) \ - LOG_IF(FATAL, GOOGLE_PREDICT_BRANCH_NOT_TAKEN(!(condition))) \ - << "Check failed: " #condition " " +#define CHECK(condition) \ + LOG_IF(FATAL, GOOGLE_PREDICT_BRANCH_NOT_TAKEN(!(condition))) \ + << "Check failed: " #condition " " + +namespace logging { +namespace internal { // A container for a string pointer which can be evaluated to a bool - -// true iff the pointer is NULL. +// true iff the pointer is nullptr. struct CheckOpString { - CheckOpString(std::string* str) : str_(str) { } - // No destructor: if str_ is non-NULL, we're about to LOG(FATAL), - // so there's no point in cleaning up str_. - operator bool() const { - return GOOGLE_PREDICT_BRANCH_NOT_TAKEN(str_ != NULL); + CheckOpString(std::unique_ptr str) : str_(std::move(str)) {} + explicit operator bool() const noexcept { + return GOOGLE_PREDICT_BRANCH_NOT_TAKEN(str_ != nullptr); } - std::string* str_; + std::unique_ptr str_; }; // Function is overloaded for integral types to allow static const // integrals declared in classes and not defined to be used as arguments to // CHECK* macros. It's not encouraged though. template -inline const T& GetReferenceableValue(const T& t) { return t; } -inline char GetReferenceableValue(char t) { return t; } -inline unsigned char GetReferenceableValue(unsigned char t) { return t; } -inline signed char GetReferenceableValue(signed char t) { return t; } -inline short GetReferenceableValue(short t) { return t; } -inline unsigned short GetReferenceableValue(unsigned short t) { return t; } -inline int GetReferenceableValue(int t) { return t; } -inline unsigned int GetReferenceableValue(unsigned int t) { return t; } -inline long GetReferenceableValue(long t) { return t; } -inline unsigned long GetReferenceableValue(unsigned long t) { return t; } -#if __cplusplus >= 201103L -inline long long GetReferenceableValue(long long t) { return t; } +inline const T& GetReferenceableValue(const T& t) { + return t; +} +inline char GetReferenceableValue(char t) { return t; } +inline unsigned char GetReferenceableValue(unsigned char t) { return t; } +inline signed char GetReferenceableValue(signed char t) { return t; } +inline short GetReferenceableValue(short t) { return t; } +inline unsigned short GetReferenceableValue(unsigned short t) { return t; } +inline int GetReferenceableValue(int t) { return t; } +inline unsigned int GetReferenceableValue(unsigned int t) { return t; } +inline long GetReferenceableValue(long t) { return t; } +inline unsigned long GetReferenceableValue(unsigned long t) { return t; } +inline long long GetReferenceableValue(long long t) { return t; } inline unsigned long long GetReferenceableValue(unsigned long long t) { return t; } -#endif // This is a dummy class to define the following operator. struct DummyClassToDefineOperator {}; -} - // Define global operator<< to declare using ::operator<<. // This declaration will allow use to use CHECK macros for user // defined classes which have operator<< (e.g., stl_logging.h). -inline std::ostream& operator<<( - std::ostream& out, const google::DummyClassToDefineOperator&) { +inline std::ostream& operator<<(std::ostream& out, + const DummyClassToDefineOperator&) { return out; } -namespace google { - // This formats a value for a failing CHECK_XX statement. Ordinarily, // it uses the definition for operator<<, with a few special cases below. template @@ -768,34 +656,29 @@ inline void MakeCheckOpValueString(std::ostream* os, const T& v) { // Overrides for char types provide readable values for unprintable // characters. -template <> GLOG_EXPORT -void MakeCheckOpValueString(std::ostream* os, const char& v); -template <> GLOG_EXPORT -void MakeCheckOpValueString(std::ostream* os, const signed char& v); -template <> GLOG_EXPORT -void MakeCheckOpValueString(std::ostream* os, const unsigned char& v); +template <> +GLOG_EXPORT void MakeCheckOpValueString(std::ostream* os, const char& v); +template <> +GLOG_EXPORT void MakeCheckOpValueString(std::ostream* os, const signed char& v); +template <> +GLOG_EXPORT void MakeCheckOpValueString(std::ostream* os, + const unsigned char& v); -// This is required because nullptr is only present in c++ 11 and later. -#if 1 && __cplusplus >= 201103L // Provide printable value for nullptr_t -template <> GLOG_EXPORT -void MakeCheckOpValueString(std::ostream* os, const std::nullptr_t& v); -#endif +template <> +GLOG_EXPORT void MakeCheckOpValueString(std::ostream* os, + const std::nullptr_t& v); // Build the error message string. Specify no inlining for code size. template -std::string* MakeCheckOpString(const T1& v1, const T2& v2, const char* exprtext) - __attribute__((noinline)); - -namespace base { -namespace internal { - -// If "s" is less than base_logging::INFO, returns base_logging::INFO. -// If "s" is greater than base_logging::FATAL, returns -// base_logging::ERROR. Otherwise, returns "s". -LogSeverity NormalizeSeverity(LogSeverity s); - -} // namespace internal +std::unique_ptr MakeCheckOpString(const T1& v1, const T2& v2, + const char* exprtext) +#if defined(__has_attribute) +# if __has_attribute(used) + __attribute__((noinline)) +# endif +#endif + ; // A helper class for formatting "expr (V1 vs. V2)" in a CHECK_XX // statement. See MakeCheckOpString for sample usage. Other @@ -806,7 +689,7 @@ LogSeverity NormalizeSeverity(LogSeverity s); class GLOG_EXPORT CheckOpMessageBuilder { public: // Inserts "exprtext" and " (" to the stream. - explicit CheckOpMessageBuilder(const char *exprtext); + explicit CheckOpMessageBuilder(const char* exprtext); // Deletes "stream_". ~CheckOpMessageBuilder(); // For inserting the first variable. @@ -814,17 +697,16 @@ class GLOG_EXPORT CheckOpMessageBuilder { // For inserting the second variable (adds an intermediate " vs. "). std::ostream* ForVar2(); // Get the result (inserts the closing ")"). - std::string* NewString(); + std::unique_ptr NewString(); private: - std::ostringstream *stream_; + std::ostringstream* stream_; }; -} // namespace base - template -std::string* MakeCheckOpString(const T1& v1, const T2& v2, const char* exprtext) { - base::CheckOpMessageBuilder comb(exprtext); +std::unique_ptr MakeCheckOpString(const T1& v1, const T2& v2, + const char* exprtext) { + CheckOpMessageBuilder comb(exprtext); MakeCheckOpValueString(comb.ForVar1(), v1); MakeCheckOpValueString(comb.ForVar2(), v2); return comb.NewString(); @@ -834,27 +716,31 @@ std::string* MakeCheckOpString(const T1& v1, const T2& v2, const char* exprtext) // The (int, int) specialization works around the issue that the compiler // will not instantiate the template version of the function on values of // unnamed enum type - see comment below. -#define DEFINE_CHECK_OP_IMPL(name, op) \ - template \ - inline std::string* name##Impl(const T1& v1, const T2& v2, \ - const char* exprtext) { \ - if (GOOGLE_PREDICT_TRUE(v1 op v2)) return NULL; \ - else return MakeCheckOpString(v1, v2, exprtext); \ - } \ - inline std::string* name##Impl(int v1, int v2, const char* exprtext) { \ - return name##Impl(v1, v2, exprtext); \ +#define DEFINE_CHECK_OP_IMPL(name, op) \ + template \ + inline std::unique_ptr name##Impl(const T1& v1, const T2& v2, \ + const char* exprtext) { \ + if (GOOGLE_PREDICT_TRUE(v1 op v2)) { \ + return nullptr; \ + } \ + return MakeCheckOpString(v1, v2, exprtext); \ + } \ + inline std::unique_ptr name##Impl(int v1, int v2, \ + const char* exprtext) { \ + return name##Impl(v1, v2, exprtext); \ } // We use the full name Check_EQ, Check_NE, etc. in case the file including // base/logging.h provides its own #defines for the simpler names EQ, NE, etc. // This happens if, for example, those are used as token names in a // yacc grammar. -DEFINE_CHECK_OP_IMPL(Check_EQ, ==) // Compilation error with CHECK_EQ(NULL, x)? -DEFINE_CHECK_OP_IMPL(Check_NE, !=) // Use CHECK(x == NULL) instead. +DEFINE_CHECK_OP_IMPL(Check_EQ, ==) +DEFINE_CHECK_OP_IMPL(Check_NE, !=) DEFINE_CHECK_OP_IMPL(Check_LE, <=) -DEFINE_CHECK_OP_IMPL(Check_LT, < ) +DEFINE_CHECK_OP_IMPL(Check_LT, <) DEFINE_CHECK_OP_IMPL(Check_GE, >=) -DEFINE_CHECK_OP_IMPL(Check_GT, > ) +DEFINE_CHECK_OP_IMPL(Check_GT, >) + #undef DEFINE_CHECK_OP_IMPL // Helper macro for binary operators. @@ -862,10 +748,10 @@ DEFINE_CHECK_OP_IMPL(Check_GT, > ) #if defined(STATIC_ANALYSIS) // Only for static analysis tool to know that it is equivalent to assert -#define CHECK_OP_LOG(name, op, val1, val2, log) CHECK((val1) op (val2)) +# define CHECK_OP_LOG(name, op, val1, val2, log) CHECK((val1)op(val2)) #elif DCHECK_IS_ON() // In debug mode, avoid constructing CheckOpStrings if possible, -// to reduce the overhead of CHECK statments by 2x. +// to reduce the overhead of CHECK statements by 2x. // Real DCHECK-heavy tests have seen 1.5x speedups. // The meaning of "string" might be different between now and @@ -873,34 +759,35 @@ DEFINE_CHECK_OP_IMPL(Check_GT, > ) // with other string implementations that get defined after this // file is included). Save the current meaning now and use it // in the macro. -typedef std::string _Check_string; -#define CHECK_OP_LOG(name, op, val1, val2, log) \ - while (google::_Check_string* _result = \ - google::Check##name##Impl( \ - google::GetReferenceableValue(val1), \ - google::GetReferenceableValue(val2), \ - #val1 " " #op " " #val2)) \ - log(__FILE__, __LINE__, \ - google::CheckOpString(_result)).stream() +using _Check_string = std::string; +# define CHECK_OP_LOG(name, op, val1, val2, log) \ + while (std::unique_ptr _result = \ + google::logging::internal::Check##name##Impl( \ + google::logging::internal::GetReferenceableValue(val1), \ + google::logging::internal::GetReferenceableValue(val2), \ + #val1 " " #op " " #val2)) \ + log(__FILE__, __LINE__, \ + google::logging::internal::CheckOpString(std::move(_result))) \ + .stream() #else // In optimized mode, use CheckOpString to hint to compiler that // the while condition is unlikely. -#define CHECK_OP_LOG(name, op, val1, val2, log) \ - while (google::CheckOpString _result = \ - google::Check##name##Impl( \ - google::GetReferenceableValue(val1), \ - google::GetReferenceableValue(val2), \ - #val1 " " #op " " #val2)) \ +# define CHECK_OP_LOG(name, op, val1, val2, log) \ + while (google::logging::internal::CheckOpString _result = \ + google::logging::internal::Check##name##Impl( \ + google::logging::internal::GetReferenceableValue(val1), \ + google::logging::internal::GetReferenceableValue(val2), \ + #val1 " " #op " " #val2)) \ log(__FILE__, __LINE__, _result).stream() #endif // STATIC_ANALYSIS, DCHECK_IS_ON() #if GOOGLE_STRIP_LOG <= 3 -#define CHECK_OP(name, op, val1, val2) \ - CHECK_OP_LOG(name, op, val1, val2, google::LogMessageFatal) +# define CHECK_OP(name, op, val1, val2) \ + CHECK_OP_LOG(name, op, val1, val2, google::LogMessageFatal) #else -#define CHECK_OP(name, op, val1, val2) \ - CHECK_OP_LOG(name, op, val1, val2, google::NullStreamFatal) -#endif // STRIP_LOG <= 3 +# define CHECK_OP(name, op, val1, val2) \ + CHECK_OP_LOG(name, op, val1, val2, google::NullStreamFatal) +#endif // STRIP_LOG <= 3 // Equality/Inequality checks - compare two values, and log a FATAL message // including the two values when the result is not as expected. The values @@ -917,41 +804,46 @@ typedef std::string _Check_string; // CHECK_EQ(string("abc")[1], 'b'); // // WARNING: These don't compile correctly if one of the arguments is a pointer -// and the other is NULL. To work around this, simply static_cast NULL to the -// type of the desired pointer. +// and the other is nullptr. To work around this, simply static_cast nullptr to +// the type of the desired pointer. #define CHECK_EQ(val1, val2) CHECK_OP(_EQ, ==, val1, val2) #define CHECK_NE(val1, val2) CHECK_OP(_NE, !=, val1, val2) #define CHECK_LE(val1, val2) CHECK_OP(_LE, <=, val1, val2) -#define CHECK_LT(val1, val2) CHECK_OP(_LT, < , val1, val2) +#define CHECK_LT(val1, val2) CHECK_OP(_LT, <, val1, val2) #define CHECK_GE(val1, val2) CHECK_OP(_GE, >=, val1, val2) -#define CHECK_GT(val1, val2) CHECK_OP(_GT, > , val1, val2) +#define CHECK_GT(val1, val2) CHECK_OP(_GT, >, val1, val2) -// Check that the input is non NULL. This very useful in constructor +// Check that the input is non nullptr. This very useful in constructor // initializer lists. -#define CHECK_NOTNULL(val) \ - google::CheckNotNull(__FILE__, __LINE__, "'" #val "' Must be non NULL", (val)) +#define CHECK_NOTNULL(val) \ + google::logging::internal::CheckNotNull( \ + __FILE__, __LINE__, "'" #val "' Must be non nullptr", (val)) // Helper functions for string comparisons. // To avoid bloat, the definitions are in logging.cc. -#define DECLARE_CHECK_STROP_IMPL(func, expected) \ - GLOG_EXPORT std::string* Check##func##expected##Impl( \ +#define DECLARE_CHECK_STROP_IMPL(func, expected) \ + GLOG_EXPORT std::unique_ptr Check##func##expected##Impl( \ const char* s1, const char* s2, const char* names); + DECLARE_CHECK_STROP_IMPL(strcmp, true) DECLARE_CHECK_STROP_IMPL(strcmp, false) DECLARE_CHECK_STROP_IMPL(strcasecmp, true) DECLARE_CHECK_STROP_IMPL(strcasecmp, false) + +} // namespace internal +} // namespace logging + #undef DECLARE_CHECK_STROP_IMPL // Helper macro for string comparisons. // Don't use this macro directly in your code, use CHECK_STREQ et al below. -#define CHECK_STROP(func, op, expected, s1, s2) \ - while (google::CheckOpString _result = \ - google::Check##func##expected##Impl((s1), (s2), \ - #s1 " " #op " " #s2)) \ - LOG(FATAL) << *_result.str_ - +#define CHECK_STROP(func, op, expected, s1, s2) \ + while (google::logging::internal::CheckOpString _result = \ + google::logging::internal::Check##func##expected##Impl( \ + (s1), (s2), #s1 " " #op " " #s2)) \ + LOG(FATAL) << (*_result.str_) // String (char*) equality/inequality checks. // CASE versions are case-insensitive. @@ -965,19 +857,19 @@ DECLARE_CHECK_STROP_IMPL(strcasecmp, false) #define CHECK_STRCASEEQ(s1, s2) CHECK_STROP(strcasecmp, ==, true, s1, s2) #define CHECK_STRCASENE(s1, s2) CHECK_STROP(strcasecmp, !=, false, s1, s2) -#define CHECK_INDEX(I,A) CHECK(I < (sizeof(A)/sizeof(A[0]))) -#define CHECK_BOUND(B,A) CHECK(B <= (sizeof(A)/sizeof(A[0]))) +#define CHECK_INDEX(I, A) CHECK(I < (sizeof(A) / sizeof(A[0]))) +#define CHECK_BOUND(B, A) CHECK(B <= (sizeof(A) / sizeof(A[0]))) -#define CHECK_DOUBLE_EQ(val1, val2) \ - do { \ - CHECK_LE((val1), (val2)+0.000000000000001L); \ - CHECK_GE((val1), (val2)-0.000000000000001L); \ +#define CHECK_DOUBLE_EQ(val1, val2) \ + do { \ + CHECK_LE((val1), (val2) + 0.000000000000001L); \ + CHECK_GE((val1), (val2)-0.000000000000001L); \ } while (0) -#define CHECK_NEAR(val1, val2, margin) \ - do { \ - CHECK_LE((val1), (val2)+(margin)); \ - CHECK_GE((val1), (val2)-(margin)); \ +#define CHECK_NEAR(val1, val2, margin) \ + do { \ + CHECK_LE((val1), (val2) + (margin)); \ + CHECK_GE((val1), (val2) - (margin)); \ } while (0) // perror()..googly style! @@ -988,21 +880,22 @@ DECLARE_CHECK_STROP_IMPL(strcasecmp, false) #define PLOG(severity) GOOGLE_PLOG(severity, 0).stream() -#define GOOGLE_PLOG(severity, counter) \ - google::ErrnoLogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, counter, \ - &google::LogMessage::SendToLog) +#define GOOGLE_PLOG(severity, counter) \ + google::ErrnoLogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + counter, &google::LogMessage::SendToLog) #define PLOG_IF(severity, condition) \ static_cast(0), \ - !(condition) ? (void) 0 : google::LogMessageVoidify() & PLOG(severity) + !(condition) \ + ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & PLOG(severity) // A CHECK() macro that postpends errno if the condition is false. E.g. // // if (poll(fds, nfds, timeout) == -1) { PCHECK(errno == EINTR); ... } -#define PCHECK(condition) \ - PLOG_IF(FATAL, GOOGLE_PREDICT_BRANCH_NOT_TAKEN(!(condition))) \ - << "Check failed: " #condition " " +#define PCHECK(condition) \ + PLOG_IF(FATAL, GOOGLE_PREDICT_BRANCH_NOT_TAKEN(!(condition))) \ + << "Check failed: " #condition " " // A CHECK() macro that lets you assert the success of a function that // returns -1 and sets errno in case of an error. E.g. @@ -1012,258 +905,117 @@ DECLARE_CHECK_STROP_IMPL(strcasecmp, false) // or // // int fd = open(filename, flags); CHECK_ERR(fd) << ": open " << filename; -#define CHECK_ERR(invocation) \ -PLOG_IF(FATAL, GOOGLE_PREDICT_BRANCH_NOT_TAKEN((invocation) == -1)) \ - << #invocation +#define CHECK_ERR(invocation) \ + PLOG_IF(FATAL, GOOGLE_PREDICT_BRANCH_NOT_TAKEN((invocation) == -1)) \ + << #invocation // Use macro expansion to create, for each use of LOG_EVERY_N(), static // variables with the __LINE__ expansion as part of the variable name. #define LOG_EVERY_N_VARNAME(base, line) LOG_EVERY_N_VARNAME_CONCAT(base, line) -#define LOG_EVERY_N_VARNAME_CONCAT(base, line) base ## line +#define LOG_EVERY_N_VARNAME_CONCAT(base, line) base##line #define LOG_OCCURRENCES LOG_EVERY_N_VARNAME(occurrences_, __LINE__) #define LOG_OCCURRENCES_MOD_N LOG_EVERY_N_VARNAME(occurrences_mod_n_, __LINE__) -#if 1 && __cplusplus >= 201103L -#define GLOG_CONSTEXPR constexpr -#else -#define GLOG_CONSTEXPR const -#endif - #define LOG_TIME_PERIOD LOG_EVERY_N_VARNAME(timePeriod_, __LINE__) #define LOG_PREVIOUS_TIME_RAW LOG_EVERY_N_VARNAME(previousTimeRaw_, __LINE__) #define LOG_TIME_DELTA LOG_EVERY_N_VARNAME(deltaTime_, __LINE__) #define LOG_CURRENT_TIME LOG_EVERY_N_VARNAME(currentTime_, __LINE__) #define LOG_PREVIOUS_TIME LOG_EVERY_N_VARNAME(previousTime_, __LINE__) -#if defined(__has_feature) -# if __has_feature(thread_sanitizer) -# define GLOG_SANITIZE_THREAD 1 -# endif -#endif - -#if !defined(GLOG_SANITIZE_THREAD) && defined(__SANITIZE_THREAD__) && __SANITIZE_THREAD__ -# define GLOG_SANITIZE_THREAD 1 -#endif - -#if defined(GLOG_SANITIZE_THREAD) -#define GLOG_IFDEF_THREAD_SANITIZER(X) X -#else -#define GLOG_IFDEF_THREAD_SANITIZER(X) -#endif - -#if defined(GLOG_SANITIZE_THREAD) -} // namespace google - -// We need to identify the static variables as "benign" races -// to avoid noisy reports from TSAN. -extern "C" void AnnotateBenignRaceSized( - const char *file, - int line, - const volatile void *mem, - size_t size, - const char *description); +} // namespace google namespace google { -#endif -#if __cplusplus >= 201103L && 1 && 1 // Have and -#define SOME_KIND_OF_LOG_EVERY_T(severity, seconds) \ - GLOG_CONSTEXPR std::chrono::nanoseconds LOG_TIME_PERIOD = std::chrono::duration_cast(std::chrono::duration(seconds)); \ - static std::atomic LOG_PREVIOUS_TIME_RAW; \ - GLOG_IFDEF_THREAD_SANITIZER( \ - AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_TIME_PERIOD, sizeof(google::int64), "")); \ - GLOG_IFDEF_THREAD_SANITIZER( \ - AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_PREVIOUS_TIME_RAW, sizeof(google::int64), "")); \ - const auto LOG_CURRENT_TIME = std::chrono::duration_cast(std::chrono::steady_clock::now().time_since_epoch()); \ - const auto LOG_PREVIOUS_TIME = LOG_PREVIOUS_TIME_RAW.load(std::memory_order_relaxed); \ - const auto LOG_TIME_DELTA = LOG_CURRENT_TIME - std::chrono::nanoseconds(LOG_PREVIOUS_TIME); \ - if (LOG_TIME_DELTA > LOG_TIME_PERIOD) \ - LOG_PREVIOUS_TIME_RAW.store(std::chrono::duration_cast(LOG_CURRENT_TIME).count(), std::memory_order_relaxed); \ - if (LOG_TIME_DELTA > LOG_TIME_PERIOD) google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity).stream() -#elif defined(GLOG_OS_WINDOWS) -#define SOME_KIND_OF_LOG_EVERY_T(severity, seconds) \ - GLOG_CONSTEXPR LONGLONG LOG_TIME_PERIOD = (seconds) * LONGLONG(1000000000); \ - static LARGE_INTEGER LOG_PREVIOUS_TIME; \ - LONGLONG LOG_TIME_DELTA; \ - { \ - LARGE_INTEGER currTime; \ - LARGE_INTEGER freq; \ - QueryPerformanceCounter(&currTime); \ - QueryPerformanceFrequency(&freq); \ - InterlockedCompareExchange64(&LOG_PREVIOUS_TIME.QuadPart, currTime.QuadPart, 0); \ - LOG_TIME_DELTA = (currTime.QuadPart - LOG_PREVIOUS_TIME.QuadPart) * LONGLONG(1000000000) / freq.QuadPart; \ - if (LOG_TIME_DELTA > LOG_TIME_PERIOD) InterlockedExchange64(&LOG_PREVIOUS_TIME.QuadPart, currTime.QuadPart); \ - } \ - if (LOG_TIME_DELTA > LOG_TIME_PERIOD) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity).stream() -#else -#define SOME_KIND_OF_LOG_EVERY_T(severity, seconds) \ - GLOG_CONSTEXPR google::int64 LOG_TIME_PERIOD(seconds * 1000000000); \ - static google::int64 LOG_PREVIOUS_TIME; \ - google::int64 LOG_TIME_DELTA = 0; \ - { \ - timespec currentTime = {}; \ - clock_gettime(CLOCK_MONOTONIC, ¤tTime); \ - LOG_TIME_DELTA = (currentTime.tv_sec * 1000000000 + currentTime.tv_nsec) - LOG_PREVIOUS_TIME; \ - } \ - if (LOG_TIME_DELTA > LOG_TIME_PERIOD) __sync_add_and_fetch(&LOG_PREVIOUS_TIME, LOG_TIME_DELTA); \ - if (LOG_TIME_DELTA > LOG_TIME_PERIOD) google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity).stream() -#endif +#define SOME_KIND_OF_LOG_EVERY_T(severity, seconds) \ + constexpr std::chrono::nanoseconds LOG_TIME_PERIOD = \ + std::chrono::duration_cast( \ + std::chrono::duration(seconds)); \ + static std::atomic LOG_PREVIOUS_TIME_RAW; \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_TIME_PERIOD, sizeof(google::int64), "")); \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_PREVIOUS_TIME_RAW, sizeof(google::int64), "")); \ + const auto LOG_CURRENT_TIME = \ + std::chrono::duration_cast( \ + std::chrono::steady_clock::now().time_since_epoch()); \ + const auto LOG_PREVIOUS_TIME = \ + LOG_PREVIOUS_TIME_RAW.load(std::memory_order_relaxed); \ + const auto LOG_TIME_DELTA = \ + LOG_CURRENT_TIME - std::chrono::nanoseconds(LOG_PREVIOUS_TIME); \ + if (LOG_TIME_DELTA > LOG_TIME_PERIOD) \ + LOG_PREVIOUS_TIME_RAW.store( \ + std::chrono::duration_cast(LOG_CURRENT_TIME) \ + .count(), \ + std::memory_order_relaxed); \ + if (LOG_TIME_DELTA > LOG_TIME_PERIOD) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_##severity).stream() -#if 1 && __cplusplus >= 201103L -#define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ +#define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ static std::atomic LOG_OCCURRENCES(0), LOG_OCCURRENCES_MOD_N(0); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES_MOD_N, sizeof(int), "")); \ - ++LOG_OCCURRENCES; \ - if (++LOG_OCCURRENCES_MOD_N > n) LOG_OCCURRENCES_MOD_N -= n; \ - if (LOG_OCCURRENCES_MOD_N == 1) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES_MOD_N, sizeof(int), "")); \ + ++LOG_OCCURRENCES; \ + if (++LOG_OCCURRENCES_MOD_N > n) LOG_OCCURRENCES_MOD_N -= n; \ + if (LOG_OCCURRENCES_MOD_N == 1) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + LOG_OCCURRENCES, &what_to_do) \ + .stream() -#define SOME_KIND_OF_LOG_IF_EVERY_N(severity, condition, n, what_to_do) \ +#define SOME_KIND_OF_LOG_IF_EVERY_N(severity, condition, n, what_to_do) \ + static std::atomic LOG_OCCURRENCES(0), LOG_OCCURRENCES_MOD_N(0); \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES_MOD_N, sizeof(int), "")); \ + ++LOG_OCCURRENCES; \ + if ((condition) && \ + ((LOG_OCCURRENCES_MOD_N = (LOG_OCCURRENCES_MOD_N + 1) % n) == (1 % n))) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + LOG_OCCURRENCES, &what_to_do) \ + .stream() + +#define SOME_KIND_OF_PLOG_EVERY_N(severity, n, what_to_do) \ static std::atomic LOG_OCCURRENCES(0), LOG_OCCURRENCES_MOD_N(0); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES_MOD_N, sizeof(int), "")); \ - ++LOG_OCCURRENCES; \ - if ((condition) && \ - ((LOG_OCCURRENCES_MOD_N=(LOG_OCCURRENCES_MOD_N + 1) % n) == (1 % n))) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES_MOD_N, sizeof(int), "")); \ + ++LOG_OCCURRENCES; \ + if (++LOG_OCCURRENCES_MOD_N > n) LOG_OCCURRENCES_MOD_N -= n; \ + if (LOG_OCCURRENCES_MOD_N == 1) \ + google::ErrnoLogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + LOG_OCCURRENCES, &what_to_do) \ + .stream() -#define SOME_KIND_OF_PLOG_EVERY_N(severity, n, what_to_do) \ - static std::atomic LOG_OCCURRENCES(0), LOG_OCCURRENCES_MOD_N(0); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES_MOD_N, sizeof(int), "")); \ - ++LOG_OCCURRENCES; \ - if (++LOG_OCCURRENCES_MOD_N > n) LOG_OCCURRENCES_MOD_N -= n; \ - if (LOG_OCCURRENCES_MOD_N == 1) \ - google::ErrnoLogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() +#define SOME_KIND_OF_LOG_FIRST_N(severity, n, what_to_do) \ + static std::atomic LOG_OCCURRENCES(0); \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ + if (LOG_OCCURRENCES <= n) ++LOG_OCCURRENCES; \ + if (LOG_OCCURRENCES <= n) \ + google::LogMessage(__FILE__, __LINE__, google::GLOG_##severity, \ + LOG_OCCURRENCES, &what_to_do) \ + .stream() -#define SOME_KIND_OF_LOG_FIRST_N(severity, n, what_to_do) \ - static std::atomic LOG_OCCURRENCES(0); \ - GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ - if (LOG_OCCURRENCES <= n) \ - ++LOG_OCCURRENCES; \ - if (LOG_OCCURRENCES <= n) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#elif defined(GLOG_OS_WINDOWS) - -#define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ - static volatile unsigned LOG_OCCURRENCES = 0; \ - static volatile unsigned LOG_OCCURRENCES_MOD_N = 0; \ - InterlockedIncrement(&LOG_OCCURRENCES); \ - if (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) > n) \ - InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n); \ - if (LOG_OCCURRENCES_MOD_N == 1) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#define SOME_KIND_OF_LOG_IF_EVERY_N(severity, condition, n, what_to_do) \ - static volatile unsigned LOG_OCCURRENCES = 0; \ - static volatile unsigned LOG_OCCURRENCES_MOD_N = 0; \ - InterlockedIncrement(&LOG_OCCURRENCES); \ - if ((condition) && \ - ((InterlockedIncrement(&LOG_OCCURRENCES_MOD_N), \ - (LOG_OCCURRENCES_MOD_N > n && InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n))), \ - LOG_OCCURRENCES_MOD_N == 1)) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#define SOME_KIND_OF_PLOG_EVERY_N(severity, n, what_to_do) \ - static volatile unsigned LOG_OCCURRENCES = 0; \ - static volatile unsigned LOG_OCCURRENCES_MOD_N = 0; \ - InterlockedIncrement(&LOG_OCCURRENCES); \ - if (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) > n) \ - InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n); \ - if (LOG_OCCURRENCES_MOD_N == 1) \ - google::ErrnoLogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#define SOME_KIND_OF_LOG_FIRST_N(severity, n, what_to_do) \ - static volatile unsigned LOG_OCCURRENCES = 0; \ - if (LOG_OCCURRENCES <= n) \ - InterlockedIncrement(&LOG_OCCURRENCES); \ - if (LOG_OCCURRENCES <= n) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#else - -#define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ - static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ - __sync_add_and_fetch(&LOG_OCCURRENCES, 1); \ - if (__sync_add_and_fetch(&LOG_OCCURRENCES_MOD_N, 1) > n) \ - __sync_sub_and_fetch(&LOG_OCCURRENCES_MOD_N, n); \ - if (LOG_OCCURRENCES_MOD_N == 1) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#define SOME_KIND_OF_LOG_IF_EVERY_N(severity, condition, n, what_to_do) \ - static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ - __sync_add_and_fetch(&LOG_OCCURRENCES, 1); \ - if ((condition) && \ - (__sync_add_and_fetch(&LOG_OCCURRENCES_MOD_N, 1) || true) && \ - ((LOG_OCCURRENCES_MOD_N >= n && __sync_sub_and_fetch(&LOG_OCCURRENCES_MOD_N, n)) || true) && \ - LOG_OCCURRENCES_MOD_N == (1 % n)) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#define SOME_KIND_OF_PLOG_EVERY_N(severity, n, what_to_do) \ - static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ - __sync_add_and_fetch(&LOG_OCCURRENCES, 1); \ - if (__sync_add_and_fetch(&LOG_OCCURRENCES_MOD_N, 1) > n) \ - __sync_sub_and_fetch(&LOG_OCCURRENCES_MOD_N, n); \ - if (LOG_OCCURRENCES_MOD_N == 1) \ - google::ErrnoLogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - -#define SOME_KIND_OF_LOG_FIRST_N(severity, n, what_to_do) \ - static int LOG_OCCURRENCES = 0; \ - if (LOG_OCCURRENCES <= n) \ - __sync_add_and_fetch(&LOG_OCCURRENCES, 1); \ - if (LOG_OCCURRENCES <= n) \ - google::LogMessage( \ - __FILE__, __LINE__, google::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() -#endif - -namespace glog_internal_namespace_ { +namespace logging { +namespace internal { template -struct CompileAssert { -}; +struct CompileAssert {}; struct CrashReason; +} // namespace internal +} // namespace logging -// Returns true if FailureSignalHandler is installed. -// Needs to be exported since it's used by the signalhandler_unittest. -GLOG_EXPORT bool IsFailureSignalHandlerInstalled(); -} // namespace glog_internal_namespace_ - -#define LOG_EVERY_N(severity, n) \ +#define LOG_EVERY_N(severity, n) \ SOME_KIND_OF_LOG_EVERY_N(severity, (n), google::LogMessage::SendToLog) #define LOG_EVERY_T(severity, T) SOME_KIND_OF_LOG_EVERY_T(severity, (T)) -#define SYSLOG_EVERY_N(severity, n) \ - SOME_KIND_OF_LOG_EVERY_N(severity, (n), google::LogMessage::SendToSyslogAndLog) +#define SYSLOG_EVERY_N(severity, n) \ + SOME_KIND_OF_LOG_EVERY_N(severity, (n), \ + google::LogMessage::SendToSyslogAndLog) #define PLOG_EVERY_N(severity, n) \ SOME_KIND_OF_PLOG_EVERY_N(severity, (n), google::LogMessage::SendToLog) @@ -1271,146 +1023,157 @@ GLOG_EXPORT bool IsFailureSignalHandlerInstalled(); #define LOG_FIRST_N(severity, n) \ SOME_KIND_OF_LOG_FIRST_N(severity, (n), google::LogMessage::SendToLog) -#define LOG_IF_EVERY_N(severity, condition, n) \ - SOME_KIND_OF_LOG_IF_EVERY_N(severity, (condition), (n), google::LogMessage::SendToLog) +#define LOG_IF_EVERY_N(severity, condition, n) \ + SOME_KIND_OF_LOG_IF_EVERY_N(severity, (condition), (n), \ + google::LogMessage::SendToLog) // We want the special COUNTER value available for LOG_EVERY_X()'ed messages -enum PRIVATE_Counter {COUNTER}; +struct Counter_t {}; +GLOG_INLINE_VARIABLE constexpr Counter_t COUNTER{}; #ifdef GLOG_NO_ABBREVIATED_SEVERITIES // wingdi.h defines ERROR to be 0. When we call LOG(ERROR), it gets // substituted with 0, and it expands to COMPACT_GOOGLE_LOG_0. To allow us // to keep using this syntax, we define this macro to do the same thing // as COMPACT_GOOGLE_LOG_ERROR. -#define COMPACT_GOOGLE_LOG_0 COMPACT_GOOGLE_LOG_ERROR -#define SYSLOG_0 SYSLOG_ERROR -#define LOG_TO_STRING_0 LOG_TO_STRING_ERROR +# define COMPACT_GOOGLE_LOG_0 COMPACT_GOOGLE_LOG_ERROR +# define SYSLOG_0 SYSLOG_ERROR +# define LOG_TO_STRING_0 LOG_TO_STRING_ERROR // Needed for LOG_IS_ON(ERROR). -const LogSeverity GLOG_0 = GLOG_ERROR; +GLOG_INLINE_VARIABLE +constexpr LogSeverity GLOG_0 = GLOG_ERROR; #else // Users may include windows.h after logging.h without // GLOG_NO_ABBREVIATED_SEVERITIES nor WIN32_LEAN_AND_MEAN. // For this case, we cannot detect if ERROR is defined before users // actually use ERROR. Let's make an undefined symbol to warn users. -# define GLOG_ERROR_MSG ERROR_macro_is_defined_Define_GLOG_NO_ABBREVIATED_SEVERITIES_before_including_logging_h_See_the_document_for_detail -# define COMPACT_GOOGLE_LOG_0 GLOG_ERROR_MSG -# define SYSLOG_0 GLOG_ERROR_MSG -# define LOG_TO_STRING_0 GLOG_ERROR_MSG -# define GLOG_0 GLOG_ERROR_MSG +# define GLOG_ERROR_MSG \ + ERROR_macro_is_defined_Define_GLOG_NO_ABBREVIATED_SEVERITIES_before_including_logging_h_See_the_document_for_detail +# define COMPACT_GOOGLE_LOG_0 GLOG_ERROR_MSG +# define SYSLOG_0 GLOG_ERROR_MSG +# define LOG_TO_STRING_0 GLOG_ERROR_MSG +# define GLOG_0 GLOG_ERROR_MSG #endif // Plus some debug-logging macros that get compiled to nothing for production #if DCHECK_IS_ON() -#define DLOG(severity) LOG(severity) -#define DVLOG(verboselevel) VLOG(verboselevel) -#define DLOG_IF(severity, condition) LOG_IF(severity, condition) -#define DLOG_EVERY_N(severity, n) LOG_EVERY_N(severity, n) -#define DLOG_IF_EVERY_N(severity, condition, n) \ - LOG_IF_EVERY_N(severity, condition, n) -#define DLOG_ASSERT(condition) LOG_ASSERT(condition) +# define DLOG(severity) LOG(severity) +# define DVLOG(verboselevel) VLOG(verboselevel) +# define DLOG_IF(severity, condition) LOG_IF(severity, condition) +# define DLOG_EVERY_N(severity, n) LOG_EVERY_N(severity, n) +# define DLOG_IF_EVERY_N(severity, condition, n) \ + LOG_IF_EVERY_N(severity, condition, n) +# define DLOG_FIRST_N(severity, n) LOG_FIRST_N(severity, n) +# define DLOG_EVERY_T(severity, T) LOG_EVERY_T(severity, T) +# define DLOG_ASSERT(condition) LOG_ASSERT(condition) // debug-only checking. executed if DCHECK_IS_ON(). -#define DCHECK(condition) CHECK(condition) -#define DCHECK_EQ(val1, val2) CHECK_EQ(val1, val2) -#define DCHECK_NE(val1, val2) CHECK_NE(val1, val2) -#define DCHECK_LE(val1, val2) CHECK_LE(val1, val2) -#define DCHECK_LT(val1, val2) CHECK_LT(val1, val2) -#define DCHECK_GE(val1, val2) CHECK_GE(val1, val2) -#define DCHECK_GT(val1, val2) CHECK_GT(val1, val2) -#define DCHECK_NOTNULL(val) CHECK_NOTNULL(val) -#define DCHECK_STREQ(str1, str2) CHECK_STREQ(str1, str2) -#define DCHECK_STRCASEEQ(str1, str2) CHECK_STRCASEEQ(str1, str2) -#define DCHECK_STRNE(str1, str2) CHECK_STRNE(str1, str2) -#define DCHECK_STRCASENE(str1, str2) CHECK_STRCASENE(str1, str2) +# define DCHECK(condition) CHECK(condition) +# define DCHECK_EQ(val1, val2) CHECK_EQ(val1, val2) +# define DCHECK_NE(val1, val2) CHECK_NE(val1, val2) +# define DCHECK_LE(val1, val2) CHECK_LE(val1, val2) +# define DCHECK_LT(val1, val2) CHECK_LT(val1, val2) +# define DCHECK_GE(val1, val2) CHECK_GE(val1, val2) +# define DCHECK_GT(val1, val2) CHECK_GT(val1, val2) +# define DCHECK_NOTNULL(val) CHECK_NOTNULL(val) +# define DCHECK_STREQ(str1, str2) CHECK_STREQ(str1, str2) +# define DCHECK_STRCASEEQ(str1, str2) CHECK_STRCASEEQ(str1, str2) +# define DCHECK_STRNE(str1, str2) CHECK_STRNE(str1, str2) +# define DCHECK_STRCASENE(str1, str2) CHECK_STRCASENE(str1, str2) #else // !DCHECK_IS_ON() -#define DLOG(severity) \ - static_cast(0), \ - true ? (void) 0 : google::LogMessageVoidify() & LOG(severity) +# define DLOG(severity) \ + static_cast(0), \ + true ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) -#define DVLOG(verboselevel) \ - static_cast(0), \ - (true || !VLOG_IS_ON(verboselevel)) ? \ - (void) 0 : google::LogMessageVoidify() & LOG(INFO) +# define DVLOG(verboselevel) \ + static_cast(0), \ + (true || !VLOG_IS_ON(verboselevel)) \ + ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(INFO) -#define DLOG_IF(severity, condition) \ - static_cast(0), \ - (true || !(condition)) ? (void) 0 : google::LogMessageVoidify() & LOG(severity) +# define DLOG_IF(severity, condition) \ + static_cast(0), \ + (true || !(condition)) \ + ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) -#define DLOG_EVERY_N(severity, n) \ - static_cast(0), \ - true ? (void) 0 : google::LogMessageVoidify() & LOG(severity) +# define DLOG_EVERY_N(severity, n) \ + static_cast(0), \ + true ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) -#define DLOG_IF_EVERY_N(severity, condition, n) \ - static_cast(0), \ - (true || !(condition))? (void) 0 : google::LogMessageVoidify() & LOG(severity) +# define DLOG_IF_EVERY_N(severity, condition, n) \ + static_cast(0), \ + (true || !(condition)) \ + ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) -#define DLOG_ASSERT(condition) \ - static_cast(0), \ - true ? (void) 0 : LOG_ASSERT(condition) +# define DLOG_FIRST_N(severity, n) \ + static_cast(0), \ + true ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) + +# define DLOG_EVERY_T(severity, T) \ + static_cast(0), \ + true ? (void)0 \ + : google::logging::internal::LogMessageVoidify() & LOG(severity) + +# define DLOG_ASSERT(condition) \ + static_cast(0), true ? (void)0 : (LOG_ASSERT(condition)) // MSVC warning C4127: conditional expression is constant -#define DCHECK(condition) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK(condition) +# define DCHECK(condition) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK(condition) -#define DCHECK_EQ(val1, val2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_EQ(val1, val2) +# define DCHECK_EQ(val1, val2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_EQ(val1, val2) -#define DCHECK_NE(val1, val2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_NE(val1, val2) +# define DCHECK_NE(val1, val2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_NE(val1, val2) -#define DCHECK_LE(val1, val2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_LE(val1, val2) +# define DCHECK_LE(val1, val2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_LE(val1, val2) -#define DCHECK_LT(val1, val2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_LT(val1, val2) +# define DCHECK_LT(val1, val2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_LT(val1, val2) -#define DCHECK_GE(val1, val2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_GE(val1, val2) +# define DCHECK_GE(val1, val2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_GE(val1, val2) -#define DCHECK_GT(val1, val2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_GT(val1, val2) +# define DCHECK_GT(val1, val2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_GT(val1, val2) // You may see warnings in release mode if you don't use the return // value of DCHECK_NOTNULL. Please just use DCHECK for such cases. -#define DCHECK_NOTNULL(val) (val) +# define DCHECK_NOTNULL(val) (val) -#define DCHECK_STREQ(str1, str2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_STREQ(str1, str2) +# define DCHECK_STREQ(str1, str2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_STREQ(str1, str2) -#define DCHECK_STRCASEEQ(str1, str2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_STRCASEEQ(str1, str2) +# define DCHECK_STRCASEEQ(str1, str2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_STRCASEEQ(str1, str2) -#define DCHECK_STRNE(str1, str2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_STRNE(str1, str2) +# define DCHECK_STRNE(str1, str2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_STRNE(str1, str2) -#define DCHECK_STRCASENE(str1, str2) \ - GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ - while (false) \ - GLOG_MSVC_POP_WARNING() CHECK_STRCASENE(str1, str2) +# define DCHECK_STRCASENE(str1, str2) \ + GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ + while (false) GLOG_MSVC_POP_WARNING() CHECK_STRCASENE(str1, str2) #endif // DCHECK_IS_ON() @@ -1435,14 +1198,10 @@ namespace base_logging { class GLOG_EXPORT LogStreamBuf : public std::streambuf { public: // REQUIREMENTS: "len" must be >= 2 to account for the '\n' and '\0'. - LogStreamBuf(char *buf, int len) { - setp(buf, buf + len - 2); - } + LogStreamBuf(char* buf, int len) { setp(buf, buf + len - 2); } // This effectively ignores overflow. - int_type overflow(int_type ch) { - return ch; - } + int_type overflow(int_type ch) { return ch; } // Legacy public ostrstream method. size_t pcount() const { return static_cast(pptr() - pbase()); } @@ -1451,6 +1210,12 @@ class GLOG_EXPORT LogStreamBuf : public std::streambuf { } // namespace base_logging +namespace logging { +namespace internal { +struct GLOG_NO_EXPORT LogMessageData; +} // namespace internal +} // namespace logging + // // This class more or less represents a particular log message. You // create an instance of LogMessage and then stream stuff to it. @@ -1461,7 +1226,7 @@ class GLOG_EXPORT LogStreamBuf : public std::streambuf { // though. You should use the LOG() macro (and variants thereof) // above. class GLOG_EXPORT LogMessage { -public: + public: enum { // Passing kNoLogPrefix for the line number disables the // log-message prefix. Useful for using the LogMessage @@ -1477,18 +1242,35 @@ public: // 2005 if you are deriving from a type in the Standard C++ Library" // http://msdn.microsoft.com/en-us/library/3tdb471s(VS.80).aspx // Let's just ignore the warning. -GLOG_MSVC_PUSH_DISABLE_WARNING(4275) + GLOG_MSVC_PUSH_DISABLE_WARNING(4275) class GLOG_EXPORT LogStream : public std::ostream { -GLOG_MSVC_POP_WARNING() - public: - LogStream(char *buf, int len, int64 ctr) - : std::ostream(NULL), - streambuf_(buf, len), - ctr_(ctr), + GLOG_MSVC_POP_WARNING() + public: + // In some cases, like when compiling glog as a static library with GCC and + // linking against a Clang-built executable, this constructor will be + // removed by the linker. We use this attribute to prevent the linker from + // discarding it. + GLOG_USED + LogStream(char* buf, int len, int64 ctr) + : std::ostream(nullptr), streambuf_(buf, len), ctr_(ctr), self_(this) { + rdbuf(&streambuf_); + } + + LogStream(LogStream&& other) noexcept + : std::ostream(nullptr), + streambuf_(std::move(other.streambuf_)), + ctr_(std::exchange(other.ctr_, 0)), self_(this) { rdbuf(&streambuf_); } + LogStream& operator=(LogStream&& other) noexcept { + streambuf_ = std::move(other.streambuf_); + ctr_ = std::exchange(other.ctr_, 0); + rdbuf(&streambuf_); + return *this; + } + int64 ctr() const { return ctr_; } void set_ctr(int64 ctr) { ctr_ = ctr; } LogStream* self() const { return self_; } @@ -1498,15 +1280,16 @@ GLOG_MSVC_POP_WARNING() char* pbase() const { return streambuf_.pbase(); } char* str() const { return pbase(); } - private: - LogStream(const LogStream&); - LogStream& operator=(const LogStream&); + LogStream(const LogStream&) = delete; + LogStream& operator=(const LogStream&) = delete; + + private: base_logging::LogStreamBuf streambuf_; - int64 ctr_; // Counter hack (for the LOG_EVERY_X() macro) - LogStream *self_; // Consistency check hack + int64 ctr_; // Counter hack (for the LOG_EVERY_X() macro) + LogStream* self_; // Consistency check hack }; -public: + public: // icc 8 requires this typedef to avoid an internal compiler error. typedef void (LogMessage::*SendMethod)(); @@ -1530,28 +1313,29 @@ public: // saves 17 bytes per call site. LogMessage(const char* file, int line, LogSeverity severity); - // Constructor to log this message to a specified sink (if not NULL). + // Constructor to log this message to a specified sink (if not nullptr). // Implied are: ctr = 0, send_method = &LogMessage::SendToSinkAndLog if // also_send_to_log is true, send_method = &LogMessage::SendToSink otherwise. LogMessage(const char* file, int line, LogSeverity severity, LogSink* sink, bool also_send_to_log); // Constructor where we also give a vector pointer - // for storing the messages (if the pointer is not NULL). + // for storing the messages (if the pointer is not nullptr). // Implied are: ctr = 0, send_method = &LogMessage::SaveOrSendToLog. LogMessage(const char* file, int line, LogSeverity severity, std::vector* outvec); // Constructor where we also give a string pointer for storing the - // message (if the pointer is not NULL). Implied are: ctr = 0, + // message (if the pointer is not nullptr). Implied are: ctr = 0, // send_method = &LogMessage::WriteToStringAndLog. LogMessage(const char* file, int line, LogSeverity severity, std::string* message); // A special constructor used for check failures - LogMessage(const char* file, int line, const CheckOpString& result); + LogMessage(const char* file, int line, + const logging::internal::CheckOpString& result); - ~LogMessage(); + ~LogMessage() noexcept(false); // Flush a buffered message to the sink set in the constructor. Always // called by the destructor, it may also be called from elsewhere if @@ -1562,13 +1346,13 @@ public: // is so that streaming can be done more efficiently. static const size_t kMaxLogMessageLen; - // Theses should not be called directly outside of logging.*, + // These should not be called directly outside of logging.*, // only passed as SendMethod arguments to other LogMessage methods: - void SendToLog(); // Actually dispatch to the logs + void SendToLog(); // Actually dispatch to the logs void SendToSyslogAndLog(); // Actually dispatch to syslog and the logs // Call abort() or similar to perform LOG(FATAL) crash. - static void __attribute__((noreturn)) Fail(); + [[noreturn]] static void Fail(); std::ostream& stream(); @@ -1577,14 +1361,25 @@ public: // Must be called without the log_mutex held. (L < log_mutex) static int64 num_messages(int severity); - const LogMessageTime& getLogMessageTime() const; + [[deprecated("Use LogMessage::time() instead.")]] const LogMessageTime& + getLogMessageTime() const { + return time(); + } - struct LogMessageData; + LogSeverity severity() const noexcept; + int line() const noexcept; + const std::thread::id& thread_id() const noexcept; + const char* fullname() const noexcept; + const char* basename() const noexcept; + const LogMessageTime& time() const noexcept; -private: + LogMessage(const LogMessage&) = delete; + LogMessage& operator=(const LogMessage&) = delete; + + private: // Fully internal SendMethod cases: void SendToSinkAndLog(); // Send to sink if provided and dispatch to the logs - void SendToSink(); // Send to sink if provided, do nothing otherwise. + void SendToSink(); // Send to sink if provided, do nothing otherwise. // Write to string if provided and dispatch to the logs. void WriteToStringAndLog(); @@ -1595,21 +1390,18 @@ private: void (LogMessage::*send_method)()); // Used to fill in crash information during LOG(FATAL) failures. - void RecordCrashReason(glog_internal_namespace_::CrashReason* reason); + void RecordCrashReason(logging::internal::CrashReason* reason); // Counts of messages sent at each priority: static int64 num_messages_[NUM_SEVERITIES]; // under log_mutex // We keep the data in a separate struct so that each instance of // LogMessage uses less stack space. - LogMessageData* allocated_; - LogMessageData* data_; - LogMessageTime logmsgtime_; + logging::internal::LogMessageData* allocated_; + logging::internal::LogMessageData* data_; + LogMessageTime time_; friend class LogDestination; - - LogMessage(const LogMessage&); - void operator=(const LogMessage&); }; // This class happens to be thread-hostile because all instances share @@ -1618,13 +1410,14 @@ private: class GLOG_EXPORT LogMessageFatal : public LogMessage { public: LogMessageFatal(const char* file, int line); - LogMessageFatal(const char* file, int line, const CheckOpString& result); - __attribute__((noreturn)) ~LogMessageFatal(); + LogMessageFatal(const char* file, int line, + const logging::internal::CheckOpString& result); + [[noreturn]] ~LogMessageFatal() noexcept(false); }; // A non-macro interface to the log facility; (useful // when the logging level is not a compile-time constant). -inline void LogAtLevel(int const severity, std::string const &msg) { +inline void LogAtLevel(LogSeverity severity, std::string const& msg) { LogMessage(__FILE__, __LINE__, severity).stream() << msg; } @@ -1632,53 +1425,13 @@ inline void LogAtLevel(int const severity, std::string const &msg) { // version since there are two advantages: 1. this version outputs the // file name and the line number where this macro is put like other // LOG macros, 2. this macro can be used as C++ stream. -#define LOG_AT_LEVEL(severity) google::LogMessage(__FILE__, __LINE__, severity).stream() - -// Check if it's compiled in C++11 mode. -// -// GXX_EXPERIMENTAL_CXX0X is defined by gcc and clang up to at least -// gcc-4.7 and clang-3.1 (2011-12-13). __cplusplus was defined to 1 -// in gcc before 4.7 (Crosstool 16) and clang before 3.1, but is -// defined according to the language version in effect thereafter. -// Microsoft Visual Studio 14 (2015) sets __cplusplus==199711 despite -// reasonably good C++11 support, so we set LANG_CXX for it and -// newer versions (_MSC_VER >= 1900). -#if (defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L || \ - (defined(_MSC_VER) && _MSC_VER >= 1900)) && !defined(__UCLIBCXX_MAJOR__) -// Helper for CHECK_NOTNULL(). -// -// In C++11, all cases can be handled by a single function. Since the value -// category of the argument is preserved (also for rvalue references), -// member initializer lists like the one below will compile correctly: -// -// Foo() -// : x_(CHECK_NOTNULL(MethodReturningUniquePtr())) {} -template -T CheckNotNull(const char* file, int line, const char* names, T&& t) { - if (t == nullptr) { - LogMessageFatal(file, line, new std::string(names)); - } - return std::forward(t); -} - -#else - -// A small helper for CHECK_NOTNULL(). -template -T* CheckNotNull(const char *file, int line, const char *names, T* t) { - if (t == NULL) { - LogMessageFatal(file, line, new std::string(names)); - } - return t; -} -#endif +#define LOG_AT_LEVEL(severity) \ + google::LogMessage(__FILE__, __LINE__, severity).stream() // Allow folks to put a counter in the LOG_EVERY_X()'ed messages. This // only works if ostream is a LogStream. If the ostream is not a // LogStream you'll get an assert saying as much at runtime. -GLOG_EXPORT std::ostream& operator<<(std::ostream &os, - const PRIVATE_Counter&); - +GLOG_EXPORT std::ostream& operator<<(std::ostream& os, const Counter_t&); // Derived class for PLOG*() above. class GLOG_EXPORT ErrnoLogMessage : public LogMessage { @@ -1694,19 +1447,37 @@ class GLOG_EXPORT ErrnoLogMessage : public LogMessage { void operator=(const ErrnoLogMessage&); }; - // This class is used to explicitly ignore values in the conditional // logging macros. This avoids compiler warnings like "value computed // is not used" and "statement has no effect". -class GLOG_EXPORT LogMessageVoidify { - public: - LogMessageVoidify() { } +namespace logging { +namespace internal { + +// Helper for CHECK_NOTNULL(). +// +// In C++11, all cases can be handled by a single function. Since the value +// category of the argument is preserved (also for rvalue references), +// member initializer lists like the one below will compile correctly: +// +// Foo() +// : x_(CHECK_NOTNULL(MethodReturningUniquePtr())) {} +template +T CheckNotNull(const char* file, int line, const char* names, T&& t) { + if (t == nullptr) { + LogMessageFatal(file, line, std::make_unique(names)); + } + return std::forward(t); +} + +struct LogMessageVoidify { // This has to be an operator with a precedence lower than << but // higher than ?: - void operator&(std::ostream&) { } + void operator&(std::ostream&) noexcept {} }; +} // namespace internal +} // namespace logging // Flushes all log files that contains messages that are at least of // the specified severity level. Thread-safe. @@ -1723,7 +1494,7 @@ GLOG_EXPORT void FlushLogFilesUnsafe(LogSeverity min_severity); // severity". Thread-safe. // GLOG_EXPORT void SetLogDestination(LogSeverity severity, - const char* base_filename); + const char* base_filename); // // Set the basename of the symlink to the latest log file at a given @@ -1732,7 +1503,7 @@ GLOG_EXPORT void SetLogDestination(LogSeverity severity, // invocation name of the program. Thread-safe. // GLOG_EXPORT void SetLogSymlink(LogSeverity severity, - const char* symlink_basename); + const char* symlink_basename); // // Used to send logs to some other kind of destination @@ -1748,7 +1519,7 @@ class GLOG_EXPORT LogSink { // during this call. virtual void send(LogSeverity severity, const char* full_filename, const char* base_filename, int line, - const LogMessageTime& logmsgtime, const char* message, + const LogMessageTime& time, const char* message, size_t message_len); // Provide an overload for compatibility purposes GLOG_DEPRECATED @@ -1774,13 +1545,13 @@ class GLOG_EXPORT LogSink { // Returns the normal text output of the log message. // Can be useful to implement send(). static std::string ToString(LogSeverity severity, const char* file, int line, - const LogMessageTime &logmsgtime, - const char* message, size_t message_len); + const LogMessageTime& time, const char* message, + size_t message_len); }; // Add or remove a LogSink as a consumer of logging data. Thread-safe. -GLOG_EXPORT void AddLogSink(LogSink *destination); -GLOG_EXPORT void RemoveLogSink(LogSink *destination); +GLOG_EXPORT void AddLogSink(LogSink* destination); +GLOG_EXPORT void RemoveLogSink(LogSink* destination); // // Specify an "extension" added to the filename specified via @@ -1788,8 +1559,7 @@ GLOG_EXPORT void RemoveLogSink(LogSink *destination); // often used to append the port we're listening on to the logfile // name. Thread-safe. // -GLOG_EXPORT void SetLogFilenameExtension( - const char* filename_extension); +GLOG_EXPORT void SetLogFilenameExtension(const char* filename_extension); // // Make it so that all log messages of at least a particular severity @@ -1810,26 +1580,15 @@ GLOG_EXPORT void LogToStderr(); // the email addresses to send to (separated by spaces, say). Thread-safe. // GLOG_EXPORT void SetEmailLogging(LogSeverity min_severity, - const char* addresses); + const char* addresses); -// A simple function that sends email. dest is a commma-separated -// list of addressess. Thread-safe. -GLOG_EXPORT bool SendEmail(const char *dest, - const char *subject, const char *body); +// A simple function that sends email. dest is a comma-separated +// list of addresses. Thread-safe. +GLOG_EXPORT bool SendEmail(const char* dest, const char* subject, + const char* body); GLOG_EXPORT const std::vector& GetLoggingDirectories(); -// For tests only: Clear the internal [cached] list of logging directories to -// force a refresh the next time GetLoggingDirectories is called. -// Thread-hostile. -void TestOnly_ClearLoggingDirectoriesList(); - -// Returns a set of existing temporary directories, which will be a -// subset of the directories returned by GetLoggingDirectories(). -// Thread-safe. -GLOG_EXPORT void GetExistingTempDirectories( - std::vector* list); - // Print any fatal message again -- useful to call from signal handler // so that the last thing in the output is the fatal message. // Thread-hostile, but a race is unlikely. @@ -1878,10 +1637,15 @@ class GLOG_EXPORT Logger { // appropriate by the higher level logging facility. For example, // textual log messages already contain timestamps, and the // file:linenumber header. + [[deprecated( + "Logger::Write accepting a std::time_t timestamp is provided for " + "compatibility purposes only. New code should implement the " + "std::chrono::system_clock::time_point overload.")]] virtual void + Write(bool force_flush, time_t timestamp, const char* message, + size_t message_len); virtual void Write(bool force_flush, - time_t timestamp, - const char* message, - size_t message_len) = 0; + const std::chrono::system_clock::time_point& timestamp, + const char* message, size_t message_len); // Flush any buffered messages virtual void Flush() = 0; @@ -1902,24 +1666,7 @@ extern GLOG_EXPORT Logger* GetLogger(LogSeverity level); // be deleted by the caller. Thread-safe. extern GLOG_EXPORT void SetLogger(LogSeverity level, Logger* logger); -} - -// glibc has traditionally implemented two incompatible versions of -// strerror_r(). There is a poorly defined convention for picking the -// version that we want, but it is not clear whether it even works with -// all versions of glibc. -// So, instead, we provide this wrapper that automatically detects the -// version that is in use, and then implements POSIX semantics. -// N.B. In addition to what POSIX says, we also guarantee that "buf" will -// be set to an empty string, if this function failed. This means, in most -// cases, you do not need to check the error code and you can directly -// use the value of "buf". It will never have an undefined value. -// DEPRECATED: Use StrError(int) instead. -GLOG_EXPORT int posix_strerror_r(int err, char *buf, size_t len); - -// A thread-safe replacement for strerror(). Returns a string describing the -// given POSIX error code. -GLOG_EXPORT std::string StrError(int err); +} // namespace base // A class for which we define operator<<, which does nothing. class GLOG_EXPORT NullStream : public LogMessage::LogStream { @@ -1928,16 +1675,16 @@ class GLOG_EXPORT NullStream : public LogMessage::LogStream { // (they'll never be actually displayed). This will be needed if a // NullStream& is implicitly converted to LogStream&, in which case // the overloaded NullStream::operator<< will not be invoked. - NullStream() : LogMessage::LogStream(message_buffer_, 1, 0) { } + NullStream(); NullStream(const char* /*file*/, int /*line*/, - const CheckOpString& /*result*/) : - LogMessage::LogStream(message_buffer_, 1, 0) { } - NullStream &stream() { return *this; } + const logging::internal::CheckOpString& /*result*/); + NullStream& stream(); + private: // A very short buffer for messages (which we discard anyway). This // will be needed if NullStream& converted to LogStream& (e.g. as a // result of a conditional expression). - char message_buffer_[2]; + char message_buffer_[3]; }; // Do nothing. This operator is inline, allowing the message to be @@ -1946,24 +1693,19 @@ class GLOG_EXPORT NullStream : public LogMessage::LogStream { // SKIP_LOG=WARNING. In those cases, NullStream will be implicitly // converted to LogStream and the message will be computed and then // quietly discarded. -template -inline NullStream& operator<<(NullStream &str, const T &) { return str; } +template +inline NullStream& operator<<(NullStream& str, const T&) { + return str; +} // Similar to NullStream, but aborts the program (without stack // trace), like LogMessageFatal. class GLOG_EXPORT NullStreamFatal : public NullStream { public: - NullStreamFatal() { } - NullStreamFatal(const char* file, int line, const CheckOpString& result) : - NullStream(file, line, result) { } -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable : 4722) -#endif // _MSC_VER - __attribute__((noreturn)) ~NullStreamFatal() throw () { _exit(EXIT_FAILURE); } -#if defined(_MSC_VER) -#pragma warning(pop) -#endif // _MSC_VER + using NullStream::NullStream; + [[noreturn]] + // Prevent the linker from discarding the destructor. + GLOG_USED ~NullStreamFatal(); }; // Install a signal handler that will dump signal information and a stack @@ -1984,19 +1726,19 @@ class GLOG_EXPORT NullStreamFatal : public NullStream { // words, stack traces of other threads won't be shown. GLOG_EXPORT void InstallFailureSignalHandler(); +// Returns true if FailureSignalHandler is installed. +GLOG_EXPORT bool IsFailureSignalHandlerInstalled(); + // Installs a function that is used for writing the failure dump. "data" // is the pointer to the beginning of a message to be written, and "size" // is the size of the message. You should not expect the data is // terminated with '\0'. -GLOG_EXPORT void InstallFailureWriter( - void (*writer)(const char* data, size_t size)); +GLOG_EXPORT void InstallFailureWriter(void (*writer)(const char* data, + size_t size)); -} +// Dump stack trace as a string. +GLOG_EXPORT std::string GetStackTrace(); -#pragma pop_macro("DECLARE_VARIABLE") -#pragma pop_macro("DECLARE_bool") -#pragma pop_macro("DECLARE_string") -#pragma pop_macro("DECLARE_int32") -#pragma pop_macro("DECLARE_uint32") +} // namespace google -#endif // GLOG_LOGGING_H +#endif // GLOG_LOGGING_H diff --git a/glog/x86_64/include/glog/platform.h b/glog/x86_64/include/glog/platform.h index e6144119..f118ca8d 100644 --- a/glog/x86_64/include/glog/platform.h +++ b/glog/x86_64/include/glog/platform.h @@ -1,4 +1,4 @@ -// Copyright (c) 2008, Google Inc. +// Copyright (c) 2024, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -35,24 +35,28 @@ #define GLOG_PLATFORM_H #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) -#define GLOG_OS_WINDOWS +# define GLOG_OS_WINDOWS #elif defined(__CYGWIN__) || defined(__CYGWIN32__) -#define GLOG_OS_CYGWIN +# define GLOG_OS_CYGWIN #elif defined(linux) || defined(__linux) || defined(__linux__) -#ifndef GLOG_OS_LINUX -#define GLOG_OS_LINUX -#endif +# ifndef GLOG_OS_LINUX +# define GLOG_OS_LINUX +# endif +# if defined(__ANDROID__) +# define GLOG_OS_ANDROID +# endif #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) -#define GLOG_OS_MACOSX +# define GLOG_OS_MACOSX #elif defined(__FreeBSD__) -#define GLOG_OS_FREEBSD +# define GLOG_OS_FREEBSD #elif defined(__NetBSD__) -#define GLOG_OS_NETBSD +# define GLOG_OS_NETBSD #elif defined(__OpenBSD__) -#define GLOG_OS_OPENBSD -#else +# define GLOG_OS_OPENBSD +#elif defined(__EMSCRIPTEN__) +# define GLOG_OS_EMSCRIPTEN // TODO(hamaji): Add other platforms. #error Platform not supported by glog. Please consider to contribute platform information by submitting a pull request on Github. #endif -#endif // GLOG_PLATFORM_H +#endif // GLOG_PLATFORM_H diff --git a/glog/x86_64/include/glog/raw_logging.h b/glog/x86_64/include/glog/raw_logging.h index eda5fb45..195a1b9c 100644 --- a/glog/x86_64/include/glog/raw_logging.h +++ b/glog/x86_64/include/glog/raw_logging.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006, Google Inc. +// Copyright (c) 2024, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -36,19 +36,19 @@ #ifndef GLOG_RAW_LOGGING_H #define GLOG_RAW_LOGGING_H -#include +#if defined(GLOG_USE_GLOG_EXPORT) +# include "glog/export.h" +#endif + +#if !defined(GLOG_EXPORT) +# error was not included correctly. See the documention for how to consume the library. +#endif + +#include "glog/log_severity.h" +#include "glog/vlog_is_on.h" namespace google { -#include -#include -#include - -#if defined(__GNUC__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wvariadic-macros" -#endif - // This is similar to LOG(severity) << format... and VLOG(level) << format.., // but // * it is to be used ONLY by low-level modules that can't use normal LOG() @@ -63,108 +63,101 @@ namespace google { // These will print an almost standard log lines like this to stderr only: // E20200821 211317 file.cc:123] RAW: Failed foo with 22: bad_file // I20200821 211317 file.cc:142] RAW: status is 20 -#define RAW_LOG(severity, ...) \ - do { \ - switch (google::GLOG_ ## severity) { \ - case 0: \ - RAW_LOG_INFO(__VA_ARGS__); \ - break; \ - case 1: \ - RAW_LOG_WARNING(__VA_ARGS__); \ - break; \ - case 2: \ - RAW_LOG_ERROR(__VA_ARGS__); \ - break; \ - case 3: \ - RAW_LOG_FATAL(__VA_ARGS__); \ - break; \ - default: \ - break; \ - } \ +#define RAW_LOG(severity, ...) \ + do { \ + switch (google::GLOG_##severity) { \ + case 0: \ + RAW_LOG_INFO(__VA_ARGS__); \ + break; \ + case 1: \ + RAW_LOG_WARNING(__VA_ARGS__); \ + break; \ + case 2: \ + RAW_LOG_ERROR(__VA_ARGS__); \ + break; \ + case 3: \ + RAW_LOG_FATAL(__VA_ARGS__); \ + break; \ + default: \ + break; \ + } \ } while (0) // The following STRIP_LOG testing is performed in the header file so that it's // possible to completely compile out the logging code and the log messages. #if !defined(STRIP_LOG) || STRIP_LOG == 0 -#define RAW_VLOG(verboselevel, ...) \ - do { \ - if (VLOG_IS_ON(verboselevel)) { \ - RAW_LOG_INFO(__VA_ARGS__); \ - } \ - } while (0) +# define RAW_VLOG(verboselevel, ...) \ + do { \ + if (VLOG_IS_ON(verboselevel)) { \ + RAW_LOG_INFO(__VA_ARGS__); \ + } \ + } while (0) #else -#define RAW_VLOG(verboselevel, ...) RawLogStub__(0, __VA_ARGS__) -#endif // STRIP_LOG == 0 +# define RAW_VLOG(verboselevel, ...) RawLogStub__(0, __VA_ARGS__) +#endif // STRIP_LOG == 0 #if !defined(STRIP_LOG) || STRIP_LOG == 0 -#define RAW_LOG_INFO(...) google::RawLog__(google::GLOG_INFO, \ - __FILE__, __LINE__, __VA_ARGS__) +# define RAW_LOG_INFO(...) \ + google::RawLog__(google::GLOG_INFO, __FILE__, __LINE__, __VA_ARGS__) #else -#define RAW_LOG_INFO(...) google::RawLogStub__(0, __VA_ARGS__) -#endif // STRIP_LOG == 0 +# define RAW_LOG_INFO(...) google::RawLogStub__(0, __VA_ARGS__) +#endif // STRIP_LOG == 0 #if !defined(STRIP_LOG) || STRIP_LOG <= 1 -#define RAW_LOG_WARNING(...) google::RawLog__(google::GLOG_WARNING, \ - __FILE__, __LINE__, __VA_ARGS__) +# define RAW_LOG_WARNING(...) \ + google::RawLog__(google::GLOG_WARNING, __FILE__, __LINE__, __VA_ARGS__) #else -#define RAW_LOG_WARNING(...) google::RawLogStub__(0, __VA_ARGS__) -#endif // STRIP_LOG <= 1 +# define RAW_LOG_WARNING(...) google::RawLogStub__(0, __VA_ARGS__) +#endif // STRIP_LOG <= 1 #if !defined(STRIP_LOG) || STRIP_LOG <= 2 -#define RAW_LOG_ERROR(...) google::RawLog__(google::GLOG_ERROR, \ - __FILE__, __LINE__, __VA_ARGS__) +# define RAW_LOG_ERROR(...) \ + google::RawLog__(google::GLOG_ERROR, __FILE__, __LINE__, __VA_ARGS__) #else -#define RAW_LOG_ERROR(...) google::RawLogStub__(0, __VA_ARGS__) -#endif // STRIP_LOG <= 2 +# define RAW_LOG_ERROR(...) google::RawLogStub__(0, __VA_ARGS__) +#endif // STRIP_LOG <= 2 #if !defined(STRIP_LOG) || STRIP_LOG <= 3 -#define RAW_LOG_FATAL(...) google::RawLog__(google::GLOG_FATAL, \ - __FILE__, __LINE__, __VA_ARGS__) +# define RAW_LOG_FATAL(...) \ + google::RawLog__(google::GLOG_FATAL, __FILE__, __LINE__, __VA_ARGS__) #else -#define RAW_LOG_FATAL(...) \ - do { \ - google::RawLogStub__(0, __VA_ARGS__); \ - exit(EXIT_FAILURE); \ - } while (0) -#endif // STRIP_LOG <= 3 +# define RAW_LOG_FATAL(...) \ + do { \ + google::RawLogStub__(0, __VA_ARGS__); \ + exit(EXIT_FAILURE); \ + } while (0) +#endif // STRIP_LOG <= 3 // Similar to CHECK(condition) << message, // but for low-level modules: we use only RAW_LOG that does not allocate memory. // We do not want to provide args list here to encourage this usage: // if (!cond) RAW_LOG(FATAL, "foo ...", hard_to_compute_args); // so that the args are not computed when not needed. -#define RAW_CHECK(condition, message) \ - do { \ - if (!(condition)) { \ - RAW_LOG(FATAL, "Check %s failed: %s", #condition, message); \ - } \ +#define RAW_CHECK(condition, message) \ + do { \ + if (!(condition)) { \ + RAW_LOG(FATAL, "Check %s failed: %s", #condition, message); \ + } \ } while (0) // Debug versions of RAW_LOG and RAW_CHECK #ifndef NDEBUG -#define RAW_DLOG(severity, ...) RAW_LOG(severity, __VA_ARGS__) -#define RAW_DCHECK(condition, message) RAW_CHECK(condition, message) +# define RAW_DLOG(severity, ...) RAW_LOG(severity, __VA_ARGS__) +# define RAW_DCHECK(condition, message) RAW_CHECK(condition, message) #else // NDEBUG -#define RAW_DLOG(severity, ...) \ - while (false) \ - RAW_LOG(severity, __VA_ARGS__) -#define RAW_DCHECK(condition, message) \ - while (false) \ - RAW_CHECK(condition, message) +# define RAW_DLOG(severity, ...) \ + while (false) RAW_LOG(severity, __VA_ARGS__) +# define RAW_DCHECK(condition, message) \ + while (false) RAW_CHECK(condition, message) #endif // NDEBUG -#if defined(__GNUC__) -#pragma GCC diagnostic pop -#endif - // Stub log function used to work around for unused variable warnings when // building with STRIP_LOG > 0. -static inline void RawLogStub__(int /* ignored */, ...) { -} +static inline void RawLogStub__(int /* ignored */, ...) {} // Helper function to implement RAW_LOG and RAW_VLOG // Logs format... at "severity" level, reporting it @@ -172,8 +165,12 @@ static inline void RawLogStub__(int /* ignored */, ...) { // This does not allocate memory or acquire locks. GLOG_EXPORT void RawLog__(LogSeverity severity, const char* file, int line, const char* format, ...) - __attribute__((__format__(__printf__, 4, 5))); - -} +#if defined(__has_attribute) +# if __has_attribute(used) + __attribute__((__format__(__printf__, 4, 5))) +# endif +#endif + ; +} // namespace google #endif // GLOG_RAW_LOGGING_H diff --git a/glog/x86_64/include/glog/stl_logging.h b/glog/x86_64/include/glog/stl_logging.h index ed200dd2..8dd7707e 100644 --- a/glog/x86_64/include/glog/stl_logging.h +++ b/glog/x86_64/include/glog/stl_logging.h @@ -1,4 +1,4 @@ -// Copyright (c) 2003, Google Inc. +// Copyright (c) 2023, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -35,140 +35,86 @@ // vector v1, v2; // CHECK_EQ(v1, v2); // -// If you want to use this header file with hash maps or slist, you -// need to define macros before including this file: -// -// - GLOG_STL_LOGGING_FOR_UNORDERED - and -// - GLOG_STL_LOGGING_FOR_TR1_UNORDERED - -// - GLOG_STL_LOGGING_FOR_EXT_HASH - -// - GLOG_STL_LOGGING_FOR_EXT_SLIST - -// -#ifndef UTIL_GTL_STL_LOGGING_INL_H_ -#define UTIL_GTL_STL_LOGGING_INL_H_ - -#if !1 -# error We do not support stl_logging for this compiler -#endif +#ifndef GLOG_STL_LOGGING_H +#define GLOG_STL_LOGGING_H #include #include #include #include #include +#include +#include #include #include -#if defined(GLOG_STL_LOGGING_FOR_UNORDERED) && __cplusplus >= 201103L -# include -# include -#endif - -#ifdef GLOG_STL_LOGGING_FOR_TR1_UNORDERED -# include -# include -#endif - -#ifdef GLOG_STL_LOGGING_FOR_EXT_HASH -# include -# include -#endif -#ifdef GLOG_STL_LOGGING_FOR_EXT_SLIST -# include -#endif - // Forward declare these two, and define them after all the container streams // operators so that we can recurse from pair -> container -> container -> pair // properly. -template +template std::ostream& operator<<(std::ostream& out, const std::pair& p); namespace google { -template +template void PrintSequence(std::ostream& out, Iter begin, Iter end); } - -#define OUTPUT_TWO_ARG_CONTAINER(Sequence) \ -template \ -inline std::ostream& operator<<(std::ostream& out, \ - const Sequence& seq) { \ - google::PrintSequence(out, seq.begin(), seq.end()); \ - return out; \ -} +#define OUTPUT_TWO_ARG_CONTAINER(Sequence) \ + template \ + inline std::ostream& operator<<(std::ostream& out, \ + const Sequence& seq) { \ + google::PrintSequence(out, seq.begin(), seq.end()); \ + return out; \ + } OUTPUT_TWO_ARG_CONTAINER(std::vector) OUTPUT_TWO_ARG_CONTAINER(std::deque) OUTPUT_TWO_ARG_CONTAINER(std::list) -#ifdef GLOG_STL_LOGGING_FOR_EXT_SLIST -OUTPUT_TWO_ARG_CONTAINER(__gnu_cxx::slist) -#endif - #undef OUTPUT_TWO_ARG_CONTAINER -#define OUTPUT_THREE_ARG_CONTAINER(Sequence) \ -template \ -inline std::ostream& operator<<(std::ostream& out, \ - const Sequence& seq) { \ - google::PrintSequence(out, seq.begin(), seq.end()); \ - return out; \ -} +#define OUTPUT_THREE_ARG_CONTAINER(Sequence) \ + template \ + inline std::ostream& operator<<(std::ostream& out, \ + const Sequence& seq) { \ + google::PrintSequence(out, seq.begin(), seq.end()); \ + return out; \ + } OUTPUT_THREE_ARG_CONTAINER(std::set) OUTPUT_THREE_ARG_CONTAINER(std::multiset) #undef OUTPUT_THREE_ARG_CONTAINER -#define OUTPUT_FOUR_ARG_CONTAINER(Sequence) \ -template \ -inline std::ostream& operator<<(std::ostream& out, \ - const Sequence& seq) { \ - google::PrintSequence(out, seq.begin(), seq.end()); \ - return out; \ -} +#define OUTPUT_FOUR_ARG_CONTAINER(Sequence) \ + template \ + inline std::ostream& operator<<(std::ostream& out, \ + const Sequence& seq) { \ + google::PrintSequence(out, seq.begin(), seq.end()); \ + return out; \ + } OUTPUT_FOUR_ARG_CONTAINER(std::map) OUTPUT_FOUR_ARG_CONTAINER(std::multimap) -#if defined(GLOG_STL_LOGGING_FOR_UNORDERED) && __cplusplus >= 201103L OUTPUT_FOUR_ARG_CONTAINER(std::unordered_set) OUTPUT_FOUR_ARG_CONTAINER(std::unordered_multiset) -#endif -#ifdef GLOG_STL_LOGGING_FOR_TR1_UNORDERED -OUTPUT_FOUR_ARG_CONTAINER(std::tr1::unordered_set) -OUTPUT_FOUR_ARG_CONTAINER(std::tr1::unordered_multiset) -#endif -#ifdef GLOG_STL_LOGGING_FOR_EXT_HASH -OUTPUT_FOUR_ARG_CONTAINER(__gnu_cxx::hash_set) -OUTPUT_FOUR_ARG_CONTAINER(__gnu_cxx::hash_multiset) -#endif - #undef OUTPUT_FOUR_ARG_CONTAINER -#define OUTPUT_FIVE_ARG_CONTAINER(Sequence) \ -template \ -inline std::ostream& operator<<(std::ostream& out, \ - const Sequence& seq) { \ - google::PrintSequence(out, seq.begin(), seq.end()); \ - return out; \ -} +#define OUTPUT_FIVE_ARG_CONTAINER(Sequence) \ + template \ + inline std::ostream& operator<<(std::ostream& out, \ + const Sequence& seq) { \ + google::PrintSequence(out, seq.begin(), seq.end()); \ + return out; \ + } -#if defined(GLOG_STL_LOGGING_FOR_UNORDERED) && __cplusplus >= 201103L OUTPUT_FIVE_ARG_CONTAINER(std::unordered_map) OUTPUT_FIVE_ARG_CONTAINER(std::unordered_multimap) -#endif -#ifdef GLOG_STL_LOGGING_FOR_TR1_UNORDERED -OUTPUT_FIVE_ARG_CONTAINER(std::tr1::unordered_map) -OUTPUT_FIVE_ARG_CONTAINER(std::tr1::unordered_multimap) -#endif -#ifdef GLOG_STL_LOGGING_FOR_EXT_HASH -OUTPUT_FIVE_ARG_CONTAINER(__gnu_cxx::hash_map) -OUTPUT_FIVE_ARG_CONTAINER(__gnu_cxx::hash_multimap) -#endif #undef OUTPUT_FIVE_ARG_CONTAINER -template +template inline std::ostream& operator<<(std::ostream& out, const std::pair& p) { out << '(' << p.first << ", " << p.second << ')'; @@ -177,7 +123,7 @@ inline std::ostream& operator<<(std::ostream& out, namespace google { -template +template inline void PrintSequence(std::ostream& out, Iter begin, Iter end) { // Output at most 100 elements -- appropriate if used for logging. for (int i = 0; begin != end && i < 100; ++i, ++begin) { @@ -189,7 +135,7 @@ inline void PrintSequence(std::ostream& out, Iter begin, Iter end) { } } -} +} // namespace google // Note that this is technically undefined behavior! We are adding things into // the std namespace for a reason though -- we are providing new operations on @@ -215,6 +161,8 @@ inline void PrintSequence(std::ostream& out, Iter begin, Iter end) { // move all of the *definitions* into namespace std, bet we need to ensure no // one references them first. This lets us take that step. We cannot define them // in both because that would create ambiguous overloads when both are found. -namespace std { using ::operator<<; } +namespace std { +using ::operator<<; +} -#endif // UTIL_GTL_STL_LOGGING_INL_H_ +#endif // GLOG_STL_LOGGING_H diff --git a/glog/x86_64/include/glog/types.h b/glog/x86_64/include/glog/types.h new file mode 100644 index 00000000..dca2f06f --- /dev/null +++ b/glog/x86_64/include/glog/types.h @@ -0,0 +1,81 @@ + +// Copyright (c) 2024, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +#ifndef GLOG_TYPES_H +#define GLOG_TYPES_H + +#include +#include + +namespace google { + +using int32 = std::int32_t; +using uint32 = std::uint32_t; +using int64 = std::int64_t; +using uint64 = std::uint64_t; + +} // namespace google + +#if defined(__has_feature) +# if __has_feature(thread_sanitizer) +# define GLOG_SANITIZE_THREAD 1 +# endif +#endif + +#if !defined(GLOG_SANITIZE_THREAD) && defined(__SANITIZE_THREAD__) && \ + __SANITIZE_THREAD__ +# define GLOG_SANITIZE_THREAD 1 +#endif + +#if defined(GLOG_SANITIZE_THREAD) +# define GLOG_IFDEF_THREAD_SANITIZER(X) X +#else +# define GLOG_IFDEF_THREAD_SANITIZER(X) +#endif + +#if defined(_MSC_VER) +# define GLOG_MSVC_PUSH_DISABLE_WARNING(n) \ + __pragma(warning(push)) __pragma(warning(disable : n)) +# define GLOG_MSVC_POP_WARNING() __pragma(warning(pop)) +#else +# define GLOG_MSVC_PUSH_DISABLE_WARNING(n) +# define GLOG_MSVC_POP_WARNING() +#endif + +#if defined(GLOG_SANITIZE_THREAD) +// We need to identify the static variables as "benign" races +// to avoid noisy reports from TSAN. +extern "C" void AnnotateBenignRaceSized(const char* file, int line, + const volatile void* mem, size_t size, + const char* description); +#endif // defined(GLOG_SANITIZE_THREAD) + +#endif // GLOG_TYPES_H diff --git a/glog/x86_64/include/glog/vlog_is_on.h b/glog/x86_64/include/glog/vlog_is_on.h index 52036b5e..f94b0fb8 100644 --- a/glog/x86_64/include/glog/vlog_is_on.h +++ b/glog/x86_64/include/glog/vlog_is_on.h @@ -1,4 +1,4 @@ -// Copyright (c) 1999, 2007, Google Inc. +// Copyright (c) 2024, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -58,10 +58,21 @@ // CAVEAT: --vmodule functionality is not available in non gcc compilers. // -#ifndef BASE_VLOG_IS_ON_H_ -#define BASE_VLOG_IS_ON_H_ +#ifndef GLOG_VLOG_IS_ON_H +#define GLOG_VLOG_IS_ON_H -#include +#include + +#if defined(GLOG_USE_GLOG_EXPORT) +# include "glog/export.h" +#endif + +#if !defined(GLOG_EXPORT) +# error was not included correctly. See the documention for how to consume the library. +#endif + +#include "glog/flags.h" +#include "glog/types.h" #if defined(__GNUC__) // We emit an anonymous static int* variable at every VLOG_IS_ON(n) site. @@ -70,19 +81,25 @@ // it's either FLAGS_v or an appropriate internal variable // matching the current source file that represents results of // parsing of --vmodule flag and/or SetVLOGLevel calls. -#define VLOG_IS_ON(verboselevel) \ - __extension__ \ - ({ static google::SiteFlag vlocal__ = {NULL, NULL, 0, NULL}; \ - google::int32 verbose_level__ = (verboselevel); \ - (vlocal__.level == NULL ? google::InitVLOG3__(&vlocal__, &FLAGS_v, \ - __FILE__, verbose_level__) : *vlocal__.level >= verbose_level__); \ - }) +# define VLOG_IS_ON(verboselevel) \ + __extension__({ \ + static google::SiteFlag vlocal__ = {nullptr, nullptr, 0, nullptr}; \ + GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized( \ + __FILE__, __LINE__, &vlocal__, sizeof(google::SiteFlag), "")); \ + google::int32 verbose_level__ = (verboselevel); \ + (vlocal__.level == nullptr \ + ? google::InitVLOG3__(&vlocal__, &FLAGS_v, __FILE__, \ + verbose_level__) \ + : *vlocal__.level >= verbose_level__); \ + }) #else // GNU extensions not available, so we do not support --vmodule. // Dynamic value of FLAGS_v always controls the logging level. -#define VLOG_IS_ON(verboselevel) (FLAGS_v >= (verboselevel)) +# define VLOG_IS_ON(verboselevel) (FLAGS_v >= (verboselevel)) #endif +namespace google { + // Set VLOG(_IS_ON) level for module_pattern to log_level. // This lets us dynamically control what is normally set by the --vmodule flag. // Returns the level that previously applied to module_pattern. @@ -96,13 +113,13 @@ extern GLOG_EXPORT int SetVLOGLevel(const char* module_pattern, int log_level); // Various declarations needed for VLOG_IS_ON above: ========================= struct SiteFlag { - google::int32* level; + int32* level; const char* base_name; - size_t base_len; + std::size_t base_len; SiteFlag* next; }; -// Helper routine which determines the logging info for a particalur VLOG site. +// Helper routine which determines the logging info for a particular VLOG site. // site_flag is the address of the site-local pointer to the controlling // verbosity level // site_default is the default to use for *site_flag @@ -110,9 +127,10 @@ struct SiteFlag { // verbose_level is the argument to VLOG_IS_ON // We will return the return value for VLOG_IS_ON // and if possible set *site_flag appropriately. -extern GLOG_EXPORT bool InitVLOG3__( - google::SiteFlag* site_flag, - google::int32* site_default, const char* fname, - google::int32 verbose_level); +extern GLOG_EXPORT bool InitVLOG3__(SiteFlag* site_flag, + int32* site_default, + const char* fname, + int32 verbose_level); +} // namespace google -#endif // BASE_VLOG_IS_ON_H_ +#endif // GLOG_VLOG_IS_ON_H diff --git a/glog/x86_64/lib/cmake/glog/glog-config-version.cmake b/glog/x86_64/lib/cmake/glog/glog-config-version.cmake index 47dc0585..1eba2de2 100644 --- a/glog/x86_64/lib/cmake/glog/glog-config-version.cmake +++ b/glog/x86_64/lib/cmake/glog/glog-config-version.cmake @@ -9,19 +9,19 @@ # The variable CVF_VERSION must be set before calling configure_file(). -set(PACKAGE_VERSION "0.6.0") +set(PACKAGE_VERSION "0.7.0") if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() - if("0.6.0" MATCHES "^([0-9]+)\\.") + if("0.7.0" MATCHES "^([0-9]+)\\.") set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}") if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0) string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}") endif() else() - set(CVF_VERSION_MAJOR "0.6.0") + set(CVF_VERSION_MAJOR "0.7.0") endif() if(PACKAGE_FIND_VERSION_RANGE) diff --git a/glog/x86_64/lib/cmake/glog/glog-config.cmake b/glog/x86_64/lib/cmake/glog/glog-config.cmake index 7f9d5702..d4fc7691 100644 --- a/glog/x86_64/lib/cmake/glog/glog-config.cmake +++ b/glog/x86_64/lib/cmake/glog/glog-config.cmake @@ -21,6 +21,8 @@ endmacro() include (CMakeFindDependencyMacro) include (${CMAKE_CURRENT_LIST_DIR}/glog-modules.cmake) +find_dependency (Threads) + diff --git a/glog/x86_64/lib/cmake/glog/glog-targets.cmake b/glog/x86_64/lib/cmake/glog/glog-targets.cmake index 7799b1fe..bfdb8034 100644 --- a/glog/x86_64/lib/cmake/glog/glog-targets.cmake +++ b/glog/x86_64/lib/cmake/glog/glog-targets.cmake @@ -54,9 +54,10 @@ endif() add_library(glog::glog STATIC IMPORTED) set_target_properties(glog::glog PROPERTIES - INTERFACE_COMPILE_DEFINITIONS "GLOG_CUSTOM_PREFIX_SUPPORT" + INTERFACE_COMPILE_DEFINITIONS "GLOG_USE_GLOG_EXPORT" + INTERFACE_COMPILE_FEATURES "cxx_std_14" INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" - INTERFACE_LINK_LIBRARIES "\$;\$" + INTERFACE_LINK_LIBRARIES "\$;\$" ) if(CMAKE_VERSION VERSION_LESS 2.8.12) diff --git a/glog/x86_64/lib/libglog.a b/glog/x86_64/lib/libglog.a index 7cc3976e..8b1f4798 100644 Binary files a/glog/x86_64/lib/libglog.a and b/glog/x86_64/lib/libglog.a differ diff --git a/librime/arm64-v8a/include/rime_api.h b/librime/arm64-v8a/include/rime_api.h index 54fd4c14..44b2ea3f 100644 --- a/librime/arm64-v8a/include/rime_api.h +++ b/librime/arm64-v8a/include/rime_api.h @@ -413,9 +413,13 @@ RIME_API RimeModule* RimeFindModule(const char* module_name); //! Run a registered task RIME_API Bool RimeRunTask(const char* task_name); +//! \deprecated use RimeApi::get_shared_data_dir_s instead. RIME_API const char* RimeGetSharedDataDir(void); +//! \deprecated use RimeApi::get_user_data_dir_s instead. RIME_API const char* RimeGetUserDataDir(void); +//! \deprecated use RimeApi::get_sync_dir_s instead. RIME_API const char* RimeGetSyncDir(void); + RIME_API const char* RimeGetUserId(void); /*! The API structure @@ -543,9 +547,14 @@ typedef struct rime_api_t { RimeModule* (*find_module)(const char* module_name); Bool (*run_task)(const char* task_name); + + //! \deprecated use get_shared_data_dir_s instead. const char* (*get_shared_data_dir)(void); + //! \deprecated use get_user_data_dir_s instead. const char* (*get_user_data_dir)(void); + //! \deprecated use get_sync_dir_s instead. const char* (*get_sync_dir)(void); + const char* (*get_user_id)(void); void (*get_user_data_sync_dir)(char* dir, size_t buffer_size); @@ -618,11 +627,13 @@ typedef struct rime_api_t { int index); //! prebuilt data directory. + //! \deprecated use get_prebuilt_data_dir_s instead. const char* (*get_prebuilt_data_dir)(void); //! staging directory, stores data files deployed to a Rime client. + //! \deprecated use get_staging_dir_s instead. const char* (*get_staging_dir)(void); - //! Deprecated: for capnproto API, use "proto" module from librime-proto + //! \deprecated for capnproto API, use "proto" module from librime-proto //! plugin. void (*commit_proto)(RimeSessionId session_id, RIME_PROTO_BUILDER* commit_builder); @@ -647,6 +658,20 @@ typedef struct rime_api_t { Bool abbreviated); Bool (*set_input)(RimeSessionId session_id, const char* input); + + void (*get_shared_data_dir_s)(char* dir, size_t buffer_size); + void (*get_user_data_dir_s)(char* dir, size_t buffer_size); + void (*get_prebuilt_data_dir_s)(char* dir, size_t buffer_size); + void (*get_staging_dir_s)(char* dir, size_t buffer_size); + void (*get_sync_dir_s)(char* dir, size_t buffer_size); + + //! highlight a selection without committing + Bool (*highlight_candidate)(RimeSessionId session_id, size_t index); + //! highlight a selection without committing + Bool (*highlight_candidate_on_current_page)(RimeSessionId session_id, + size_t index); + + Bool (*change_page)(RimeSessionId session_id, Bool backward); } RimeApi; //! API entry diff --git a/librime/arm64-v8a/lib/librime.a b/librime/arm64-v8a/lib/librime.a index 862ea660..35e4f3c5 100644 Binary files a/librime/arm64-v8a/lib/librime.a and b/librime/arm64-v8a/lib/librime.a differ diff --git a/librime/armeabi-v7a/include/rime_api.h b/librime/armeabi-v7a/include/rime_api.h index 54fd4c14..44b2ea3f 100644 --- a/librime/armeabi-v7a/include/rime_api.h +++ b/librime/armeabi-v7a/include/rime_api.h @@ -413,9 +413,13 @@ RIME_API RimeModule* RimeFindModule(const char* module_name); //! Run a registered task RIME_API Bool RimeRunTask(const char* task_name); +//! \deprecated use RimeApi::get_shared_data_dir_s instead. RIME_API const char* RimeGetSharedDataDir(void); +//! \deprecated use RimeApi::get_user_data_dir_s instead. RIME_API const char* RimeGetUserDataDir(void); +//! \deprecated use RimeApi::get_sync_dir_s instead. RIME_API const char* RimeGetSyncDir(void); + RIME_API const char* RimeGetUserId(void); /*! The API structure @@ -543,9 +547,14 @@ typedef struct rime_api_t { RimeModule* (*find_module)(const char* module_name); Bool (*run_task)(const char* task_name); + + //! \deprecated use get_shared_data_dir_s instead. const char* (*get_shared_data_dir)(void); + //! \deprecated use get_user_data_dir_s instead. const char* (*get_user_data_dir)(void); + //! \deprecated use get_sync_dir_s instead. const char* (*get_sync_dir)(void); + const char* (*get_user_id)(void); void (*get_user_data_sync_dir)(char* dir, size_t buffer_size); @@ -618,11 +627,13 @@ typedef struct rime_api_t { int index); //! prebuilt data directory. + //! \deprecated use get_prebuilt_data_dir_s instead. const char* (*get_prebuilt_data_dir)(void); //! staging directory, stores data files deployed to a Rime client. + //! \deprecated use get_staging_dir_s instead. const char* (*get_staging_dir)(void); - //! Deprecated: for capnproto API, use "proto" module from librime-proto + //! \deprecated for capnproto API, use "proto" module from librime-proto //! plugin. void (*commit_proto)(RimeSessionId session_id, RIME_PROTO_BUILDER* commit_builder); @@ -647,6 +658,20 @@ typedef struct rime_api_t { Bool abbreviated); Bool (*set_input)(RimeSessionId session_id, const char* input); + + void (*get_shared_data_dir_s)(char* dir, size_t buffer_size); + void (*get_user_data_dir_s)(char* dir, size_t buffer_size); + void (*get_prebuilt_data_dir_s)(char* dir, size_t buffer_size); + void (*get_staging_dir_s)(char* dir, size_t buffer_size); + void (*get_sync_dir_s)(char* dir, size_t buffer_size); + + //! highlight a selection without committing + Bool (*highlight_candidate)(RimeSessionId session_id, size_t index); + //! highlight a selection without committing + Bool (*highlight_candidate_on_current_page)(RimeSessionId session_id, + size_t index); + + Bool (*change_page)(RimeSessionId session_id, Bool backward); } RimeApi; //! API entry diff --git a/librime/armeabi-v7a/lib/librime.a b/librime/armeabi-v7a/lib/librime.a index a2e3e9f8..e0489db4 100644 Binary files a/librime/armeabi-v7a/lib/librime.a and b/librime/armeabi-v7a/lib/librime.a differ diff --git a/librime/x86/include/rime_api.h b/librime/x86/include/rime_api.h index 54fd4c14..44b2ea3f 100644 --- a/librime/x86/include/rime_api.h +++ b/librime/x86/include/rime_api.h @@ -413,9 +413,13 @@ RIME_API RimeModule* RimeFindModule(const char* module_name); //! Run a registered task RIME_API Bool RimeRunTask(const char* task_name); +//! \deprecated use RimeApi::get_shared_data_dir_s instead. RIME_API const char* RimeGetSharedDataDir(void); +//! \deprecated use RimeApi::get_user_data_dir_s instead. RIME_API const char* RimeGetUserDataDir(void); +//! \deprecated use RimeApi::get_sync_dir_s instead. RIME_API const char* RimeGetSyncDir(void); + RIME_API const char* RimeGetUserId(void); /*! The API structure @@ -543,9 +547,14 @@ typedef struct rime_api_t { RimeModule* (*find_module)(const char* module_name); Bool (*run_task)(const char* task_name); + + //! \deprecated use get_shared_data_dir_s instead. const char* (*get_shared_data_dir)(void); + //! \deprecated use get_user_data_dir_s instead. const char* (*get_user_data_dir)(void); + //! \deprecated use get_sync_dir_s instead. const char* (*get_sync_dir)(void); + const char* (*get_user_id)(void); void (*get_user_data_sync_dir)(char* dir, size_t buffer_size); @@ -618,11 +627,13 @@ typedef struct rime_api_t { int index); //! prebuilt data directory. + //! \deprecated use get_prebuilt_data_dir_s instead. const char* (*get_prebuilt_data_dir)(void); //! staging directory, stores data files deployed to a Rime client. + //! \deprecated use get_staging_dir_s instead. const char* (*get_staging_dir)(void); - //! Deprecated: for capnproto API, use "proto" module from librime-proto + //! \deprecated for capnproto API, use "proto" module from librime-proto //! plugin. void (*commit_proto)(RimeSessionId session_id, RIME_PROTO_BUILDER* commit_builder); @@ -647,6 +658,20 @@ typedef struct rime_api_t { Bool abbreviated); Bool (*set_input)(RimeSessionId session_id, const char* input); + + void (*get_shared_data_dir_s)(char* dir, size_t buffer_size); + void (*get_user_data_dir_s)(char* dir, size_t buffer_size); + void (*get_prebuilt_data_dir_s)(char* dir, size_t buffer_size); + void (*get_staging_dir_s)(char* dir, size_t buffer_size); + void (*get_sync_dir_s)(char* dir, size_t buffer_size); + + //! highlight a selection without committing + Bool (*highlight_candidate)(RimeSessionId session_id, size_t index); + //! highlight a selection without committing + Bool (*highlight_candidate_on_current_page)(RimeSessionId session_id, + size_t index); + + Bool (*change_page)(RimeSessionId session_id, Bool backward); } RimeApi; //! API entry diff --git a/librime/x86/lib/librime.a b/librime/x86/lib/librime.a index 6382342e..366ed622 100644 Binary files a/librime/x86/lib/librime.a and b/librime/x86/lib/librime.a differ diff --git a/librime/x86_64/include/rime_api.h b/librime/x86_64/include/rime_api.h index 54fd4c14..44b2ea3f 100644 --- a/librime/x86_64/include/rime_api.h +++ b/librime/x86_64/include/rime_api.h @@ -413,9 +413,13 @@ RIME_API RimeModule* RimeFindModule(const char* module_name); //! Run a registered task RIME_API Bool RimeRunTask(const char* task_name); +//! \deprecated use RimeApi::get_shared_data_dir_s instead. RIME_API const char* RimeGetSharedDataDir(void); +//! \deprecated use RimeApi::get_user_data_dir_s instead. RIME_API const char* RimeGetUserDataDir(void); +//! \deprecated use RimeApi::get_sync_dir_s instead. RIME_API const char* RimeGetSyncDir(void); + RIME_API const char* RimeGetUserId(void); /*! The API structure @@ -543,9 +547,14 @@ typedef struct rime_api_t { RimeModule* (*find_module)(const char* module_name); Bool (*run_task)(const char* task_name); + + //! \deprecated use get_shared_data_dir_s instead. const char* (*get_shared_data_dir)(void); + //! \deprecated use get_user_data_dir_s instead. const char* (*get_user_data_dir)(void); + //! \deprecated use get_sync_dir_s instead. const char* (*get_sync_dir)(void); + const char* (*get_user_id)(void); void (*get_user_data_sync_dir)(char* dir, size_t buffer_size); @@ -618,11 +627,13 @@ typedef struct rime_api_t { int index); //! prebuilt data directory. + //! \deprecated use get_prebuilt_data_dir_s instead. const char* (*get_prebuilt_data_dir)(void); //! staging directory, stores data files deployed to a Rime client. + //! \deprecated use get_staging_dir_s instead. const char* (*get_staging_dir)(void); - //! Deprecated: for capnproto API, use "proto" module from librime-proto + //! \deprecated for capnproto API, use "proto" module from librime-proto //! plugin. void (*commit_proto)(RimeSessionId session_id, RIME_PROTO_BUILDER* commit_builder); @@ -647,6 +658,20 @@ typedef struct rime_api_t { Bool abbreviated); Bool (*set_input)(RimeSessionId session_id, const char* input); + + void (*get_shared_data_dir_s)(char* dir, size_t buffer_size); + void (*get_user_data_dir_s)(char* dir, size_t buffer_size); + void (*get_prebuilt_data_dir_s)(char* dir, size_t buffer_size); + void (*get_staging_dir_s)(char* dir, size_t buffer_size); + void (*get_sync_dir_s)(char* dir, size_t buffer_size); + + //! highlight a selection without committing + Bool (*highlight_candidate)(RimeSessionId session_id, size_t index); + //! highlight a selection without committing + Bool (*highlight_candidate_on_current_page)(RimeSessionId session_id, + size_t index); + + Bool (*change_page)(RimeSessionId session_id, Bool backward); } RimeApi; //! API entry diff --git a/librime/x86_64/lib/librime.a b/librime/x86_64/lib/librime.a index f7b1b1ef..de668cc3 100644 Binary files a/librime/x86_64/lib/librime.a and b/librime/x86_64/lib/librime.a differ diff --git a/toolchain-versions.json b/toolchain-versions.json index 96ff1c23..3ec4d7e4 100644 --- a/toolchain-versions.json +++ b/toolchain-versions.json @@ -2,5 +2,5 @@ "cmake": "3.22.1", "ndk": " 25.2.9519653", "platform": 23, - "prebuilder": "1b4b3db05f8cd8486b758ff073bbc4b3b4a2681d" + "prebuilder": "1ea929e17c31229265e85603cc8ac5bdb7aab4f2" } \ No newline at end of file