luo980/glog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use unordered_map instead of vector and rename member

Browse Source
This commit is contained in:
HNOONa-0 2025-02-21 14:59:49 +02:00
parent 55e6f473d9
commit 73a803b3ac
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/logging.cc
View File

@ -72,6 +72,7 @@
#include <regex> #include <regex>
#include <sstream> #include <sstream>
#include <vector> #include <vector>
#include <unordered_map>
#ifdef HAVE__CHSIZE_S #ifdef HAVE__CHSIZE_S
# include <io.h> // for truncate log file # include <io.h> // for truncate log file
@ -455,7 +456,7 @@ class LogCleaner {
bool base_filename_selected, const string& base_filename, bool base_filename_selected, const string& base_filename,
const string& filename_extension); const string& filename_extension);
bool enabled() const; bool enabled() const { return !overdue_.empty(); }
private: private:
vector<string> GetOverdueLogNames( vector<string> GetOverdueLogNames(
@ -471,7 +472,7 @@ class LogCleaner {
const string& filepath, const string& filepath,
const std::chrono::system_clock::time_point& current_time) const; const std::chrono::system_clock::time_point& current_time) const;
vector<std::chrono::minutes> overdue_per_severity_; std::unordered_map<LogSeverity, std::chrono::minutes> overdue_;
std::chrono::system_clock::time_point std::chrono::system_clock::time_point
next_cleanup_time_; // cycle count at which to clean overdue log next_cleanup_time_; // cycle count at which to clean overdue log
}; };
@ -1292,32 +1293,23 @@ void LogFileObject::Write(
} }
} }
LogCleaner::LogCleaner() { LogCleaner::LogCleaner() = default;
overdue_per_severity_.resize(NUM_SEVERITIES, std::chrono::minutes::max());
}
bool LogCleaner::enabled() const {
// return true if any severity is enabled by iterating over the array
for (int i = 0; i < NUM_SEVERITIES; i++) {
if (overdue_per_severity_[i] != std::chrono::minutes::max()) return true;
}
return false;
}
void LogCleaner::Enable(const std::chrono::minutes& overdue) { void LogCleaner::Enable(const std::chrono::minutes& overdue) {
// for backward compatability, set all severities to the same value // for backward compatability, set all severities to the same value
fill(overdue_per_severity_.begin(), overdue_per_severity_.end(), overdue); for (int i = GLOG_INFO; i < NUM_SEVERITIES; i++) {
overdue_[static_cast<LogSeverity>(i)] = overdue;
}
} }
void LogCleaner::Enable(const LogSeverity severity, const std::chrono::minutes& overdue) { void LogCleaner::Enable(const LogSeverity severity, const std::chrono::minutes& overdue) {
overdue_per_severity_[severity] = overdue; overdue_[severity] = overdue;
} }
void LogCleaner::Disable() { fill(overdue_per_severity_.begin(), overdue_per_severity_.end(), std::chrono::minutes::max()); } void LogCleaner::Disable() { overdue_.clear(); }
void LogCleaner::Disable(const LogSeverity severity) { void LogCleaner::Disable(const LogSeverity severity) {
overdue_per_severity_[severity] = std::chrono::minutes::max(); overdue_.erase(severity);
} }
void LogCleaner::Run(const std::chrono::system_clock::time_point& current_time, void LogCleaner::Run(const std::chrono::system_clock::time_point& current_time,
@ -1508,7 +1500,12 @@ bool LogCleaner::IsLogLastModifiedOver(
return false; return false;
} }
return diff >= overdue_per_severity_[severity]; auto severity_it = overdue_.find(static_cast<LogSeverity>(severity));
if (severity_it == overdue_.end()) {
return false;
}
return diff >= severity_it->second;
} }
// If failed to get file stat, don't return true! // If failed to get file stat, don't return true!