Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
spdlog
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
spdlog
Commits
3c7103d9
Commit
3c7103d9
authored
Apr 29, 2018
by
gabime
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Format
parent
5ec37c05
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
23 additions
and
28 deletions
+23
-28
example/bench.cpp
example/bench.cpp
+3
-3
example/example.cpp
example/example.cpp
+4
-4
example/multisink.cpp
example/multisink.cpp
+1
-1
include/spdlog/async.h
include/spdlog/async.h
+1
-1
include/spdlog/details/logger_impl.h
include/spdlog/details/logger_impl.h
+3
-3
include/spdlog/details/thread_pool.h
include/spdlog/details/thread_pool.h
+2
-4
include/spdlog/sinks/daily_file_sink.h
include/spdlog/sinks/daily_file_sink.h
+2
-2
include/spdlog/sinks/rotating_file_sink.h
include/spdlog/sinks/rotating_file_sink.h
+2
-3
include/spdlog/sinks/simple_file_sink.h
include/spdlog/sinks/simple_file_sink.h
+1
-2
include/spdlog/sinks/stdout_color_sinks.h
include/spdlog/sinks/stdout_color_sinks.h
+1
-1
tests/includes.h
tests/includes.h
+3
-4
No files found.
example/bench.cpp
View file @
3c7103d9
...
...
@@ -7,10 +7,10 @@
// bench.cpp : spdlog benchmarks
//
#include "spdlog/async.h"
#include "spdlog/sinks/simple_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/rotating_file_sink.h"
#include "spdlog/sinks/simple_file_sink.h"
#include "spdlog/spdlog.h"
#include "utils.h"
...
...
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
threads
=
atoi
(
argv
[
2
]);
if
(
argc
>
3
)
queue_size
=
atoi
(
argv
[
3
]);
cout
<<
"*******************************************************************************
\n
"
;
cout
<<
"Single thread, "
<<
format
(
howmany
)
<<
" iterations"
<<
endl
;
cout
<<
"*******************************************************************************
\n
"
;
...
...
example/example.cpp
View file @
3c7103d9
...
...
@@ -10,9 +10,9 @@
#define SPDLOG_TRACE_ON
#define SPDLOG_DEBUG_ON
#include "spdlog/sinks/simple_file_sink.h"
#include "spdlog/sinks/daily_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 <iostream>
...
...
@@ -61,13 +61,13 @@ int main(int, char *[])
daily_logger
->
info
(
123.44
);
// Customize msg format for all messages
spd
::
set_pattern
(
"[%^+++%$] [%H:%M:%S %z] [thread %t] %v"
);
spd
::
set_pattern
(
"[%^+++%$] [%H:%M:%S %z] [thread %t] %v"
);
console
->
info
(
"This an info message with custom format"
);
console
->
error
(
"This an error message with custom format"
);
// Change format back to to default
spd
::
set_pattern
(
"%+"
);
// Change format back to to default
spd
::
set_pattern
(
"%+"
);
// Runtime log levels
spd
::
set_level
(
spd
::
level
::
info
);
// Set global log level to info
...
...
example/multisink.cpp
View file @
3c7103d9
#include "spdlog/spdlog.h"
#include "spdlog/sinks/file_sinks.h"
#include "spdlog/sinks/stdout_sinks.h"
#include "spdlog/spdlog.h"
#include <iostream>
#include <memory>
...
...
include/spdlog/async.h
View file @
3c7103d9
...
...
@@ -11,7 +11,7 @@
// All loggers created here share same global thread pool.
// Each log message is pushed to a queue along withe a shared pointer to the logger.
// If a logger deleted while having pending messages in the queue, it's actual destruction will defer
// until all its messages are processed by the thread pool.
// until all its messages are processed by the thread pool.
// This is because each message in the queue holds a shared_ptr to the originating logger.
#include "spdlog/async_logger.h"
...
...
include/spdlog/details/logger_impl.h
View file @
3c7103d9
...
...
@@ -72,7 +72,7 @@ inline void spdlog::logger::log(level::level_enum lvl, const char *fmt, const Ar
}
catch
(...)
{
_err_handler
(
"Unknown exception in logger "
+
_name
);
_err_handler
(
"Unknown exception in logger "
+
_name
);
}
}
...
...
@@ -95,7 +95,7 @@ inline void spdlog::logger::log(level::level_enum lvl, const char *msg)
}
catch
(...)
{
_err_handler
(
"Unknown exception in logger "
+
_name
);
_err_handler
(
"Unknown exception in logger "
+
_name
);
}
}
...
...
@@ -118,7 +118,7 @@ inline void spdlog::logger::log(level::level_enum lvl, const T &msg)
}
catch
(...)
{
_err_handler
(
"Unknown exception in logger "
+
_name
);
_err_handler
(
"Unknown exception in logger "
+
_name
);
}
}
...
...
include/spdlog/details/thread_pool.h
View file @
3c7103d9
...
...
@@ -151,8 +151,6 @@ public:
return
_msg_counter
.
load
(
std
::
memory_order_relaxed
);
}
private:
std
::
atomic
<
size_t
>
_msg_counter
;
// total # of messages processed in this pool
q_type
_q
;
...
...
@@ -222,12 +220,12 @@ private:
using
std
::
chrono
::
milliseconds
;
auto
time_since_op
=
now
-
last_op_time
;
// yield upto 150 micros
if
(
time_since_op
<=
microseconds
(
150
))
{
return
std
::
this_thread
::
yield
();
}
}
// sleep for 20 ms upto 200 ms
if
(
time_since_op
<=
milliseconds
(
200
))
...
...
include/spdlog/sinks/daily_file_sink.h
View file @
3c7103d9
...
...
@@ -4,11 +4,11 @@
//
#pragma once
#include "spdlog/spdlog.h"
#include "spdlog/details/file_helper.h"
#include "spdlog/details/null_mutex.h"
#include "spdlog/fmt/fmt.h"
#include "spdlog/sinks/base_sink.h"
#include "spdlog/spdlog.h"
#include <algorithm>
#include <cerrno>
...
...
@@ -123,7 +123,7 @@ using daily_file_sink_st = daily_file_sink<details::null_mutex>;
}
// namespace sinks
//
// factory functions
// factory functions
//
template
<
typename
Factory
=
default_factory
>
inline
std
::
shared_ptr
<
logger
>
daily_logger_mt
(
const
std
::
string
&
logger_name
,
const
filename_t
&
filename
,
int
hour
=
0
,
int
minute
=
0
)
...
...
include/spdlog/sinks/rotating_file_sink.h
View file @
3c7103d9
...
...
@@ -4,18 +4,18 @@
//
#pragma once
#include "spdlog/spdlog.h"
#include "spdlog/details/file_helper.h"
#include "spdlog/details/null_mutex.h"
#include "spdlog/fmt/fmt.h"
#include "spdlog/sinks/base_sink.h"
#include "spdlog/spdlog.h"
#include <cerrno>
#include <chrono>
#include <tuple>
#include <ctime>
#include <mutex>
#include <string>
#include <tuple>
namespace
spdlog
{
namespace
sinks
{
...
...
@@ -117,7 +117,6 @@ using rotating_file_sink_st = rotating_file_sink<details::null_mutex>;
// factory functions
//
template
<
typename
Factory
=
default_factory
>
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
)
...
...
include/spdlog/sinks/simple_file_sink.h
View file @
3c7103d9
...
...
@@ -4,10 +4,10 @@
//
#pragma once
#include "spdlog/spdlog.h"
#include "spdlog/details/file_helper.h"
#include "spdlog/details/null_mutex.h"
#include "spdlog/sinks/base_sink.h"
#include "spdlog/spdlog.h"
#include <mutex>
#include <string>
...
...
@@ -55,7 +55,6 @@ private:
using
simple_file_sink_mt
=
simple_file_sink
<
std
::
mutex
>
;
using
simple_file_sink_st
=
simple_file_sink
<
details
::
null_mutex
>
;
}
// namespace sinks
//
...
...
include/spdlog/sinks/stdout_color_sinks.h
View file @
3c7103d9
...
...
@@ -49,6 +49,6 @@ inline std::shared_ptr<logger> stderr_color_mt(const std::string &logger_name)
template
<
typename
Factory
=
default_factory
>
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
\ No newline at end of file
tests/includes.h
View file @
3c7103d9
...
...
@@ -12,12 +12,11 @@
#define SPDLOG_TRACE_ON
#define SPDLOG_DEBUG_ON
#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/rotating_file_sink.h"
#include "spdlog/sinks/null_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"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment