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
c97c025a
Commit
c97c025a
authored
Aug 27, 2019
by
gabime
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
clang-format
parent
c55336e7
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
82 additions
and
88 deletions
+82
-88
bench/async_bench.cpp
bench/async_bench.cpp
+1
-1
bench/latency.cpp
bench/latency.cpp
+1
-1
example/example.cpp
example/example.cpp
+1
-1
include/spdlog/async_logger-inl.h
include/spdlog/async_logger-inl.h
+0
-1
include/spdlog/async_logger.h
include/spdlog/async_logger.h
+0
-1
include/spdlog/details/backtracer.h
include/spdlog/details/backtracer.h
+5
-3
include/spdlog/details/log_msg_buffer.h
include/spdlog/details/log_msg_buffer.h
+1
-1
include/spdlog/logger-inl.h
include/spdlog/logger-inl.h
+1
-1
include/spdlog/logger.h
include/spdlog/logger.h
+4
-5
tests/test_backtrace.cpp
tests/test_backtrace.cpp
+46
-51
tests/test_sink.h
tests/test_sink.h
+22
-22
No files found.
bench/async_bench.cpp
View file @
c97c025a
...
...
@@ -116,7 +116,7 @@ int main(int argc, char *argv[])
auto
file_sink
=
std
::
make_shared
<
spdlog
::
sinks
::
basic_file_sink_mt
>
(
filename
,
true
);
auto
logger
=
std
::
make_shared
<
async_logger
>
(
"async_logger"
,
std
::
move
(
file_sink
),
std
::
move
(
tp
),
async_overflow_policy
::
block
);
bench_mt
(
howmany
,
std
::
move
(
logger
),
threads
);
//verify_file(filename, howmany);
//
verify_file(filename, howmany);
}
spdlog
::
info
(
""
);
...
...
bench/latency.cpp
View file @
c97c025a
example/example.cpp
View file @
c97c025a
...
...
@@ -45,7 +45,7 @@ int main(int, char *[])
// Loggers can store in a ring buffer all messages (including debug/trace) for later inspection.
// When needed, call dump_backtrace() to see what happened:
spdlog
::
enable_backtrace
(
10
);
// create ring buffer with capacity of 10 messages
for
(
int
i
=
0
;
i
<
100
;
i
++
)
for
(
int
i
=
0
;
i
<
100
;
i
++
)
{
spdlog
::
debug
(
"Backtrace message {}"
,
i
);
// not logged..
}
...
...
include/spdlog/async_logger-inl.h
View file @
c97c025a
...
...
@@ -83,4 +83,3 @@ SPDLOG_INLINE void spdlog::async_logger::backend_flush_()
SPDLOG_LOGGER_CATCH
()
}
}
include/spdlog/async_logger.h
View file @
c97c025a
...
...
@@ -49,7 +49,6 @@ public:
async_logger
(
std
::
string
logger_name
,
sink_ptr
single_sink
,
std
::
weak_ptr
<
details
::
thread_pool
>
tp
,
async_overflow_policy
overflow_policy
=
async_overflow_policy
::
block
);
protected:
void
sink_it_
(
const
details
::
log_msg
&
msg
)
override
;
void
flush_
()
override
;
...
...
include/spdlog/details/backtracer.h
View file @
c97c025a
...
...
@@ -22,11 +22,13 @@ class backtracer
public:
explicit
backtracer
(
size_t
n_messages
)
:
n_messages_
{
n_messages
},
messages_
{
n_messages
}
:
n_messages_
{
n_messages
}
,
messages_
{
n_messages
}
{}
backtracer
(
const
backtracer
&
other
)
:
n_messages_
{
other
.
n_messages_
},
messages_
{
other
.
messages_
}
backtracer
(
const
backtracer
&
other
)
:
n_messages_
{
other
.
n_messages_
}
,
messages_
{
other
.
messages_
}
{}
size_t
n_messages
()
const
...
...
include/spdlog/details/log_msg_buffer.h
View file @
c97c025a
include/spdlog/logger-inl.h
View file @
c97c025a
...
...
@@ -23,7 +23,7 @@ SPDLOG_INLINE logger::logger(const logger &other)
,
flush_level_
(
other
.
flush_level_
.
load
(
std
::
memory_order_relaxed
))
,
custom_err_handler_
(
other
.
custom_err_handler_
)
{
if
(
other
.
tracer_
)
if
(
other
.
tracer_
)
{
tracer_
=
std
::
make_shared
<
details
::
backtracer
>
(
*
other
.
tracer_
);
}
...
...
include/spdlog/logger.h
View file @
c97c025a
...
...
@@ -356,7 +356,6 @@ public:
// error handler
void
set_error_handler
(
err_handler
);
protected:
std
::
string
name_
;
std
::
vector
<
sink_ptr
>
sinks_
;
...
...
tests/test_backtrace.cpp
View file @
c97c025a
...
...
@@ -2,9 +2,6 @@
#include "test_sink.h"
#include "spdlog/async.h"
TEST_CASE
(
"bactrace1"
,
"[bactrace]"
)
{
...
...
@@ -17,14 +14,14 @@ TEST_CASE("bactrace1", "[bactrace]")
logger
.
enable_backtrace
(
backtrace_size
);
logger
.
info
(
"info message"
);
for
(
int
i
=
0
;
i
<
100
;
i
++
)
for
(
int
i
=
0
;
i
<
100
;
i
++
)
logger
.
debug
(
"debug message {}"
,
i
);
REQUIRE
(
test_sink
->
lines
().
size
()
==
1
);
REQUIRE
(
test_sink
->
lines
()[
0
]
==
"info message"
);
logger
.
dump_backtrace
();
REQUIRE
(
test_sink
->
lines
().
size
()
==
backtrace_size
+
3
);
REQUIRE
(
test_sink
->
lines
().
size
()
==
backtrace_size
+
3
);
REQUIRE
(
test_sink
->
lines
()[
1
]
==
"****************** Backtrace Start ******************"
);
REQUIRE
(
test_sink
->
lines
()[
2
]
==
"debug message 95"
);
REQUIRE
(
test_sink
->
lines
()[
3
]
==
"debug message 96"
);
...
...
@@ -34,7 +31,6 @@ TEST_CASE("bactrace1", "[bactrace]")
REQUIRE
(
test_sink
->
lines
()[
7
]
==
"****************** Backtrace End ********************"
);
}
TEST_CASE
(
"bactrace-async"
,
"[bactrace]"
)
{
using
spdlog
::
sinks
::
test_sink_mt
;
...
...
@@ -49,7 +45,7 @@ TEST_CASE("bactrace-async", "[bactrace]")
logger
->
enable_backtrace
(
backtrace_size
);
logger
->
info
(
"info message"
);
for
(
int
i
=
0
;
i
<
100
;
i
++
)
for
(
int
i
=
0
;
i
<
100
;
i
++
)
logger
->
debug
(
"debug message {}"
,
i
);
sleep_for_millis
(
10
);
...
...
@@ -58,7 +54,7 @@ TEST_CASE("bactrace-async", "[bactrace]")
logger
->
dump_backtrace
();
sleep_for_millis
(
100
);
// give time for the async dump to complete
REQUIRE
(
test_sink
->
lines
().
size
()
==
backtrace_size
+
3
);
REQUIRE
(
test_sink
->
lines
().
size
()
==
backtrace_size
+
3
);
REQUIRE
(
test_sink
->
lines
()[
1
]
==
"****************** Backtrace Start ******************"
);
REQUIRE
(
test_sink
->
lines
()[
2
]
==
"debug message 95"
);
REQUIRE
(
test_sink
->
lines
()[
3
]
==
"debug message 96"
);
...
...
@@ -67,4 +63,3 @@ TEST_CASE("bactrace-async", "[bactrace]")
REQUIRE
(
test_sink
->
lines
()[
6
]
==
"debug message 99"
);
REQUIRE
(
test_sink
->
lines
()[
7
]
==
"****************** Backtrace End ********************"
);
}
tests/test_sink.h
View file @
c97c025a
...
...
@@ -19,6 +19,7 @@ template<class Mutex>
class
test_sink
:
public
base_sink
<
Mutex
>
{
const
size_t
lines_to_save
=
100
;
public:
size_t
msg_counter
()
{
...
...
@@ -45,7 +46,6 @@ public:
return
lines_
;
}
protected:
void
sink_it_
(
const
details
::
log_msg
&
msg
)
override
{
...
...
@@ -53,9 +53,9 @@ protected:
base_sink
<
Mutex
>::
formatter_
->
format
(
msg
,
formatted
);
// save the line without the eol
auto
eol_len
=
strlen
(
details
::
os
::
default_eol
);
if
(
lines_
.
size
()
<
lines_to_save
)
if
(
lines_
.
size
()
<
lines_to_save
)
{
lines_
.
emplace_back
(
formatted
.
begin
(),
formatted
.
end
()
-
eol_len
);
lines_
.
emplace_back
(
formatted
.
begin
(),
formatted
.
end
()
-
eol_len
);
}
msg_counter_
++
;
std
::
this_thread
::
sleep_for
(
delay_
);
...
...
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