mirror of https://github.com/gabime/spdlog.git
Merge v1.x
gabime
5 years ago
commit
23d4fe3363
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,2 +1,2 @@
|
||||
#include "os.h"
|
||||
#warning "fmt/posix.h is deprecated; use fmt/os.h instead"
|
||||
#warning "fmt/posix.h is deprecated; use fmt/os.h instead"
|
||||
|
||||
@ -0,0 +1,125 @@
|
||||
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
|
||||
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
|
||||
|
||||
#pragma once
|
||||
|
||||
#ifndef SPDLOG_HEADER_ONLY
|
||||
#include <spdlog/spdlog.h>
|
||||
#endif
|
||||
|
||||
#include <spdlog/common.h>
|
||||
#include <spdlog/pattern_formatter.h>
|
||||
|
||||
namespace spdlog {
|
||||
|
||||
SPDLOG_INLINE void initialize_logger(std::shared_ptr<logger> logger)
|
||||
{
|
||||
details::registry::instance().initialize_logger(std::move(logger));
|
||||
}
|
||||
|
||||
SPDLOG_INLINE std::shared_ptr<logger> get(const std::string &name)
|
||||
{
|
||||
return details::registry::instance().get(name);
|
||||
}
|
||||
|
||||
SPDLOG_INLINE void set_formatter(std::unique_ptr<spdlog::formatter> formatter)
|
||||
{
|
||||
details::registry::instance().set_formatter(std::move(formatter));
|
||||
}
|
||||
|
||||
SPDLOG_INLINE void set_pattern(std::string pattern, pattern_time_type time_type)
|
||||
{
|
||||
set_formatter(std::unique_ptr<spdlog::formatter>(new pattern_formatter(std::move(pattern), time_type)));
|
||||
}
|
||||
|
||||
SPDLOG_INLINE void enable_backtrace(size_t n_messages)
|
||||
{
|
||||
details::registry::instance().enable_backtrace(n_messages);
|
||||
}
|
||||
|
||||
SPDLOG_INLINE void disable_backtrace()
|
||||
{
|
||||
details::registry::instance().disable_backtrace();
|
||||
}
|
||||
|
||||
SPDLOG_INLINE void dump_backtrace()
|
||||
{
|
||||
default_logger_raw()->dump_backtrace();
|
||||
}
|
||||
|
||||
SPDLOG_INLINE level::level_enum get_level()
|
||||
{
|
||||
return default_logger_raw()->level();
|
||||
}
|
||||
|
||||
SPDLOG_INLINE bool should_log(level::level_enum log_level)
|
||||
{
|
||||
return default_logger_raw()->should_log(log_level);
|
||||
}
|
||||
|
||||
SPDLOG_INLINE void set_level(level::level_enum log_level)
|
||||
{
|
||||
details::registry::instance().set_level(log_level);
|
||||
}
|
||||
|
||||
SPDLOG_INLINE void flush_on(level::level_enum log_level)
|
||||
{
|
||||
details::registry::instance().flush_on(log_level);
|
||||
}
|
||||
|
||||
SPDLOG_INLINE void flush_every(std::chrono::seconds interval)
|
||||
{
|
||||
details::registry::instance().flush_every(interval);
|
||||
}
|
||||
|
||||
SPDLOG_INLINE void set_error_handler(void (*handler)(const std::string &msg))
|
||||
{
|
||||
details::registry::instance().set_error_handler(handler);
|
||||
}
|
||||
|
||||
SPDLOG_INLINE void register_logger(std::shared_ptr<logger> logger)
|
||||
{
|
||||
details::registry::instance().register_logger(std::move(logger));
|
||||
}
|
||||
|
||||
SPDLOG_INLINE void apply_all(const std::function<void(std::shared_ptr<logger>)> &fun)
|
||||
{
|
||||
details::registry::instance().apply_all(fun);
|
||||
}
|
||||
|
||||
SPDLOG_INLINE void drop(const std::string &name)
|
||||
{
|
||||
details::registry::instance().drop(name);
|
||||
}
|
||||
|
||||
SPDLOG_INLINE void drop_all()
|
||||
{
|
||||
details::registry::instance().drop_all();
|
||||
}
|
||||
|
||||
SPDLOG_INLINE void shutdown()
|
||||
{
|
||||
details::registry::instance().shutdown();
|
||||
}
|
||||
|
||||
SPDLOG_INLINE void set_automatic_registration(bool automatic_registration)
|
||||
{
|
||||
details::registry::instance().set_automatic_registration(automatic_registration);
|
||||
}
|
||||
|
||||
SPDLOG_INLINE std::shared_ptr<spdlog::logger> default_logger()
|
||||
{
|
||||
return details::registry::instance().default_logger();
|
||||
}
|
||||
|
||||
SPDLOG_INLINE spdlog::logger *default_logger_raw()
|
||||
{
|
||||
return details::registry::instance().get_default_raw();
|
||||
}
|
||||
|
||||
SPDLOG_INLINE void set_default_logger(std::shared_ptr<spdlog::logger> default_logger)
|
||||
{
|
||||
details::registry::instance().set_default_logger(std::move(default_logger));
|
||||
}
|
||||
|
||||
} // namespace spdlog
|
||||
@ -0,0 +1,61 @@
|
||||
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
|
||||
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <spdlog/fmt/fmt.h>
|
||||
|
||||
// Stopwatch support for spdlog (using std::chrono::high_resolution_clock).
|
||||
// Displays elapsed seconds since construction as double.
|
||||
//
|
||||
// Usage:
|
||||
//
|
||||
// spdlog::stopwatch sw;
|
||||
// ...
|
||||
// spdlog::debug("Elapsed: {} seconds", sw); => "Elapsed 0.005116733 seconds"
|
||||
// spdlog::info("Elapsed: {:.6} seconds", sw); => "Elapsed 0.005163 seconds"
|
||||
//
|
||||
//
|
||||
// If other units are needed (e.g. millis instead of double), include "fmt/chrono.h" and use "duration_cast<..>(sw.elapsed())":
|
||||
//
|
||||
// #include <fmt/chrono.h>
|
||||
//..
|
||||
// using std::chrono::duration_cast;
|
||||
// using std::chrono::milliseconds;
|
||||
// spdlog::info("Elapsed {}", duration_cast<milliseconds>(sw.elapsed())); => "Elapsed 5ms"
|
||||
|
||||
namespace spdlog {
|
||||
class stopwatch
|
||||
{
|
||||
using clock = std::chrono::high_resolution_clock;
|
||||
std::chrono::time_point<clock> start_tp_;
|
||||
|
||||
public:
|
||||
stopwatch()
|
||||
: start_tp_{clock::now()}
|
||||
{}
|
||||
|
||||
std::chrono::duration<double> elapsed() const
|
||||
{
|
||||
return std::chrono::duration<double>(clock::now() - start_tp_);
|
||||
}
|
||||
|
||||
void reset()
|
||||
{
|
||||
start_tp_ = clock ::now();
|
||||
}
|
||||
};
|
||||
} // namespace spdlog
|
||||
|
||||
// Support for fmt formatting (e.g. "{:012.9}" or just "{}")
|
||||
namespace fmt {
|
||||
template<>
|
||||
struct formatter<spdlog::stopwatch> : formatter<double>
|
||||
{
|
||||
template<typename FormatContext>
|
||||
auto format(const spdlog::stopwatch &sw, FormatContext &ctx) -> decltype(ctx.out())
|
||||
{
|
||||
return formatter<double>::format(sw.elapsed().count(), ctx);
|
||||
}
|
||||
};
|
||||
} // namespace fmt
|
||||
@ -0,0 +1,35 @@
|
||||
#include "includes.h"
|
||||
#include "test_sink.h"
|
||||
#include "spdlog/stopwatch.h"
|
||||
|
||||
TEST_CASE("stopwatch1", "[stopwatch]")
|
||||
{
|
||||
using std::chrono::milliseconds;
|
||||
milliseconds wait_ms(250);
|
||||
milliseconds tolerance_ms(250);
|
||||
|
||||
spdlog::stopwatch sw;
|
||||
std::this_thread::sleep_for(wait_ms);
|
||||
REQUIRE(sw.elapsed() >= wait_ms);
|
||||
REQUIRE(sw.elapsed() <= wait_ms + tolerance_ms);
|
||||
}
|
||||
|
||||
TEST_CASE("stopwatch2", "[stopwatch]")
|
||||
{
|
||||
using spdlog::sinks::test_sink_st;
|
||||
|
||||
std::chrono::duration<double> wait_duration(0.250);
|
||||
std::chrono::duration<double> tolerance_duration(0.250);
|
||||
|
||||
auto test_sink = std::make_shared<test_sink_st>();
|
||||
|
||||
spdlog::stopwatch sw;
|
||||
spdlog::logger logger("test-stopwatch", test_sink);
|
||||
logger.set_pattern("%v");
|
||||
std::this_thread::sleep_for(wait_duration);
|
||||
logger.info("{}", sw);
|
||||
auto val = std::stod(test_sink->lines()[0]);
|
||||
|
||||
REQUIRE(val >= wait_duration.count());
|
||||
REQUIRE(val <= (wait_duration + tolerance_duration).count());
|
||||
}
|
||||
Loading…
Reference in New Issue