Module: check_mk
Branch: master
Commit: 15904f00626ce216257a08dfb762b30aaa2b79cc
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15904f00626ce2…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Wed Aug 16 13:19:43 2017 +0200
Const-corrected TimeperiodsCache.
Change-Id: I7463486cf7889d6f559453993d78ee1c708360fc
---
livestatus/src/TimeperiodsCache.cc | 6 +++---
livestatus/src/TimeperiodsCache.h | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/livestatus/src/TimeperiodsCache.cc b/livestatus/src/TimeperiodsCache.cc
index 2bf5dbc..219e15b 100644
--- a/livestatus/src/TimeperiodsCache.cc
+++ b/livestatus/src/TimeperiodsCache.cc
@@ -40,7 +40,7 @@ TimeperiodsCache::TimeperiodsCache(Logger *logger)
TimeperiodsCache::~TimeperiodsCache() = default;
-void TimeperiodsCache::logCurrentTimeperiods() {
+void TimeperiodsCache::logCurrentTimeperiods() const {
lock_guard<mutex> lg(_cache_lock);
time_t now = time(nullptr);
// Loop over all timeperiods and compute if we are
@@ -100,7 +100,7 @@ void TimeperiodsCache::update(time_t now) {
}
}
-bool TimeperiodsCache::inTimeperiod(const char *tpname) {
+bool TimeperiodsCache::inTimeperiod(const char *tpname) const {
for (timeperiod *tp = timeperiod_list; tp != nullptr; tp = tp->next) {
if (strcmp(tpname, tp->name) == 0) {
return inTimeperiod(tp);
@@ -109,7 +109,7 @@ bool TimeperiodsCache::inTimeperiod(const char *tpname) {
return true; // unknown timeperiod is assumed to be 7X24
}
-bool TimeperiodsCache::inTimeperiod(timeperiod *tp) {
+bool TimeperiodsCache::inTimeperiod(timeperiod *tp) const {
lock_guard<mutex> lg(_cache_lock);
auto it = _cache.find(tp);
bool is_in;
diff --git a/livestatus/src/TimeperiodsCache.h b/livestatus/src/TimeperiodsCache.h
index c9f1b90..961ae0a 100644
--- a/livestatus/src/TimeperiodsCache.h
+++ b/livestatus/src/TimeperiodsCache.h
@@ -37,15 +37,15 @@ public:
explicit TimeperiodsCache(Logger *logger);
~TimeperiodsCache();
void update(time_t now);
- bool inTimeperiod(timeperiod *tp);
- bool inTimeperiod(const char *tpname);
- void logCurrentTimeperiods();
+ bool inTimeperiod(timeperiod *tp) const;
+ bool inTimeperiod(const char *tpname) const;
+ void logCurrentTimeperiods() const;
private:
Logger *const _logger;
time_t _cache_time;
std::map<timeperiod *, bool> _cache;
- std::mutex _cache_lock;
+ mutable std::mutex _cache_lock;
void logTransition(char *name, int from, int to);
};