astyle
This commit is contained in:
parent
992a4e6077
commit
0f76db880e
@ -249,7 +249,8 @@ inline void spdlog::details::async_log_helper::push_msg(details::async_log_helpe
|
|||||||
{
|
{
|
||||||
now = details::os::now();
|
now = details::os::now();
|
||||||
sleep_or_yield(now, last_op_time);
|
sleep_or_yield(now, last_op_time);
|
||||||
} while (!_q.enqueue(std::move(new_msg)));
|
}
|
||||||
|
while (!_q.enqueue(std::move(new_msg)));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -60,7 +60,8 @@ inline spdlog::async_logger::async_logger(const std::string& logger_name,
|
|||||||
const async_overflow_policy overflow_policy,
|
const async_overflow_policy overflow_policy,
|
||||||
const std::function<void()>& worker_warmup_cb,
|
const std::function<void()>& worker_warmup_cb,
|
||||||
const std::chrono::milliseconds& flush_interval_ms) :
|
const std::chrono::milliseconds& flush_interval_ms) :
|
||||||
async_logger(logger_name, {
|
async_logger(logger_name,
|
||||||
|
{
|
||||||
single_sink
|
single_sink
|
||||||
}, queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms) {}
|
}, queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms) {}
|
||||||
|
|
||||||
|
@ -87,7 +87,8 @@ public:
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void flush() {
|
void flush()
|
||||||
|
{
|
||||||
std::fflush(_fd);
|
std::fflush(_fd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -50,7 +50,8 @@ inline spdlog::logger::logger(const std::string& logger_name, sinks_init_list si
|
|||||||
|
|
||||||
// ctor with single sink
|
// ctor with single sink
|
||||||
inline spdlog::logger::logger(const std::string& logger_name, spdlog::sink_ptr single_sink) :
|
inline spdlog::logger::logger(const std::string& logger_name, spdlog::sink_ptr single_sink) :
|
||||||
logger(logger_name, {
|
logger(logger_name,
|
||||||
|
{
|
||||||
single_sink
|
single_sink
|
||||||
}) {}
|
}) {}
|
||||||
|
|
||||||
@ -314,7 +315,8 @@ inline void spdlog::logger::_set_formatter(formatter_ptr msg_formatter)
|
|||||||
_formatter = msg_formatter;
|
_formatter = msg_formatter;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline void spdlog::logger::flush() {
|
inline void spdlog::logger::flush()
|
||||||
|
{
|
||||||
for (auto& sink : _sinks)
|
for (auto& sink : _sinks)
|
||||||
sink->flush();
|
sink->flush();
|
||||||
}
|
}
|
@ -167,8 +167,8 @@ inline int utc_minutes_offset(const std::tm& tm = details::os::localtime())
|
|||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
(void)tm; // avoid unused param warning
|
(void)tm; // avoid unused param warning
|
||||||
#if _WIN32_WINNT < _WIN32_WINNT_WS08
|
#if _WIN32_WINNT < _WIN32_WINNT_WS08
|
||||||
TIME_ZONE_INFORMATION tzinfo;
|
TIME_ZONE_INFORMATION tzinfo;
|
||||||
auto rv = GetTimeZoneInformation(&tzinfo);
|
auto rv = GetTimeZoneInformation(&tzinfo);
|
||||||
#else
|
#else
|
||||||
DYNAMIC_TIME_ZONE_INFORMATION tzinfo;
|
DYNAMIC_TIME_ZONE_INFORMATION tzinfo;
|
||||||
auto rv = GetDynamicTimeZoneInformation(&tzinfo);
|
auto rv = GetDynamicTimeZoneInformation(&tzinfo);
|
||||||
|
@ -500,7 +500,7 @@ inline void spdlog::pattern_formatter::handle_flag(char flag)
|
|||||||
{
|
{
|
||||||
switch (flag)
|
switch (flag)
|
||||||
{
|
{
|
||||||
// logger name
|
// logger name
|
||||||
case 'n':
|
case 'n':
|
||||||
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::name_formatter()));
|
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::name_formatter()));
|
||||||
break;
|
break;
|
||||||
|
@ -158,7 +158,7 @@ private:
|
|||||||
throw spdlog_ex("logger with name " + logger_name + " already exists");
|
throw spdlog_ex("logger with name " + logger_name + " already exists");
|
||||||
_loggers[logger->name()] = logger;
|
_loggers[logger->name()] = logger;
|
||||||
}
|
}
|
||||||
registry_t<Mutex>(){}
|
registry_t<Mutex>() {}
|
||||||
registry_t<Mutex>(const registry_t<Mutex>&) = delete;
|
registry_t<Mutex>(const registry_t<Mutex>&) = delete;
|
||||||
registry_t<Mutex>& operator=(const registry_t<Mutex>&) = delete;
|
registry_t<Mutex>& operator=(const registry_t<Mutex>&) = delete;
|
||||||
Mutex _mutex;
|
Mutex _mutex;
|
||||||
|
@ -58,8 +58,8 @@ protected:
|
|||||||
const android_LogPriority priority = convert_to_android(msg.level);
|
const android_LogPriority priority = convert_to_android(msg.level);
|
||||||
const int expected_size = msg.formatted.size();
|
const int expected_size = msg.formatted.size();
|
||||||
const int size = __android_log_write(
|
const int size = __android_log_write(
|
||||||
priority, _tag.c_str(), msg.formatted.c_str()
|
priority, _tag.c_str(), msg.formatted.c_str()
|
||||||
);
|
);
|
||||||
if (size > expected_size)
|
if (size > expected_size)
|
||||||
{
|
{
|
||||||
// Will write a little bit more than original message
|
// Will write a little bit more than original message
|
||||||
@ -75,16 +75,26 @@ private:
|
|||||||
{
|
{
|
||||||
switch(level)
|
switch(level)
|
||||||
{
|
{
|
||||||
case spdlog::level::trace: return ANDROID_LOG_VERBOSE;
|
case spdlog::level::trace:
|
||||||
case spdlog::level::debug: return ANDROID_LOG_DEBUG;
|
return ANDROID_LOG_VERBOSE;
|
||||||
case spdlog::level::info: return ANDROID_LOG_INFO;
|
case spdlog::level::debug:
|
||||||
case spdlog::level::notice: return ANDROID_LOG_INFO;
|
return ANDROID_LOG_DEBUG;
|
||||||
case spdlog::level::warn: return ANDROID_LOG_WARN;
|
case spdlog::level::info:
|
||||||
case spdlog::level::err: return ANDROID_LOG_ERROR;
|
return ANDROID_LOG_INFO;
|
||||||
case spdlog::level::critical: return ANDROID_LOG_FATAL;
|
case spdlog::level::notice:
|
||||||
case spdlog::level::alert: return ANDROID_LOG_FATAL;
|
return ANDROID_LOG_INFO;
|
||||||
case spdlog::level::emerg: return ANDROID_LOG_FATAL;
|
case spdlog::level::warn:
|
||||||
default: throw spdlog_ex("Incorrect level value");
|
return ANDROID_LOG_WARN;
|
||||||
|
case spdlog::level::err:
|
||||||
|
return ANDROID_LOG_ERROR;
|
||||||
|
case spdlog::level::critical:
|
||||||
|
return ANDROID_LOG_FATAL;
|
||||||
|
case spdlog::level::alert:
|
||||||
|
return ANDROID_LOG_FATAL;
|
||||||
|
case spdlog::level::emerg:
|
||||||
|
return ANDROID_LOG_FATAL;
|
||||||
|
default:
|
||||||
|
throw spdlog_ex("Incorrect level value");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -69,7 +69,7 @@ public:
|
|||||||
{
|
{
|
||||||
std::lock_guard<Mutex> lock(base_sink<Mutex>::_mutex);
|
std::lock_guard<Mutex> lock(base_sink<Mutex>::_mutex);
|
||||||
if (sink &&
|
if (sink &&
|
||||||
_sinks.end() == std::find(_sinks.begin(), _sinks.end(), sink))
|
_sinks.end() == std::find(_sinks.begin(), _sinks.end(), sink))
|
||||||
{
|
{
|
||||||
_sinks.push_back(sink);
|
_sinks.push_back(sink);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user