From 2df0ca34aa3000dadf76633ca700abf0bf50756d Mon Sep 17 00:00:00 2001 From: Hans-Andreas Engel Date: Fri, 8 Apr 2016 10:51:40 +0200 Subject: reduce memory allocations to zero --- src/logging.cc | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'src/logging.cc') diff --git a/src/logging.cc b/src/logging.cc index ec9eef1..42290f4 100644 --- a/src/logging.cc +++ b/src/logging.cc @@ -336,6 +336,7 @@ const size_t LogMessage::kMaxLogMessageLen = 30000; struct LogMessage::LogMessageData { LogMessageData(); + void reset(); int preserved_errno_; // preserved errno // Buffer space; contains complete message text. @@ -1141,10 +1142,22 @@ static bool fatal_msg_exclusive = true; static LogMessage::LogMessageData fatal_msg_data_exclusive; static LogMessage::LogMessageData fatal_msg_data_shared; +#ifdef GLOG_THREAD_LOCAL_STORAGE +// Static thread-local log data space to use, because typically at most one +// LogMessageData object exists (in this case glog makes zero heap memory +// allocations). +static GLOG_THREAD_LOCAL_STORAGE bool thread_data_available = true; +static GLOG_THREAD_LOCAL_STORAGE LogMessage::LogMessageData thread_msg_data; +#endif // defined(GLOG_THREAD_LOCAL_STORAGE) + LogMessage::LogMessageData::LogMessageData() : stream_(message_text_, LogMessage::kMaxLogMessageLen, 0) { } +void LogMessage::LogMessageData::reset() { + stream_.reset(); +} + LogMessage::LogMessage(const char* file, int line, LogSeverity severity, int ctr, void (LogMessage::*send_method)()) : allocated_(NULL) { @@ -1197,8 +1210,22 @@ void LogMessage::Init(const char* file, void (LogMessage::*send_method)()) { allocated_ = NULL; if (severity != GLOG_FATAL || !exit_on_dfatal) { +#ifdef GLOG_THREAD_LOCAL_STORAGE + // No need for locking, because this is thread local. + if (thread_data_available) { + thread_data_available = false; + data_ = &thread_msg_data; + // Make sure to clear log data since it may have been used and filled with + // data. We do not want to append the new message to the previous one. + data_->reset(); + } else { + allocated_ = new LogMessageData(); + data_ = allocated_; + } +#else // !defined(GLOG_THREAD_LOCAL_STORAGE) allocated_ = new LogMessageData(); data_ = allocated_; +#endif // defined(GLOG_THREAD_LOCAL_STORAGE) data_->first_fatal_ = false; } else { MutexLock l(&fatal_msg_lock); @@ -1267,6 +1294,10 @@ void LogMessage::Init(const char* file, LogMessage::~LogMessage() { Flush(); +#ifdef GLOG_THREAD_LOCAL_STORAGE + if (data_ == &thread_msg_data) + thread_data_available = true; +#endif // defined(GLOG_THREAD_LOCAL_STORAGE) delete allocated_; } -- cgit v1.2.3