[checkmk-commits] Removed micro-optimization.

Module: check_mk Branch: master Commit: bec02ebf7b587e2af38d7e09b676c152b78557dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bec02ebf7b587e… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Wed Feb 27 15:42:34 2019 +0100 Removed micro-optimization. Change-Id: I5ae96c64422b8a40cb2e0bb3e2c0551cab34088a --- livestatus/src/LogCache.cc | 9 +++------ livestatus/src/Logfile.cc | 5 ----- livestatus/src/Logfile.h | 1 - 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 49380d1..c25b00c 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -123,8 +123,7 @@ void LogCache::logLineHasBeenAdded(Logfile *logfile, unsigned logclasses) { break; } if (it->second->size() > 0) { - _num_cached_log_messages -= it->second->size(); - it->second->flush(); // drop all messages of that file + _num_cached_log_messages -= it->second->freeMessages(~0); if (_num_cached_log_messages <= _mc->maxCachedMessages()) { // remember the number of log messages in cache when // the last memory-release was done. No further @@ -148,8 +147,7 @@ void LogCache::logLineHasBeenAdded(Logfile *logfile, unsigned logclasses) { Debug(logger()) << "freeing classes " << ~logclasses << " of file " << it->second->path(); // flush only messages not needed for current query - long freed = it->second->freeMessages(~logclasses); - _num_cached_log_messages -= freed; + _num_cached_log_messages -= it->second->freeMessages(~logclasses); if (_num_cached_log_messages <= _mc->maxCachedMessages()) { _num_at_last_check = _num_cached_log_messages; return; @@ -165,8 +163,7 @@ void LogCache::logLineHasBeenAdded(Logfile *logfile, unsigned logclasses) { if (it->second->size() > 0) { Debug(logger()) << "flush newer log, " << it->second->size() << " number of entries"; - _num_cached_log_messages -= it->second->size(); - it->second->flush(); + _num_cached_log_messages -= it->second->freeMessages(~0); if (_num_cached_log_messages <= _mc->maxCachedMessages()) { _num_at_last_check = _num_cached_log_messages; return; diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index f824d98..067b147 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -70,11 +70,6 @@ Logfile::Logfile(Logger *logger, LogCache *log_cache, fs::path path, bool watch) , _lineno(0) , _logclasses_read(0) {} -void Logfile::flush() { - _entries.clear(); - _logclasses_read = 0; -} - void Logfile::load(size_t max_lines_per_logfile, unsigned logclasses) { unsigned missing_types = logclasses & ~_logclasses_read; // The current logfile has the _watch flag set to true. diff --git a/livestatus/src/Logfile.h b/livestatus/src/Logfile.h index c7dd033..b28099d 100644 --- a/livestatus/src/Logfile.h +++ b/livestatus/src/Logfile.h @@ -46,7 +46,6 @@ public: fs::path path() const { return _path; } // for tricky protocol between LogCache::logLineHasBeenAdded and this class - void flush(); time_t since() const { return _since; } unsigned classesRead() const { return _logclasses_read; } size_t size() const { return _entries.size(); }