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
292fc153
Commit
292fc153
authored
Aug 26, 2019
by
gabime
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
clang-format
parent
25d3c83d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
22 deletions
+30
-22
include/spdlog/async_logger-inl.h
include/spdlog/async_logger-inl.h
+29
-19
include/spdlog/async_logger.h
include/spdlog/async_logger.h
+1
-2
include/spdlog/logger-inl.h
include/spdlog/logger-inl.h
+0
-1
No files found.
include/spdlog/async_logger-inl.h
View file @
292fc153
...
@@ -17,38 +17,49 @@
...
@@ -17,38 +17,49 @@
#include <string>
#include <string>
SPDLOG_INLINE
spdlog
::
async_logger
::
async_logger
(
SPDLOG_INLINE
spdlog
::
async_logger
::
async_logger
(
std
::
string
logger_name
,
sinks_init_list
sinks_list
,
std
::
weak_ptr
<
details
::
thread_pool
>
tp
,
std
::
string
logger_name
,
sinks_init_list
sinks_list
,
std
::
weak_ptr
<
details
::
thread_pool
>
tp
,
async_overflow_policy
overflow_policy
)
async_overflow_policy
overflow_policy
)
:
async_logger
(
std
::
move
(
logger_name
),
sinks_list
.
begin
(),
sinks_list
.
end
(),
std
::
move
(
tp
),
overflow_policy
)
:
async_logger
(
std
::
move
(
logger_name
),
sinks_list
.
begin
(),
sinks_list
.
end
(),
std
::
move
(
tp
),
overflow_policy
)
{}
{}
SPDLOG_INLINE
spdlog
::
async_logger
::
async_logger
(
SPDLOG_INLINE
spdlog
::
async_logger
::
async_logger
(
std
::
string
logger_name
,
sink_ptr
single_sink
,
std
::
weak_ptr
<
details
::
thread_pool
>
tp
,
std
::
string
logger_name
,
sink_ptr
single_sink
,
std
::
weak_ptr
<
details
::
thread_pool
>
tp
,
async_overflow_policy
overflow_policy
)
async_overflow_policy
overflow_policy
)
:
async_logger
(
std
::
move
(
logger_name
),
{
std
::
move
(
single_sink
)},
std
::
move
(
tp
),
overflow_policy
)
:
async_logger
(
std
::
move
(
logger_name
),
{
std
::
move
(
single_sink
)},
std
::
move
(
tp
),
overflow_policy
)
{}
{}
// send the log message to the thread pool
// send the log message to the thread pool
SPDLOG_INLINE
void
spdlog
::
async_logger
::
sink_it_
(
const
details
::
log_msg
&
msg
)
{
SPDLOG_INLINE
void
spdlog
::
async_logger
::
sink_it_
(
const
details
::
log_msg
&
msg
)
if
(
auto
pool_ptr
=
thread_pool_
.
lock
())
{
{
if
(
auto
pool_ptr
=
thread_pool_
.
lock
())
{
pool_ptr
->
post_log
(
shared_from_this
(),
msg
,
overflow_policy_
);
pool_ptr
->
post_log
(
shared_from_this
(),
msg
,
overflow_policy_
);
}
else
{
}
else
{
SPDLOG_THROW
(
spdlog_ex
(
"async log: thread pool doesn't exist anymore"
));
SPDLOG_THROW
(
spdlog_ex
(
"async log: thread pool doesn't exist anymore"
));
}
}
}
}
// send flush request to the thread pool
// send flush request to the thread pool
SPDLOG_INLINE
void
spdlog
::
async_logger
::
flush_
()
{
SPDLOG_INLINE
void
spdlog
::
async_logger
::
flush_
()
if
(
auto
pool_ptr
=
thread_pool_
.
lock
())
{
{
if
(
auto
pool_ptr
=
thread_pool_
.
lock
())
{
pool_ptr
->
post_flush
(
shared_from_this
(),
overflow_policy_
);
pool_ptr
->
post_flush
(
shared_from_this
(),
overflow_policy_
);
}
else
{
}
else
{
SPDLOG_THROW
(
spdlog_ex
(
"async flush: thread pool doesn't exist anymore"
));
SPDLOG_THROW
(
spdlog_ex
(
"async flush: thread pool doesn't exist anymore"
));
}
}
}
}
SPDLOG_INLINE
void
spdlog
::
async_logger
::
dump_backtrace_
()
SPDLOG_INLINE
void
spdlog
::
async_logger
::
dump_backtrace_
()
{
{
if
(
auto
pool_ptr
=
thread_pool_
.
lock
())
{
if
(
auto
pool_ptr
=
thread_pool_
.
lock
())
{
pool_ptr
->
post_dump_backtrace
(
shared_from_this
(),
overflow_policy_
);
pool_ptr
->
post_dump_backtrace
(
shared_from_this
(),
overflow_policy_
);
}
else
{
}
else
{
SPDLOG_THROW
(
spdlog_ex
(
"async dump_backtrace: thread pool doesn't exist anymore"
));
SPDLOG_THROW
(
spdlog_ex
(
"async dump_backtrace: thread pool doesn't exist anymore"
));
}
}
}
}
...
@@ -83,13 +94,12 @@ SPDLOG_INLINE void spdlog::async_logger::backend_flush_()
...
@@ -83,13 +94,12 @@ SPDLOG_INLINE void spdlog::async_logger::backend_flush_()
SPDLOG_INLINE
void
spdlog
::
async_logger
::
backend_dump_backtrace_
()
SPDLOG_INLINE
void
spdlog
::
async_logger
::
backend_dump_backtrace_
()
{
{
spdlog
::
logger
::
dump_backtrace_
();
spdlog
::
logger
::
dump_backtrace_
();
}
}
SPDLOG_INLINE
std
::
shared_ptr
<
spdlog
::
logger
>
spdlog
::
async_logger
::
clone
(
std
::
string
new_name
)
SPDLOG_INLINE
std
::
shared_ptr
<
spdlog
::
logger
>
spdlog
::
async_logger
::
clone
(
std
::
string
new_name
)
{
{
auto
cloned
=
std
::
make_shared
<
spdlog
::
async_logger
>
(
std
::
move
(
new_name
),
sinks_
.
begin
(),
sinks_
.
end
(),
auto
cloned
=
std
::
make_shared
<
spdlog
::
async_logger
>
(
std
::
move
(
new_name
),
sinks_
.
begin
(),
sinks_
.
end
(),
thread_pool_
,
overflow_policy_
);
thread_pool_
,
overflow_policy_
);
cloned
->
set_level
(
this
->
level
());
cloned
->
set_level
(
this
->
level
());
cloned
->
flush_on
(
this
->
flush_level
());
cloned
->
flush_on
(
this
->
flush_level
());
...
...
include/spdlog/async_logger.h
View file @
292fc153
...
@@ -51,11 +51,10 @@ public:
...
@@ -51,11 +51,10 @@ public:
std
::
shared_ptr
<
logger
>
clone
(
std
::
string
new_name
)
override
;
std
::
shared_ptr
<
logger
>
clone
(
std
::
string
new_name
)
override
;
protected:
protected:
void
sink_it_
(
const
details
::
log_msg
&
msg
)
override
;
void
sink_it_
(
const
details
::
log_msg
&
msg
)
override
;
void
flush_
()
override
;
void
flush_
()
override
;
void
dump_backtrace_
()
override
;
void
dump_backtrace_
()
override
;
void
backend_sink_it_
(
const
details
::
log_msg
&
incoming_log_msg
);
void
backend_sink_it_
(
const
details
::
log_msg
&
incoming_log_msg
);
void
backend_flush_
();
void
backend_flush_
();
void
backend_dump_backtrace_
();
void
backend_dump_backtrace_
();
...
...
include/spdlog/logger-inl.h
View file @
292fc153
...
@@ -161,7 +161,6 @@ SPDLOG_INLINE void logger::dump_backtrace()
...
@@ -161,7 +161,6 @@ SPDLOG_INLINE void logger::dump_backtrace()
dump_backtrace_
();
dump_backtrace_
();
}
}
// flush functions
// flush functions
SPDLOG_INLINE
void
logger
::
flush
()
SPDLOG_INLINE
void
logger
::
flush
()
{
{
...
...
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