mirrors/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2025-04-01 02:42:41 +08:00
Code

fixes

Browse Source
This commit is contained in:
gabime 2014-03-05 23:07:35 +02:00
commit 5f4bc3086a
7 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
example/example.cpp
View File

@ -48,7 +48,7 @@ void testlog(int threads)
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
if(argc || argv){}; if(argc || argv) {};
using namespace std::chrono; using namespace std::chrono;
using namespace c11log; using namespace c11log;
using namespace utils; using namespace utils;
@ -60,7 +60,7 @@ int main(int argc, char* argv[])
auto null_sink = std::make_shared<sinks::null_sink>(); auto null_sink = std::make_shared<sinks::null_sink>();
//auto async = std::make_shared<sinks::async_sink>(1000); //auto async = std::make_shared<sinks::async_sink>(1000);
//async->add_sink(fsink); //async->add_sink(fsink);
my_logger.add_sink(null_sink); my_logger.add_sink(fsink);
auto start = system_clock::now(); auto start = system_clock::now();
const unsigned int howmany = 10000000; const unsigned int howmany = 10000000;

6
include/c11log/details/blocking_queue.h
View File

@ -58,8 +58,7 @@ public:
// If the queue is full, block the calling thread until there is room. // If the queue is full, block the calling thread until there is room.
template<typename TT> template<typename TT>
void push(TT&& item) { void push(TT&& item) {
constexpr std::chrono::hours one_hour(1); while (!push(std::forward<TT>(item), std::chrono::hours(1)));
while (!push(std::forward<TT>(item), one_hour));
} }
// Pop a copy of the front item in the queue into the given item ref. // Pop a copy of the front item in the queue into the given item ref.
@ -86,8 +85,7 @@ public:
// Pop a copy of the front item in the queue into the given item ref. // Pop a copy of the front item in the queue into the given item ref.
// If the queue is empty, block the calling thread util there is item to pop. // If the queue is empty, block the calling thread util there is item to pop.
void pop(T& item) { void pop(T& item) {
constexpr std::chrono::hours one_hour(1); while (!pop(item, std::chrono::hours(1)));
while (!pop(item, one_hour));
} }
// Clear the queue // Clear the queue

5
include/c11log/details/fast_oss.h
View File

@ -18,6 +18,7 @@ public:
const std::string& str_ref() const { const std::string& str_ref() const {
return _str; return _str;
std::ostringstream oss;
} }
void clear() { void clear() {
@ -47,7 +48,9 @@ class fast_oss:public std::ostream {
public: public:
fast_oss():std::ostream(&_dev) {} fast_oss():std::ostream(&_dev) {}
~fast_oss() = default; ~fast_oss() = default;
fast_oss(const fast_oss& other):std::basic_ios<char>(), std::ostream(),_dev(other._dev) {}
fast_oss(const fast_oss& other) :std::basic_ios<char>(), std::ostream(&_dev), _dev(other._dev) {}
fast_oss& operator=(const fast_oss& other) { fast_oss& operator=(const fast_oss& other) {
if(&other != this) if(&other != this)
_dev = other._dev; _dev = other._dev;

5
include/c11log/details/os.h
View File

@ -26,6 +26,8 @@ inline std::tm localtime()
} }
inline bool operator==(const std::tm& tm1, const std::tm& tm2) inline bool operator==(const std::tm& tm1, const std::tm& tm2)
{ {
return (tm1.tm_sec == tm2.tm_sec && return (tm1.tm_sec == tm2.tm_sec &&
@ -45,3 +47,6 @@ inline bool operator!=(const std::tm& tm1, const std::tm& tm2)
} }
} }
} }

6
include/c11log/logger.h
View File

@ -30,8 +30,10 @@ public:
_logger_name(name), _logger_name(name),
_formatter(new formatters::default_formatter()), _formatter(new formatters::default_formatter()),
_sinks(), _sinks(),
_mutex(), _mutex()
_atomic_level(level::INFO) { {
//Seems that vs2013 doesnt support atomic member initialization in ctor, so its done here
_atomic_level = level::INFO;
} }
~logger() = default; ~logger() = default;

2
include/c11log/sinks/async_sink.h
View File

@ -61,7 +61,7 @@ inline void c11log::sinks::async_sink::_sink_it(const std::string& msg)
inline void c11log::sinks::async_sink::_thread_loop() inline void c11log::sinks::async_sink::_thread_loop()
{ {
constexpr auto pop_timeout = std::chrono::seconds(1); static std::chrono::seconds pop_timeout { 1 };
std::string msg; std::string msg;
while (_active) { while (_active) {

9
include/c11log/sinks/stdout_sinks.h
View File

@ -25,15 +25,6 @@ protected:
std::mutex _mutex; std::mutex _mutex;
}; };
inline std::shared_ptr<ostream_sink> cout_sink() {
static const ostream_sink& instance{std::cout};
return std::shared_ptr<ostream_sink>(&instance, [=](ostream_sink*) {});
}
inline std::shared_ptr<ostream_sink> cerr_sink() {
static const ostream_sink& instance = ostream_sink(std::cerr);
return std::shared_ptr<ostream_sink>(&instance, [=](ostream_sink*) {});
}
} }