Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: reduce manual deallocations #1016

Merged
merged 1 commit into from
Jan 2, 2024
Merged

feat: reduce manual deallocations #1016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/glog/logging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2023, Google Inc.
// Copyright (c) 2024, Google Inc.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -43,6 +43,7 @@
#include <cstring>
#include <ctime>
#include <iosfwd>
#include <memory>
#include <ostream>
#include <sstream>
#include <string>
Expand Down Expand Up @@ -590,12 +591,13 @@ DECLARE_string(logmailer);
FORMAT_MESSAGE_FROM_SYSTEM | \
FORMAT_MESSAGE_IGNORE_INSERTS, \
0, result, 0, msg, 100, nullptr); \
std::unique_ptr<char, decltype(&LocalFree)> release{message, \
&LocalFree}; \
if (message_length > 0) { \
google::LogMessage(__FILE__, __LINE__, google::GLOG_ERROR, 0, \
&google::LogMessage::SendToLog) \
.stream() \
<< reinterpret_cast<const char*>(message); \
LocalFree(message); \
} \
}
#endif
Expand Down
46 changes: 24 additions & 22 deletions src/logging.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2023, Google Inc.
// Copyright (c) 2024, Google Inc.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -560,6 +560,7 @@ class LogDestination {
}

static void DeleteLogDestinations();
LogDestination(LogSeverity severity, const char* base_filename);

private:
#if defined(__cpp_lib_shared_mutex) && (__cpp_lib_shared_mutex >= 201505L)
Expand All @@ -573,7 +574,7 @@ class LogDestination {
#endif // defined(__cpp_lib_shared_mutex) && (__cpp_lib_shared_mutex >=
// 201505L)

LogDestination(LogSeverity severity, const char* base_filename);
friend std::default_delete<LogDestination>;
~LogDestination();

// Take a log message of a particular severity and log it to stderr
Expand Down Expand Up @@ -614,14 +615,14 @@ class LogDestination {
LogFileObject fileobject_;
base::Logger* logger_; // Either &fileobject_, or wrapper around it

static LogDestination* log_destinations_[NUM_SEVERITIES];
static std::unique_ptr<LogDestination> log_destinations_[NUM_SEVERITIES];
static LogSeverity email_logging_severity_;
static string addresses_;
static string hostname_;
static bool terminal_supports_color_;

// arbitrary global logging destinations.
static vector<LogSink*>* sinks_;
static std::unique_ptr<vector<LogSink*>> sinks_;

// Protects the vector sinks_,
// but not the LogSink objects its elements reference.
Expand All @@ -638,7 +639,7 @@ LogSeverity LogDestination::email_logging_severity_ = 99999;
string LogDestination::addresses_;
string LogDestination::hostname_;

vector<LogSink*>* LogDestination::sinks_ = nullptr;
std::unique_ptr<vector<LogSink*>> LogDestination::sinks_;
LogDestination::SinkMutex LogDestination::sink_mutex_;
bool LogDestination::terminal_supports_color_ = TerminalSupportsColor();

Expand Down Expand Up @@ -674,14 +675,15 @@ void LogDestination::SetLoggerImpl(base::Logger* logger) {
inline void LogDestination::FlushLogFilesUnsafe(int min_severity) {
// assume we have the log_mutex or we simply don't care
// about it
for (int i = min_severity; i < NUM_SEVERITIES; i++) {
LogDestination* log = log_destinations_[i];
if (log != nullptr) {
// Flush the base fileobject_ logger directly instead of going
// through any wrappers to reduce chance of deadlock.
log->fileobject_.FlushUnlocked();
}
}
std::for_each(std::next(std::begin(log_destinations_), min_severity),
std::end(log_destinations_),
[](std::unique_ptr<LogDestination>& log) {
if (log != nullptr) {
// Flush the base fileobject_ logger directly instead of
// going through any wrappers to reduce chance of deadlock.
log->fileobject_.FlushUnlocked();
}
});
}

inline void LogDestination::FlushLogFiles(int min_severity) {
Expand Down Expand Up @@ -717,7 +719,7 @@ inline void LogDestination::AddLogSink(LogSink* destination) {
// Prevent any subtle race conditions by wrapping a mutex lock around
// all this stuff.
SinkLock l{sink_mutex_};
if (!sinks_) sinks_ = new vector<LogSink*>;
if (sinks_ == nullptr) sinks_ = std::make_unique<std::vector<LogSink*>>();
sinks_->push_back(destination);
}

Expand Down Expand Up @@ -935,24 +937,24 @@ inline void LogDestination::WaitForSinks(LogMessage::LogMessageData* data) {
}
}

LogDestination* LogDestination::log_destinations_[NUM_SEVERITIES];
std::unique_ptr<LogDestination>
LogDestination::log_destinations_[NUM_SEVERITIES];

inline LogDestination* LogDestination::log_destination(LogSeverity severity) {
assert(severity >= 0 && severity < NUM_SEVERITIES);
if (!log_destinations_[severity]) {
log_destinations_[severity] = new LogDestination(severity, nullptr);
if (log_destinations_[severity] == nullptr) {
log_destinations_[severity] =
std::make_unique<LogDestination>(severity, nullptr);
}
return log_destinations_[severity];
return log_destinations_[severity].get();
}

void LogDestination::DeleteLogDestinations() {
for (auto& log_destination : log_destinations_) {
delete log_destination;
log_destination = nullptr;
log_destination.reset();
}
SinkLock l{sink_mutex_};
delete sinks_;
sinks_ = nullptr;
sinks_.reset();
}

namespace {
Expand Down