This commit is contained in:
gabime 2018-04-29 01:36:45 +03:00
parent 5ec37c05f7
commit 3c7103d90d
11 changed files with 23 additions and 28 deletions

View File

@ -7,10 +7,10 @@
// bench.cpp : spdlog benchmarks // bench.cpp : spdlog benchmarks
// //
#include "spdlog/async.h" #include "spdlog/async.h"
#include "spdlog/sinks/simple_file_sink.h"
#include "spdlog/sinks/daily_file_sink.h" #include "spdlog/sinks/daily_file_sink.h"
#include "spdlog/sinks/rotating_file_sink.h"
#include "spdlog/sinks/null_sink.h" #include "spdlog/sinks/null_sink.h"
#include "spdlog/sinks/rotating_file_sink.h"
#include "spdlog/sinks/simple_file_sink.h"
#include "spdlog/spdlog.h" #include "spdlog/spdlog.h"
#include "utils.h" #include "utils.h"

View File

@ -10,9 +10,9 @@
#define SPDLOG_TRACE_ON #define SPDLOG_TRACE_ON
#define SPDLOG_DEBUG_ON #define SPDLOG_DEBUG_ON
#include "spdlog/sinks/simple_file_sink.h"
#include "spdlog/sinks/daily_file_sink.h" #include "spdlog/sinks/daily_file_sink.h"
#include "spdlog/sinks/rotating_file_sink.h" #include "spdlog/sinks/rotating_file_sink.h"
#include "spdlog/sinks/simple_file_sink.h"
#include "spdlog/sinks/stdout_color_sinks.h" #include "spdlog/sinks/stdout_color_sinks.h"
#include <iostream> #include <iostream>
@ -66,8 +66,8 @@ int main(int, char *[])
console->info("This an info message with custom format"); console->info("This an info message with custom format");
console->error("This an error message with custom format"); console->error("This an error message with custom format");
// Change format back to to default // Change format back to to default
spd::set_pattern ("%+"); spd::set_pattern("%+");
// Runtime log levels // Runtime log levels
spd::set_level(spd::level::info); // Set global log level to info spd::set_level(spd::level::info); // Set global log level to info

View File

@ -1,6 +1,6 @@
#include "spdlog/spdlog.h"
#include "spdlog/sinks/file_sinks.h" #include "spdlog/sinks/file_sinks.h"
#include "spdlog/sinks/stdout_sinks.h" #include "spdlog/sinks/stdout_sinks.h"
#include "spdlog/spdlog.h"
#include <iostream> #include <iostream>
#include <memory> #include <memory>

View File

@ -151,8 +151,6 @@ public:
return _msg_counter.load(std::memory_order_relaxed); return _msg_counter.load(std::memory_order_relaxed);
} }
private: private:
std::atomic<size_t> _msg_counter; // total # of messages processed in this pool std::atomic<size_t> _msg_counter; // total # of messages processed in this pool
q_type _q; q_type _q;

View File

@ -4,11 +4,11 @@
// //
#pragma once #pragma once
#include "spdlog/spdlog.h"
#include "spdlog/details/file_helper.h" #include "spdlog/details/file_helper.h"
#include "spdlog/details/null_mutex.h" #include "spdlog/details/null_mutex.h"
#include "spdlog/fmt/fmt.h" #include "spdlog/fmt/fmt.h"
#include "spdlog/sinks/base_sink.h" #include "spdlog/sinks/base_sink.h"
#include "spdlog/spdlog.h"
#include <algorithm> #include <algorithm>
#include <cerrno> #include <cerrno>

View File

@ -4,18 +4,18 @@
// //
#pragma once #pragma once
#include "spdlog/spdlog.h"
#include "spdlog/details/file_helper.h" #include "spdlog/details/file_helper.h"
#include "spdlog/details/null_mutex.h" #include "spdlog/details/null_mutex.h"
#include "spdlog/fmt/fmt.h" #include "spdlog/fmt/fmt.h"
#include "spdlog/sinks/base_sink.h" #include "spdlog/sinks/base_sink.h"
#include "spdlog/spdlog.h"
#include <cerrno> #include <cerrno>
#include <chrono> #include <chrono>
#include <tuple>
#include <ctime> #include <ctime>
#include <mutex> #include <mutex>
#include <string> #include <string>
#include <tuple>
namespace spdlog { namespace spdlog {
namespace sinks { namespace sinks {
@ -117,7 +117,6 @@ using rotating_file_sink_st = rotating_file_sink<details::null_mutex>;
// factory functions // factory functions
// //
template<typename Factory = default_factory> template<typename Factory = default_factory>
inline std::shared_ptr<logger> rotating_logger_mt( inline std::shared_ptr<logger> rotating_logger_mt(
const std::string &logger_name, const filename_t &filename, size_t max_file_size, size_t max_files) const std::string &logger_name, const filename_t &filename, size_t max_file_size, size_t max_files)

View File

@ -4,10 +4,10 @@
// //
#pragma once #pragma once
#include "spdlog/spdlog.h"
#include "spdlog/details/file_helper.h" #include "spdlog/details/file_helper.h"
#include "spdlog/details/null_mutex.h" #include "spdlog/details/null_mutex.h"
#include "spdlog/sinks/base_sink.h" #include "spdlog/sinks/base_sink.h"
#include "spdlog/spdlog.h"
#include <mutex> #include <mutex>
#include <string> #include <string>
@ -55,7 +55,6 @@ private:
using simple_file_sink_mt = simple_file_sink<std::mutex>; using simple_file_sink_mt = simple_file_sink<std::mutex>;
using simple_file_sink_st = simple_file_sink<details::null_mutex>; using simple_file_sink_st = simple_file_sink<details::null_mutex>;
} // namespace sinks } // namespace sinks
// //

View File

@ -49,6 +49,6 @@ inline std::shared_ptr<logger> stderr_color_mt(const std::string &logger_name)
template<typename Factory = default_factory> template<typename Factory = default_factory>
inline std::shared_ptr<logger> stderr_color_st(const std::string &logger_name) inline std::shared_ptr<logger> stderr_color_st(const std::string &logger_name)
{ {
return Factory::template create<stderr_color_sink_mt > (logger_name); return Factory::template create<stderr_color_sink_mt>(logger_name);
} }
} // namespace spdlog } // namespace spdlog

View File

@ -12,12 +12,11 @@
#define SPDLOG_TRACE_ON #define SPDLOG_TRACE_ON
#define SPDLOG_DEBUG_ON #define SPDLOG_DEBUG_ON
#include "spdlog/async.h" #include "spdlog/async.h"
#include "spdlog/sinks/simple_file_sink.h"
#include "spdlog/sinks/stdout_color_sinks.h"
#include "spdlog/sinks/daily_file_sink.h" #include "spdlog/sinks/daily_file_sink.h"
#include "spdlog/sinks/rotating_file_sink.h"
#include "spdlog/sinks/null_sink.h" #include "spdlog/sinks/null_sink.h"
#include "spdlog/sinks/ostream_sink.h" #include "spdlog/sinks/ostream_sink.h"
#include "spdlog/sinks/rotating_file_sink.h"
#include "spdlog/sinks/simple_file_sink.h"
#include "spdlog/sinks/stdout_color_sinks.h"
#include "spdlog/spdlog.h" #include "spdlog/spdlog.h"