Commit 8a072b53 authored by Dominik Charousset's avatar Dominik Charousset

Fix error when compiling without logging

parent 59801ea6
...@@ -209,8 +209,6 @@ private: ...@@ -209,8 +209,6 @@ private:
// placeholder macros when compiling without logging // placeholder macros when compiling without logging
inline caf::actor_id caf_set_aid_dummy() { return 0; } inline caf::actor_id caf_set_aid_dummy() { return 0; }
#define CAF_LOG_IMPL(lvlname, classname, funname, message) \
CAF_PRINT_ERROR_IMPL(lvlname, classname, funname, message)
#define CAF_PUSH_AID(unused) CAF_VOID_STMT #define CAF_PUSH_AID(unused) CAF_VOID_STMT
......
...@@ -56,7 +56,10 @@ constexpr const char* log_level_name[] = { ...@@ -56,7 +56,10 @@ constexpr const char* log_level_name[] = {
}; };
#ifdef CAF_LOG_LEVEL #ifdef CAF_LOG_LEVEL
constexpr int global_log_level = 0; static_assert(CAF_LOG_LEVEL >= 0 && CAF_LOG_LEVEL <= 4,
"assertion: 0 <= CAF_LOG_LEVEL <= 4");
constexpr int global_log_level = CAF_LOG_LEVEL;
#ifdef CAF_MSVC #ifdef CAF_MSVC
thread_local thread_local
...@@ -78,15 +81,6 @@ inline logger* get_current_logger() { ...@@ -78,15 +81,6 @@ inline logger* get_current_logger() {
return sys ? &sys->logger() : nullptr; return sys ? &sys->logger() : nullptr;
} }
#else #else
static_assert(CAF_LOG_LEVEL >= 0 && CAF_LOG_LEVEL <= 4,
"assertion: 0 <= CAF_LOG_LEVEL <= 4");
constexpr int global_log_level = CAF_LOG_LEVEL;
inline actor_system* current_logger_system() {
return nullptr;
}
inline void current_logger_system(actor_system*) { inline void current_logger_system(actor_system*) {
// nop // nop
} }
...@@ -305,18 +299,22 @@ void logger::run() { ...@@ -305,18 +299,22 @@ void logger::run() {
} }
void logger::start() { void logger::start() {
# ifdef CAF_LOG_LEVEL
const char* log_level_table[] = {"ERROR", "WARN", "INFO", "DEBUG", "TRACE"}; const char* log_level_table[] = {"ERROR", "WARN", "INFO", "DEBUG", "TRACE"};
thread_ = std::thread{[this] { this->run(); }}; thread_ = std::thread{[this] { this->run(); }};
std::string msg = "ENTRY log level = "; std::string msg = "ENTRY log level = ";
msg += log_level_table[global_log_level]; msg += log_level_table[global_log_level];
log(4, "caf::logger", "run", __FILE__, __LINE__, msg); log(4, "caf::logger", "run", __FILE__, __LINE__, msg);
# endif
} }
void logger::stop() { void logger::stop() {
# ifdef CAF_LOG_LEVEL
log(4, "caf::logger", "run", __FILE__, __LINE__, "EXIT"); log(4, "caf::logger", "run", __FILE__, __LINE__, "EXIT");
// an empty string means: shut down // an empty string means: shut down
queue_.synchronized_enqueue(queue_mtx_, queue_cv_, new event{""}); queue_.synchronized_enqueue(queue_mtx_, queue_cv_, new event{""});
thread_.join(); thread_.join();
# endif
} }
} // namespace caf } // namespace caf
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment