Compare commits

..

1878 Commits

Author SHA1 Message Date
Gabi Melman
cf6f1dd01e Merge pull request #1387 from gocarlos/patch-1
docs: spdlog now available in conan center, bincrafters repo is deprecated
2020-01-13 10:06:56 +02:00
Carlos Gomes Martinho
286eb59081 docs: spdlog now available in conan center 2020-01-13 08:40:01 +01:00
Gabi Melman
40bb28e9b6 Merge pull request #1378 from ldanko/v1.x
meson: add fallback to fmt dependency
2020-01-02 04:10:50 +02:00
Łukasz Dańko
aac085a9be meson: add fallback to fmt dependency
Now `fmt` library can be used as subproject which helps with cross
compilation.
2020-01-01 23:59:32 +01:00
Gabi Melman
58e68901c7 Merge pull request #1370 from segfault-magnet/bugfix/invalid_meson_option
Fix invalid meson option
2019-12-23 17:44:31 +02:00
Ahmed Sagdati
8e69c6e492 Fix invalid meson option 2019-12-23 15:57:16 +01:00
gabime
4d98a14cb1 Updated fmt.cpp to 6.1.2 2019-12-22 22:54:31 +02:00
Gabi Melman
09d729bfba Update README.md 2019-12-22 19:46:56 +02:00
Gabi Melman
9caaca742e Update README.md 2019-12-22 19:42:08 +02:00
Gabi Melman
ac95c3ffbf Update README.md 2019-12-22 19:40:50 +02:00
Gabi Melman
9715d80030 Update README.md 2019-12-22 19:39:52 +02:00
Gabi Melman
a0a1e5c078 Update README.md 2019-12-22 19:37:42 +02:00
Gabi Melman
d7ba1fdd3d Update README.md 2019-12-22 19:36:58 +02:00
Gabi Melman
c73a5ff918 Merge pull request #1367 from mike239x/v1.x
Fix a small problem in the basic example
2019-12-20 12:42:57 +02:00
Mike Lezhnin
9858d4e918 Fix a small problem in the basic example
The line
```
SPDLOG_TRACE("Some trace message with param {}", {});
```
which normally is discarded at the compile time since by deafult
`SPDLOG_ACTIVE_LEVEL` is at `SPDLOG_LEVEL_INFO`. If however, one goes
to `tweak.me` and sets
```
 #define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_TRACE
```
suddenly the basic example does not compile any more.
This commit fixes the potential problem.
2019-12-20 11:05:38 +01:00
gabime
d52e825bbc clang-format 2019-12-13 00:12:05 +02:00
gabime
ebaa16f403 CMakeLists.txt allow overriding the cpp standard to higher than 11 2019-12-12 23:52:22 +02:00
gabime
175741ed1d Bump fmt to 6.1.2 2019-12-12 23:50:30 +02:00
gabime
0f8f510ebb removed junk file 2019-12-11 01:27:27 +02:00
gabime
25a702fc22 Update fmt.h 2019-12-10 03:03:08 +02:00
gabime
ab178057db Fixed (maybe) #1348 2019-12-10 03:00:06 +02:00
gabime
c44cf5a720 Removed extra space 2019-12-10 02:42:28 +02:00
gabime
98ca01bf2d Fix issue #1347 2019-12-10 02:40:06 +02:00
gabime
3a258ee5c9 Fix CMakeList for older versions of CMake 2019-12-08 14:14:57 +02:00
Gabi Melman
1586c4b0c7 Update appveyor.yml 2019-12-05 23:19:31 +02:00
Gabi Melman
9198e97401 Update appveyor.yml 2019-12-05 23:03:01 +02:00
Gabi Melman
346267c82f Update appveyor.yml 2019-12-05 22:53:06 +02:00
Gabi Melman
529f72325f Update appveyor.yml 2019-12-05 22:34:36 +02:00
Gabi Melman
1cf1209586 Update appveyor.yml 2019-12-05 21:24:31 +02:00
Gabi Melman
36774529a4 Update appveyor.yml 2019-12-05 20:52:57 +02:00
Gabi Melman
27dcb1008c Update appveyor.yml 2019-12-05 20:21:04 +02:00
Gabi Melman
e8a9c7b13e Update appveyor.yml 2019-12-05 20:20:10 +02:00
Gabi Melman
7be59851d5 Update appveyor.yml 2019-12-05 20:13:02 +02:00
Gabi Melman
15cf9ec365 Update appveyor.yml 2019-12-05 18:59:43 +02:00
Gabi Melman
c44c904161 Update appveyor.yml 2019-12-05 18:51:26 +02:00
Gabi Melman
9e3d8d1650 Update appveyor.yml 2019-12-05 18:37:19 +02:00
Gabi Melman
7b9668fe01 Update appveyor.yml 2019-12-05 18:07:43 +02:00
gabime
2334c48e02 Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x 2019-12-05 17:44:48 +02:00
gabime
afb949a417 CMake: - Allow non fatal security wanrnings for msvc 2015 and below 2019-12-05 17:44:38 +02:00
gabime
c9bb85c91d Revert supress of warning 4996 under msvc 2015 2019-12-05 17:25:12 +02:00
Gabi Melman
13e1667d61 Update appveyor.yml 2019-12-05 16:24:13 +02:00
Gabi Melman
3c106c9cec Update appveyor.yml 2019-12-05 16:23:11 +02:00
Gabi Melman
1988668d10 Update appveyor.yml 2019-12-05 14:17:10 +02:00
Gabi Melman
484d7f91e5 Added vs2017 to appveyor.yml 2019-12-05 13:42:28 +02:00
gabime
53d58f222f fix warning C4996 under vs2015 about std::copy in fmt 2019-12-05 13:37:31 +02:00
gabime
d5a72b1eaf Fixed msvc compilation 2019-12-05 02:02:16 +02:00
gabime
6b5ebab6ae Fixed msvc compilation 2019-12-05 02:01:02 +02:00
gabime
8107df08a8 Bump bundled fmt to 6.1.1-rc 2019-12-05 01:29:32 +02:00
gabime
dc29500931 version 1.5.0-rc 2019-12-05 01:21:58 +02:00
gabime
31fc1aca53 Supress -Wimplicit-fallthrough and -Wsign-conversion when including fmt headers 2019-12-05 01:12:55 +02:00
gabime
0db4b04ad3 Bump bundled fmt to version 6.1.0 2019-12-04 23:39:17 +02:00
gabime
1aa9ea92e2 Fix #1340 2019-12-03 00:35:28 +02:00
gabime
2698f54a9c Fix #1325. Added SPDLOG_FMT_EXTERNAL_HO option 2019-12-01 02:19:34 +02:00
gabime
6f977248bf Impl #1298 2019-12-01 01:28:28 +02:00
Gabi Melman
046fd62dc4 Merge pull request #1337 from luigino/meson
Set version for shared library
2019-11-29 14:41:21 +02:00
Luigi Baldoni
da60dda2dd Set version for shared library 2019-11-29 13:32:41 +01:00
gabime
d25fb08a75 clang-format 2019-11-29 12:50:54 +02:00
gabime
79e105243c Fix #1335 2019-11-29 12:48:21 +02:00
gabime
2d4e531ac9 Fix #1327 2019-11-29 12:36:06 +02:00
gabime
52403ad9ed Fix #1332 2019-11-29 11:32:46 +02:00
Gabi Melman
2d264855cc Merge pull request #1331 from 0x8000-0000/fix-warnings
Fix compiler warnings
2019-11-28 02:34:17 +02:00
Florin Iucha
c172c72be9 Fix compiler warnings 2019-11-27 19:17:27 -05:00
Gabi Melman
79259fdb3f Update os-inl.h 2019-11-16 13:23:00 +02:00
gabime
cee35f7d24 Added truncate flag (issue #1297) 2019-11-14 12:28:23 +02:00
Gabi Melman
1f5f17622e Merge pull request #1311 from inhzus/v1.x
Remove redundant semicolon
2019-11-11 13:13:50 +02:00
Zhi Sun
e8f7f80f2b Remove redundant semicolon 2019-11-11 18:41:58 +08:00
gabime
6db8beeade Removed un needed file 2019-11-10 00:55:50 +02:00
gabime
4f66313440 Fix #1308 2019-11-10 00:35:34 +02:00
gabime
89b5bcfdc7 Updated ringbuffer sink 2019-11-10 00:18:24 +02:00
gabime
26f706ebe3 Fixed #1302 2019-11-10 00:11:39 +02:00
gabime
0cb38085a1 Updated ringbuffer sink 2019-11-10 00:08:50 +02:00
Gabi Melman
cff6644b28 Merge pull request #1307 from eudoxos/ringbuffer-sink
Add ringbuffer sink
2019-11-09 21:38:57 +02:00
Václav Šmilauer
63837530ed Fix circular_q::size() empty case 2019-11-09 19:26:49 +01:00
Václav Šmilauer
62e09e73f7 defer formatting, use log_msg_buffer for intermediate storage 2019-11-09 13:48:04 +01:00
Václav Šmilauer
daef0a2374 Fix circular_q::size() 2019-11-09 13:15:57 +01:00
Václav Šmilauer
042045b998 typo fix 2019-11-09 09:35:05 +01:00
Václav Šmilauer
bad7284465 Fix cicular_q::size() 2019-11-09 09:30:27 +01:00
Václav Šmilauer
6f0cb6365e Move ringbuffer_sink to spdlog::details::circular_q, enhance its API: size(), at(i) 2019-11-08 19:25:31 +01:00
gabime
653ec05c0e Updated .clang-tidy with more checks 2019-11-08 16:42:16 +02:00
gabime
be2a751513 Fixed clang-tidy warning in example 2019-11-08 16:35:18 +02:00
gabime
840adfbbcf Added performance chacks tp .clang-tidy 2019-11-08 16:32:57 +02:00
Václav Šmilauer
acf32be842 Add ringbuffer sink (requires boost::circular_buffer)
Ringbuffer sink keeps user-given number of most recent log messages in
memory and returns them upon request (using the ringbuffer_sink::last
method). This can be useful for e.g. remote debugging of a running app.
2019-11-08 15:29:20 +01:00
gabime
3999613eca Added performance chacks tp .clang-tidy 2019-11-08 16:27:08 +02:00
gabime
bff85725d2 Fixed some more clang-tidy warnings 2019-11-08 16:20:41 +02:00
gabime
93008b2369 Fix clang-tidy warning about non existing move 2019-11-08 15:31:33 +02:00
gabime
be336e7514 Added noexcept to log_msg move constructor 2019-11-08 15:21:18 +02:00
gabime
255f7f2dee Optimze backtracer operator= 2019-11-08 15:09:57 +02:00
gabime
de2c07ac62 always cache gmt offset 2019-11-08 14:37:52 +02:00
gabime
844d54d7e6 Fix #1302 2019-11-08 14:27:05 +02:00
gabime
ff3e6c7248 Fix issue #1306 2019-11-08 14:08:31 +02:00
Gabi Melman
408a2229d6 Merge pull request #1304 from RedDwarf69/include_path
"#include" <spdlog/.*> instead of "spdlog/.*"
2019-11-06 22:27:56 +02:00
Cristian Morales Vega
7cdd65075c "#include" <spdlog/.*> instead of "spdlog/.*"
The meaning of using quotes to #include is implementation defined, so it
may or not may be what we want. At least POSIX
(https://pubs.opengroup.org/onlinepubs/9699919799/utilities/c99.html)
says: "headers whose names are enclosed in double-quotes ( "" ) shall be
searched for first in the directory of the file with the #include line",
so not what we want since "spdlog" ends up twice in the path.
2019-11-06 19:15:29 +00:00
gabime
436ce16e79 Updated meson tests build 2019-11-05 00:31:36 +02:00
gabime
58320e2678 Updated meson build options 2019-11-05 00:22:30 +02:00
gabime
a6f7edf94b Updated meson build options 2019-11-05 00:16:45 +02:00
gabime
4a4f13be46 Updated meson build 2019-11-04 23:38:31 +02:00
gabime
a13b0abb7d Simplify meson for tests 2019-11-04 23:29:05 +02:00
gabime
c081919320 Enabled tests under meson by default 2019-11-04 23:19:02 +02:00
gabime
21f7f78130 Update tests CMakeLists.txt 2019-11-04 23:16:44 +02:00
gabime
bb1b24c178 Fixed #1295 2019-11-04 23:16:21 +02:00
gabime
3f30000088 comment 2019-11-04 17:51:57 +02:00
gabime
e6ce39f76e comment 2019-11-04 17:46:59 +02:00
gabime
10116b7717 Removed SPDLOG_NO_DATETIME option 2019-11-04 17:43:30 +02:00
gabime
18edb8bd63 Added tweakme options to CMakeLists.txt 2019-11-04 17:19:18 +02:00
gabime
dae1aeb1f7 clang-format 2019-11-04 16:48:54 +02:00
gabime
57085c892f exclude from compilation prevent_child_fd() if SPDLOG_PREVENT_CHILD_FD not defined 2019-11-04 16:42:58 +02:00
Gabi Melman
d67efb2cab Merge pull request #1296 from sylveon/patch-1
Correctly guard SetHandleInformation API call
2019-11-04 10:58:14 +02:00
Charles Milette
0e09ecbaa5 Correctly guard SetHandleInformation API call
`__cplusplus_winrt` only detected C++/CX (which can be used without compiling for UWP, SetHandleInformation would be available in those cases), and did not detect native UWP C++. This patch fixes that by using the WINAPI_FAMILY_PARTITION macro in the Windows SDK headers in the same way those headers remove SetHandleInformation in UWP builds.
2019-11-03 22:41:55 -05:00
gabime
e3699070a4 clang-format 2019-11-03 17:07:37 +02:00
gabime
bf40855825 Micro-optimize level checking by inlining 2019-11-03 17:04:34 +02:00
gabime
3ee4f2810d Micro-optimze log_it_ 2019-11-03 17:01:58 +02:00
gabime
79468cf676 Micro-optimze log_it_ 2019-11-03 17:00:12 +02:00
gabime
4037942a26 suppress modernize-use-trailing-return-type fron clang-tidy 2019-11-03 15:22:54 +02:00
gabime
cae6c9ab36 Removed lazy argument evaluation from macros 2019-11-03 15:19:59 +02:00
gabime
15b393193a Replaced a forgotten try with SPDLOG_TRY 2019-11-03 15:16:03 +02:00
Gabi Melman
53ab34928c Merge pull request #1294 from pck/refmacro
Improve log macros
2019-11-03 12:17:00 +02:00
Paul Kunysch
eb4a169cfb Improve log macros 2019-11-02 09:40:37 +01:00
Gabi Melman
6f6cadf31d Merge pull request #1292 from jktjkt/journald
improve systemd journald support
2019-10-30 21:33:31 +02:00
Jan Kundrát
17513a6dce journald: structured output for logger's name
Previously, the logger name was effectively lost. There were two choices
on how to add it:

- Via a formatter, which would mean that `journalctl` would not be able
to filter against that. That would be suboptimal.

- As a "syslog identifier". This means that `journalctl` will, by
default, stop showing the daemon's executable name and replace that via
the logger name. The PID is still shown, and if one would like to go
back to the previous behavior, it is still possible via `journalctl -o
with-unit`.

I think that the second option is strictly better than the first one.

fixes #1289
2019-10-30 20:08:30 +01:00
Jan Kundrát
a44560ddb6 journald: fix source file location
This is what my manpage says, and what the original blog post [1] says
as well.

Also, `sd_journal_send` can add the location of its own invocation to
the log. That's typically not what we want, so we have to suppress that
feature and instead put whatever is inside the spdlog message into the
journal.

[1] http://0pointer.de/blog/projects/journal-submit.html
2019-10-30 20:08:29 +01:00
gabime
2b8afb38b7 Revert pull #1288 2019-10-28 23:41:40 +02:00
Gabi Melman
685ad74d53 Merge pull request #1288 from yipdw/bugfix/use-64-bit-file-access
Use _FILE_OFFSET_BITS=64 when building on Linux 32-bit systems
2019-10-28 20:48:56 +02:00
David Yip
288ea11534 Use _FILE_OFFSET_BITS=64 when building tests on Linux 32-bit systems
When cross-compiling spdlog from x86-64 to armhf, I ran spdlog-utests
via qemu-arm and noticed that the "daily_logger rotate" test was failing
because count_files always returned zero.

Investigation of count_files revealed that readdir was returning nullptr
immediately and setting errno to 75, i.e. "value too large for defined
data type".  I suspected this had something to do with some 64 vs.
32-bit thing, so I added _FILE_OFFSET_BITS=64 to the build and that
seems to have made readdir happy.

It might be safe to add _FILE_OFFSET_BITS=64 for all Linux builds, but
it only seems to be necessary for the 32-bit case (which is a pretty
small audience these days -- I'm only building for armhf to target a
Raspberry Pi 3 running Raspbian, which runs in 32-bit mode).
2019-10-28 13:23:01 -05:00
Gabi Melman
b848ff8db9 Merge pull request #1285 from masmullin2000/v1.x
Remove unused variable
2019-10-25 22:22:59 +03:00
Michael Mullin
5881fcb0d6 Remove unused variable 2019-10-25 14:47:38 -04:00
Gabi Melman
491a2e8732 Update os-inl.h 2019-10-25 18:59:02 +03:00
gabime
4a620a2c5e Merge branch 'Issue-1248' into v1.x 2019-10-25 16:56:26 +03:00
gabime
05105155f8 refactoed file_helper 2019-10-25 16:55:24 +03:00
gabime
9f96545fa7 refactoed file_helper 2019-10-25 16:52:12 +03:00
gabime
0c60107e62 refactoed file_helper 2019-10-25 16:50:06 +03:00
gabime
49eb9cbdd8 Removed junk folder 2019-10-25 16:26:21 +03:00
gabime
594d226056 update tests 2019-10-25 16:20:24 +03:00
gabime
aac7dccf45 comment 2019-10-25 16:17:55 +03:00
gabime
c19e325b83 Added some tests for create_dir 2019-10-25 16:17:02 +03:00
gabime
bd92c23add comment 2019-10-25 16:07:10 +03:00
gabime
88335bd92e clang-format 2019-10-25 16:05:12 +03:00
gabime
a4602021d8 Renamed private members of file_helper 2019-10-25 16:04:07 +03:00
gabime
dbe5c17a96 Renamed file_exists()->path_exists() 2019-10-25 15:56:23 +03:00
gabime
c40555c0ac clang-format 2019-10-25 15:44:53 +03:00
gabime
bfc76278a9 update tests 2019-10-25 15:24:54 +03:00
gabime
a1f283946e updated os::dir_name and tests 2019-10-25 14:29:57 +03:00
gabime
066087b383 Update create_dir 2019-10-25 14:14:50 +03:00
gabime
e9d42e059f // support forward slash in windows 2019-10-25 12:52:39 +03:00
Gabi Melman
d1dadc9814 Merge pull request #1283 from bencsikandrei/refactor/cmake-minor-duplication-removal
Minor cmake code duplication improvement
2019-10-25 12:28:10 +03:00
Andrei-Florin BENCSIK
2cc620ef33 Function instead of macro
Be more consistent with the existing code and with the naming
_function -> function
2019-10-25 11:15:07 +03:00
Andrei-Florin BENCSIK
cee705ccd3 Minor cmake code duplication improvement
Create a macro to add tests for both static/header only.

The only differneces between these two are the libraries they link
with and the target names. Created the simple macro:

_spdlog_prepare_test(<target> <spdlog_lib>)

which does the work.

Signed-off-by: Andrei-Florin BENCSIK <andrei.bencsik@gmail.com>
2019-10-24 22:57:47 +03:00
gabime
a8f72424db Merge branch 'Issue-1248' of https://github.com/gabime/spdlog into Issue-1248 2019-10-21 13:43:57 +03:00
gabime
31ed133932 Added dir_name tests 2019-10-21 13:42:25 +03:00
Gabi Melman
d3c6974e99 Update os.h 2019-10-20 19:09:37 +03:00
Gabi Melman
1271081865 Update os-inl.h 2019-10-20 19:08:47 +03:00
Gabi Melman
8a638a95a0 Update os-inl.h 2019-10-20 18:31:04 +03:00
Gabi Melman
d9f726f2a5 Add global namespace qualifiers to global function calls in os-inl.h 2019-10-20 18:25:09 +03:00
Gabi Melman
5f3521b3d4 Update utils.cpp 2019-10-20 17:55:13 +03:00
gabime
9a68bd8cc8 Fixed missing include 2019-10-20 17:48:13 +03:00
gabime
9b7812a0f2 auto create log dir 2019-10-20 17:40:56 +03:00
gabime
4858d7e454 Fix #1274 2019-10-20 10:27:17 +03:00
gabime
fbb3f41dff Fix #1273 2019-10-20 10:22:44 +03:00
Gabi Melman
1472048b97 Merge pull request #1275 from flopp/spelling
Fix some spelling errors.
2019-10-19 11:09:11 +03:00
Florian Pigorsch
4aad51a352 Fix some spelling errors.
casese -> cases (1)
chache -> cache (1)
cirucal -> circular (1)
dependecy -> dependency (1)
detrmine -> determine (2)
eavluate -> evaluate (1)
exertnal -> external (1)
ony -> only (1)
registation -> registration (3)
registring -> registering (2)
regsistration -> registration (3)
seperate -> separate (2)
wit -> with (1)
withe -> with (1)
2019-10-19 09:42:38 +02:00
gabime
9a0a0c2d8c clang-format 2019-10-18 16:14:08 +03:00
gabime
fcc809f4f1 Refactored logger 2019-10-18 16:10:57 +03:00
Gabi Melman
f3369677ef Merge pull request #1270 from jktjkt/fix-clang7-libc++
Fix build failure on clang 7 with libc++
2019-10-18 11:38:56 +03:00
Jan Kundrát
a03f9eb156 Fix build failure on clang 7 with libc++
Unlike the GNU C++ STL, there's no implicit include for <array> in this
one, apparently.
2019-10-18 10:14:44 +02:00
Gabi Melman
aa65dd8905 version 1.4.3 rc 2019-10-11 19:48:33 +03:00
Gabi Melman
856b4f4654 Update README.md 2019-10-09 23:22:45 +03:00
gabime
9369fe8c27 Fix #1262 2019-10-09 21:41:02 +03:00
gabime
1549ff12f1 Replace STRING(PREPEND ..) in CMakeLists.txt to support older CMake versions 2019-10-06 13:13:26 +03:00
gabime
70357ceff2 clang-format 2019-10-06 00:31:38 +03:00
gabime
cfe7cac1c4 version 1.4.2 2019-10-06 00:30:40 +03:00
gabime
fb70eca0a3 CmakeLists.txt: add -pthread to pkg-config 2019-10-04 21:56:17 +03:00
gabime
cf2bf488a2 CmakeLists.txt: Fixed package config generation 2019-10-04 21:49:20 +03:00
Gabi Melman
5c02fc47b9 Merge pull request #1253 from DasRoteSkelett/v1.x
CMakeLists.txt: removed spdlog subdir from library install
2019-10-01 22:45:58 +03:00
Matthias Schoepfer
4021e5eea9 CMakeLists.txt: removed spdlog subdir from library install
The library gets installed into ${CMAKE_INSTALL_LIBDIR}/spdlog, which
is for unix / linux a rather strange place, hence, put it where the linker
is more likely to find it.

Signed-off-by: Matthias Schoepfer <matthias.schoepfer@ithinx.io>
2019-10-01 17:14:01 +02:00
Gabi Melman
5cd0b6272d Update logger-inl.h 2019-10-01 01:56:02 +03:00
Gabi Melman
bf49bebe7a Update logger.h 2019-10-01 01:50:18 +03:00
Gabi Melman
1e8299e893 Merge pull request #1252 from bsergean/v1.x
Fix windows compile error where std::max is overriden by a macro (#1251)
2019-09-30 08:34:02 +03:00
Benjamin Sergeant
5381061d97 Fix windows compile error where std::max is overriden by a macro (#1251) 2019-09-29 22:03:47 -07:00
gabime
274558c430 Fix issue #1250 2019-09-28 11:39:06 +03:00
gabime
188afe20f9 Fix issue #1249 2019-09-28 11:20:26 +03:00
gabime
1add9c9a02 Added SPDLOG_WCHAR_FILENAMES options to CMake 2019-09-28 11:19:56 +03:00
Gabi Melman
e7d4b99350 Merge pull request #1246 from tcraigtyler/v1.x
Set additional CPACK variables for RPM generator
2019-09-27 21:58:27 +03:00
Craig Tyler
8627721533 Set additional CPACK variables for RPM generator
Sets the following when querying the generated RPM's info:

Group       : System Environment/Libraries
License     : MIT
URL         : https://github.com/gabime/spdlog
Summary     : Fast C++ logging library
Description :
Very fast, header-only/compiled, C++ logging library.
2019-09-27 09:40:09 -07:00
Gabi Melman
6696416107 Update README.md 2019-09-25 10:58:30 +03:00
gabime
453be2e08a clang-format 2019-09-23 12:38:19 +03:00
gabime
83497e4dc9 Update test_stdout_api.cpp 2019-09-23 12:11:12 +03:00
gabime
3806a9c320 Added wchar api tests to windows 2019-09-23 12:06:21 +03:00
Gabi Melman
4da95066a0 Merge pull request #1241 from orbea/fmt
cmake: Only install fmt headers when SPDLOG_FMT_EXTERNAL is not defined.
2019-09-23 10:25:48 +03:00
Gabi Melman
ab1105524f Merge pull request #1238 from orbea/pkgconfig
cmake: Add a new spdlog.pc pkgconfig file.
2019-09-23 10:22:36 +03:00
Gabi Melman
d70b743e03 Merge pull request #1240 from Bak-Jin-Hyeong/fix1239
Fix #1239, Remove basic_string_view_t
2019-09-23 10:20:08 +03:00
orbea
920dd078f3 cmake: Only install fmt headers when SPDLOG_FMT_EXTERNAL is not defined. 2019-09-22 23:19:11 -07:00
Bak, Jin Hyeong
f8e780b9dd Fix #1239, Remove basic_string_view_t 2019-09-23 14:48:09 +09:00
orbea
588910129c cmake: Add a new spdlog.pc pkgconfig file.
Fixes https://github.com/gabime/spdlog/issues/1237.
2019-09-22 19:04:29 -07:00
gabime
e42867f0a8 Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x 2019-09-21 18:35:33 +03:00
gabime
fe20afac17 clang-format 2019-09-21 18:16:38 +03:00
Gabi Melman
10578ff08c Update test_mpmc_q.cpp 2019-09-21 15:49:54 +03:00
Gabi Melman
1f0513cf4e Update .travis.yml 2019-09-21 15:35:22 +03:00
Gabi Melman
647470f3ae Update .travis.yml 2019-09-21 15:33:03 +03:00
Gabi Melman
efd0dbe5c2 Update .travis.yml 2019-09-21 15:30:29 +03:00
Gabi Melman
bd2fe64bf1 Update .travis.yml 2019-09-21 15:24:37 +03:00
gabime
7153db954f Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x 2019-09-21 15:14:18 +03:00
gabime
3b425affd3 Fixed missing braces around initializer warnings about std::array initializations 2019-09-21 15:13:50 +03:00
Gabi Melman
d5a79ad5d7 Update .travis.yml 2019-09-21 14:46:09 +03:00
Gabi Melman
7951338d27 Update .travis.yml 2019-09-21 14:38:54 +03:00
Gabi Melman
90801267ee Merge pull request #1234 from jbeich/dragonfly
Unbreak on more BSDs
2019-09-20 20:47:41 +03:00
Jan Beich
8d57823e51 fstat64 is missing on other DragonFly, NetBSD, OpenBSD
Modern operating systems don't need to implement transitional
extensions for large file support.
2019-09-20 13:27:58 +00:00
Gabi Melman
277ccc5e18 Update log_msg_buffer-inl.h 2019-09-20 16:17:48 +03:00
Gabi Melman
cff9db5044 Update log_msg_buffer-inl.h 2019-09-20 16:11:40 +03:00
Gabi Melman
216f905670 Fix log msg buffer operator= 2019-09-20 16:11:22 +03:00
Jan Beich
53b2308011 Implement _thread_id() on more Unices 2019-09-20 13:10:27 +00:00
gabime
c368500efd Reverted some external template declarations 2019-09-20 02:05:24 +03:00
gabime
2fed68a73b Reverted some external template declarations 2019-09-20 01:52:05 +03:00
gabime
e7ab49c973 Added extern tempalate declarations 2019-09-20 01:28:02 +03:00
gabime
5496491aa4 Added extern template declarations 2019-09-20 00:18:36 +03:00
Gabi Melman
53ca5b2870 Update spdlog.cpp 2019-09-19 12:06:53 +03:00
Gabi Melman
6aced26c35 Update spdlog.cpp 2019-09-19 12:06:22 +03:00
Gabi Melman
2331750b58 Update log_msg_buffer.h 2019-09-19 12:02:59 +03:00
Gabi Melman
b3fb4c1265 Update log_msg_buffer-inl.h 2019-09-19 12:01:11 +03:00
Gabi Melman
3ad7b9b117 Update log_msg_buffer-inl.h 2019-09-19 12:00:59 +03:00
gabime
5721debdf1 split to log_msg_buffer.h ito header and mpl 2019-09-19 11:52:03 +03:00
gabime
c1c23d1e7b Revert pull #1228 2019-09-18 16:16:44 +03:00
gabime
9605641982 Updatede meson 2019-09-18 15:31:09 +03:00
gabime
e52672c263 Fixed CMakeLists.txt 2019-09-18 15:08:15 +03:00
gabime
50f070980e Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x 2019-09-18 15:01:28 +03:00
gabime
7733849478 Updated meson build 2019-09-18 15:01:23 +03:00
Gabi Melman
4bbc8a89a0 Merge pull request #1228 from scatter-dev/arch_independent
Added ARCH_INDEPENDENT option
2019-09-18 14:55:19 +03:00
Christian
c87882e82f added version check 2019-09-18 09:20:01 -02:30
Christian
bd4301b2c1 added arch_independent option 2019-09-17 14:45:59 -02:30
gabime
e771f4e75e Fix mingw32 compilation 2019-09-17 13:27:42 +03:00
Gabi Melman
35835469d7 Update common.h 2019-09-17 12:52:59 +03:00
Gabi Melman
0d6992fcdd Update common.h 2019-09-17 12:48:54 +03:00
gabime
29b3f471cf Added const vecsion to circula_q::front() 2019-09-17 12:28:02 +03:00
gabime
4985875a15 Renamed item_type => value_type in circular_q 2019-09-17 12:07:54 +03:00
gabime
4fffd3a111 Avoid un necessary move when popping circular_q 2019-09-17 12:05:23 +03:00
gabime
590749e8be Avoid un necessary move when popping circular_q 2019-09-17 12:03:54 +03:00
gabime
27cc76766c Avoid un necessary move when popping circular_q 2019-09-17 12:01:15 +03:00
gabime
d52cf87d71 Avoid un necessary move when popping circular_q 2019-09-17 11:56:17 +03:00
gabime
2ddd6895e1 Backported clang warning fix from fmt 2019-09-17 00:15:35 +03:00
gabime
545e7d2de8 Fixed clang warning 2019-09-16 23:50:56 +03:00
gabime
a9ed6b352b Update utils.cpp 2019-09-16 11:58:51 +03:00
gabime
523eebe47d Update utils.cpp 2019-09-16 11:58:26 +03:00
gabime
b303d8bc40 Update tests utils 2019-09-16 11:56:56 +03:00
Gabi Melman
68118f4233 Update daily_file_sink.h 2019-09-15 21:50:29 +03:00
Gabi Melman
fcc6b97f88 Update utils.cpp 2019-09-15 21:01:15 +03:00
gabime
adc4398cc5 Fixed widows tests 2019-09-15 20:56:20 +03:00
Gabi Melman
c53d26cfca Update utils.cpp 2019-09-15 19:15:35 +03:00
Gabi Melman
c188bee229 Update utils.cpp 2019-09-15 19:09:57 +03:00
Gabi Melman
7f1a89e3f6 Update utils.cpp 2019-09-15 18:49:19 +03:00
gabime
5d46f3fcab Fix windows build 2019-09-15 18:44:45 +03:00
gabime
b55d95d365 Update test utils for windows 2019-09-15 18:38:31 +03:00
gabime
494cc8bace Implemented daily sink rotation #661 2019-09-15 18:34:29 +03:00
gabime
03e8c0f45c Fix issue #1219 2019-09-13 14:01:53 +03:00
gabime
b6388a15ff Fix issue #1223 2019-09-13 11:38:24 +03:00
gabime
45a18a61c6 CmakeLists.txt: Added version-number and debug suffixes + SPDLOG_BUILD_SHARED property 2019-09-08 00:42:23 +03:00
gabime
1857a44c7c Fix #1215 2019-09-07 20:11:58 +03:00
gabime
bd9e1475e2 clang-format 2019-09-07 20:11:35 +03:00
gabime
6883267996 Added const to circular_q empty() and full() 2019-09-06 18:55:45 +03:00
gabime
b88c784634 Improved circular_q move 2019-09-06 18:53:10 +03:00
gabime
31020f9eea Fixed vs 2015 warning abour fmt unused variable 2019-09-06 16:41:36 +03:00
gabime
e89d59995a Merge branch 'tgpfeiffer-bump-fmtlib-6.0.0' into v1.x 2019-09-06 15:18:52 +03:00
Tobias Pfeiffer
bf324a11cd made the declarations in fmt.c match the ones in fmt-6.0.0 2019-09-06 10:06:00 +09:00
Tobias Pfeiffer
e149433a80 Bumped fmt to version 6.0.0 2019-09-06 09:51:42 +09:00
gabime
65d02e495e Reverted the version() function 2019-09-05 19:50:00 +03:00
gabime
f196a9fd27 Fix dupllicate 2019-09-05 19:42:08 +03:00
gabime
7f0398ca25 Added version() function 2019-09-05 18:51:28 +03:00
gabime
d7f05722d4 Fixed example 2019-09-05 18:32:54 +03:00
gabime
26377a2195 Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x 2019-09-05 18:31:16 +03:00
gabime
aa4eaa16bf Fixed missing includes 2019-09-05 18:31:08 +03:00
Gabi Melman
abc7bfe5c9 Update README.md 2019-09-05 14:46:07 +03:00
Gabi Melman
f0f4499540 Update README.md 2019-09-05 14:42:34 +03:00
gabime
dae4f9fef6 split spdlog.cpp to multiple .cpp files 2019-09-05 14:37:25 +03:00
gabime
4c45c6fbd8 Removed redundant func 2019-09-05 02:31:23 +03:00
gabime
172cf26d77 Update comment 2019-09-05 02:31:03 +03:00
gabime
feefb7e7e2 format 2019-09-05 01:58:34 +03:00
gabime
ced44a15ea format 2019-09-05 01:54:29 +03:00
gabime
5c2855e1c1 wip backtracer 2019-09-05 01:25:00 +03:00
gabime
433785dc64 fix warnings and build 2019-09-05 01:12:27 +03:00
gabime
28845b96bd Update circular_q.h 2019-09-05 00:46:08 +03:00
gabime
98ec35cee1 Update backtracer.h 2019-09-05 00:39:50 +03:00
gabime
f795297e15 try different apprach to backtracer object 2019-09-05 00:39:11 +03:00
gabime
3fd3c47e6d Update logger-inl.h 2019-09-03 18:20:27 +03:00
gabime
153c25dbb3 Update logger-inl.h 2019-09-03 17:55:34 +03:00
gabime
a1a6b7e64f Update backtracer.h 2019-09-03 14:56:06 +03:00
gabime
3ea7fb18d6 Fix potential race condidion when in logger copy ctor
Don't copy other.trace - just create a new one with same size instead
2019-09-03 14:54:17 +03:00
gabime
6ff52332a8 Remove unused member from backtracer 2019-09-03 14:33:30 +03:00
gabime
5e75b104d6 Fix backtracer 2019-09-03 14:04:31 +03:00
gabime
dc893701f9 Update circular_q.h 2019-09-03 13:47:55 +03:00
gabime
e6b0aaf94a typo 2019-09-03 11:53:28 +03:00
gabime
e754cbf763 Update daily_file_sink.h 2019-09-02 12:55:05 +03:00
gabime
5988895d69 Simplify daily sink filename creation 2019-09-02 12:40:47 +03:00
gabime
2af5eea2c6 SImplify filename creation in rotating sink 2019-09-02 12:35:33 +03:00
Gabi Melman
554acb7429 Merge pull request #1203 from matt77hias/v1.x
Fixed {fmt} include if using the non-bundled version
2019-08-31 22:46:06 +03:00
Matthias Moulin
9c5869ce5a Fixed {fmt} include if using the non-bundled version 2019-08-31 21:30:36 +02:00
Gabi Melman
e641ff64fd Merge pull request #1202 from Jerry-Ma/patch-2
Remove extra semicolon
2019-08-31 18:52:03 +03:00
Zhiyuan "Jerry" Ma
aa731e3297 Remove extra semicolon
... in macro SPDLOG_LOGGER_CALL
2019-08-31 11:21:36 -04:00
Gabi Melman
ac6407bb8e Update README.md 2019-08-29 01:13:43 +03:00
Gabi Melman
baf08eee09 Update README.md 2019-08-29 01:12:07 +03:00
Gabi Melman
04a43cd6a1 Update README.md 2019-08-29 01:10:50 +03:00
gabime
ed8d099607 Fixed #1197 2019-08-29 01:05:23 +03:00
gabime
b693d0cd91 Fix #1195 2019-08-29 00:28:00 +03:00
gabime
fafedd2d59 Minor cleanup 2019-08-29 00:07:21 +03:00
gabime
f3a7ef1199 Fix compile bug 2019-08-28 23:53:00 +03:00
Gabi Melman
cb890c96b9 Update logger.h 2019-08-28 22:59:16 +03:00
Gabi Melman
37bfa092a5 Update README.md 2019-08-28 20:13:35 +03:00
Gabi Melman
c517cb64ae Update README.md 2019-08-28 20:08:51 +03:00
Gabi Melman
51e09fa504 Update README.md 2019-08-28 20:07:31 +03:00
Gabi Melman
691172e28b Update README.md 2019-08-28 19:56:06 +03:00
Gabi Melman
6cf6d2159b Update README.md 2019-08-28 19:55:10 +03:00
Gabi Melman
17f0b417d5 Update README.md 2019-08-28 19:54:27 +03:00
gabime
d89baf4c5b Fixed tidy warning 2019-08-28 19:00:35 +03:00
gabime
2eb52cd047 Unified usage of fmt::memory_buffer across the codebase 2019-08-28 18:50:11 +03:00
gabime
f5492aed12 Unified usage of fmt::memory_buffer across the codebase 2019-08-28 18:46:09 +03:00
gabime
c2efd6ee58 Increased msg_buffer size to 250 2019-08-28 17:47:22 +03:00
gabime
be507bf1cc Updated bench to include backtrace testing 2019-08-28 17:37:36 +03:00
gabime
f11f3ce8b7 Updated bench 2019-08-28 16:56:24 +03:00
Gabi Melman
b2a3e930c1 Update README.md 2019-08-28 16:32:16 +03:00
Gabi Melman
147bf04d08 Merge pull request #1196 from gabime/backtrace_support
Backtrace support !
2019-08-28 16:28:32 +03:00
gabime
f4d3616c4b Update test_backtrace.cpp 2019-08-28 15:59:58 +03:00
gabime
c97c025adb clang-format 2019-08-27 20:22:07 +03:00
gabime
c55336e78d Better support for logger copy with backtrace 2019-08-27 20:20:15 +03:00
gabime
13e9135935 Update test_backtrace.cpp 2019-08-27 19:45:21 +03:00
gabime
5c1e44a93d Added bactrace tests 2019-08-27 18:06:27 +03:00
gabime
75adf9e75e Improved test_sink in unit tests 2019-08-27 17:18:09 +03:00
gabime
0fa09f6af4 Removed dead clode 2019-08-27 16:39:18 +03:00
gabime
011ed270e8 backtrace support for wchar api under windows 2019-08-27 15:06:53 +03:00
gabime
d7e58ce10e Fixed example 2019-08-27 13:08:45 +03:00
gabime
813536d4c6 Update latency bench 2019-08-27 02:35:00 +03:00
gabime
b89023efa1 Merge branch 'backtrace_support' of https://github.com/gabime/spdlog into backtrace_support 2019-08-27 02:29:38 +03:00
gabime
b155347560 Added forgotten lock in backtracer 2019-08-27 02:28:49 +03:00
Gabi Melman
15faf742f1 Update README.md 2019-08-27 02:27:21 +03:00
Gabi Melman
2ba7d1639e Update README.md 2019-08-27 02:26:28 +03:00
Gabi Melman
a2de7cf070 Update README.md 2019-08-27 02:23:22 +03:00
Gabi Melman
c6d558b6f2 Update README.md 2019-08-27 02:20:17 +03:00
gabime
d1b97c0ba9 Updated async_logger include 2019-08-27 02:16:29 +03:00
gabime
755ce0a016 Updated async_logger flush 2019-08-27 02:15:08 +03:00
gabime
79334ca5ab Fixed bench 2019-08-27 02:02:35 +03:00
gabime
11e9752536 Fixed logger's copy ctor 2019-08-27 01:56:48 +03:00
gabime
72b0f9e8f7 Updated example 2019-08-27 01:51:59 +03:00
gabime
408a162044 Removed logger::clone() from API 2019-08-27 01:16:57 +03:00
gabime
7d6444491c Fixed registy::disable_backtrace() 2019-08-27 01:08:48 +03:00
gabime
7bfb6d6b76 Fixed example 2019-08-27 00:58:01 +03:00
gabime
e1be7f3d6f Refactoring to better support backtrace 2019-08-27 00:56:49 +03:00
gabime
04a8485b17 Replaced backtace implementation 2019-08-26 19:59:16 +03:00
gabime
f330dd210e Renamed file 2019-08-26 13:43:42 +03:00
gabime
97dc27b5fa minor code formatting 2019-08-26 01:16:53 +03:00
gabime
1fd43fe673 Fixed async_logger::clone 2019-08-26 01:11:22 +03:00
gabime
29e21cc7f3 Comment 2019-08-26 00:56:05 +03:00
gabime
292fc153ef clang-format 2019-08-26 00:55:14 +03:00
gabime
25d3c83d3b Update async bench 2019-08-26 00:53:52 +03:00
gabime
6b7f3db28e Fixed async sink_it 2019-08-26 00:23:09 +03:00
gabime
eec6e28b19 Async logger cleanup 2019-08-26 00:13:43 +03:00
gabime
f3e379cf78 Fixed async dump_backtrace 2019-08-25 23:55:35 +03:00
gabime
0258c47774 some cleanup in logger 2019-08-25 19:35:57 +03:00
gabime
f63df65245 some cleanup in logger 2019-08-25 19:33:12 +03:00
gabime
099137fe9a backtrace_sink code cleanup 2019-08-25 18:05:47 +03:00
gabime
36f253893e Pass logger name to tracer 2019-08-25 17:44:08 +03:00
gabime
8280c0d64c Merge branch 'backtrace_support' of https://github.com/gabime/spdlog into backtrace_support 2019-08-25 17:28:49 +03:00
gabime
4f98b000eb Fixed example 2019-08-25 17:27:21 +03:00
gabime
b5d61b963a Fixed example 2019-08-25 17:25:06 +03:00
gabime
a7f7984c4a backtrace support api 2019-08-25 17:24:17 +03:00
gabime
dd33c16aae Replace backtrace trigger with dump_backtrace() 2019-08-23 14:47:40 +03:00
Gabi Melman
e0bf0c0301 Update thread_pool.h 2019-08-23 03:30:56 +03:00
gabime
8d8aacf5e9 Protect from double call to enable_backtrace() 2019-08-23 03:17:45 +03:00
gabime
e085ba7fcc Fix example 2019-08-23 02:48:40 +03:00
gabime
33f881ac8b clang-format 2019-08-23 02:45:41 +03:00
gabime
b24ef39b9d Update example 2019-08-23 02:45:35 +03:00
gabime
a6d8b52686 Added enable_backtrace to spdlog_api 2019-08-23 02:28:52 +03:00
gabime
65407539bb Fixed log_msg_buffer 2019-08-23 01:10:48 +03:00
gabime
543060683b Clean log_msg_buffer 2019-08-23 00:16:44 +03:00
gabime
2848e51755 Clean log_msg_buffer 2019-08-23 00:16:13 +03:00
gabime
0db4978899 Fixed example 2019-08-22 19:58:49 +03:00
gabime
0284a23d0a Changed sink_it_ to accept const log_message& 2019-08-22 19:57:59 +03:00
gabime
7e728869cc comment 2019-08-22 19:48:11 +03:00
gabime
a19d93e1a2 brace initialize some ctors 2019-08-22 19:45:32 +03:00
gabime
5aefa1af3d Fixed clang-tidy warnings 2019-08-22 19:40:45 +03:00
gabime
f1718fb5b3 clang-format 2019-08-22 19:38:00 +03:00
gabime
6b527a50dd backtrace sink and refactoring 2019-08-22 19:36:47 +03:00
gabime
74df115fc1 Removed uneeded include 2019-08-22 00:59:16 +03:00
Gabi Melman
3adfeeec3e Merge pull request #1189 from AMS21/patch-1
Fix Wundef in os-inl.h
2019-08-20 00:21:04 +03:00
AMS21
c4df94a1d9 Fix Wundef in os-inl.h 2019-08-19 20:50:46 +00:00
gabime
da1d98d603 Fix example 2019-08-19 13:12:22 +03:00
gabime
6683418983 Fix example 2019-08-19 13:06:30 +03:00
gabime
2c1d97f1ad Removed junk 2019-08-19 13:03:25 +03:00
Gabi Melman
2f854428bc Merge pull request #1188 from gabime/no-exceptions
Support for -fno exceptions
2019-08-19 12:58:11 +03:00
gabime
c1a524a969 Fixed clang-tidy warnings 2019-08-19 12:20:37 +03:00
gabime
23807e12e8 Fixed throw macros and includes 2019-08-19 12:13:37 +03:00
gabime
87ec1ab97b Fixed clang warnings 2019-08-19 12:06:29 +03:00
gabime
b057b979fa Added missing include 2019-08-19 12:03:58 +03:00
gabime
7dc378e296 Update CMakeLists.txt 2019-08-19 11:38:19 +03:00
gabime
6d8cc30f12 fix conflict 2019-08-19 11:33:39 +03:00
gabime
0335e3fcc0 Print error and abort instead of throw if SPDLOG_NO_EXEPTIONS is defined 2019-08-19 11:31:33 +03:00
Gabi Melman
76aa1059cd Update async.h 2019-08-18 20:16:52 +03:00
gabime
b0a25f0183 wip - no-exceptions support 2019-08-18 19:46:28 +03:00
gabime
db1babab5e Fixed some msvc code analysis warnings 2019-08-18 18:28:13 +03:00
gabime
7ea951613d Update logger-inl.h 2019-08-18 17:45:09 +03:00
gabime
6506b73523 Add noexcept to move ctor and operator= 2019-08-18 17:33:35 +03:00
gabime
639029007d Update .gitignore 2019-08-18 17:32:54 +03:00
gabime
01eb59ca9b Removed spdlog::default_level and its usage in registry 2019-08-16 19:04:49 +03:00
gabime
a8b5e3da29 Removed unneeded test targets from CMakeLists 2019-08-16 18:48:18 +03:00
gabime
8cc0997f79 Added SPDLOG_WCHAR_SUPPORT options to CMake under windows 2019-08-09 10:31:53 +03:00
gabime
ffb7c317b5 Fix #1176 again 2019-08-09 10:16:18 +03:00
Gabi Melman
bb7420fc22 Update logger.h 2019-08-07 06:15:46 +03:00
gabime
0df9164e7c Fix #1176 2019-08-07 01:29:59 +03:00
gabime
dcd590b9de fstat64(..) -> ::fstat64(..) 2019-08-07 00:59:29 +03:00
gabime
8dc3a66688 Fix #1180 2019-08-06 19:12:35 +03:00
Gabi Melman
88b4adebdc Update README.md 2019-07-26 22:41:24 -04:00
Gabi Melman
01f2438c1f Merge pull request #1169 from TranslucentTB/v1.x
Add more overloads to spdlog::log and spdlog::logger::log
2019-07-24 22:10:23 -04:00
Charles Milette
eb51f37c67 Fix ambiguous overload errors 2019-07-24 13:52:03 -04:00
Charles Milette
4ef4d0659d Improve correctness of convertion checks 2019-07-24 13:30:43 -04:00
Charles Milette
2ce9a3f70f Add overload to logger when T can be statically converted to wstring_view_t 2019-07-24 13:27:54 -04:00
Charles Milette
59cbdaaf49 Add more source_loc overloads in spdlog namespace 2019-07-24 13:26:42 -04:00
Gabi Melman
e0cf16b7e9 Fix #1168 2019-07-24 08:49:59 -04:00
Gabi Melman
1cdf09e9dd Merge pull request #1164 from AMS21/patch-1
Fix use of old style cast in os-inl.h
2019-07-22 17:11:14 -04:00
AMS21
9966a6a4b7 Fix use old style cast 2019-07-22 20:35:30 +00:00
Gabi Melman
20a1d1c519 Merge pull request #1161 from mensinda/mesonSubInstall
meson: Do not install when used as a subproject
2019-07-20 08:30:22 -04:00
Daniel Mensinger
313ec87dc1 meson: Do not install when used as a subproject 2019-07-20 14:26:17 +02:00
gabime
a7ba6e447d clang-format 2019-07-18 14:26:36 +03:00
gabime
baa978ab0b Added stdout_sinks.h to the library build 2019-07-18 14:00:16 +03:00
Gabi Melman
9f1b4fc9e7 Update wincolor_sink-inl.h 2019-07-18 01:37:55 +03:00
gabime
38e5dbd866 Fix win-color sink redirection to file 2019-07-18 00:55:24 +03:00
Gabi Melman
50ed27946d Update README.md 2019-07-17 21:34:26 +03:00
Gabi Melman
856ac7d773 Update README.md 2019-07-17 21:31:58 +03:00
Gabi Melman
81f12df8b5 Update README.md 2019-07-17 21:30:06 +03:00
Gabi Melman
9eca3234e8 Update README.md 2019-07-17 21:28:56 +03:00
Gabi Melman
5a540bdd42 Update README.md 2019-07-17 21:21:56 +03:00
Gabi Melman
6d394b132d Update README.md 2019-07-17 21:20:38 +03:00
Gabi Melman
96a317ce68 Update README.md 2019-07-17 21:19:16 +03:00
Gabi Melman
bca8945c26 Merge pull request #1155 from raphaelts3/how-to-compile-from-source
Update README.md
2019-07-17 21:16:55 +03:00
raphaelts3
a4b108334f Update README.md
Moving the instructions to Install section
2019-07-17 15:12:52 -03:00
raphaelts3
4f72cf9744 Update README.md
Add steps to compile and install from source
2019-07-17 13:05:29 -03:00
gabime
3c30f77d31 limit default error handler to 1 message/second to avoid flood 2019-07-17 18:05:01 +03:00
gabime
bcb6484062 Removed redundant include statements 2019-07-17 16:09:39 +03:00
gabime
11472eddbc Catch sink exceptions without affecting other sinks 2019-07-17 16:01:30 +03:00
gabime
12470f6221 Revert null_sink changes 2019-07-17 15:33:29 +03:00
gabime
a82d0e2f57 try to prevent optimizer to remove null sink code altogether 2019-07-17 14:48:44 +03:00
gabime
dca1d1e0d1 try to prevent optimizer to remove null sink code altogether 2019-07-17 14:45:52 +03:00
gabime
0cef8f3d26 try to prevent optimizer to remove null sink code altogether 2019-07-17 14:42:26 +03:00
gabime
fbde18fc02 try to prevent optimizer to remove null sink code altogether 2019-07-17 14:41:18 +03:00
gabime
b640c59087 try to prevent optimizer to remove null sink code altogether 2019-07-17 14:41:07 +03:00
gabime
1f3dea60d3 try to prevent optimizer to remove null sink code altogether 2019-07-17 14:38:01 +03:00
gabime
a7c06eadd0 Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x 2019-07-17 14:02:27 +03:00
gabime
39910f5137 Fixed execption include 2019-07-16 15:50:42 +03:00
Gabi Melman
6fc4eb92db Merge pull request #1150 from ainola/v1.x
meson: fix typo (extrenal -> external)
2019-07-15 18:12:21 +03:00
gabime
81e82fb2d3 Rename func name wincolor sink 2019-07-15 12:22:34 +03:00
gabime
c817254495 Update wincolor_sink-inl.h
minor formatting
2019-07-15 12:14:46 +03:00
gabime
4578b0ad11 Fixed gcc9 conversion warning 2019-07-15 01:36:20 +03:00
gabime
9fbf82b603 Fixed gcc9 conversion warning 2019-07-15 01:31:31 +03:00
gabime
4b0267910c Refactored padding handling in formatter using templates 2019-07-15 01:17:22 +03:00
gabime
54456aee9e Refactored padding handling in formatter using templates 2019-07-15 01:16:57 +03:00
gabime
2a31cdcded Fix clang tidy script 2019-07-15 01:16:29 +03:00
gabime
d3f31c6038 Fixed build 2019-07-14 18:42:51 +03:00
gabime
59dd9f6203 comment 2019-07-14 18:39:43 +03:00
gabime
05cac05c06 clang_format 2019-07-14 18:35:59 +03:00
gabime
724713ac80 Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x 2019-07-14 18:33:56 +03:00
gabime
72f3d5291c Fix issue #1147 2019-07-14 18:32:24 +03:00
gabime
c138685364 Fix issue #1147 2019-07-14 18:31:58 +03:00
Brett Cornwall
4180d00a6c meson: fix typo (extrenal -> external) 2019-07-14 07:29:23 -06:00
gabime
2512ac1e3c Added const qualifier to padinfo 2019-07-14 14:31:55 +03:00
gabime
121fc0a273 Minor update to CMakelists 2019-07-14 13:27:09 +03:00
gabime
4d9281018f Minor update to CMakelists 2019-07-14 13:26:01 +03:00
Gabi Melman
3a94a60537 Update stdout_sinks-inl.h 2019-07-14 01:41:19 +03:00
Gabi Melman
161e6fb8fb Merge pull request #1145 from k0zmo/v1.x
Fix compiler and linker errors
2019-07-14 01:38:39 +03:00
k0zmo
29fa474e4a Use SPDLOG_HEADER_ONLY uniformly 2019-07-13 10:56:22 +02:00
k0zmo
ddb19f4a4f Add missing include directive 2019-07-13 10:55:17 +02:00
k0zmo
789fb1e7c9 Move templated constructor definition to header file 2019-07-13 10:54:22 +02:00
gabime
521c5317a2 Fix #1143 2019-07-11 19:23:06 +03:00
Gabi Melman
e0d85e60a3 Merge pull request #1142 from PeterTh/v1.x
Prevent NEAR and FAR macro definitions from leaking on Windows platforms
2019-07-10 20:47:59 +03:00
PeterTh
ac7821f9bf Prevent NEAR and FAR macro definitions from leaking on Windows platforms 2019-07-10 16:54:40 +02:00
Gabi Melman
84809db955 Update example.cpp 2019-07-10 03:07:17 +03:00
Gabi Melman
e6cecd97ac Update README.md 2019-07-10 02:51:32 +03:00
Gabi Melman
60e7deaaf5 Update README.md 2019-07-10 02:51:09 +03:00
Gabi Melman
23b07d8cb6 Update README.md 2019-07-10 02:49:52 +03:00
gabime
5f27697198 clang-format 2019-07-10 02:42:47 +03:00
gabime
261d2c5ae4 Protected from size_t to int overflow in systemd sink 2019-07-10 02:25:11 +03:00
gabime
847f7de003 Simplify syslog sinks overflow check 2019-07-10 02:19:16 +03:00
gabime
dffc8df3e0 Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x 2019-07-10 02:03:48 +03:00
gabime
330d491eba Enable again test building by default in cmake 2019-07-10 01:45:05 +03:00
gabime
db103ff340 Replaced passing time by val istead of ref in helper 2019-07-10 01:42:43 +03:00
gabime
1ac46bacfe Updated formatter bench 2019-07-10 01:41:55 +03:00
gabime
c27a4ee61f Added elapsed flag to formatter 2019-07-10 01:35:22 +03:00
Gabi Melman
2d8c4b1c88 Merge pull request #1140 from mattiasj-axis/fix-syslog-termination
Fix syslog output
2019-07-08 14:25:54 +03:00
Mattias Jernberg
d969f8621d Fix syslog output
payload does not appear to be reliably null terminated and leaks
data. Use size to the formatter to reliably terminate messages.
2019-07-08 13:14:15 +02:00
gabime
a4ec91fd06 Cleaned bench folder 2019-07-07 17:58:36 +03:00
gabime
fd53472238 Cleaned common.h 2019-07-07 17:22:58 +03:00
gabime
b3ddef2fc2 Minor cmake fix in for tests 2019-07-07 14:09:23 +03:00
gabime
07d753176f Update CMakeLists.txt to not build tests by default 2019-07-07 13:36:46 +03:00
gabime
8d758add63 Relace remaining const char* with string_view_t in the API 2019-07-07 12:55:56 +03:00
gabime
506ab1c735 Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x 2019-07-07 12:35:54 +03:00
Gabi Melman
945020e505 Merge pull request #1139 from matt77hias/v1.x
Added fmt::(w)string_view support (v2).
2019-07-06 20:17:16 +03:00
Matthias Moulin
5a7bcd0a4f Update logger.h 2019-07-06 19:00:49 +02:00
Matthias Moulin
ae92279f5c Update spdlog.h 2019-07-06 19:00:17 +02:00
Matthias Moulin
be33f5eb89 Added wstring_view_t 2019-07-06 18:59:45 +02:00
gabime
717a582085 Dont allow including of dup_filter_sink if SPDLOG_NO_DATETIME is defined 2019-07-05 14:28:03 +03:00
gabime
ee87aee4dd Updated bench 2019-07-05 13:39:19 +03:00
Gabi Melman
2d6afeebe1 Update README.md 2019-07-05 12:30:36 +03:00
gabime
49bc58da04 Moved .clang-tidy and .clang-format to scripts dir 2019-07-05 10:49:46 +03:00
gabime
f5831d5132 clang-format 2019-07-05 10:45:37 +03:00
gabime
517ccc4088 Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x 2019-07-05 10:45:24 +03:00
gabime
90dd56b839 Fix #1130 2019-07-05 10:44:54 +03:00
Gabi Melman
d1794f4c1b Merge pull request #1133 from Jerry-Ma/patch-1
Add missing include
2019-07-04 01:19:41 +03:00
Zhiyuan "Jerry" Ma
75bb4346b2 Add missing include 2019-07-03 17:01:17 -04:00
Gabi Melman
13477e5478 Update .travis.yml 2019-07-02 09:58:23 +03:00
Gabi Melman
1093897838 Update CMakeLists.txt 2019-07-02 09:57:42 +03:00
Gabi Melman
4d27419d7c Update CMakeLists.txt 2019-07-02 09:50:13 +03:00
Gabi Melman
89e6d66872 Update .travis.yml 2019-07-02 08:41:15 +03:00
Gabi Melman
b97c16a636 Update appveyor.yml 2019-07-01 23:55:09 +03:00
Gabi Melman
751ff59e2a Update .travis.yml 2019-07-01 23:51:05 +03:00
Gabi Melman
64a549d051 Update meson.build 2019-07-01 23:19:57 +03:00
Gabi Melman
7a686d4d21 Update CMakeLists.txt 2019-07-01 15:03:53 +03:00
Gabi Melman
7b218737cc Merge pull request #1126 from mensinda/meson
Add meson support
2019-07-01 14:53:46 +03:00
Gabi Melman
b1520a87c3 Merge pull request #1129 from s-shin/hotfix/daily_file_sink_when_no_datetime_2
Fix one more `msg.time` in daily_file_sink.
2019-07-01 13:41:49 +03:00
Daniel Mensinger
2a2a34601c moved scripts into subdirectory 2019-07-01 12:37:18 +02:00
Daniel Mensinger
3c64b3da97 Added example meson.build 2019-07-01 12:32:12 +02:00
Gabi Melman
e7889e9ce2 Delete spdlogConfigVersion.cmake 2019-07-01 13:19:25 +03:00
Gabi Melman
7c8f45747c Delete spdlogConfig.cmake 2019-07-01 13:19:18 +03:00
Gabi Melman
d37def7a72 Delete CPackSourceConfig.cmake 2019-07-01 13:19:10 +03:00
Gabi Melman
452770e374 Delete CPackConfig.cmake 2019-07-01 13:19:03 +03:00
Shintaro Seki
54e44ab477 Fix one more msg.time. 2019-07-01 19:04:37 +09:00
Gabi Melman
6012d52fdb Merge pull request #1128 from s-shin/hotfix/daily_file_sink_when_no_datetime
Fix rotation condition when SPDLOG_NO_DATETIME is defined.
2019-07-01 12:21:33 +03:00
Shintaro Seki
7ffa0766b4 Fix rotation condition when SPDLOG_NO_DATETIME is defined.
When SPDLOG_NO_DATETIME is defined, the rotation was never worked
because `msg.time` is always zero.
2019-07-01 16:22:56 +09:00
Gabi Melman
d8e17111b9 Merge pull request #1127 from TranslucentTB/v1.x
Fix deprecation warnings in filename_to_str and improve performance of wbuf_to_utf8buf
2019-07-01 05:34:16 +03:00
Charles Milette
9e602a491b Silence narrowing warning 2019-06-30 21:43:28 -04:00
Charles Milette
f529afa625 Use stack allocated space when possible 2019-06-30 21:34:19 -04:00
Gabi Melman
5a4deb6e88 Update README.md 2019-07-01 03:14:08 +03:00
Charles Milette
3bcd3cef2f Fix deprecation warnings in filename_to_str 2019-06-30 19:12:16 -04:00
gabime
fbe6f945f3 Updated travis and appveyor to new cmake options 2019-07-01 02:08:48 +03:00
gabime
bb0f3839c1 Updated CMake options and defaults 2019-07-01 02:06:09 +03:00
Daniel Mensinger
af4026104c Extract version from header file 2019-06-30 16:48:20 +02:00
Daniel Mensinger
822aee2b4f Added meson build support 2019-06-30 16:27:28 +02:00
gabime
f09334dc6f Updated pattern_foramtter tests 2019-06-28 17:31:55 +03:00
gabime
d1d2609f49 Updated syslog_sink 2019-06-28 17:31:28 +03:00
gabime
9aa6cdc494 Updated systemd sink and tests 2019-06-28 17:29:52 +03:00
Gabi Melman
8b403081c1 Merge pull request #1122 from jbelloncastro/v1.x
Provide source location support for systemd_sink.h
2019-06-28 08:07:38 +03:00
Gabi Melman
dc054c3f8a Merge branch 'v1.x' into v1.x 2019-06-28 08:07:15 +03:00
gabime
94c2810b0a Reduced max padding 128=>64 2019-06-28 01:41:11 +03:00
gabime
6e83abdbf2 Removed stdout_sinks from spdlog.cpp for faster library compile time 2019-06-28 01:01:22 +03:00
gabime
f03eaaaf33 Fixed dup_filter test 2019-06-28 00:48:30 +03:00
gabime
71162ebdbb Fixed dup_filter test 2019-06-28 00:47:10 +03:00
gabime
c75549f6db Removed un needed #include 2019-06-28 00:14:16 +03:00
gabime
2ebc96d8eb Fixed windows build 2019-06-28 00:05:06 +03:00
gabime
29f2eeea31 Removed formatter_ member from the sink interface 2019-06-27 23:56:37 +03:00
Jorge Bellon-Castro
a13981ffe4 Provide source location support for systemd_sink.h 2019-06-27 18:18:48 +01:00
gabime
cf152e6030 Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x 2019-06-27 17:41:17 +03:00
gabime
b279196af2 Added tests for dup_filter sink 2019-06-27 17:41:04 +03:00
gabime
98e151fda7 Added tests for dup_filter sink 2019-06-27 17:40:40 +03:00
gabime
7f3b5fb84d Fix dup filter 2019-06-27 17:17:25 +03:00
Gabi Melman
3d069f7b46 Update dist_sink.h 2019-06-26 01:25:06 +03:00
Gabi Melman
65c4f955a6 Update systemd_sink.h 2019-06-26 01:22:24 +03:00
Gabi Melman
246b4b01c5 Update syslog_sink.h 2019-06-26 01:21:40 +03:00
Gabi Melman
a680b71dc7 Update null_sink.h 2019-06-26 01:18:06 +03:00
Gabi Melman
d0b5b09318 Merge pull request #1120 from casperevan/patch-1
Fix missing include for null_mutex in rotating_file_sink.h
2019-06-26 00:10:47 +03:00
casperevan
67f3a83c31 Fix missing include for null_mutex in rotating_file_sink.h 2019-06-25 13:09:16 -07:00
gabime
5dd260c336 Added missing include to dist_sink 2019-06-25 17:56:25 +03:00
gabime
ee6f165a1f New duplicate filter sink 2019-06-25 17:55:20 +03:00
Gabi Melman
0cc2ff83ed Merge pull request #1119 from MarkKoester/patch-1
Fix warning: redundant move in return statement
2019-06-21 22:33:05 +03:00
Mark Koester
a9e92d6c5c Fix warning: redundant move in return statement 2019-06-21 15:24:52 -04:00
Gabi Melman
ea5f07110b Merge pull request #1118 from DanielChabrowski/stdout-incomplete
Fix use of incomplete type in stdout sinks
2019-06-21 07:54:02 +03:00
DanielChabrowski
59746c2e36 Fix use of incomplete type in stdout sinks 2019-06-21 01:21:30 +02:00
gabime
6399e05209 clang-format 2019-06-20 01:05:57 +03:00
gabime
08de642536 Added stdout tests 2019-06-20 01:02:54 +03:00
gabime
ab9e1b3aa7 Removed unneeded includes 2019-06-20 01:02:25 +03:00
gabime
af6744b112 Fixed color 2019-06-20 01:00:50 +03:00
gabime
1d86803e38 Fix #1116 2019-06-20 00:29:23 +03:00
gabime
b12c19162b Added thread callback option to thread_pool 2019-06-19 18:38:35 +03:00
gabime
220608e52a clang-format 2019-06-19 18:31:21 +03:00
gabime
06fb5c7c69 Close issue #1113 2019-06-19 18:30:50 +03:00
gabime
8970fd5d2f CMake cosmetic 2019-06-19 18:01:34 +03:00
gabime
67d5f65507 CMake support for building shared lib (not for win32) 2019-06-19 17:52:50 +03:00
gabime
7d678be07a CMake - turn off examples by default 2019-06-19 17:31:25 +03:00
gabime
74e2aa9c66 Micoro optimize macros 2019-06-19 17:13:48 +03:00
Gabi Melman
b9cc158e52 Fix #1115 2019-06-19 01:24:06 +03:00
gabime
e68cf1c9ed Add formatting option to syslog in ctor. Fix issue #729 #1107 2019-06-19 00:52:38 +03:00
gabime
f0fcc73f92 Minor improvments to ansicolor sink 2019-06-18 23:45:18 +03:00
gabime
a340b3812c Add missing template instantiation 2019-06-18 23:42:36 +03:00
gabime
78c833a09f clang-format 2019-06-18 17:05:27 +03:00
gabime
38888ba5b3 Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x 2019-06-18 16:56:17 +03:00
gabime
99e519cf0f Simplify color sinks 2019-06-18 12:32:51 +03:00
gabime
09cb45001b Added copy ctor and assignment to logger 2019-06-15 19:46:41 +03:00
gabime
9d3aa5a253 Revert last commit 2019-06-14 20:44:46 +03:00
gabime
314308f975 Removed unused template from spdlog.cpp 2019-06-14 19:01:28 +03:00
gabime
b658ff2124 Fix unittests 2019-06-14 18:45:16 +03:00
Gabi Melman
c844ea4423 Update test_pattern_formatter.cpp 2019-06-14 01:30:43 +03:00
gabime
db5af8ead1 clang-format 2019-06-14 00:23:51 +03:00
gabime
c09dee7717 Moved source filename shortening to pattern formatter instead of macro 2019-06-14 00:23:25 +03:00
Gabi Melman
352281313f Update README.md 2019-06-11 23:17:08 +03:00
gabime
8afe18f148 Minor improvement CMakeLists to use generators 2019-06-10 20:10:28 +03:00
gabime
90f348d26a Version 2019-06-10 19:55:26 +03:00
gabime
8d3d06b7a0 Fixed version extraction in CMake 2019-06-10 19:53:39 +03:00
Gabi Melman
c56ee8ec03 Update version.h 2019-06-10 19:19:29 +03:00
Gabi Melman
76f6c10434 Update README.md 2019-06-10 19:18:47 +03:00
gabime
cf64f2baca Fixed CMake address sanitizer 2019-06-10 18:32:10 +03:00
gabime
68a0193d95 CMake refactoring to functions 2019-06-10 18:09:36 +03:00
Gabi Melman
80740f0e46 Merge pull request #1105 from jktjkt/do-not-impose-extra-warnings
Do not impose -Wextra -Wconversion etc on library users
2019-06-10 12:35:42 +03:00
Jan Kundrát
c60f790793 Do not impose -Wextra -Wconversion etc on library users
I had to nuke the flags targetting spdlog_header_only because in CMake,
an interface target apparently really only supports the INTERFACE
option.

As I am only targeting Linux, the MSVC changes rely on spdlog's CI and
manual code review. That said, it makes sense to also stop forcing these
options on third party code, assuming that the CMake installations work
the same on Windows.

Fixes #1104
2019-06-10 10:54:49 +02:00
gabime
e0b4ec54bd Fix warning in bench 2019-06-07 16:39:32 +03:00
gabime
d1bed6bf45 Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x 2019-06-06 19:26:17 +03:00
Gabi Melman
b82966e775 Update README.md 2019-06-06 19:25:07 +03:00
Gabi Melman
19a9d87486 Update README.md 2019-06-06 19:23:55 +03:00
gabime
3448e5867e Added oberrun policy bench to async-bench and removed async from bench 2019-06-06 19:23:15 +03:00
Gabi Melman
e013d6b98c Update README.md 2019-06-06 18:50:03 +03:00
gabime
d392739049 Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x 2019-06-06 18:31:21 +03:00
gabime
12266ad004 Fix async bench under msvc 2019-06-06 18:31:12 +03:00
gabime
e03c160e27 Optmize set_formatter to avoid redundant clone 2019-06-06 18:19:36 +03:00
gabime
03f0e2196e Fix async bench under msvc 2019-06-06 18:13:30 +03:00
Gabi Melman
34ea38c12e Update README.md 2019-06-04 23:42:13 +03:00
gabime
a33de607df Fix issue #1099 2019-06-04 16:41:24 +03:00
gabime
e39959a132 Updated tests to catch v2.8.0 2019-06-04 16:35:34 +03:00
gabime
33a42202c7 Replace string pointer with string_view in log_msg 2019-06-04 16:10:49 +03:00
gabime
efc358da9f Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x 2019-06-04 15:39:02 +03:00
gabime
c1b39eb2ce Fix circular include 2019-06-04 15:38:26 +03:00
Gabi Melman
12e30f0eb4 Update format.sh 2019-06-04 12:26:49 +03:00
Gabi Melman
94bf971f72 Update clang_tidy.sh 2019-06-04 12:26:00 +03:00
gabime
bcfa9241b8 Updated copyright headers 2019-06-04 00:09:16 +03:00
gabime
eea9d6136f Moved default sync factory to seperate file to avoid cyclic includes 2019-06-03 23:56:18 +03:00
gabime
c35f33e61a Fixed clang warning about size_t indexing 2019-06-03 23:24:57 +03:00
gabime
78eeba940a Fix issue #114 2019-06-03 23:20:53 +03:00
gabime
b3ed5f77f2 Updated tweakme 2019-06-03 23:10:01 +03:00
gabime
38f6b5ea71 Keep clang-tidy happy 2019-06-03 22:49:21 +03:00
gabime
c000a6164c Removed unused member from log_msg 2019-06-03 22:20:46 +03:00
Gabi Melman
cb6208a6fa Update .clang-tidy 2019-06-03 12:53:36 +03:00
Gabi Melman
b540558db6 Update INSTALL 2019-06-03 12:51:42 +03:00
Gabi Melman
e70b2dfbb2 Update INSTALL 2019-06-03 12:51:20 +03:00
Gabi Melman
f64cad89c4 Update INSTALL 2019-06-03 12:50:52 +03:00
Gabi Melman
935b3de2ad Update INSTALL 2019-06-03 12:50:27 +03:00
Gabi Melman
abc0359522 Update INSTALL 2019-06-03 12:49:35 +03:00
Gabi Melman
fcd48d9b2d Update INSTALL 2019-06-03 12:48:43 +03:00
Gabi Melman
97a79a4511 Update README.md 2019-06-03 12:23:33 +03:00
Gabi Melman
31172b0ecc Update README.md 2019-06-03 12:21:17 +03:00
Gabi Melman
74bd1613bd Update README.md 2019-06-03 12:19:57 +03:00
Gabi Melman
1fb3f95fdb Update README.md 2019-06-03 12:19:34 +03:00
gabime
ca571e7a7a Updated bench of empty logger 2019-06-01 15:00:14 +03:00
gabime
52b6be0dfe Added logger ctor that accepts only name(empty logger) 2019-06-01 14:57:57 +03:00
gabime
abd6a6784e Set default queue size in async bench to 8192 2019-06-01 13:44:21 +03:00
gabime
978df46611 Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x 2019-06-01 13:41:57 +03:00
gabime
31c428cece Report memory consumption in async bench 2019-06-01 13:41:39 +03:00
Gabi Melman
67c892991a Update README.md 2019-05-30 10:20:29 +03:00
gabime
5743adc467 CMake use extract version from version.h 2019-05-29 15:15:35 +03:00
gabime
76fc166e11 CMakeLists.txt minor improvments 2019-05-29 01:41:48 +03:00
gabime
459cd21070 Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x 2019-05-29 01:33:44 +03:00
gabime
fc53e3339f CMakeLists.txt minor improvments 2019-05-29 01:33:20 +03:00
Gabi Melman
9b788a882d Update README.md 2019-05-29 01:07:42 +03:00
Gabi Melman
5a3e0d5e85 Update README.md 2019-05-29 01:06:31 +03:00
Gabi Melman
ce4da69cc0 Update README.md 2019-05-29 01:04:54 +03:00
Gabi Melman
1a779077db Update README.md 2019-05-29 01:04:33 +03:00
Gabi Melman
e79531b292 Update README.md 2019-05-29 01:03:34 +03:00
Gabi Melman
7fea60183f Update README.md 2019-05-29 01:02:19 +03:00
Gabi Melman
41df6c4df2 Update README.md 2019-05-29 01:01:44 +03:00
Gabi Melman
b6a28b497b Update README.md 2019-05-29 01:00:29 +03:00
Gabi Melman
c75fbabc0f Update README.md 2019-05-29 00:59:36 +03:00
Gabi Melman
4cc0876efa Update README.md 2019-05-29 00:57:56 +03:00
Gabi Melman
abe1e37253 Update README.md 2019-05-29 00:57:29 +03:00
Gabi Melman
4dec965569 Update README.md 2019-05-29 00:57:00 +03:00
Gabi Melman
f478eaa98e Update README.md 2019-05-29 00:56:22 +03:00
Gabi Melman
1e105f88ca Update README.md 2019-05-29 00:53:50 +03:00
Gabi Melman
6586f3ed29 Update README.md 2019-05-29 00:52:59 +03:00
Gabi Melman
ba7019de8a Update README.md 2019-05-29 00:52:18 +03:00
Gabi Melman
9562ce3b87 Update README.md 2019-05-29 00:51:30 +03:00
Gabi Melman
a48fe674ee Update README.md 2019-05-29 00:51:04 +03:00
gabime
d439f75491 Minor CMake cosmetic fix 2019-05-29 00:17:38 +03:00
gabime
c559067f77 CMake refactoring 2019-05-29 00:13:02 +03:00
gabime
30bd80bd85 CMake improvements 2019-05-29 00:05:24 +03:00
Gabi Melman
5709cb10d1 Merge pull request #1089 from gabime/static-lib
Static lib support using -DSPDLOG_COMPILED_LIB
2019-05-25 23:14:32 +03:00
gabime
9329f8d3cd Merge v1.x 2019-05-24 12:46:20 +03:00
gabime
884c23a9c9 Merge v1.x 2019-05-24 12:44:51 +03:00
gabime
7a3a560c44 Merge v1.x 2019-05-24 12:33:14 +03:00
gabime
2963da1392 Updated travis 2019-05-24 08:47:29 +03:00
gabime
54f1941691 Fixed target_compile_options in cmake 2019-05-24 01:39:02 +03:00
gabime
ca14ae19db Turn off tsan in travis - gives false positives 2019-05-24 01:38:26 +03:00
gabime
6636ae6e63 CmakeLists.txt compiler warnings 2019-05-23 23:35:30 +03:00
gabime
2e75f42c69 Install using GNUInstallDirs in cmake 2019-05-23 19:17:52 +03:00
gabime
c9547f383a Fixed appveyor cmake 2019-05-23 18:33:02 +03:00
gabime
65576707bf Removed shared_lib option (not supported by windwos) and remove example and test from default build 2019-05-23 18:26:47 +03:00
gabime
6ec8a06a09 Fixed Cmake under windows and disable bench build from default config 2019-05-22 12:32:59 +03:00
gabime
9205c9d031 Merge branch 'static-lib' of https://github.com/gabime/spdlog into static-lib 2019-05-22 12:19:55 +03:00
gabime
1ef80d6330 Updated CMakeLists.txt 2019-05-19 19:39:38 +03:00
Gabi Melman
322665a22f Delete example.cpp 2019-05-19 17:59:00 +03:00
Gabi Melman
cfa6d12691 Delete Application.mk 2019-05-19 17:58:52 +03:00
Gabi Melman
c264c3e2dd Delete Android.mk 2019-05-19 17:58:44 +03:00
Gabi Melman
d21bcd2f87 Delete utils.h 2019-05-19 17:57:18 +03:00
Gabi Melman
84f25b9f18 Update CMakeLists.txt 2019-05-19 17:19:35 +03:00
Gabi Melman
576fec4c36 Update CMakeLists.txt 2019-05-19 17:17:58 +03:00
Gabi Melman
48acafd10d Update CMakeLists.txt 2019-05-19 17:16:22 +03:00
Gabi Melman
a532a072ce Update CMakeLists.txt 2019-05-19 17:06:22 +03:00
gabime
2cd53c6ff1 Updated cmake example 2019-05-19 16:34:38 +03:00
gabime
18ccd55725 Removed multisink and test in example 2019-05-19 15:57:22 +03:00
gabime
87eb569929 More updates to CMake (version support , cmake.in) 2019-05-19 15:47:49 +03:00
gabime
92387b1527 Merge branch 'static-lib' of https://github.com/gabime/spdlog into static-lib 2019-05-19 12:27:11 +03:00
David Zemon
dd2f293f33 Clean up CMake a bit more 2019-05-17 23:33:44 -05:00
David Zemon
24e4f0aa87 Allowed overriding of SPDLOG_MASTER_PROJECT to better support Conan 2019-05-17 23:31:30 -05:00
David Zemon
6fe899af10 Set Threads::Threads dependency on spdlog libs - don't make user do it 2019-05-17 23:28:53 -05:00
David Zemon
107fe0a142 Ensure header_only library works by adding another example exe 2019-05-17 23:27:44 -05:00
David Zemon
b021be29e5 Add support for .tar.gz and .zip packages via CPack 2019-05-17 23:27:44 -05:00
David Zemon
55e7844ca0 Remove the namespaced
Namespaces are good for avoiding collisions, but since the
non-namespaced targets still exist, it does no good to add the
namespaced targets on top.
2019-05-17 23:27:44 -05:00
David Zemon
8dd85285e7 Allow user to choose between static or shared library 2019-05-17 23:26:06 -05:00
David Zemon
dbcbeb7a57 Ignore CLion's default build directories 2019-05-17 23:05:48 -05:00
David Zemon
a9aee1c5b3 Disable automatic handling of line endings 2019-05-17 23:02:39 -05:00
gabime
b3fe4b54c8 Fixed CMakeLists.txt 2019-05-13 01:28:06 +03:00
gabime
872ea6bf09 Deleted redundant Make files and solutions 2019-05-13 01:13:58 +03:00
gabime
32fb9d51b9 Cmake update to support both header-only and static 2019-05-13 01:06:25 +03:00
gabime
ce637440bb wip static-lib 2019-05-13 00:09:00 +03:00
gabime
61e4597488 Removed include of fmt_helper from thrad_pool.h 2019-05-13 00:02:55 +03:00
gabime
26a064ed2d wip static-lib 2019-05-12 23:36:48 +03:00
gabime
d5c9bac3c7 wip static-lib 2019-05-12 23:08:14 +03:00
gabime
1665006401 Minor fix in example 2019-05-12 17:12:08 +03:00
gabime
5220ac4a9e Added missing header 2019-05-12 17:05:14 +03:00
gabime
ee0fdf016a Minore cmake fix 2019-05-12 16:13:13 +03:00
gabime
8b4eedb594 More template instantiations for static lib 2019-05-12 16:11:35 +03:00
gabime
01f5efa1d9 Added wincolor sink to static build 2019-05-12 15:32:54 +03:00
gabime
130bc26b9a wip static-lib 2019-05-12 02:16:31 +03:00
gabime
09e83937de wip static-lib 2019-05-12 02:10:39 +03:00
gabime
42e30468a9 added rotating_file_sink to static build 2019-05-12 01:43:30 +03:00
gabime
3834acad5b #error if compiling spdlog.cpp under header only configuration 2019-05-12 01:12:46 +03:00
gabime
654f7eceee #error if compiling spdlog.cpp under header only configuration 2019-05-12 01:04:48 +03:00
gabime
ca9c8ae5fb Warn if compiling spdlog.cpp under header only configuration 2019-05-12 01:01:37 +03:00
gabime
1752086cfd Don't include fmt format.cc source if using external fmt 2019-05-12 00:50:43 +03:00
gabime
369b2f7cd2 Moved format.cpp into spdlog.cpp - this way only one src file is needed 2019-05-12 00:44:26 +03:00
gabime
8b244ca988 Moved format.cpp into spdlog.cpp - this way only one src file is needed 2019-05-12 00:43:58 +03:00
gabime
fb9e51d943 Fixed include order and example 2019-05-12 00:34:55 +03:00
gabime
bb3dc87953 Fixed include order and example 2019-05-12 00:32:57 +03:00
gabime
6bcb422c80 clang format and SPLDOG_HEADER_ONLY macro 2019-05-12 00:22:39 +03:00
gabime
540f865355 Normalized copyright message 2019-05-11 20:15:03 +03:00
gabime
46ef71e3ec Normalized copyright message 2019-05-11 20:06:17 +03:00
gabime
005450ff13 wip 2019-05-11 13:52:46 +03:00
gabime
f809427575 Moved cpp files to inl.h 2019-05-11 13:20:11 +03:00
gabime
9564eb2edb Moved cpp files to inl.h 2019-05-11 13:19:53 +03:00
gabime
49708f209b fix inclusion of fmt 2019-05-11 12:28:36 +03:00
Gabi Melman
14381fe8d0 Update os.h 2019-05-11 03:05:22 +03:00
gabime
17bec5c3ce Use fmt src file instead of inline in static lib build 2019-05-11 01:33:48 +03:00
gabime
2b90ab496a ansicolor_sink.cpp 2019-05-10 18:48:03 +03:00
gabime
74dbf4cf70 mutex protect should_color() 2019-05-10 18:46:13 +03:00
Gabi Melman
e504aceeb5 Update wincolor_sink.h 2019-05-10 17:59:48 +03:00
gabime
3ce9ac74a6 Mutex protect set_color_mode() 2019-05-10 17:41:21 +03:00
Gabi Melman
3b0e7b4d0d Merge pull request #1075 from psalz/add-force-color-output-option
Add option to force color output without TTY
2019-05-10 17:20:12 +03:00
Philip Salzmann
5e856c6b4d Add mode enum to control output of color sinks
This adds a new "color_mode" enum that can be used to control the color
code output behavior of sinks with color support. It can be one of three
values: always, automatic and never.
2019-05-10 09:47:16 +02:00
gabime
6651a48c4d wip 2019-05-08 17:50:23 +03:00
gabime
c031ae2aab Cmake message 2019-05-08 17:37:25 +03:00
gabime
1ac6c9f9c2 clang-format static-lib 2019-05-08 17:17:11 +03:00
gabime
5d0eb6dda5 wip static-lib 2019-05-08 17:16:56 +03:00
gabime
29c949ab03 static lib by default 2019-05-08 16:36:14 +03:00
gabime
576e389788 static lib by default and tests 2019-05-08 16:34:20 +03:00
gabime
7b15a3d345 wip cmake 2019-04-27 19:42:19 +03:00
gabime
eedb43d756 wip cmake 2019-04-27 19:41:25 +03:00
gabime
338125b93a wip cmake 2019-04-27 19:40:24 +03:00
gabime
3ecc3ab798 wip cmake 2019-04-27 19:38:39 +03:00
gabime
de1cdb2dbe wip cmake 2019-04-27 19:38:26 +03:00
gabime
c9887874bc wip cmake 2019-04-27 19:37:59 +03:00
gabime
69fcaf14e5 wip static-lib 2019-04-27 18:44:48 +03:00
gabime
f414198fee Cmake fix 2019-04-27 02:42:33 +03:00
gabime
2de924a187 clang-format 2019-04-27 02:34:50 +03:00
gabime
c1c2ff2d07 wip 2019-04-27 02:33:33 +03:00
gabime
ff89f1476d Restored error_handler as std::function 2019-04-26 18:14:59 +03:00
gabime
e8d99cee70 fix formatter bench 2019-04-26 17:52:47 +03:00
gabime
ccfa3f03b0 Fixed clang tidy 2019-04-26 17:39:58 +03:00
gabime
baefe0b3f6 wip 2019-04-26 15:11:01 +03:00
Gabi Melman
3669351427 Merge pull request #1064 from jhasse/extra-semi
Remove unnecessary semicolons (-Wextra-semi)
2019-04-17 20:57:59 +02:00
Jan Niklas Hasse
79938b98da Remove unnecessary semicolons (-Wextra-semi) 2019-04-17 15:24:25 +02:00
Gabi Melman
411d588fea Merge pull request #1058 from mnemotic/cmake-fmt-header-only
Add a CMake option to use a header-only external fmt
2019-04-10 10:24:53 +03:00
Martin Green
7e63d773ef Make header-only external fmt the default 2019-04-10 06:49:57 +03:00
gabime
3e378f009d Fixed build 2019-04-09 16:49:19 +03:00
gabime
13db9d9452 Fix build 2019-04-09 16:46:17 +03:00
gabime
c1c6e6265c Fixed header only build 2019-04-09 16:42:44 +03:00
Martin Green
a984b1b073 Add a CMake option to use a header-only external fmt 2019-04-07 17:29:27 +03:00
gabime
215b6aea95 file_helper.cpp and filename_t fix 2019-04-06 13:45:33 +03:00
gabime
96b7214ae2 fix common.h 2019-04-06 13:13:47 +03:00
gabime
1b0752b0a9 Merge branch 'static-lib' of https://github.com/gabime/spdlog into static-lib 2019-04-06 13:08:30 +03:00
Gabi Melman
02329f61e3 Merge pull request #1057 from martinkrammer/patch-1
Update README.md
2019-04-06 12:58:05 +03:00
gabime
7e29c48379 removed spdlite 2019-04-06 12:57:09 +03:00
Martin Krammer
ad63efdaf7 Update README.md
In order to use basic_logger_mt an additional include is required.
2019-04-06 11:17:11 +02:00
Gabi Melman
6bec53dcd2 Update logger.h 2019-04-06 02:14:08 +03:00
gabime
fef405ac98 Merge branch 'static-lib' of https://github.com/gabime/spdlog into static-lib 2019-04-06 01:44:18 +03:00
gabime
97f9cc4bc0 some cleanup 2019-04-06 01:44:03 +03:00
gabime
7ab6fd9db6 source_loc change line to int 2019-04-06 01:40:53 +03:00
gabime
b7ecec0c23 some cleanup 2019-04-06 01:37:51 +03:00
gabime
d12a858897 some cleanup 2019-04-06 01:37:27 +03:00
gabime
9716ff69c4 added inline statemetns 2019-04-06 01:32:15 +03:00
gabime
4dd1a24d0b wip static lib 2019-04-06 01:25:33 +03:00
gabime
c69c49047b wip static lib 2019-04-06 00:15:14 +03:00
gabime
bfbb4e4050 some err handler cleanup 2019-04-05 23:40:27 +03:00
gabime
2aceb13f3e fix support for utf8 logging under win32 2019-04-05 23:34:55 +03:00
gabime
e9f34fbd26 wip 2019-04-05 23:10:12 +03:00
gabime
17f9cdd401 static lib wip 2019-04-05 23:05:46 +03:00
gabime
156b856a80 static lib wip 2019-04-05 16:57:49 +03:00
gabime
e2e3df9013 static lib wip 2019-04-05 16:44:17 +03:00
gabime
ef8773a89b Moved logger_impl back into logger.h 2019-04-05 13:26:33 +03:00
Gabi Melman
536f5d8203 Merge pull request #1055 from db-panda/v1.x
Fix unexpected log macro expansion.
2019-04-04 17:44:43 +03:00
Daniel Binsmaier
631416d54a Fix missing ';' in log macros 2019-04-04 12:04:53 +02:00
Daniel Binsmaier
d366a06461 Fix unexpected log macro expansion 2019-04-04 09:25:21 +02:00
Gabi Melman
7bf8f14879 Merge pull request #1045 from p-po/v1.x
Namespace qualify stat functions
2019-04-01 02:00:48 +03:00
Ponnuvel Palaniyappan
cd65d6de69 namespace qualify stat functions 2019-03-31 22:05:37 +01:00
gabime
b57d514b1e added missing files 2019-03-30 16:56:37 +03:00
gabime
f36be4d5e4 Moved lite source to folders| 2019-03-30 16:49:02 +03:00
gabime
c2b0e223fa wip lite 2019-03-30 14:53:02 +03:00
gabime
e32c856a04 wip lite 2019-03-30 13:49:54 +03:00
gabime
bc7cd2ccc2 move lite namespace to topelevel spdlite 2019-03-30 10:58:56 +03:00
gabime
1842669104 Merge branch 'lite' of https://github.com/gabime/spdlog into lite 2019-03-29 14:46:54 +03:00
gabime
c7535a91a6 wip lite 2019-03-29 14:46:32 +03:00
gabime
99a5484dfb added header to cmake 2019-03-29 14:46:32 +03:00
gabime
b78ae5ab10 comment 2019-03-29 14:46:32 +03:00
gabime
f74d3e7e94 comment 2019-03-29 14:46:32 +03:00
gabime
eba37e8fbe clone support in lite logger 2019-03-29 14:46:32 +03:00
gabime
84fb11599e Removed default ctor from lite logger 2019-03-29 14:46:32 +03:00
gabime
099812d219 Renamed source file 2019-03-29 14:46:32 +03:00
gabime
c4291510e8 renamed printf 2019-03-29 14:46:32 +03:00
gabime
775a411215 renamed printf 2019-03-29 14:46:32 +03:00
gabime
59b4dd4c46 update example 2019-03-29 14:46:32 +03:00
gabime
2f907e3a92 clang-format 2019-03-29 14:46:32 +03:00
gabime
9971fd2864 Fixed examples 2019-03-29 14:46:32 +03:00
gabime
23a394d1fc moved macros to seprate headers 2019-03-29 14:46:32 +03:00
gabime
91d450df4e Removed source logging 2019-03-29 14:46:32 +03:00
gabime
ea3943a87a added printf syntax support for even faster compilation! 2019-03-29 14:46:32 +03:00
gabime
019eda5b0c wip lite 2019-03-29 14:46:32 +03:00
gabime
5056437ca1 support for const char* messages 2019-03-29 14:46:32 +03:00
gabime
90c912a5e2 wip lite 2019-03-29 14:46:32 +03:00
gabime
9219613957 Dont check level in macros (redundant) 2019-03-29 14:46:32 +03:00
gabime
9858f2e499 renamed 2019-03-29 14:46:31 +03:00
gabime
6b0bf33f8e clang-format 2019-03-29 14:46:31 +03:00
gabime
9ea6079072 wip lite 2019-03-29 14:46:31 +03:00
gabime
478f16234d wip lite 2019-03-29 14:46:31 +03:00
gabime
57a312cb1a lite wip 2019-03-29 14:46:31 +03:00
gabime
bb88a74f92 wip lite 2019-03-29 14:38:40 +03:00
gabime
4a07ce5fae added header to cmake 2019-03-29 13:56:44 +03:00
Gabi Melman
043c4acc7e Merge pull request #1035 from tt4g/add-public-api-initialize-logger
Add spdlog::initialize_logger
2019-03-25 12:02:31 +02:00
tt4g
eb478e38b2 Add spdlog::initialize_logger 2019-03-25 12:58:55 +09:00
gabime
bf307e24c5 comment 2019-03-24 01:50:56 +02:00
gabime
4a00590a1b comment 2019-03-24 01:44:40 +02:00
gabime
4ccca079a5 clone support in lite logger 2019-03-24 01:40:20 +02:00
gabime
9e5d1b3ba5 Removed default ctor from lite logger 2019-03-24 01:34:21 +02:00
gabime
240f13a0a6 Renamed source file 2019-03-24 01:27:05 +02:00
gabime
221ce33eb5 renamed printf 2019-03-24 01:23:14 +02:00
gabime
722943000e renamed printf 2019-03-24 01:21:07 +02:00
gabime
509a503761 update example 2019-03-24 01:18:05 +02:00
gabime
bac1e4a850 clang-format 2019-03-24 00:41:22 +02:00
gabime
934cc892eb Fixed examples 2019-03-24 00:40:27 +02:00
gabime
b1c90f08cc moved macros to seprate headers 2019-03-24 00:38:00 +02:00
gabime
680f19a424 Removed source logging 2019-03-24 00:31:55 +02:00
gabime
621e0a8330 added printf syntax support for even faster compilation! 2019-03-24 00:30:08 +02:00
gabime
4449bf6f83 wip lite 2019-03-23 23:13:38 +02:00
gabime
569c62e528 support for const char* messages 2019-03-23 20:06:49 +02:00
gabime
4c240edf94 wip lite 2019-03-23 19:34:50 +02:00
gabime
0e977d66c1 Dont check level in macros (redundant) 2019-03-23 19:23:37 +02:00
gabime
3dee10772d renamed 2019-03-23 17:25:50 +02:00
gabime
1d72edcc4f clang-format 2019-03-23 16:39:32 +02:00
gabime
c29b7d22d9 wip lite 2019-03-23 16:39:05 +02:00
gabime
ee502aed49 wip lite 2019-03-23 16:15:58 +02:00
gabime
414ff25564 lite wip 2019-03-23 13:31:57 +02:00
gabime
b084b8b1d8 Cleaned systemd test 2019-03-22 14:16:16 +02:00
gabime
3ca19a8580 fix link to systemd in tests 2019-03-22 14:01:34 +02:00
Gabi Melman
9c12a44d6e Merge pull request #1027 from WarShoe/v1.x
Add systemd sink.
2019-03-20 17:22:52 +02:00
Alexander Zvyagin
4706b0ada4 Add signature. 2019-03-20 15:32:47 +01:00
Alexander Zvyagin
cc98e9850d Avoid unnecessary conversion of log_msg::payload to std::string. 2019-03-20 15:29:38 +01:00
Alexander Zvyagin
af80db8c22 Add systemd sink. 2019-03-14 16:20:58 +01:00
Gabi Melman
053d5ad24d Update README.md 2019-03-11 19:19:36 +02:00
Gabi Melman
e2805ac68a Merge pull request #1022 from floouuu/v1.x
Expose should_do_colors_ in ansicolor_sink.h
2019-03-11 19:12:03 +02:00
Florian Wörter
1caf05cc52 Renamed exposed method. [#1004] 2019-03-11 14:15:58 +01:00
Florian Wörter
63cfb7db25 Exposed should_do_colors_ in ansicolor_sink.h. [#1004] 2019-03-11 14:12:26 +01:00
Gabi Melman
bdfc7d2a5a Merge pull request #996 from MFornander/v1.x
Add tweak support for user short level names
2019-02-18 23:59:15 +02:00
Mattias Fornander
0ccbdcdd1f Add tweak support for user short level names 2019-02-18 14:33:41 -07:00
Gabi Melman
c598b2fa2d Merge pull request #994 from romainthomas/fix/README
Fix typo in Android logger
2019-02-13 11:51:28 +02:00
Romain Thomas
4f86448bd4 Fix typo in Android logger 2019-02-13 09:19:29 +01:00
Gabi Melman
d235e7d46f Fix #992 2019-02-08 12:14:17 +02:00
Gabi Melman
e25b323d1b Merge pull request #990 from mnemotic/cmake-conditional-install
Add CMake option for conditional installation
2019-02-07 21:20:44 +02:00
Gabi Melman
42093c48b2 Merge pull request #988 from DanielChabrowski/remove-log-func
Remove unnecessary log function
2019-02-07 21:15:02 +02:00
Martin Green
9fca0b20f0 Add CMake option for conditional installation 2019-02-06 07:38:26 +02:00
DanielChabrowski
a6229d9e87 Remove pointless log with enable_if 2019-02-06 05:24:25 +01:00
Gabi Melman
c443896644 Merge pull request #986 from DanielChabrowski/sink-allow-custom-formatter
Allow custom formatter in sink's ctor
2019-02-03 19:50:22 +02:00
DanielChabrowski
79f11bd655 Allow custom formatter in sink ctor 2019-02-03 16:49:29 +01:00
Gabi Melman
c5552dac1f Merge pull request #985 from FrancoisChabot/v1.x
Allow the inclusion of an external fmtlib as as sub_directory
2019-02-01 22:33:05 +02:00
Francois Chabot
734af31c13 Allow the inclusion of an external fmtlib as as sub_directory 2019-02-01 12:12:58 -05:00
Gabi Melman
2d96896fae Merge pull request #984 from ZGCDDoo/shadowed_parameter
Shadowed parameter
2019-02-01 17:34:08 +02:00
charles-david
20a0f82701 Renamed input parameters to "params_in". 2019-02-01 07:59:50 -05:00
charles-david
e4b7dbce7f CMakeLists.txt same as v1.x branch. 2019-01-31 23:05:38 -05:00
charles-david
0f128fd561 Warning for shadowed parameter corrected in common.h
However, not in bundled fmt. Corrects compiling with basic logger with header only and -Werror.
2019-01-31 22:47:02 -05:00
Gabi Melman
ac8a7bc12d Merge pull request #981 from ksergey/cmake-fix
CMAKE_BINARY_DIR -> CMAKE_CURRENT_BINARY_DIR
2019-01-28 12:10:49 +02:00
Sergey Kovalevich
90a299f424 CMAKE_BINARY_DIR -> CMAKE_CURRENT_BINARY_DIR 2019-01-28 11:48:45 +03:00
Gabi Melman
00a7f5d75d Update README.md 2019-01-27 19:10:34 +02:00
Gabi Melman
2463fe92bd Merge pull request #958 from pwm1234/pwm1234/rotate_on_open
Pwm1234/rotate on open
2019-01-24 18:23:48 +02:00
Philip Miller
4f65fcd7b1 remove minor optimization for the sake of simplicity 2019-01-24 09:19:52 -05:00
Philip Miller
e41b92c55a fix inadvertent rename to original test function 2019-01-24 00:13:14 -05:00
Philip Miller
3925f8fa16 streamline constructor logic
and improve test for rotate_on_open=true
2019-01-24 00:06:15 -05:00
Philip Miller
cce1e36e26 Merge remote-tracking branch 'origin/v1.x' into pwm1234/rotate_on_open 2019-01-23 21:44:27 -05:00
Gabi Melman
3466c9c8cb Merge pull request #978 from markniebur/file-sink-filename-method
Add method to filesinks to return filename
2019-01-23 23:07:57 +02:00
Mark Niebur
6e2dadc63a Add method to filesinks to return filename 2019-01-23 11:35:55 -07:00
Gabi Melman
00e89a23f6 Merge pull request #977 from Myz/cmake-baseline-configuration-without-google-benchmark
Disable building benchmarks by default
2019-01-23 12:00:36 +02:00
Pius Raeder
a29e518cfe Disable building benchmarks by default
Building the benchmarks requires google-benchmark to be installed which is
not the case for most of the build systems. The option now has a tiny
hint what the requirement is and where to get it.

closes #975
2019-01-23 10:03:03 +01:00
gabime
a7148b718e Version 1.3.1 2019-01-18 12:13:07 +02:00
gabime
23fdc0eae4 Fixed issue #959 2019-01-17 17:09:35 +02:00
Gabi Melman
8cb1bc89f1 Merge pull request #969 from scribam/patch-1
Update log_msg.h
2019-01-17 03:18:36 +02:00
scribam
1798a1fa12 Update log_msg.h
`SPDLOG_NO_THREAD_ID` should only affect thread retrieval.
2019-01-17 00:23:06 +01:00
Gabi Melman
f4c737ef42 Merge pull request #962 from myd7349/bench-patch
Fix #961 benchmark link error
2019-01-14 15:53:28 +02:00
myd7349
611df4964d Fix #961 benchmark link error 2019-01-14 20:18:35 +08:00
Gabi Melman
0a4ccf22da Update README.md 2019-01-14 11:39:35 +02:00
Philip Miller
4fe98bf6e6 Merge remote-tracking branch 'origin/v1.x' into pwm1234/rotate_on_open 2019-01-11 10:04:42 -05:00
gabime
57c3023881 Moved SPDLOG_FUNCTION define to common.h 2019-01-10 19:18:31 +02:00
gabime
4408e079ff Refactored log macros 2019-01-10 17:04:27 +02:00
gabime
2991057aef Add check log level before evaluating the logging macros 2019-01-10 16:45:06 +02:00
gabime
6b4fea39ab clang-format 2019-01-10 16:31:06 +02:00
Gabi Melman
a08ffcff50 Merge pull request #956 from possiblyhuman/v1.x-macrochanges
Allow filename/line number at all levels. Add function name %! support.
2019-01-10 02:15:50 +02:00
possiblyhuman
6bd9f4a13a Merge branch 'v1.x' into v1.x-macrochanges 2019-01-09 21:38:33 +00:00
possiblyhuman
32420b77c8 Reduced amount of macros used.
Removed SPDLOG_SOURCE_MACROS_ON and SPDLOG_FUNCTION_SUFFIX.
2019-01-09 21:15:19 +00:00
Gabi Melman
0b8a84f536 Update README.md 2019-01-09 15:56:05 +02:00
gabime
f18a55831c Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x 2019-01-09 11:28:36 +02:00
gabime
58fb0decbf Removed old header 2019-01-09 11:28:22 +02:00
possiblyhuman
2124b7bf64 Allow filename/line number at all levels. Add function name %! support. 2019-01-08 22:52:40 +00:00
Gabi Melman
5b273a33b4 Merge pull request #955 from brridder/fix-typo
Fix typo in file_helper.h
2019-01-08 20:36:06 +02:00
Ben Ridder
fb702f989f Fix typo in file_helper.h
* "extenstion" -> "extension"
2019-01-08 10:09:11 -08:00
gabime
0203a0fdaf Fixed issue #948 2019-01-08 17:35:34 +02:00
gabime
112a7ada74 Fixd copy ellision warning in tests 2019-01-08 17:33:31 +02:00
gabime
452ba76507 Fixed conversion warnings 2019-01-08 17:31:46 +02:00
gabime
2ac42c0d14 Bumped fmt to version 5.3.0 2019-01-08 17:09:07 +02:00
Gabi Melman
0955ea5b85 Merge pull request #945 from cneumann/fix-external-fmt
Fix handling of external fmt lib
2018-12-17 19:34:49 +02:00
Carsten Neumann
084bc72d90 Fix handling of external fmt lib
Using an external fmt lib should cause the spdlog::spdlog target to have
a dependency on fmt lib - so that a consuming project does not need
to call find_package(fmt) and target_link_libraries(... fmt::fmt).

To this end a new cmake option SPDLOG_FMT_EXTERNAL is introduced which
makes spdlog depend on fmt lib and defines the SPDLOG_FMT_EXTERNAL macro
to avoid using the bundled fmt lib. The value of SPDLOG_FMT_EXTERNAL is
also stored in the installed spdlogConfig.cmake and if it is ON
find_dependency() is used to ensure the fmt::fmt target is imported.
2018-12-17 10:18:16 -06:00
Gabi Melman
57e2193432 Merge pull request #939 from peergynt/fix-typos
Fix typos
2018-12-06 23:21:22 +02:00
Jerome Meyer
ce8cf1e152 Fix typos 2018-12-06 16:06:01 -05:00
gabime
3da189f7c0 SPDLOG_TRACE to check log level before calling the logger 2018-12-06 13:27:00 +02:00
gabime
058d2d1bd4 Use default pattern in latency test 2018-12-06 11:37:49 +02:00
Gabi Melman
f70f2f8c62 Merge pull request #936 from bzindovic/v1.x
Corrected the text alignment in the example
2018-12-06 03:22:21 +02:00
Budo Zindovic
8d6086da48 Corrected the text alignment in the example
I've changed the alignment character in the example to illustrate left alignment of text.
2018-12-06 01:30:07 +01:00
gabime
bd6d88b884 Removed uneeded locale include 2018-12-05 18:03:56 +02:00
gabime
4003218ceb Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x 2018-12-04 12:29:01 +02:00
gabime
ec3f2b76b0 Strip path from __FILE__ in SPDLOG_TRACE macros 2018-12-04 12:28:21 +02:00
gabime
fcb661d0e9 Fixed tests 2018-12-02 19:04:44 +02:00
gabime
d8eb0558e9 Fix test for mingw 2018-12-02 17:13:50 +02:00
Gabi Melman
5191948b64 Update appveyor.yml 2018-12-02 16:40:02 +02:00
Gabi Melman
7442d720f4 Update appveyor.yml 2018-12-02 16:30:07 +02:00
Gabi Melman
bbc859ca19 Update .travis.yml 2018-12-02 15:25:03 +02:00
gabime
7275fb6f52 simplify SPDLOG_BUILD_TESTS Cmake option 2018-12-02 12:25:46 +02:00
Gabi Melman
2d50202b2d Merge pull request #934 from dpacbach/ctest-fix
CMake: include(CTest) only when building tests.
2018-12-02 13:49:50 +02:00
David P. Sicilia
f5dc16603e Enable testing in the Travis config file.
This is needed because ENABLE_TESTING is no longer enabled by
default.
2018-12-01 20:57:45 -05:00
David P. Sicilia
85b4d7c8d6 CMake: include(CTest) only when building tests.
This is needed in order to support usage of this library as a
subdirectory in a parent project.  In that situation, prior
to this change, the inclusion of CTest would unconditionally
enable BUILD_TESTING which would then bleed into other parts
of the project.

Also added some comments explaining how this logic works.
2018-12-01 20:37:06 -05:00
gabime
f0c962d274 source_loc ctor: brace init members 2018-11-29 12:55:14 +02:00
Gabi Melman
486b6937d3 Merge pull request #929 from dpacbach/warnings-fix
Fix some minor warnings found with a recent clang version
2018-11-28 07:59:32 +02:00
David P. Sicilia
a6152ebadd Make an implicit cast from int --> uint32_t explicit.
Perhaps this casting should not happen to begin with, but better
to make it explicit where it is happening for readability.  This
fixes a compiler warning.
2018-11-27 20:24:21 -05:00
David P. Sicilia
63a475d88c Do not attempt to default operator= when it is implicitly deleted 2018-11-27 20:23:51 -05:00
Gabi Melman
3eba3224c8 Merge pull request #926 from lestera/patch-1
Fix exceptions on file size calculation on Windows XP x64 and Windows Server 2003 x64
2018-11-27 16:08:30 +02:00
Adi Lester
247c4e55e7 Update os.h 2018-11-27 14:39:41 +02:00
Adi Lester
26d7c27bee Use _filelengthi64 instead of _fstat64 to calculate file size on x64 machines
For some reason, `_fstat64` fails with errno 22 on Windows Server 2003 x64 when compiled using the `v141_xp` toolset.
Using `_filelengthi64` instead solves this issue
2018-11-27 14:16:25 +02:00
Gabi Melman
b492642282 Update fmt_helper.h 2018-11-27 11:37:09 +02:00
gabime
cff78f5833 Move logging macros outside the spdlog namespace 2018-11-25 11:20:27 +02:00
gabime
4ba19821ce Fixed compilation for vs2013 2018-11-25 10:54:06 +02:00
gabime
1e385851d7 Removed padding from from bench_formatters/all 2018-11-25 01:12:12 +02:00
gabime
4643f74a03 Added the all flag to bench formatter 2018-11-25 00:46:24 +02:00
gabime
6453d396bf Added the all flag to bench formatter 2018-11-25 00:45:43 +02:00
gabime
92921f767e clang-format 2018-11-25 00:44:51 +02:00
gabime
c251c4ccbb Added the all flag to bench formatter 2018-11-25 00:44:27 +02:00
gabime
0ce670e45a Store level names as string_views 2018-11-25 00:36:14 +02:00
gabime
2671b48a6c Minor performance fix in full formatter 2018-11-24 23:57:39 +02:00
gabime
382478259f Fix compilation for msvc 2015 2018-11-24 18:27:27 +02:00
gabime
e3c333be47 pattern_formatter - padding_info small refactor 2018-11-24 18:21:25 +02:00
gabime
a1a463787f Updated example's comment 2018-11-24 18:15:24 +02:00
gabime
a16ff07a06 Show source location if present in default formatter 2018-11-24 18:00:56 +02:00
gabime
3218caf34a Added some comments 2018-11-24 17:34:33 +02:00
gabime
01583ef540 Clean macros 2018-11-24 17:15:58 +02:00
gabime
dc13700094 Fixed source location and make SPDLOG_TRACE: that only one that inject source location info. 2018-11-24 17:08:13 +02:00
Gabi Melman
1293af093c call flush_() instead of flush() from looger::sink_it_() 2018-11-24 11:11:03 +02:00
gabime
2998815166 Added missing test file 2018-11-22 21:35:11 +02:00
gabime
9484c4dc05 clang-format 2018-11-22 19:18:43 +02:00
gabime
521b0733d4 Support for source location in async loggers 2018-11-22 19:17:41 +02:00
gabime
a463989278 keep clang-tidy happy 2018-11-22 18:50:56 +02:00
gabime
a31719b546 clang-format 2018-11-22 18:49:14 +02:00
gabime
f97cb00737 Updated macros tests 2018-11-22 18:48:32 +02:00
gabime
f2305fe5bf Support for source file/line logging 2018-11-22 18:47:50 +02:00
gabime
216cd6935f Updated formatter-bench to include source location 2018-11-22 17:05:27 +02:00
gabime
3a8f9484d2 Cleaned bench.cpp a little 2018-11-22 16:58:20 +02:00
gabime
3fa76b2d8f Renamed test filename 2018-11-22 12:31:16 +02:00
gabime
50648553cf clang-format 2018-11-21 16:02:02 +02:00
gabime
70d03fd9c3 Minor optimization 2018-11-21 16:01:28 +02:00
gabime
0a8cce6984 comments 2018-11-21 14:21:26 +02:00
gabime
fb1a3a3a12 Micro optimized some formatter flags 2018-11-20 15:40:51 +02:00
gabime
52e2722412 Renamed test filenames 2018-11-20 12:14:21 +02:00
Gabi Melman
b64e4464a7 Update current_size_ to 0 in after of truncating in rotation error 2018-11-20 10:26:10 +02:00
Gabi Melman
f1ab6feba2 Merge pull request #919 from DanielChabrowski/fix-compilation
Fix template error
2018-11-19 20:02:24 +02:00
Daniel Chabrowski
e751461ff1 Fix template error 2018-11-19 18:59:17 +01:00
Gabi Melman
c7f42d1a4a Merge pull request #917 from DanielChabrowski/fix-xcode-ci
Fix osx build
2018-11-19 19:39:59 +02:00
Daniel Chabrowski
6232ec78f7 Change count_digits to depend on template param, not size_t 2018-11-19 18:34:52 +01:00
Daniel Chabrowski
f09d0f2301 Add helper for count_digits 2018-11-19 18:12:50 +01:00
Daniel Chabrowski
14a071c478 Fix osx build 2018-11-19 02:54:02 +01:00
gabime
e601ebe19b Updated formatter-bench 2018-11-16 14:13:29 +02:00
gabime
7068c45115 Fixed issue #908 2018-11-16 13:28:34 +02:00
gabime
3bfcb0468e clang-format 2018-11-16 12:56:57 +02:00
gabime
b2735eb30c Fixed fmt_helper tests 2018-11-16 12:56:36 +02:00
gabime
552416bda4 fmt_helper cleanup 2018-11-16 12:55:19 +02:00
gabime
b522413085 Replaced SPDLOG_DISABLE_TID_CACHING with SPDLOG_NO_TLS 2018-11-16 10:07:31 +02:00
gabime
8a0fc92f20 Replaced SPDLOG_DISABLE_TID_CACHING with SPDLOG_NO_TLS 2018-11-15 16:42:42 +02:00
gabime
4a34cd0662 Optimized nano seconds formatting 2018-11-12 16:44:34 +02:00
gabime
11d83515dd Added formatter becnhmarks 2018-11-12 16:13:52 +02:00
gabime
7ce8ae72e8 Added test of pattern_formatter::clone() 2018-11-12 16:04:35 +02:00
gabime
cc7e122915 Added test of pattern_formatter::clone() 2018-11-12 16:04:09 +02:00
gabime
da84893921 Added test of pattern_formatter::clone() 2018-11-12 16:00:32 +02:00
gabime
1d5b6d7ae6 Added test of pattern_formatter::clone() 2018-11-12 15:59:03 +02:00
gabime
314991ac60 Fixed pattern formatter constructor bug 2018-11-12 12:46:07 +02:00
gabime
9b5b4cd505 comment 2018-11-12 12:12:33 +02:00
gabime
c5069135d7 Improved compile time level support 2018-11-12 12:01:10 +02:00
gabime
971c1f46b0 Updated latency tests 2018-11-12 11:07:51 +02:00
gabime
34c60e5486 Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x 2018-11-12 10:44:43 +02:00
gabime
526f21ae7f Fixed #902 2018-11-12 10:39:34 +02:00
gabime
48597a94e8 Updated example 2018-11-11 18:20:53 +02:00
gabime
0e77c3391b New compile time API using SPDLOG_ACTIVE_LEVEL 2018-11-11 18:15:24 +02:00
Gabi Melman
f1e79bde2e Update pattern_formatter.h 2018-11-11 02:27:03 +02:00
gabime
7b6849578b Fixed some clang-tidy warnings 2018-11-11 01:53:51 +02:00
gabime
617fcc92cf clang-format 2018-11-11 01:48:50 +02:00
gabime
18f0e4ba1a Added some pattern-formatter padding tests 2018-11-11 01:43:40 +02:00
gabime
6fedffe6d6 Moved the SPDLOG_CATCH_AND_HANDLE to logger_impl.h 2018-11-11 01:33:08 +02:00
gabime
d54e302a28 clang-format 2018-11-11 01:26:57 +02:00
gabime
d99179f822 Small refactoring to registry class 2018-11-11 01:26:22 +02:00
gabime
a6fbb3ef4c Minor fix to test 2018-11-11 01:25:17 +02:00
gabime
65cff673b8 Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x 2018-11-11 01:19:13 +02:00
gabime
dc166cad92 Added default pattern support for pattern_formatter to avoid parsing pattern when using default pattern 2018-11-11 01:18:57 +02:00
gabime
7d7ccac416 Updated bench cmake 2018-11-11 01:17:14 +02:00
gabime
e933c5f481 Fixed example 2018-11-11 01:11:09 +02:00
gabime
2ba4b23b85 added padder bench 2018-11-11 00:52:21 +02:00
gabime
ba4ed0eb7f micro optimize scoped_padder 2018-11-11 00:48:25 +02:00
gabime
3cdf2b7f04 micro optimize scoped_padder 2018-11-11 00:31:14 +02:00
Gabi Melman
99b68c8352 Merge pull request #892 from pabloariasal/disable_global_logger_registration
Global option that disables global registration of loggers
2018-11-10 19:46:45 +02:00
Pablo Arias
a446f187c1 Fixed deadlock by recursive mutex 2018-11-10 17:38:23 +01:00
gabime
3ff541cf77 Optimized scoped_pad 2018-11-10 18:03:11 +02:00
Pablo Arias
10895796b2 Added mutexes to protect logger initialization and toggling automatic registration 2018-11-10 16:55:35 +01:00
Pablo Arias
fbc58ebef8 * using API call instead of macro for toggling automatic registration
* added unit test for disabling automatic registration
2018-11-10 14:34:04 +01:00
gabime
5c54414be7 Padding support in pattern formatter 2018-11-09 15:18:45 +02:00
gabime
4df28728e2 clang-format 2018-11-09 14:56:48 +02:00
Gabi Melman
f14a4c0b18 Merge pull request #893 from ZaMaZaN4iK/ZaMaZaN4iK-patch-1
Fix typo in Android example
2018-11-07 11:05:22 +02:00
Alexander Zaitsev
f5a27250b1 Fix typo in Android example 2018-11-05 03:04:22 +03:00
Pablo Arias
f95b189fe3 Added a global option in tweakme.h that disabled global registration of
loggers. fixes #712
2018-11-04 20:12:42 +01:00
Gabi Melman
1aace95c8d Update periodic_worker.h 2018-11-02 17:53:27 +02:00
Gabi Melman
7844471971 Merge pull request #890 from rwen2012/v1.x
change the log_msg&& to log_msg&
2018-10-31 07:33:31 +02:00
rwen2012
794a636dd3 change the log_msg&& to log_msg& 2018-10-31 11:01:28 +08:00
gabime
e35414a0f1 Removed redundant casts to string_view 2018-10-30 01:23:17 +02:00
gabime
0d0706a204 Small fix to pattern formatter 2018-10-30 01:14:42 +02:00
gabime
80f19324bc Small update to async bench 2018-10-30 01:08:32 +02:00
gabime
1b04c222cf Fixed issue #888 2018-10-30 00:54:22 +02:00
gabime
5d04848886 Updated latency Makefile 2018-10-30 00:11:29 +02:00
gabime
fc14e831eb Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x 2018-10-30 00:08:58 +02:00
gabime
04d577262a Updated latency tests 2018-10-30 00:08:49 +02:00
Gabi Melman
7be3d2afe9 Update appveyor.yml 2018-10-29 23:58:19 +02:00
Gabi Melman
d1237d8984 Merge pull request #887 from peergynt/peergynt-cleanup
Cleanup header file: remove log_msg.h include from fmt_helper.h
2018-10-29 19:18:04 +02:00
Jerome Meyer
1b391ccd06 Cleanup header file: remove log_msg.h include from fmt_helper.h 2018-10-29 09:55:41 -04:00
gabime
7377bfcf07 Updated latency makefile 2018-10-26 18:59:00 +03:00
gabime
665b708e6e Update cmake 2018-10-26 18:57:53 +03:00
gabime
f87049370f latency test update 2018-10-26 18:57:34 +03:00
gabime
47948a34dd latency using google-benchmark 2018-10-26 16:34:14 +03:00
gabime
121a7dcedf Use google benchmark to test latency 2018-10-24 22:31:50 +03:00
gabime
240a58fd6e Fixed issue #881 2018-10-24 08:47:02 +03:00
gabime
99e23b41eb use static_cast<string_view> instead of ctor in logger impl 2018-10-22 00:47:51 +03:00
gabime
cadb3d7da2 Fixed test 2018-10-22 00:14:07 +03:00
gabime
392d126372 Renamed string_view_type -> string_view_t 2018-10-21 23:50:07 +03:00
gabime
871cca2401 Fixed pattern formatter 2018-10-21 23:48:11 +03:00
gabime
1bdd556d3b code formatting 2018-10-21 23:23:40 +03:00
gabime
9daad800a8 Fix mingw compilation 2018-10-21 19:26:11 +03:00
gabime
8d2c956563 Optimize log(const T&) if can be statically converted to string_view 2018-10-21 19:04:55 +03:00
gabime
0584d6d89b Removed logn declaration 2018-10-21 18:38:37 +03:00
gabime
5763733490 Fix sdk version in msvc example 2018-10-21 12:49:04 +03:00
gabime
894438d5fb Better support for string_view 2018-10-21 12:46:58 +03:00
Gabi Melman
2ad191aeba Update log_msg.h 2018-10-20 18:27:58 +03:00
gabime
dd9d7e62d5 bench C-string title 2018-10-19 17:16:51 +03:00
gabime
4e3e80109a Code formatting 2018-10-19 17:12:35 +03:00
gabime
70bef682b0 Fixed clang-tidy warning about implicit conversion to string_view 2018-10-19 17:12:02 +03:00
gabime
c2a9bf9974 Small refactoring and support wchar again 2018-10-19 16:48:22 +03:00
gabime
23da9f13b0 Fixed valgrind warning in example 2018-10-19 16:31:43 +03:00
gabime
a5a39c52b0 Added nullptr check to append_string_view 2018-10-19 02:45:35 +03:00
gabime
6355e9895d Major change to log_msg - contain only string_view instead of buffer 2018-10-19 02:15:50 +03:00
gabime
abf4af2645 Merge branch 'sized_buf' of https://github.com/peergynt/spdlog into peergynt-sized_buf 2018-10-18 23:29:42 +03:00
Jerome Meyer
cb71fea0f6 Use fmt::string_view when logging a C string to avoid unnecessary copy 2018-10-18 11:04:20 -04:00
gabime
3e2d593dde always initialize level and thread_id in log_msg 2018-10-18 11:18:02 +03:00
gabime
4b66e94ecf Code formatting 2018-10-16 19:32:12 +03:00
gabime
40143cae1e async-bech to use spdlog for output 2018-10-16 19:31:25 +03:00
gabime
b1277caeeb Typo 2018-10-16 19:30:38 +03:00
gabime
13cc6478fb Bench: eat our own dog food 2018-10-16 16:11:28 +03:00
gabime
c465250c21 Fixed clang-tidy warning (added move) 2018-10-16 14:39:29 +03:00
gabime
815b52b8fb Fixed implicit conversion to str in c_formatter 2018-10-16 00:12:54 +03:00
gabime
275167d1b0 Micro optimize eol in formatter 2018-10-15 16:22:00 +03:00
gabime
45717147f7 Improved null_logger factory 2018-10-13 20:01:05 +03:00
gabime
f2f9f324ec Updated default API impl and tests 2018-10-13 19:23:11 +03:00
gabime
8131d3e127 Added SPDLOG_DISABLE_DEFAULT_LOGGER option to tweakme.h 2018-10-12 03:21:21 +03:00
gabime
226d5a1d36 Added SPDLOG_DISABLE_DEFAULT_LOGGER option to tweakme.h 2018-10-12 03:17:51 +03:00
gabime
312fe4775d Added SPDLOG_DISABLE_DEFAULT_LOGGER option to tweakme.h 2018-10-12 03:16:22 +03:00
gabime
b368d18b0f Added default logger API 2018-10-12 03:04:55 +03:00
gabime
8e4996baf4 Replaced constexpr with SPDLOG_CONSTEXPR 2018-10-12 01:32:21 +03:00
gabime
b7cd502054 Removed redundant file 2018-10-12 01:25:11 +03:00
gabime
53ac379bc5 Removed extra whitespace from SDPLOG_TRACE message 2018-10-11 19:14:02 +03:00
Gabi Melman
10e809cf64 Merge pull request #864 from DimRochette/v1.x
fix namespace of make_unique
2018-10-10 12:58:46 +03:00
DimRochette
3079551d30 fix namespace of make_unique 2018-10-10 11:23:25 +02:00
gabime
f4c5c5a367 Replaced noexcept with SPDLOG_NOEXCEPT 2018-10-10 01:01:37 +03:00
gabime
2a7b995723 Added noexcept some function in common.h 2018-10-10 00:57:16 +03:00
gabime
d0beac70bd Removed dead code from os.h 2018-10-10 00:29:34 +03:00
gabime
cbf66ac653 Removed dead code from os.h 2018-10-10 00:29:21 +03:00
gabime
98f9cb8c1f Added noexcept to most of details::os functions 2018-10-10 00:26:52 +03:00
Gabi Melman
8bd4c87d2f Merge pull request #856 from ulvgard/cmake_android_log_dependency
Add dependency to Android's log target in CMake
2018-10-08 12:12:29 +03:00
Gabi Melman
c88b568685 Update example.cpp 2018-10-08 01:46:01 +03:00
gabime
c83c9a3193 Version 1.2.0 2018-10-07 22:31:36 +03:00
Gabi Melman
410c46f1ab Update README.md 2018-10-06 15:38:26 +03:00
gabime
1b8bf35acc Micro optimize: don't init log_msg.msg_id on construction. It will be set anyway later 2018-10-06 01:49:34 +03:00
gabime
aa47ac85c9 add constexpr to hex chars 2018-10-05 23:23:09 +03:00
gabime
3eadda9466 code formating 2018-10-05 15:21:05 +03:00
gabime
dea6a7c217 Tests: Fixed some clang-tidy warnings 2018-10-05 15:20:14 +03:00
gabime
887a104dd0 Fixed clang-tidy warning 2018-10-05 15:19:03 +03:00
gabime
1808e3c4c8 Fixed bug in async_bench 2018-10-05 14:52:38 +03:00
gabime
1f4cae4bf7 Changed forward<log_msg> to std::move(log_msg) in thread pool 2018-10-05 14:50:30 +03:00
gabime
3b009f5aa6 Changed forward<worker_ptr> to std::move in async logger 2018-10-05 14:33:53 +03:00
gabime
36112371c0 Reverted const qualifier to log_msg& args, fixed issue #849, and added counter tests 2018-10-05 14:23:37 +03:00
gabime
2fa538779f Fixed static_assert 2018-10-04 02:20:47 +03:00
gabime
b7a6659451 code formatting 2018-10-04 02:10:46 +03:00
gabime
102c31a04c Accecpt iterators by value in logger ctor insted of ref 2018-10-04 02:06:39 +03:00
Tobias Ulvgard
f01da91abf Add dependency to Android's log target in CMake 2018-10-03 10:10:37 +02:00
gabime
10000c383a Better error message if WideCharToMultiByte fails 2018-10-03 00:26:58 +03:00
gabime
8b42b7d269 Fix support for wchar to utf8 under windows (fix issue #851 and #764) 2018-10-02 18:27:49 +03:00
gabime
17702969fa Upgrded to fmt version 5.2.1 2018-10-02 16:14:39 +03:00
Gabi Melman
cc3613e012 Update README.md 2018-10-02 15:24:43 +03:00
Gabi Melman
0258418a99 Merge pull request #853 from blackball/v1.x
return nothing if it's a void function.
2018-10-02 15:22:58 +03:00
Hui
397c2a934f Merge pull request #1 from blackball/blackball-patch-1
Fix return type in README file.
2018-10-02 19:22:02 +08:00
Hui
796986f38c Fix return type in README file.
void function should not return 1.
2018-10-02 19:21:41 +08:00
Gabi Melman
c5011181bb Update log_msg.h 2018-10-01 14:27:43 +03:00
gabime
dace099348 Added fmt_helper tests 2018-09-28 01:30:29 +03:00
gabime
0876e39c4f pad3 small optimization 2018-09-28 01:27:37 +03:00
gabime
0b516733db user buffer.clear() insread of resize(0) 2018-09-27 17:08:21 +03:00
Gabi Melman
e15deead32 Update README.md 2018-09-27 03:59:43 +03:00
gabime
18df6138a7 clang-format 2018-09-27 02:03:12 +03:00
gabime
8c125ed009 Added clang-tidy script 2018-09-27 02:02:13 +03:00
gabime
4720b703f4 Fixed clang-tidy warnings 2018-09-27 01:58:39 +03:00
gabime
cd8e15dcd1 Fixed clang-tidy warnings 2018-09-27 01:39:26 +03:00
gabime
a06d32ae19 Fixed clang-tidy warnings 2018-09-27 01:14:35 +03:00
gabime
7af3f014af Fixed clang-tidy warning 2018-09-27 00:59:28 +03:00
gabime
8e80081f99 Fixed clang-tidy warning 2018-09-27 00:56:19 +03:00
gabime
14c0417f3e Fixed clang-tidy warning 2018-09-27 00:47:09 +03:00
gabime
0879dea444 Fixed clang-tidy warning 2018-09-27 00:39:17 +03:00
gabime
a8c4aef6bd fix typo 2018-09-26 23:50:47 +03:00
gabime
669a66f18a format 2018-09-26 23:48:59 +03:00
gabime
e8dae26176 Moved spdlog::make_unique to spdlog::details::make_unique and prevent T to be array 2018-09-26 23:48:36 +03:00
gabime
e3a66473b2 Small cleanup in set_formatter 2018-09-26 15:53:54 +03:00
gabime
7704e41336 Fixed issue #833 2018-09-26 15:43:23 +03:00
gabime
a74bbe7381 base_sink default ctor 2018-09-26 15:41:57 +03:00
gabime
729ec21629 Added virtual protected functions to base_sink 2018-09-26 15:29:19 +03:00
gabime
b393715bee Added virtual protected functions to base_sink 2018-09-26 15:27:48 +03:00
gabime
5ec4e60424 Replaced SPDLOG_FINAL macro with final 2018-09-26 15:26:34 +03:00
gabime
5cd24f3033 Replaced SPDLOG_FINAL macro with final 2018-09-26 15:26:27 +03:00
gabime
27a03c5cec Replaced SPDLOG_FINAL macro with final 2018-09-26 15:24:22 +03:00
gabime
5d34d21f40 Fixed issue #842 in tests 2018-09-26 14:45:57 +03:00
gabime
ca8accbaa8 Replaced SPDLOG_FINAL macro with final 2018-09-26 14:45:38 +03:00
gabime
65defd3806 Replaced SPDLOG_FINAL macro with final 2018-09-26 14:33:37 +03:00
Gabi Melman
be7e7237e9 Update README.md 2018-09-25 01:51:03 +03:00
gabime
234cb2dfba Updated becnhmark info 2018-09-25 01:43:05 +03:00
Gabi Melman
b922ae0fb8 Update README.md 2018-09-25 01:26:17 +03:00
gabime
8649fb5118 Added binary logging example 2018-09-25 01:25:10 +03:00
Gabi Melman
a4bae6aba9 Update bench.cpp 2018-09-25 01:22:28 +03:00
gabime
808bc1f4ed clang format 2018-09-25 01:11:36 +03:00
gabime
41d879e292 Added support for binary logging using to_hex(..) 2018-09-25 01:03:57 +03:00
Gabi Melman
2e7b3cae2a Update bench.cpp 2018-09-21 11:22:57 +03:00
gabime
a0ae62a733 format.sh 2018-09-18 00:19:16 +03:00
gabime
06eb69b93a format.sh 2018-09-18 00:18:22 +03:00
gabime
7025ff4280 format.sh don't format bundled src 2018-09-18 00:16:13 +03:00
gabime
2fa7410c0e Improve rotating sink error handling 2018-09-18 00:09:58 +03:00
gabime
3771d12992 Upgraded to fmt ver 5.2.0 2018-09-17 14:40:52 +03:00
Gabi Melman
f4ac67ae1c Merge pull request #837 from myrgy/missing_include_ansicolor_sing
ansicolor_sink.h - add missing sink include
2018-09-17 12:50:17 +03:00
Alexander Dalshov
d48d6939c2 ansicolor_sink.h - add missing sink include 2018-09-17 11:26:40 +03:00
Gabi Melman
188cff7d65 Merge pull request #831 from taketwo/fix-830
Change the default value for SPDLOG_BUILD_xxx
2018-09-12 23:33:36 +03:00
Sergey Alexandrov
75925762e8 Change the default value for SPDLOG_BUILD_xxx
The value based on whether spdlog is used as a third-party dependency or
as a standalone project. If spdlog is included through add_subdirectory,
the tests/examples/benchmarsk are disabled by default, and if spdlog is
configured standalone, then they are enabled by default.
2018-09-12 16:11:45 -04:00
Gabi Melman
f2ac7d730c Update README.md 2018-09-07 02:12:28 +03:00
Gabi Melman
c5c1c5458b Update README.md 2018-09-07 02:09:13 +03:00
Gabi Melman
1649597eae Update README.md 2018-09-07 02:07:25 +03:00
Philip Miller
22f85deb2c Merge remote-tracking branch 'origin/v1.x' into pwm1234/rotate_on_open 2018-09-06 11:40:46 -04:00
Gabi Melman
1cb49bfe72 Merge pull request #824 from gabime/revert-822-patch-1
Revert "Add `conda` to package managers in README"
2018-09-06 13:31:09 +03:00
Gabi Melman
1aa4b657d6 Revert "Add conda to package managers in README" 2018-09-06 13:30:25 +03:00
Philip Miller
52a01b2cf2 add argument to rotating file sink for rotate_on_open
when true, the log file will be rotated when it is opened so the newly constructed file will start off being empty
2018-09-06 02:47:48 -04:00
Gabi Melman
d803e7003f Merge pull request #822 from epruesse/patch-1
Add `conda` to package managers in README
2018-09-06 06:02:45 +03:00
Elmar Pruesse
18efcd62ff Add conda to package managers in README 2018-09-05 19:25:11 -06:00
Gabi Melman
9fda1cb421 Merge pull request #813 from jwnimmer-tri/dist_sink_reset_v1.x
Add set_sinks method to dist_sink
2018-09-04 23:56:03 +03:00
Gabi Melman
bcc6db4a06 Update README.md 2018-09-04 19:34:59 +03:00
Gabi Melman
37cd707294 Fix issue #819 2018-09-03 19:08:57 +03:00
gabime
3698c1d2f1 added spdlog namespace when calling make_unique 2018-09-02 01:27:28 +03:00
Gabi Melman
00acb8ba41 Update registry.h 2018-09-01 22:41:56 +03:00
Gabi Melman
a6ee1cf590 fix vc compliation error about make_unique 2018-09-01 21:56:19 +03:00
gabime
ebce97947d use make_unique 2018-09-01 21:30:05 +03:00
gabime
f4bbe8b2b3 Fixed some extra warnings from clang 2018-08-31 14:17:11 +03:00
Gabi Melman
e52e258f15 Update README.md 2018-08-31 04:14:23 +03:00
Jeremy Nimmer
679fcd787f Add set_sinks method to dist_sink
This allows users to set exactly the sinks they want, even if other
unknown application code has added bespoke sinks in the meantime.
2018-08-29 12:29:32 -04:00
Gabi Melman
f3798159e7 Merge pull request #814 from maciekgajewski/no-pessimizing-move
Pessimizing move removed
2018-08-29 19:21:56 +03:00
Maciej Gajewski
c4de214cea Pessimizing move removed 2018-08-29 17:21:38 +02:00
gabime
6c5bbca0c1 Added clone tests 2018-08-25 18:10:42 +03:00
gabime
447a6a15d9 Fixed readme 2018-08-25 17:57:41 +03:00
gabime
5d7845c138 Added "clone()" support to loggers 2018-08-25 17:55:31 +03:00
gabime
91d8869f36 Added "clone()" support to loggers 2018-08-25 17:35:20 +03:00
Gabi Melman
1f8b2cbb8b Update file_helper.h 2018-08-24 13:27:49 +03:00
Gabi Melman
d0cfca0820 Update file_helper.h 2018-08-24 13:27:10 +03:00
Gabi Melman
f6049cd333 Update file_helper.h 2018-08-24 13:26:45 +03:00
Gabi Melman
a25fd62349 Merge pull request #806 from emruiz81/v1.x
WIN32: Don't deny access to file sinks from other processes
2018-08-23 19:15:28 +03:00
eruiz
39492436ec WIN32: Don't deny access to file sinks from other processes 2018-08-23 12:20:26 -03:00
Gabi Melman
df962e5c53 Merge pull request #804 from DanielChabrowski/globals-include
Add missing include in console_globals.h
2018-08-23 00:12:17 +03:00
Daniel Chabrowski
2990126054 Change console_globals include to windows.h only 2018-08-22 22:47:16 +02:00
Daniel Chabrowski
3edc7f1d18 Add missing include in console_globals.h 2018-08-22 21:46:46 +02:00
Gabi Melman
2870afdeae Update stdout_sinks.h 2018-08-21 03:37:29 +03:00
gabime
d3c1ad29a0 Optimize logging for const char* messages 2018-08-20 12:43:31 +03:00
Gabi Melman
23db7a213d Merge pull request #801 from yhchen/v1.x
remove invalid files from project
2018-08-19 13:02:35 +03:00
yhchen
3151081ff3 remove invalid files from project 2018-08-19 17:21:15 +08:00
gabime
0758b39061 Stop compilation on first error 2018-08-18 02:19:52 +03:00
gabime
45d3c8341c Fixed mpmc_q test for osx in travis 2018-08-17 17:45:48 +03:00
gabime
8418131ae3 Fixed mpmc_q test for osx in travis 2018-08-17 17:30:33 +03:00
gabime
9ad9cfb898 Fixed mpmc_q test for osx in travis 2018-08-17 17:17:16 +03:00
gabime
a281d21fbf Removed valgrind from travis 2018-08-17 16:26:52 +03:00
gabime
af5962450e Try adding osx to travis 2018-08-17 16:15:02 +03:00
gabime
3b3af1ab1e Try adding osx to travis 2018-08-17 16:00:14 +03:00
gabime
acd7a88bf2 Try adding osx to travis 2018-08-17 15:59:52 +03:00
Gabi Melman
176cab4fee Update file_helper.h 2018-08-17 14:07:49 +03:00
Gabi Melman
28435dc736 Normalized spdlog includes in file_helper 2018-08-17 14:06:48 +03:00
gabime
a58d7594cb Fixed issue #798 and added -Wconversion compiler flag to build 2018-08-17 00:32:13 +03:00
Gabi Melman
06181720fb Merge pull request #800 from DanielChabrowski/fix-registry-test
Fix registry test
2018-08-16 19:25:34 +03:00
Daniel Chabrowski
b51c8cfd0f Fix registry test 2018-08-16 17:53:55 +02:00
gabime
b6b9d835c5 Version 1.1.0 2018-08-15 19:34:10 +03:00
gabime
ebea09c8b4 Added pedantic flag to compiler in cmake 2018-08-15 19:09:37 +03:00
gabime
137f801ec7 Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x 2018-08-15 19:02:07 +03:00
gabime
3d58f8d471 code formatting 2018-08-15 19:01:54 +03:00
gabime
b962fbb15c Fixed issue #797 2018-08-15 19:01:44 +03:00
Gabi Melman
e8927dc75f Merge pull request #796 from DanielChabrowski/cmake-refactor
Little cmake and tests refactor
2018-08-14 23:21:11 +03:00
Daniel Chabrowski
fb37585bc1 Little cmake and tests refactor
Change from spdlog_ex to const spdlog_ex& got rid of the GCC8 warning.
2018-08-14 21:33:47 +02:00
gabime
4a871b9792 Added some mpmc_q tests 2018-08-14 17:59:14 +03:00
gabime
057bf1b92d Added some mpmc_q tests 2018-08-14 17:57:55 +03:00
gabime
750b520f41 Fix broken build 2018-08-14 16:38:35 +03:00
Gabi Melman
c23f36c734 Merge pull request #795 from indiosmo/queue_full_counter
Expose a counter for how many messages were dropped in async mode
2018-08-14 16:36:38 +03:00
Luiz Siqueira
4eb80dd8d2 acquire lock before reading overrun_counter 2018-08-14 10:11:03 -03:00
Luiz Siqueira
c543985cf4 use size_t instead of int for overrun counter 2018-08-14 09:21:52 -03:00
Luiz Siqueira
863f704f47 increment counter every time we overrid a message in async mode. 2018-08-14 08:51:20 -03:00
gabime
54896763ab Update readme 2018-08-14 01:51:22 +03:00
Gabi Melman
0272bd2846 Update README.md 2018-08-14 01:50:09 +03:00
gabime
70f3ed66f4 Update readme 2018-08-14 01:46:57 +03:00
gabime
1dba3162c4 Fixed travis 2018-08-14 01:19:29 +03:00
gabime
cb0d8cfbbd Fixed travis 2018-08-14 01:15:39 +03:00
gabime
08064716b3 Fixed cmake for bench 2018-08-14 01:05:16 +03:00
gabime
dca20731a2 Added thread sanitizer tests to travis CI 2018-08-14 01:02:05 +03:00
gabime
530e209f66 Fixed async tests to pass TASN checks 2018-08-14 00:58:50 +03:00
gabime
566df7e826 Added missing include to q 2018-08-14 00:58:09 +03:00
gabime
56b3a17e56 Udpated README 2018-08-13 12:38:36 +03:00
gabime
d6cc5847fa Udpated README 2018-08-13 12:37:15 +03:00
gabime
1d672d39cf Udpated README 2018-08-13 12:33:58 +03:00
gabime
aefde13858 formatting 2018-08-13 12:27:25 +03:00
gabime
607779cccf micro optimization in log_msg constructor 2018-08-13 12:27:11 +03:00
gabime
da2af6ea2e Fixed some clang-tidy warning 2018-08-13 11:43:00 +03:00
gabime
ba337d1393 Fixed warning in tests 2018-08-13 11:16:50 +03:00
gabime
6ae240c0b6 code formatting and clang tidy warnings fixes 2018-08-13 10:32:07 +03:00
gabime
05d6960ebc code formatting and clang tidy warnings fixes 2018-08-13 10:30:02 +03:00
gabime
4866f2ac05 Put override kw again 2018-08-13 09:27:11 +03:00
gabime
4456f96ae3 Fixed clang warnings 2018-08-13 09:21:47 +03:00
gabime
8008d7fe53 Replace emplace_back with push_back in pattern_formatter 2018-08-13 09:09:49 +03:00
gabime
0a585092dc Added ASAN test in release build to travis 2018-08-13 02:02:17 +03:00
gabime
387ccae7d8 Removed gcc7 debug from travis 2018-08-13 01:59:49 +03:00
gabime
d951ea32a6 travis improvments 2018-08-13 01:44:10 +03:00
gabime
da30e2ef18 Improved CMakeLists and added bench 2018-08-13 01:22:35 +03:00
Gabi Melman
cb299375f6 Merge pull request #789 from DanielChabrowski/ci-v1
Modify travis-ci, fix compilation issues
2018-08-12 21:52:26 +03:00
Daniel Chabrowski
4534d5239f Remove tsan and gcc 4.9 jobs 2018-08-12 20:34:30 +02:00
Daniel Chabrowski
af5a516443 Add valgrind to a clang6 addon
Unfortunately valgrind is required for all addons
2018-08-12 18:51:34 +02:00
Daniel Chabrowski
368b3699d0 Run ASAN/TSAN jobs with clang
Bring back removed tests/Makefile
2018-08-12 18:42:54 +02:00
Daniel Chabrowski
49d663f6c8 Move tsan/asan flag management to cmake
Add sudo: required to fix asan builds
2018-08-12 17:11:56 +02:00
Daniel Chabrowski
7e32ccbd8f Modify travis-ci, fix issues
Added:
* Release/Debug job for gcc 7 and clang 3.5
* Debug asan gcc 7 job
* Debug tsan gcc 7 job
* Disabled extensions
* Added a spdlog::spdlog alias for tests

Removed:
* Valgrind workaround, the current version is 3.10.1
* install_libcxx
* Makefiles

Fixed:
* examples build
* multisink build

Workarounds:
* gcc7 with tsan and asan needs gold linker, otherwise build
  fails becase of unrecognized option '--push-state'
2018-08-11 02:24:45 +02:00
Gabi Melman
f8f2d7b950 Merge pull request #786 from rajesh-p/v1.x
Namespace fix  for the issue 785
2018-08-10 09:45:31 +03:00
rajesh-p
769f11109d Namespace fix for the issue 785
Added namespace fix
2018-08-09 21:17:53 -07:00
Gabi Melman
85a2bf1c17 Merge pull request #784 from baishuai/v1.x
add new line at end of file, fix compiler warnings #778
2018-08-08 22:29:14 +03:00
baishuai
a2fa7a833c add new line at end of file, fix compiler warnings 2018-08-08 22:59:57 +08:00
Gabi Melman
8179b26388 Update file_log.cpp 2018-08-07 03:29:45 +03:00
Gabi Melman
12bbef308b Update README.md 2018-08-06 22:19:16 +03:00
gabime
caff7296b1 small fix to example.sln 2018-08-05 01:33:52 +03:00
gabime
779328a940 Fixed async_bench 2018-08-05 01:25:40 +03:00
gabime
01e05a4495 clang format 2018-08-05 00:35:32 +03:00
gabime
af6b3fe599 delay the release mutex in the async queue only for mingw 2018-08-05 00:34:59 +03:00
gabime
74e8bebb75 Added async_bench 2018-08-05 00:14:01 +03:00
gabime
8bfec30d48 Fix deadlock issue with mingw in async logger 2018-08-03 13:38:41 +03:00
Gabi Melman
2880eceeae Merge pull request #773 from slapenko/v1.x
We can control should daily_file_sink truncate an underlying file or not
2018-08-02 17:13:40 +03:00
slapenko
34ada56f5d Refactoring. Rid of open_file for clarity 2018-08-02 07:27:49 -05:00
slapenko
64521005ab We can control should daily_file_sink truncate an underlying file or not 2018-08-01 22:58:15 -05:00
Gabi Melman
16b18f7962 Update README.md 2018-08-01 22:01:35 +03:00
Gabi Melman
986af6ea9e Update README.md 2018-07-26 21:53:40 +03:00
Gabi Melman
691011c473 Update README.md 2018-07-26 21:52:52 +03:00
gabime
fd54719351 clang-format 2018-07-26 21:13:19 +03:00
gabime
420b17ae65 Fix issue #769 2018-07-26 21:09:40 +03:00
gabime
ef5e7af68a Fixed bench Makefile 2018-07-26 00:29:13 +03:00
gabime
05b68b8581 Fixed example and inline 2018-07-26 00:23:44 +03:00
gabime
de6ddf4e2a Some code refactoring in formatter 2018-07-26 00:20:31 +03:00
gabime
a12a21a18e Improved millis formatting 2018-07-25 23:33:03 +03:00
gabime
d8053dd6a6 -Ofast in bench Makefile 2018-07-25 20:15:27 +03:00
gabime
7d38e2b01e Removed junk folder 2018-07-25 18:48:45 +03:00
gabime
53cd47e19f Remove un needed declaration from thread_pool 2018-07-25 16:50:14 +03:00
gabime
ce5c1c24cf added explicit kw to ctor 2018-07-25 00:33:11 +03:00
gabime
2894e8de5e clang format 2018-07-25 00:06:10 +03:00
gabime
74c10df169 Changed SPDLOG_VERSION to be numeric 2018-07-25 00:03:27 +03:00
gabime
0da977f9c7 Fixed bench Makefile 2018-07-24 23:32:11 +03:00
gabime
0b7c505b50 Fixed forgotten inline keyword 2018-07-24 23:07:32 +03:00
gabime
cb9c984aa7 registery and periodic flusher fixes. 2018-07-24 22:59:34 +03:00
Gabi Melman
516a8e4212 Update periodic_worker.h 2018-07-24 03:08:49 +03:00
Gabi Melman
40aeaaee54 Update periodic_worker.h 2018-07-24 03:01:27 +03:00
Gabi Melman
5fd56ec463 Update README.md 2018-07-23 22:53:23 +03:00
gabime
33329c80a9 code formatting 2018-07-23 00:13:52 +03:00
gabime
fe73255452 Fixed issue #759 2018-07-23 00:13:24 +03:00
gabime
9d497d5afd Fix issue #765 2018-07-22 21:55:47 +03:00
gabime
693103af9c support set_formatter in spdlog.h 2018-07-22 21:52:46 +03:00
gabime
7184c42376 Changed some static string array to char* arrays 2018-07-22 13:06:16 +03:00
Gabi Melman
349829fa96 Update periodic_worker.h 2018-07-22 02:02:36 +03:00
Gabi Melman
3684228cd5 Update periodic_worker.h 2018-07-22 02:02:01 +03:00
gabime
9e4925eff0 clang format 2018-07-21 23:48:07 +03:00
gabime
a96b4d7529 Added periodic flusher support, and fixed some registry issues 2018-07-21 23:30:26 +03:00
gabime
d5af87a8e1 Added periodic flusher support, and fixed some registry issues 2018-07-21 22:43:36 +03:00
gabime
683dc0b216 Added async test to tests 2018-07-21 00:35:22 +03:00
gabime
989a10e48b Added async test to tests 2018-07-21 00:33:27 +03:00
gabime
41d248f442 Fixed Makefile.mingw example 2018-07-21 00:24:30 +03:00
gabime
2dfea6bee3 Fixed tests under windows 2018-07-21 00:13:37 +03:00
gabime
0c07df7005 Fixed async factory 2018-07-20 23:58:21 +03:00
gabime
599981e2e6 Fixed mingw build 2018-07-20 23:34:02 +03:00
gabime
b0059b290f Fix issue #761 2018-07-20 23:26:52 +03:00
gabime
9cbdd5ffd4 Added async_nonblocking factory 2018-07-20 23:20:48 +03:00
gabime
ddb3002bc1 Added non const sinks() function to support addition/removal of sinks from existing logger 2018-07-20 12:49:30 +01:00
Gabi Melman
63db70aacc Update README.md 2018-07-20 14:35:57 +03:00
gabime
6225a9fa4f Minor cleaning of spdlog.h 2018-07-19 15:09:10 +03:00
gabime
3aaefc48ec Minor cleaning of common.h 2018-07-19 15:07:54 +03:00
gabime
c832a39d44 fixed example msvc solution 2018-07-19 15:03:37 +03:00
gabime
0a3c81826f Changed some functions to accept strings instead of ref to strings for better semantics 2018-07-19 15:03:08 +03:00
gabime
b710e0fe86 Changed some functions to accept strings instead of ref to strings for better semantics 2018-07-19 15:00:05 +03:00
gabime
9df2bd256e Changed some functions to accept strings instead of ref to strings for better semantics 2018-07-19 14:54:26 +03:00
Gabi Melman
b238bf9512 fix issue #755 2018-07-17 20:09:05 +03:00
Gabi Melman
07928109af Update README.md 2018-07-17 15:28:53 +03:00
Gabi Melman
2e4e80f2a9 Update README.md 2018-07-17 15:27:21 +03:00
Gabi Melman
4b62819da0 Update README.md 2018-07-17 15:26:12 +03:00
Gabi Melman
e3af4124de Update README.md 2018-07-17 15:20:02 +03:00
Gabi Melman
653c4d6472 Update README.md 2018-07-17 15:19:38 +03:00
Gabi Melman
b96a244984 Update README.md 2018-07-17 15:17:31 +03:00
Gabi Melman
2656a031e1 Update README.md 2018-07-17 15:16:14 +03:00
Gabi Melman
532671662d Update README.md 2018-07-17 15:15:18 +03:00
Gabi Melman
58f244a003 Update README.md 2018-07-17 15:13:31 +03:00
Gabi Melman
51c851ce3d Update README.md 2018-07-17 15:09:36 +03:00
gabime
c2a49080aa Refactored sink interface and base_sink 2018-07-14 16:21:53 +03:00
Gabi Melman
2bc05b6b17 Merge pull request #752 from baishuai/v1.x
fix bug in android_sink.h
2018-07-13 20:18:14 +03:00
baishuai
41f708e438 fix bug in android_sink.h 2018-07-13 23:41:26 +08:00
gabime
7d40244a89 Fixed issue #726 and changed default filename calculator to dateonly 2018-07-13 01:44:29 +03:00
gabime
08ef5a2a66 Updated null_mt bench report 2018-07-12 23:48:24 +03:00
gabime
16ee72da7c clang format 2018-07-10 23:53:00 +03:00
gabime
d409e5367b Revert d5468e50f6 2018-07-10 23:51:20 +03:00
gabime
d5468e50f6 Small optimization in thread pool 2018-07-10 20:42:27 +03:00
gabime
ef111ddba2 Fix issue #736 2018-07-10 20:20:55 +03:00
gabime
81f29a9a7a Fixed wchar support in messages 2018-07-10 17:01:49 +03:00
gabime
898e1f2641 Fixed bench 2018-07-10 16:11:01 +03:00
gabime
23ad1aa243 Fixed bench 2018-07-10 16:08:39 +03:00
gabime
4e9fafac75 comment 2018-07-10 14:35:54 +03:00
gabime
b9180f8f5a Fix to a windows issue, where very high rotation rates sometimes fail if antivirus is running. 2018-07-10 14:33:38 +03:00
gabime
cf6e9461af Fixed comversion warning in bench under msvc 2018-07-10 10:48:29 +03:00
gabime
97c201297f Udpated example 2018-07-10 10:40:25 +03:00
gabime
4a59ea3b1e Fixedconversion warning in 32 bits 2018-07-10 10:40:09 +03:00
gabime
f9019870da Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x 2018-07-10 10:34:08 +03:00
gabime
60ca07c2d5 fixed latency test 2018-07-09 23:56:07 +03:00
gabime
8baa8cf8ea fixed latency test 2018-07-09 23:55:17 +03:00
gabime
a776a774e1 cache millis in full_formatter 2018-07-09 21:07:44 +03:00
gabime
374a22b4b9 bench fix 2018-07-09 21:06:59 +03:00
gabime
bc495bbc63 Added latency bench 2018-07-09 21:06:15 +03:00
gabime
c887907d4a faster reset of cached buffer 2018-07-09 15:10:43 +03:00
gabime
b4dcd592d8 faster reset of cached buffer 2018-07-09 15:10:24 +03:00
gabime
21524c16fa faster reset of cached buffer 2018-07-09 15:05:48 +03:00
Gabi Melman
bbff8abf58 Update CMakeLists.txt 2018-07-08 19:25:15 +03:00
Gabi Melman
99cc35384b Update common.h 2018-07-08 19:24:26 +03:00
Gabi Melman
8266dde556 Update README.md 2018-07-08 17:03:13 +03:00
Gabi Melman
2277fdc80d Update README.md 2018-07-08 17:02:26 +03:00
Gabi Melman
9cc731001b Update README.md 2018-07-08 17:00:57 +03:00
gabime
80855329e7 Updated readme.md 2018-07-08 16:50:56 +03:00
gabime
5851fb9de9 Updated readme.md 2018-07-08 16:49:57 +03:00
gabime
866e593138 Updated readme.md 2018-07-08 16:48:58 +03:00
gabime
7f26ad29a0 Updated bench.cpp 2018-07-08 16:46:52 +03:00
gabime
f766b6d882 Updated bench.cpp 2018-07-08 16:46:12 +03:00
gabime
ca2724d82e Updated readme 2018-07-08 16:45:35 +03:00
gabime
a8b026bd70 Updated readme 2018-07-08 16:43:55 +03:00
gabime
2292f7a27a Updated readme 2018-07-08 16:43:04 +03:00
gabime
3ea1d27aac Updated readme 2018-07-08 16:42:21 +03:00
gabime
df779f66a2 Updated readme 2018-07-08 16:39:25 +03:00
gabime
81f3cc5575 clang format 2018-07-08 16:26:25 +03:00
gabime
1fd166d417 Updated example 2018-07-08 16:26:14 +03:00
gabime
5bfeb672f7 updated slot size in async queue 2018-07-08 16:22:04 +03:00
gabime
3c40c5ca5d Added mulitsink example 2018-07-08 16:20:28 +03:00
gabime
f4771be70e Upgraded to fmt 5.1.0 2018-07-08 11:03:43 +03:00
gabime
887326e715 minor code cleanup 2018-07-08 01:41:32 +03:00
gabime
45da6c9c33 spelling 2018-07-08 00:56:05 +03:00
gabime
7ed8e1b59d renamed async block policy 2018-07-08 00:53:50 +03:00
gabime
4f1ce9189f Fixed issue #747 2018-07-07 16:40:29 +03:00
gabime
775e410b00 Fixed issue #747 2018-07-07 16:29:05 +03:00
gabime
c9331594bb Renamed file to pattern_forammter.h and fixed utc support 2018-07-07 16:15:17 +03:00
gabime
cbc4db8649 Renamed filename and other small formatter changes 2018-07-07 15:34:25 +03:00
gabime
b07069fb4d Fixed example 2018-07-07 15:27:17 +03:00
Gabi Melman
4fc59e3e7b Update example.cpp 2018-07-07 15:05:01 +03:00
Gabi Melman
5fddfca7c6 Update example.cpp 2018-07-07 15:03:57 +03:00
Gabi Melman
745b9e32ed Update example.cpp 2018-07-07 15:03:34 +03:00
gabime
9dc44c39e7 Fixed bugs in stdout_sinks and in msvc 2018-07-07 14:04:31 +03:00
gabime
bde4c7149f Renamed traits to console globals 2018-07-07 13:38:15 +03:00
gabime
39c6eb752a Code formatting 2018-07-07 13:22:43 +03:00
gabime
a9a7309001 fixed dist_sink.h 2018-07-07 13:22:09 +03:00
gabime
72f4fae207 updated example 2018-07-07 12:53:56 +03:00
gabime
b0bf457538 updated example 2018-07-07 12:37:17 +03:00
gabime
98ab8e0d73 Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x 2018-07-07 12:12:54 +03:00
gabime
cd4dcbab36 Renamed simple_file_sink -> basic_file_sink 2018-07-07 12:12:45 +03:00
Gabi Melman
3ebdb2fd8b Update logger.h 2018-07-06 08:40:55 +03:00
gabime
69c11ea7d2 Updated bench 2018-07-05 16:35:07 +03:00
gabime
bd759bfca7 removed force_flush from simple logger 2018-07-05 16:34:20 +03:00
gabime
4a90950fe5 updated bench 2018-07-05 16:19:23 +03:00
gabime
005468248b Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x 2018-07-05 14:56:19 +03:00
gabime
ecd7669e42 Fixed gcc warning 2018-07-05 12:57:14 +03:00
gabime
36a823df70 Fixed msvc example solution 2018-07-05 10:55:19 +03:00
gabime
3643db6821 Fixed msvc conversion warning 2018-07-05 10:54:02 +03:00
gabime
59f54cda10 Fixed msvc conversion warnings 2018-07-04 10:44:05 +03:00
gabime
95de24e4f6 fixed tests and renamed to_short_str 2018-07-04 09:59:26 +03:00
gabime
1d9e2304be renamed level::to_str() to level::to_c_str() 2018-07-04 02:08:28 +03:00
gabime
1f801828a5 pad6 thread id and micros in formatter 2018-07-04 01:41:05 +03:00
gabime
94a7152afc async queue - overrun oldsest policy option 2018-07-04 01:24:52 +03:00
gabime
0358d115e0 removed std::string from async messages 2018-07-04 00:46:50 +03:00
gabime
b4349e4226 pre allocate async q memory 2018-07-04 00:38:23 +03:00
gabime
92e2cef67f remove unneeded includes from file 2018-06-26 02:37:35 +03:00
gabime
91264ea2f0 small improvment to formatter 2018-06-26 02:32:19 +03:00
gabime
e66ee8b710 fix gcc and clang warnings 2018-06-26 02:00:33 +03:00
gabime
a6e2f23780 Pattern formatter optimizations 2018-06-26 01:13:02 +03:00
gabime
87e013534c wincolor sink fix 2018-06-25 16:32:22 +03:00
gabime
1d9ec2373a Better support for 32bits 2018-06-25 16:31:56 +03:00
gabime
46cf0f86b8 Added set_pattern() to sink class 2018-06-24 01:55:30 +03:00
gabime
e574f57511 Fixed stdout_color_sinks.h namespace 2018-06-24 01:55:09 +03:00
gabime
8fdd26da82 Fixed example.cpp 2018-06-24 01:37:34 +03:00
gabime
0c19bdd772 pattern per sink and pattern caching 2018-06-24 01:32:39 +03:00
gabime
9d7a5c253a Moved fmt helpers to new file 2018-06-15 14:15:35 +03:00
gabime
ac6a2a4c0f -mpattern_formatter small change in pad3 2018-06-15 13:56:12 +03:00
Gabi Melman
58e09dbd33 Update common.h 2018-06-13 21:14:18 +03:00
Gabi Melman
e770673f11 Update common.h 2018-06-13 21:13:22 +03:00
gabime
6d5670fde7 format 2018-06-13 20:19:13 +03:00
gabime
da0d6d0478 Removed printf support 2018-06-13 20:16:45 +03:00
gabime
5683c06d9a solve issue #724 2018-06-13 20:16:31 +03:00
gabime
65506136e2 solve issue #724 2018-06-13 19:10:22 +03:00
gabime
2989e998ee Speed up pattern_formatter 2018-06-13 18:47:02 +03:00
gabime
3f438a8084 added bundled fmt 5.x 2018-06-13 10:55:14 +03:00
gabime
f2a8847902 Speed up pattern_formatter 2018-06-13 01:47:03 +03:00
gabime
94ac1261e4 Speed up default pattern 2018-06-13 01:06:37 +03:00
gabime
8b7e19e92f Bug fixes in pattern_formatter and async_logger 2018-06-13 00:20:54 +03:00
gabime
81fa788bca Updated tests 2018-06-12 22:43:49 +03:00
gabime
cdbf2e361b Upgrade to fmt 5.x 2018-06-12 18:48:22 +03:00
gabime
378c7789ba Fixed issue #720 2018-06-10 23:16:00 +03:00
gabime
15f3b0fea5 format 2018-06-10 23:03:55 +03:00
gabime
28ef15d669 updated example 2018-06-10 23:02:53 +03:00
gabime
145fc367f9 updated example 2018-06-10 23:01:46 +03:00
gabime
a21594bec7 move underscores to the end of private members 2018-06-10 22:59:17 +03:00
gabime
7d975de193 removed message_counter from tp 2018-06-01 18:56:51 +03:00
gabime
5833c1dec8 cleaned bench source folder 2018-06-01 17:58:57 +03:00
gabime
4b9949de7b format 2018-06-01 17:52:05 +03:00
gabime
5997e5aae7 cleaned bench folder to contain only spdlog tests 2018-06-01 17:50:59 +03:00
gabime
52d1c08896 cleaned tests 2018-06-01 17:30:38 +03:00
gabime
7815d39807 removed wait_empty() from tp and q 2018-06-01 17:25:23 +03:00
gabime
7f6220d960 increase errno string buffer size 2018-06-01 17:21:00 +03:00
gabime
8a3c858d36 bench 2018-06-01 17:09:22 +03:00
gabime
38b3ecb02e use fmt::safe_strerror 2018-06-01 17:07:39 +03:00
gabime
f2bc1571b4 update example 2018-05-27 03:21:59 +03:00
gabime
4d7245bb67 update example 2018-05-27 03:18:12 +03:00
gabime
ef5c4f027c added tp getter to async api 2018-05-27 03:14:55 +03:00
gabime
c568640595 update bench 2018-05-27 03:02:51 +03:00
gabime
8338b45b2b added tp->wait_empty() 2018-05-27 02:53:16 +03:00
gabime
0d0a841e8d format 2018-05-27 02:21:49 +03:00
gabime
31ff43ef81 more async tests 2018-05-27 02:21:31 +03:00
gabime
a43a44bb88 update example 2018-05-27 01:29:13 +03:00
gabime
cfbc8e52ba use underscore at end of private members names 2018-05-26 19:21:20 +03:00
gabime
72506b3bab use underscore at end of private members names 2018-05-26 19:02:58 +03:00
gabime
b002a21c36 use underscore at end of private members names 2018-05-26 19:02:20 +03:00
gabime
7a339e2b5e Updated usage message in async null bench 2018-05-26 18:57:29 +03:00
gabime
e033a0da9a Fixed usage message in async null bench 2018-05-26 18:54:52 +03:00
gabime
0d7a1d1ef9 format 2018-05-26 18:48:39 +03:00
gabime
80f19d7136 updated null-async bench command line flags 2018-05-26 18:48:33 +03:00
gabime
15d6432302 Fixed bench 2018-05-26 17:42:49 +03:00
gabime
59a15c02d3 use std::string in async_msg instead of fmt::MemoryWriter 2018-05-26 14:56:20 +03:00
gabime
e4ed7528e3 fixed class name 2018-05-26 14:50:42 +03:00
gabime
8932b77d63 fixed example 2018-05-26 14:50:27 +03:00
Gabi Melman
b3543452c2 Update simple_file_sink.h 2018-05-25 19:01:24 +03:00
Gabi Melman
16376c18aa Update thread_pool.h 2018-05-25 18:44:43 +03:00
Gabi Melman
a23eb3769a Update async.h 2018-05-25 18:28:29 +03:00
Gabi Melman
001e22ebee Update registry.h 2018-05-25 18:20:08 +03:00
Gabi Melman
e8a726df03 Update stdout_color_sinks.h 2018-05-25 18:09:30 +03:00
gabime
8901cbffe0 added catch macro and fixed some tests 2018-05-24 00:18:55 +03:00
gabime
b9d7c45e40 Use blocking queue 2018-05-22 21:59:27 +03:00
gabime
cf63bcb808 catch exceptions during flush and cal handler 2018-05-22 21:59:14 +03:00
Gabi Melman
d0b8ecb6dd Update README.md 2018-04-29 01:56:18 +03:00
Gabi Melman
13774e62bd Update README.md 2018-04-29 01:55:09 +03:00
gabime
4ec17f1a1a Normalized spdlog include paths 2018-04-29 01:43:42 +03:00
gabime
f886ae0005 Removed unneeded include 2018-04-29 01:39:36 +03:00
gabime
7db5b56dd7 Removed unneeded include 2018-04-29 01:38:21 +03:00
gabime
3c7103d90d Format 2018-04-29 01:36:45 +03:00
gabime
5ec37c05f7 Normalized spdlog include paths 2018-04-29 01:35:49 +03:00
gabime
780dab6977 Fixed tests 2018-04-29 01:34:36 +03:00
gabime
caa26a2a47 Normalized spdlog include paths 2018-04-29 01:31:09 +03:00
gabime
d389bda2cc moved file sinks sinks folder 2018-04-29 01:26:10 +03:00
gabime
60f8a68ae0 Splitted file sinks to seperate headers 2018-04-29 01:23:18 +03:00
gabime
99ca7f1cbe Comments 2018-04-29 00:52:56 +03:00
gabime
3e28d9ab5a Renamed default factory 2018-04-29 00:44:35 +03:00
gabime
4bee0ec294 Fixed stderr_logger typedef 2018-04-29 00:43:24 +03:00
gabime
b3a23039b1 Renamed default factory 2018-04-29 00:42:24 +03:00
gabime
e500fa013f example 2018-04-29 00:35:32 +03:00
gabime
b393c9d6e6 Fixed console traits 2018-04-29 00:23:59 +03:00
gabime
e4f0d6446b Small template rename 2018-04-29 00:21:15 +03:00
gabime
9b5c5b4f3d Small template rename 2018-04-29 00:20:04 +03:00
gabime
0d61ab82e4 small makefile fix for example 2018-04-29 00:09:56 +03:00
gabime
67ddd59701 Move msg and remove spinning 2018-04-29 00:08:46 +03:00
gabime
78ea362e27 Don't rethrow after catch(...) 2018-04-28 23:30:35 +03:00
gabime
d51102a168 example.cpp fix 2018-04-28 19:29:10 +03:00
gabime
f2023e80a8 Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x 2018-04-22 00:26:02 +03:00
gabime
384ae1dc1b Removed unneeded intializers from async_msg 2018-04-22 00:25:20 +03:00
Gabi Melman
c63f8a6ea0 Delete spdlog_impl.h 2018-04-20 15:55:00 +03:00
gabime
64c725cee2 Fixed multisink example 2018-04-20 14:03:36 +03:00
gabime
110bdd93c8 Fixed stdout_sinks 2018-04-20 14:03:15 +03:00
gabime
c962c88342 Fixed linux port of v1.x 2018-04-20 13:20:19 +03:00
gabime
c80cc3306f Fixed tests 2018-04-20 03:04:53 +03:00
gabime
e4d3eb64e6 Udpated example and spdlog.h 2018-04-20 02:57:05 +03:00
gabime
0969118ce7 added default_factory alias 2018-04-20 01:55:31 +03:00
gabime
ba7c4c0530 stdout and color logger factories 2018-04-20 01:50:09 +03:00
gabime
d6cb447667 fixed compile error 2018-04-19 18:41:00 +03:00
gabime
b9fac2b179 added missing header 2018-04-19 18:40:58 +03:00
gabime
11e068d7a3 Added missing #include 2018-04-19 17:50:18 +03:00
gabime
924ef84241 Refactred spdlog.h and console sinks. Added global lock for all console sinks (traits) 2018-04-18 02:04:10 +03:00
gabime
9bffa921ae global mutex stdout stderr sinks 2018-04-16 01:07:22 +03:00
gabime
c50ba69689 removed un needed includes 2018-04-14 04:16:05 +03:00
gabime
b4cde3fc21 Added missing files 2018-04-14 04:11:03 +03:00
gabime
6f1dc624e6 fix example 2018-04-14 03:47:26 +03:00
gabime
7378cc297c fix example 2018-04-14 03:43:00 +03:00
gabime
6f4cd8d397 thread_pool and refactoring async 2018-04-14 03:34:57 +03:00
Gabi Melman
5e08950ed2 Created contrib/sinks directory 2018-04-13 12:45:33 +03:00
Gabi Melman
bce3b75c53 Created contrib directory 2018-04-13 12:44:43 +03:00
gabime
3fdc7996db code formatting 2018-04-09 15:14:13 +03:00
gabime
e9bb008f15 Fixed example 2018-04-09 15:12:51 +03:00
gabime
d352aa0990 Fixed example 2018-04-09 15:11:42 +03:00
gabime
cfb450c059 Fixed eol write in pattern_formatter_impl 2018-04-09 14:14:52 +03:00
Gabi Melman
b416685d6f Fix gcc warning on stat (32 bits) 2018-04-09 02:06:33 +03:00
gabime
64c2fe180b Fixed bug in wrapping colors around level name in default pattern 2018-04-08 18:27:18 +03:00
gabime
309327187a Fixed example makefile for clang 2018-04-06 04:36:22 +03:00
gabime
1dea46e1ab code formatting 2018-04-06 04:06:02 +03:00
Gabi Melman
4abe403544 Update README.md 2018-04-06 04:05:23 +03:00
Gabi Melman
21d437fbf5 Update README.md 2018-04-06 04:04:50 +03:00
Gabi Melman
84c7f927c2 Merge pull request #679 from gabime/color-formatting
Color formatting
2018-04-06 04:00:17 +03:00
gabime
644c81b9fb Added color ranges to formatter tests 2018-04-06 03:42:24 +03:00
gabime
3452892f76 minor renaming 2018-04-06 03:22:27 +03:00
gabime
2f7fdf2663 wincolor color formatting support 2018-04-06 03:06:41 +03:00
gabime
d040ab93ea wincolor color formatting support 2018-04-06 03:04:18 +03:00
gabime
c8610d9a86 support for color formatting 2018-04-06 02:24:07 +03:00
gabime
93d41b2c0e fixed gcc warning about struct stat 2018-03-22 20:35:49 +02:00
gabime
c03ae5fafd Merge branch 'master' of https://github.com/gabime/spdlog 2018-03-22 20:08:33 +02:00
Gabi Melman
b3988d6e1f Merge pull request #665 from kasru/more_bench
More benchmarks
2018-03-21 20:58:11 +02:00
Alexander Kiselev
ad2c7b3959 Add README 2018-03-21 17:15:33 +03:00
Alexander Kiselev
5e1e897d10 Remove p7-bench binary 2018-03-21 16:51:43 +03:00
Alexander Kiselev
37f209079e Update spdlog-bench 2018-03-21 16:50:45 +03:00
Alexander Kiselev
0f66c63f72 Update easyloggingpp, Add plog 2018-03-21 16:46:52 +03:00
Gabi Melman
abde900cd7 Merge pull request #663 from kasru/more_bench
More bench
2018-03-19 21:27:03 +02:00
Alexander Kiselev
fd1c4d7877 Fix: unknown conversion specifier 'Y' 2018-03-19 20:03:47 +03:00
Alexander Kiselev
70ad1aa409 Changes: boost, easylogging, g2log, glog, spdlog. 2018-03-19 19:22:02 +03:00
Alexander Kiselev
c83dd5d60e Added: g3log, log4cplus, log4cpp, p7. Changes: boost, easylogging, g2log, glog, spdlog. 2018-03-19 19:17:26 +03:00
gabime
18c99682a8 fixed clang warning about uninitialized values 2018-03-17 14:08:10 +02:00
gabime
200815892f Fix clang-tidy warnings about missing braces around if and for statements 2018-03-17 13:42:09 +02:00
gabime
7eb6ca6337 formatting 2018-03-17 12:49:45 +02:00
gabime
5a0f90bc82 clang format namespace fix 2018-03-17 12:49:31 +02:00
gabime
2a86cdb203 Merge branch 'master' of https://github.com/gabime/spdlog 2018-03-17 12:47:56 +02:00
gabime
56e4a201ec formatting 2018-03-17 12:47:46 +02:00
gabime
c739e68021 clang format namespace fix 2018-03-17 12:47:04 +02:00
Gabi Melman
fe8a519434 Update logger.h 2018-03-16 22:03:54 +02:00
gabime
4445f6f869 formatting 2018-03-16 17:35:56 +02:00
gabime
4ee89877d5 Changed clang formatting for templates 2018-03-16 17:35:50 +02:00
gabime
ea95ea8295 Fix potential issue #660 2018-03-16 17:20:56 +02:00
gabime
fe5aaf4932 Fixed example 2018-03-16 17:17:33 +02:00
gabime
5afb5dc782 Changed clang formatting for templates 2018-03-16 17:13:50 +02:00
gabime
f4ce52d206 Changed clang formatting for templates 2018-03-16 17:13:22 +02:00
gabime
1108515738 format.sh small fix 2018-03-16 17:04:35 +02:00
gabime
8ee7b772a9 Added -O3 flag to CMakeLists.txt 2018-03-16 14:15:35 +02:00
Gabi Melman
650daf7542 Update common.h
Updated spdlog version macro to 0.16.4-rc
2018-03-09 23:26:28 +02:00
Gabi Melman
1946818292 Update .clang-format 2018-03-09 23:11:48 +02:00
gabime
cbe98c0fd2 clang format 2018-03-09 15:30:48 +02:00
gabime
ad221b0990 Changed function name to level::from_str 2018-03-09 15:27:53 +02:00
gabime
a2653d409f clang-format 2018-03-09 15:26:33 +02:00
gabime
461b5ef28a Fixed missing ; 2018-03-09 15:26:00 +02:00
gabime
7f1f7b6232 Changed function name to level::from_str 2018-03-09 15:24:37 +02:00
gabime
d741f1b654 some clang format fixes 2018-03-09 15:02:15 +02:00
gabime
f0606bcdb7 Merge branch 'master' of https://github.com/gabime/spdlog 2018-03-09 14:29:23 +02:00
gabime
03bc9ebb1f .clang-format 2018-03-09 14:29:20 +02:00
gabime
1f79c01dc4 Use clang-format-5.0 instead of astyle 2018-03-09 14:27:15 +02:00
Gabi Melman
dcf803de73 Merge pull request #622 from fegomes/to_level
New function to convert level_enum from string
2018-03-09 14:27:01 +02:00
fegomes
46f9768599 change of scope the name_to_level variable 2018-03-09 09:04:44 -03:00
gabime
2e098421f1 added .log extension to bench test 2018-03-09 12:08:56 +02:00
fegomes
c21dd874d1 removed class to return size of array. 2018-03-08 19:09:46 -03:00
fegomes
48c8755d06 include test to convert functions and change suggested by @gabime 2018-03-08 19:08:24 -03:00
fegomes
f9750dddee Merge branch 'master' into to_level 2018-03-08 18:16:10 -03:00
Gabi Melman
e8a39c894f Update test_pattern_formatter.cpp 2018-03-06 10:31:36 +02:00
Gabi Melman
97cdbc45e8 Merge pull request #653 from tbastos/master
Fix implicit conversion warnings (-Wsign-conversion)
2018-03-05 22:29:51 +02:00
Thiago Bastos
d044369e3b Fix implicit conversion warnings (-Wsign-conversion) 2018-03-05 20:00:48 +01:00
gabime
84d3c90b93 Fixed g++ 4.9 warnings after the clang-tidy fixes 2018-02-28 00:11:50 +02:00
Gabi Melman
2e973c8b3d Merge pull request #647 from DanielChabrowski/clang-tidy
Applied some of clang-tidy fixes
2018-02-27 23:41:24 +02:00
Daniel Chabrowski
de642b6263 astyle applied 2018-02-25 12:41:18 +01:00
Daniel Chabrowski
5355bd3a8f readability-named-parameter 2018-02-25 12:39:37 +01:00
Daniel Chabrowski
35a843f8b6 modernize-return-braced-init-list 2018-02-25 12:24:21 +01:00
Daniel Chabrowski
17caf77784 google-build-namespaces 2018-02-25 12:12:34 +01:00
Daniel Chabrowski
0c94ce0039 deleted copy op and a little format 2018-02-25 03:35:20 +01:00
Daniel Chabrowski
af50d5ef1f readability-inconsistent-declaration-parameter-name 2018-02-25 02:19:26 +01:00
Daniel Chabrowski
9ce66f2c9a modernize-pass-by-value 2018-02-25 01:58:09 +01:00
Daniel Chabrowski
ad624432d8 google-explicit-constructor 2018-02-25 01:40:46 +01:00
Daniel Chabrowski
1e1ca23101 modernize-use-equals-default 2018-02-25 01:25:15 +01:00
Daniel Chabrowski
e5bbe57f01 cppcoreguidelines-pro-type-member 2018-02-25 01:15:35 +01:00
Daniel Chabrowski
68f91822ed performance-unnecessary-value-param 2018-02-25 00:54:14 +01:00
Daniel Chabrowski
7aed498540 modernize-use-default-member-init 2018-02-25 00:38:54 +01:00
Daniel Chabrowski
d5a3bb5234 readability-else-after-return 2018-02-25 00:24:47 +01:00
Daniel Chabrowski
9ebb9ff318 readability-implicit-bool-cast 2018-02-25 00:16:18 +01:00
Daniel Chabrowski
fb6df0512f modernize-use-override 2018-02-24 23:56:56 +01:00
Daniel Chabrowski
7f4c1bb77c modernize-use-using 2018-02-24 22:35:09 +01:00
gabime
abc0d43995 astyle 2018-02-23 18:33:03 +02:00
gabime
3826ac1433 bumped bundled fmt version to 4.1.0 2018-02-23 18:32:06 +02:00
gabime
d650fa2456 Fixed tests for older gcc compilers 2018-02-23 18:25:39 +02:00
gabime
80163dc6c1 Better support for WinRT 2018-02-23 18:16:43 +02:00
gabime
a8b5bb894e fixed cmake for tests 2018-02-23 16:49:26 +02:00
gabime
3620b31ef2 added pattern formatter tests 2018-02-23 16:40:45 +02:00
gabime
7709fc70eb small fix to pattern_formatter ctor 2018-02-23 15:10:21 +02:00
Gabi Melman
bce33698be Merge pull request #628 from emadwill/eol
Support for custom EOL per formatter -Thanks @emadwill
2018-02-23 15:11:10 +02:00
gabime
04d0dd5987 moved SPDLOG_VERSION macro to common.h 2018-02-23 14:39:41 +02:00
gabime
051048ebd7 Fixed issue #645 (include tweakme.h from common.h) 2018-02-23 14:34:25 +02:00
gabime
7fe3912f12 astyle 2018-02-23 14:29:31 +02:00
gabime
7eb41ccf0f Use -O3 flag in tests 2018-02-23 14:29:14 +02:00
gabime
79d55fd802 Merge branch 'master' of https://github.com/gabime/spdlog 2018-02-23 14:07:45 +02:00
gabime
6df52df5b4 Use emplace_back in pattern_formatter 2018-02-23 14:05:48 +02:00
gabime
bdca50e6a7 Fixed issue #637 2018-02-23 13:26:53 +02:00
Gabi Melman
851b49e147 Update CMakeLists.txt 2018-02-22 13:37:50 +02:00
Gabi Melman
e64847bd09 Merge pull request #644 from grzadr/patch-1
Fix indentation in tests/catch.hpp:2916
2018-02-22 11:44:55 +02:00
grzadr
8e861728a0 Fix indentation in line 2916
Compiling with -Wmisleading-indentation triggers warning:
/data/Git/spdlog/tests/catch.hpp: In member function ‘bool Catch::TestSpec::Filter::matches(const Catch::TestCaseInfo&) const’:
/data/Git/spdlog/tests/catch.hpp:2913:17: warning: this ‘for’ clause does not guard... [-Wmisleading-indentation]
                 for( std::vector<Ptr<Pattern> >::const_iterator it = m_patterns.begin(), itEnd = m_patterns.end(); it != itEnd; ++it )
                 ^~~
/data/Git/spdlog/tests/catch.hpp:2916:21: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘for’
                     return true;
                     ^~~~~~
2018-02-22 09:46:54 +01:00
Gabi Melman
8cfd71a9be Merge pull request #635 from DanielChabrowski/cmake_explicit_lang
CMake explicit language
2018-02-12 01:16:49 +02:00
Daniel Chabrowski
5d08bd1709 Bump example's cmake version to 3.1
CMake 3.1 is used in main CMakeLists file, no reason not to use it in example.
Threads::Threads is introduced in cmake 3.1.
2018-02-11 21:16:15 +01:00
Daniel Chabrowski
646a140ed4 Specify CXX language explicitly in CMake
Marking project as CXX will disable detecting C compiler and other checks.
Removed 'INCLUDES DESTINATION' as it made the include path appear doubled.
2018-02-11 21:13:33 +01:00
Gabi Melman
5eef243ab6 Merge pull request #634 from ColinDuquesnoy/patch-1
Fix compilation error with GCC 8
2018-02-10 19:05:33 +02:00
Colin Duquesnoy
11ee6834f6 Fix compilation error with GCC 8
error: need 'typename' before 'std::conditional<std::is_same<char, char>::value, fmt::BasicMemoryWriter<char>, fmt::BasicMemoryWriter<wchar_t> >::type' because 'std::conditional<std::is_same<char, char>::value, fmt::BasicMemoryWriter<char>, fmt::BasicMemoryWriter<wchar_t> >' is a dependent scope
         std::conditional<std::is_same<filename_t::value_type, char>::value, fmt::MemoryWriter, fmt::WMemoryWriter>::type w;
2018-02-10 15:15:46 +01:00
Gabi Melman
c07e81a049 Merge pull request #632 from bschindler/wincolor_set_color_public
Make set_color public in wincolor_sink to retain configurability
2018-02-08 11:04:29 +02:00
Benjamin Schindler
05b2aabe0e Make set_color public in wincolor_sink to retain configurability 2018-02-08 09:14:45 +01:00
Emad William Farag
55680db160 Support for custom EOL per formatter 2018-02-05 21:51:01 -05:00
Fernando Gomes
f4ffddc942 Merge branch 'master' into to_level 2018-02-05 09:52:30 -02:00
gabime
5ab033fba5 Fix issue #629 2018-02-05 12:20:57 +02:00
Gabi Melman
1dfc8282df Merge pull request #624 from yisonPylkita/modern_cmake_tests
Modern CMake in /tests
2018-02-03 19:10:44 +02:00
gabime
f8aec1bdf1 Merge branch 'master' of https://github.com/gabime/spdlog.git 2018-02-03 18:58:10 +02:00
gabime
51a83da578 Repplaced map with unordered_map for level->colos mapping 2018-02-03 18:57:57 +02:00
yisonPylkita
38ccd51399 Modern CMake in /tests 2018-01-28 00:49:03 +01:00
fegomes
8696ad8739 new function to convert level_enum from string 2018-01-24 23:08:46 -02:00
Gabi Melman
c336470320 Merge pull request #621 from rcarmich/fix_example_spelling_errors
Fixed spelling mistake in example.cpp
2018-01-24 22:42:31 +02:00
Ryan Carmichael
da51d8dfd3 Fixed spelling mistake in example.cpp 2018-01-24 14:18:05 -06:00
Gabi Melman
22fdd3bf0f Merge pull request #615 from Qix-/master
A few small ANSI color improvements
2018-01-18 22:01:46 +02:00
Josh Junon
cae749fc9b clear line after writing log message contents 2018-01-18 15:06:47 +01:00
Josh Junon
58e68725ae rename grey to black 2018-01-18 15:03:26 +01:00
Josh Junon
a59f74e8a2 remove needless zeros in reset code 2018-01-18 15:03:03 +01:00
Gabi Melman
f258af4364 Update CMakeLists.txt 2018-01-12 16:06:30 +02:00
gabime
ccd675a286 version 0.16.3 2018-01-12 14:09:34 +02:00
gabime
5372d58adc comment 2018-01-12 14:09:07 +02:00
Gabi Melman
751520f0cf Merge pull request #610 from joaomoreno/fix609
Use Sleep in Windows instead of sleep_for
2018-01-11 23:09:38 +02:00
Joao Moreno
357a63d914 fix spdlog namespace 2018-01-11 21:58:02 +01:00
Joao Moreno
a938045135 use Sleep in Windows instead of sleep_for
fixes #609
2018-01-11 14:50:47 +01:00
Gabi Melman
32177aa77a Merge pull request #604 from sam-lunt/improve-macros
Ensure marcos always expand to expressions
2018-01-03 18:05:25 +02:00
Gabi Melman
ce1df17262 Merge pull request #605 from sam-lunt/add-flush-on
Add global flush_on function
2018-01-03 18:00:08 +02:00
Sam Lunt
9f8413308a add global flush_on function 2018-01-03 09:36:09 -06:00
Sam Lunt
f25f0e0e40 add (void)0 when logging is disabled 2018-01-03 09:07:58 -06:00
Gabi Melman
a2890f2778 Merge pull request #596 from Broekman/master
Issue fix for spdlog #595. Conversion warning.
2017-12-26 21:22:08 +02:00
Stefan Broekman
de4644b44a Issue fix for spdlog #595. Conversion warning.
See: https://github.com/gabime/spdlog/issues/595

On line 85 in file sinks/wincolor_sink.h:
back_color &= ~(FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE |
FOREGROUND_INTENSITY);

'back_color' is of type 'WORD' (unsigned short) whereas a bitwise
complement/NOT returns an int. This results in a conversion warning with
-Wconversion enabled.

85:20: warning: conversion to 'WORD {aka short unsigned int}' from 'int'
may alter its value [-Wconversion] back_color &= ~(FOREGROUND_RED |
FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY);

Possible solution:
We know that the result of ~(FOREGROUND_RED | FOREGROUND_GREEN |
FOREGROUND_BLUE | FOREGROUND_INTENSITY) is always within the limits of
an unsigned short so a simple cast should suffice (correct me if I'm
wrong):

back_color &= static_cast<unsigned short>(~(FOREGROUND_RED |
FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY));
2017-12-26 19:23:29 +01:00
Gabi Melman
03db102375 Update README.md 2017-12-26 13:26:04 +02:00
gabime
3d967dd716 added catch license in tests folder 2017-12-24 19:37:54 +02:00
Gabi Melman
b53d207f44 Update file_helper.h 2017-12-23 11:43:41 +02:00
Gabi Melman
fde12195ee Update file_helper.h 2017-12-22 19:06:01 +02:00
gabime
4ca6991828 astyle 2017-12-22 18:55:19 +02:00
gabime
813dcbcf63 version 0.16.2 2017-12-22 18:50:08 +02:00
gabime
7663f58379 Fixed file_helper::split_by_extenstion tests for gcc 2017-12-22 18:48:02 +02:00
gabime
8e3f968ba4 Fixed file_helper::split_by_extenstion and added more tests for it 2017-12-22 18:41:03 +02:00
gabime
f695e536dd Fixed file_helper::split_by_extenstion and added more tests for it 2017-12-22 18:37:51 +02:00
gabime
f257e4ea8c gitignore tests/logs 2017-12-22 18:36:54 +02:00
gabime
0ed3e4cf76 Merge branch 'master' of https://github.com/gabime/spdlog 2017-12-22 14:38:54 +02:00
gabime
6d355fd602 report about unknown excepptions before rethrow 2017-12-22 14:38:44 +02:00
Gabi Melman
dd0b7b2d13 Merge pull request #590 from fcharlie/master
fix split_by_extenstion parse error extenstion
2017-12-22 12:50:52 +02:00
Force Charlie
42e5d98a48 fix split_by_extenstion parse error extenstion 2017-12-22 17:52:50 +08:00
Gabi Melman
c060a10c10 update to version 0.16.1 2017-12-20 10:08:49 +02:00
Gabi Melman
79a3a633c7 uupdate version to 0.16.1 2017-12-20 10:07:50 +02:00
Gabi Melman
52dfd478d6 Merge pull request #584 from horar/master
Update version strings to 0.16.0
2017-12-20 10:02:17 +02:00
Gabi Melman
48eca46680 Merge pull request #586 from horar/fix/warnings
Solve compiler warning in tests
2017-12-20 09:50:34 +02:00
Ľubomír Carik
f93277d271 Solve compiler warning in tests
Signed-off-by: Ľubomír Carik <Lubomir.Carik@anritsu.com>
2017-12-20 04:34:08 +01:00
Ľubomír Carik
dda8af0092 Update version strings to 0.16.0
Signed-off-by: Ľubomír Carik <Lubomir.Carik@anritsu.com>
2017-12-20 03:43:47 +01:00
gabime
ed5498a2e9 report unexected exception types 2017-12-20 00:29:15 +02:00
gabime
6dd928dc3c Undo fix #529 (causes a warning under gcc and clang when no args passed) 2017-12-20 00:04:16 +02:00
gabime
de595fe2b7 Fix #529 (SPDLOG_TRACE macro problem) 2017-12-19 23:09:27 +02:00
Gabi Melman
d460c3026a Merge pull request #568 from adubovikov/master
added facilty for syslog
2017-12-19 11:49:51 +02:00
Gabi Melman
88fe218741 Update logger_impl.h 2017-12-06 15:59:27 +02:00
Gabi Melman
b1be7b9fea async log: increased sleep to to 500ms the worker loop 2017-12-05 14:07:13 +02:00
Alexandr Dubovikov
bec6919587 added facilty for syslog 2017-12-04 13:03:40 +01:00
Gabi Melman
2f81ff7f17 Update README.md 2017-12-03 21:01:07 +02:00
Gabi Melman
4db70c2078 Update README.md 2017-12-03 20:58:19 +02:00
gabime
26b390bb19 removed lock from dist_sink::_flush() (moved to base_sink::flush()) 2017-12-02 17:24:02 +02:00
gabime
a9149c6d46 added lock on flush in base_sink 2017-12-02 17:06:59 +02:00
gabime
859b7f1d58 fixed test for visual c++ 2017-12-01 04:42:23 +02:00
gabime
49989e0678 fixed test for gcc 4.8 (no regex) 2017-12-01 04:35:23 +02:00
gabime
70274924b7 fixed test comment 2017-12-01 03:59:35 +02:00
gabime
f5939f9e56 astyle 2017-12-01 03:46:19 +02:00
gabime
84e307521d Fixed test 2017-12-01 03:45:29 +02:00
gabime
3c4a2bf531 Handle file extensions in rotating and daily loggers 2017-12-01 03:40:49 +02:00
gabime
60ce47a814 Removed include_if.cpp from the tests .sln 2017-12-01 01:28:12 +02:00
Gabi Melman
613f024d42 Removed forgotten *_if declarations 2017-11-30 23:42:57 +02:00
gabime
799ba2a57b added SPDLOG_DISABLE_TID_CACHING macro to prevent invalid thread ids after fork 2017-11-26 00:40:47 +02:00
gabime
adbc22096a enable final keyword by default. Can be disabled in tweakme.h for older compilers 2017-11-25 15:53:35 +02:00
gabime
e7cf25a1c0 fixed issue #562 2017-11-25 15:41:55 +02:00
gabime
dcc7b347ca Removed all *_if functions (trace_if, debug_if, info_if,..) because they are redundant and confusing way to preform if 2017-11-25 15:19:41 +02:00
gabime
9a8f5c59e2 Added .idea/ to .gitignore 2017-11-25 15:11:18 +02:00
gabime
c41b6d28b5 astyle 2017-11-24 20:59:58 +02:00
gabime
fd170b0fe1 catch(...) exceptions, report it, and rethrow 2017-11-24 20:58:43 +02:00
Gabi Melman
587b528292 Merge pull request #556 from jpcima/syslog-build
correct include path for sink/syslog_sink.h
2017-11-14 16:29:20 +02:00
Gabi Melman
36c8e79a4a Merge pull request #555 from jpcima/windebug-sink
accept msvc_sink on all compilers, add name windebug_sink (fixes #554)
2017-11-14 16:28:39 +02:00
JP Cimalando
ecec210d0e accept msvc_sink on all compilers, add name windebug_sink (fixes #554) 2017-11-14 14:41:31 +01:00
JP Cimalando
76d2620dad correct include path for sink/syslog_sink.h 2017-11-14 14:25:43 +01:00
gabime
8ca1d84a32 Removed catch(..) from the codebase. Catch only std::exception 2017-11-12 19:46:15 +02:00
Gabi Melman
63d7c64618 Merge pull request #551 from daylanKifky/modified_includes
modified path on quoted #includes
2017-11-11 16:50:06 +02:00
daylanKifky
10772eadae fix wincolor_sink's common.h include 2017-11-11 15:38:08 +01:00
daylanKifky
b220bbb349 fix printf include 2017-11-11 15:21:34 +01:00
daylanKifky
5153b44507 minor fixes 2017-11-11 14:06:01 +01:00
daylanKifky
27e7412640 modified path on quoted #includes
Paths pointing to the root of the library where replaced for ones relatives to each file.

For example, inside /include/spdlog/details/file_helper.h:

This will look for os.h in /include/spdlog/details/spdlog/details/ which doesn't exists.

replaced with:
2017-11-11 13:44:27 +01:00
gabime
93be7713e0 astyle 2017-11-06 12:39:04 +02:00
Gabi Melman
6ab2f0e099 Merge pull request #548 from Subenle/master
Declare variables as size_t rather than unsigned.
2017-11-06 12:37:04 +02:00
Subenlele
34a9f24dba Declare variables as size_t rather than unsigned.
Modify `unsigned front, front1, back;` to `size_t front, front1, back;`
2017-11-05 20:59:37 -06:00
gabime
f70b2ef3b8 Fixed cygwin support 2017-11-05 01:17:21 +02:00
gabime
79e97fa1ec Added the license file of the fmtlib in the bundled folder 2017-11-05 00:34:16 +02:00
gabime
a66e9bbaf1 Minor fix in comment 2017-11-05 00:29:19 +02:00
gabime
f5fe681a41 Fixed issue #546 by adding an "is_empty" method to the queue instead of the buggy approx_size 2017-11-05 00:21:00 +02:00
Gabi Melman
6fd5f3c866 Merge pull request #545 from costinm/patch-1
Allow compilation on platforms with unwind (android)
2017-11-04 10:24:43 +02:00
Costin Manolache
f4f3e3fb66 Use __ANDROID__
Based on review feedback.
2017-11-03 19:37:38 -07:00
Costin Manolache
23dd8d3559 Allow compilation on platforms with unwind (android) 2017-11-02 17:12:08 -07:00
Gabi Melman
47c17be9a1 Merge pull request #457 from rkollataj/appveyor
Adding additional build environments for AppVeyor
2017-10-25 13:09:09 +03:00
Gabi Melman
1f3d939009 Merge pull request #538 from berkus/patch-1
Fix typos. Thanks @berkus
2017-10-25 12:59:38 +03:00
Gabi Melman
fbb8244f7d Merge pull request #533 from manuel-schiller/patch-1
rethrow unwind exception
2017-10-25 12:57:40 +03:00
manuel-schiller
039b34e83a rethrow unwind exception
On Linux with pthread library spdlog causes an SIGABORT and crashes
the application in case it catches a thread specific cancellation
exception in a critical execution phase while in a try/catch block
in spdlog/detail/logger_impl.h

The exception is caught by some general catch(...) clause where
it is NOT rethrown.

However rethrowing these kind of exception is mandatory, otherwise
an abort will be caused by the glibc.
2017-10-25 10:15:27 +02:00
Gabi Melman
69e6af0bf9 Merge pull request #539 from knowledge4igor/fix_cast_warnings
Fix warnings which are caused by C style cast
2017-10-25 04:36:18 +03:00
knowledge4igor
147bdbf591 Fix warnings which are caused by C style cast 2017-10-25 00:40:42 +03:00
Berkus Decker
4974743ee8 Make short month names match in length 2017-10-24 14:10:58 +03:00
Berkus Decker
1c8cc65f6c Fix typos 2017-10-24 14:10:29 +03:00
Berkus Decker
a6b5ef55a4 Fix typo 2017-10-24 13:34:58 +03:00
Berkus Decker
cefea324cb Fix typos 2017-10-24 12:03:59 +03:00
Gabi Melman
7f953c115d Merge pull request #535 from vitor-alves/master
Update README.md
2017-10-17 10:04:18 +03:00
Vitor Alves
20a4143537 Update README.md
Updated install section for Arch Linux. Added yaourt instead of pacman.
2017-10-16 22:23:19 -02:00
gabime
87a44555b6 fixed macro tests 2017-10-13 02:15:49 +03:00
gabime
21ed31844c fixed bug in SPDLOG_TRACE_IF macro and added some related tests 2017-10-13 02:04:31 +03:00
gabime
4a159ad66d Fixed unused variable warning 2017-10-12 19:59:14 +03:00
gabime
19264b8399 Merge branch 'master' of https://github.com/gabime/spdlog 2017-10-12 19:53:07 +03:00
gabime
709948ff4a Fixed issue #527 2017-10-12 19:48:04 +03:00
Gabi Melman
30d5fd16d7 Update README.md 2017-10-12 19:06:01 +03:00
Gabi Melman
9688689938 Merge pull request #531 from fogo/printf
Support for printf-style logging
2017-10-10 13:56:37 +03:00
fogo
e8b7f4194a Moved printf include to fmt.h 2017-10-09 20:05:20 -03:00
fogo
ee525f9bef allow printf style logging
* tests updated for printf style
* tests makefile support printf style
2017-10-05 10:54:06 -03:00
fogo
552d6214e0 updated bundled fmt to contain printf 2017-10-05 08:19:53 -03:00
Gabi Melman
dc8ac4c671 Update tweakme.h 2017-09-29 22:43:48 +03:00
Gabi Melman
cd6a8c9a4c Merge pull request #524 from 2Park/master
Fix SPDLOG_WCHAR_TO_UTF8_SUPPORT wchar_t logging
2017-09-28 21:44:55 +03:00
John Andre Hestad
375b7fdda5 Fix SPDLOG_WCHAR_TO_UTF8_SUPPORT wchar_t logging 2017-09-28 14:19:04 +02:00
Gabi Melman
3a21b765cb Merge pull request #522 from jasonbeach/feat_add_epoch_formatter
add formatter for unix epoch time in seconds.
2017-09-18 09:46:16 +03:00
Jason Beach
f7fabfb2c4 add formatter for unix epoch time in seconds. 2017-09-17 22:11:23 -04:00
Gabi Melman
a4e6d8877c Update README.md 2017-08-29 12:00:10 +03:00
Gabi Melman
e303f02cce Merge pull request #515 from elelel/trace
Compiler-dependent line numbering
2017-08-25 21:34:23 +03:00
El El
b242fb087d Compiler-dependent line numbering 2017-08-25 15:19:29 +00:00
Gabi Melman
02b9f970d3 Merge pull request #514 from stackforce/feature/improve-cmake-lists
Feature/improve cmake lists
2017-08-25 17:11:33 +03:00
Adrian Antonana
e6b9fa577d cmake: set project version to 0.14.0 2017-08-25 09:12:15 +02:00
Adrian Antonana
fe2fa4087d cmake: add some small comments to point out whats being done 2017-08-24 16:57:07 +02:00
Adrian Antonana
ab25004242 cmake: add some commend blocks to clearly differentiate CMakeLists file sections 2017-08-24 16:55:55 +02:00
Adrian Antonana
5504630e46 cmake: improve CMakeLists.txt
* support CMake user registry package registration
* use GNUInstallDirs to set installation firectories
* use spdlog namespace in both build and install interfaces
2017-08-24 16:55:06 +02:00
Gabi Melman
c4d93ae0b5 Merge pull request #513 from Lectem/patch-1
SPDLOG_BUILD_TESTING now depends on BUILD_TESTING
2017-08-23 17:35:04 +03:00
Lectem
47cf62f878 SPDLOG_BUILD_TESTING now depends on BUILD_TESTING
I encountered an issue when using spdlog through add_subdirectory.
Since SPDLOG_BUILD_TESTING is ON by default, it now adds tests to my project, even if BUILD_TESTING (the official CTest variable) is set to OFF.
cmake_dependent_option makes it so that if someone enables BUILD_TESTING then SPDLOG_BUILD_TESTING will be set to ON by default.
This way one can disable all external tests by setting BUILD_TESTING before using add_subdirectory and then setting it back to its original value.
The only change for those using the library directly is that they now use BUILD_TESTING instead of SPDLOG_BUILD_TESTING when configuring.
2017-08-23 15:12:40 +02:00
Gabi Melman
4fba14c79f Version 0.14.0 2017-08-19 18:48:43 +03:00
gabime
cb02b344a3 Fix issue #510 (spelling) 2017-08-19 15:49:16 +03:00
gabime
fced34e3d8 bumped fmt version to 4.0.0 2017-08-19 15:46:01 +03:00
gabime
268222e496 Fixed crash in async logger in gcc 4.8.5 regarding static members in pattern_formatter impl 2017-08-19 15:36:34 +03:00
Gabi Melman
6340c164ce Merge pull request #490 from asit-dhal/issue-488
Issue-488: warning for missing enumeration value
2017-08-17 00:21:44 +03:00
Gabi Melman
f546036e70 Merge pull request #502 from gg7/readme-add-gentoo-package
readme: Add Gentoo package name
2017-08-12 22:43:34 +01:00
George Gaydarov
c69b356c86 readme: Add Gentoo package name 2017-08-12 17:01:47 +01:00
Asit Kumar Dhal
e35c7fd065 Issue-488: warning for missing enumeration value 2017-08-05 00:30:03 +02:00
Gabi Melman
5ed426980b Merge pull request #484 from vgabi94/patch-1
Background color unchanged
2017-07-30 09:52:44 +03:00
Gabriel Vaduva
3173422786 Background color unchanged
Keep the background color unchaged on Windows console when using colored loggers.
2017-07-29 23:07:02 +03:00
Gabi Melman
fc14ac23e9 Merge pull request #478 from snapbug/master
Added TRACE/DEBUG_IF macro definitions when TRACE/DEBUG_ON aren't defined
2017-07-23 10:11:42 +03:00
Matt Crane
13a938fc7f Added TRACE_IF and DEBUG_IF macro definitions when TRACE_ON and DEBUG_ON aren't defined 2017-07-22 21:42:20 -04:00
Gabi Melman
b75da32f4d Merge pull request #473 from asit-dhal/master
fixed length and upper case log level tags(after suggestion)
2017-07-13 01:19:31 +03:00
Asit Kumar Dhal
3a40f0c34d fixed length and upper case log level tags 2017-07-12 20:25:32 +02:00
gabime
4371092309 fixed gcc shadow warnings 2017-06-29 18:14:17 +03:00
Gabi Melman
f06f3f1468 Merge pull request #468 from p-alik/master
code formatting (astyle and dos2unix)
2017-06-29 12:20:32 +03:00
Alexei Pastuchov
8fd16fc45e code formatting (astyle and dos2unix)
it aims to solve the issue #467
2017-06-29 09:51:44 +02:00
Gabi Melman
9a04e37275 Merge pull request #465 from cyres/re_add_color
Add set_color to ansicolor_sink
2017-06-27 09:18:37 +03:00
Cyres
765095db66 Add set_color to ansicolor_sink
It is now possible again to set the color in the ansicolor_sink with set_color
2017-06-27 01:23:35 +02:00
Gabi Melman
431fb423fa Merge pull request #463 from sheldonlyr/threadid-osx
More meaningful thread id for OSX
2017-06-24 11:34:43 +03:00
sheldonlyr
66a2c4993b More meaningful thread id for OSX 2017-06-24 15:38:18 +08:00
Gabi Melman
1e4f14c789 Update README.md 2017-06-18 07:46:02 +03:00
Gabi Melman
c0f0fd713d Merge pull request #460 from asit-dhal/master
conditional logging
2017-06-18 03:13:53 +03:00
Asit Kumar Dhal
97be4532cc trace_if and debug_if macro added 2017-06-18 01:12:11 +02:00
Asit Kumar Dhal
868c0cedb0 Update README file 2017-06-17 20:26:07 +02:00
Asit Kumar Dhal
a767f07ba3 Conditional logging in the example 2017-06-17 19:10:52 +02:00
Asit Kumar Dhal
de0154c525 Test Case for conditional logging 2017-06-17 18:50:21 +02:00
Asit Kumar Dhal
380233b727 mend 2017-06-17 17:24:16 +02:00
Asit Kumar Dhal
b463b06ab5 conditional logging for all levels 2017-06-17 16:07:04 +02:00
Asit Kumar Dhal
9a189badbd conditional logging implementation 2017-06-17 15:54:44 +02:00
Asit Kumar Dhal
ed7c3a83f8 conditional logging implementation 2017-06-17 02:45:24 +02:00
Gabi Melman
d3e013a567 Merge pull request #459 from cneumann/create_async
Add create_async factory functions for async loggers
2017-06-15 22:42:48 +03:00
Carsten Neumann
8ee90d3349 Add create_async factory functions for async loggers 2017-06-15 11:08:44 -05:00
Gabi Melman
e6cbc22da5 Merge pull request #456 from rkollataj/mingw_fix
Fix for MinGW error: 'There are no arguments that depend on a template parameter'
2017-06-09 21:16:03 +03:00
Remigiusz Kołłątaj
2e84ca4fa4 Adding additional build environments for AppVeyor
Signed-off-by: Remigiusz Kołłątaj <remigiusz.kollataj@gmail.com>
2017-06-09 19:11:29 +02:00
Remigiusz Kołłątaj
fab55c8a14 Fix for MinGW error: 'There are no arguments that depend on a template parameter'
Signed-off-by: Remigiusz Kołłątaj <remigiusz.kollataj@gmail.com>
2017-06-09 19:03:11 +02:00
Gabi Melman
9470bdd3ec Update common.h 2017-06-01 03:42:10 +03:00
Gabi Melman
5d5f2f3ac3 Merge pull request #451 from ThePhD/pattern_time
UTC Time
2017-05-31 21:39:18 +03:00
ThePhD
7e09f01847 brace styling 2017-05-31 13:12:21 -04:00
ThePhD
d98d54896b use if statement instead of switch (changes of adding new time specifications outside of standard are probably unlikely anyhow)
pattern_time -> pattern_time_type
ptime variable name -> pattern_time variable name
make sure four spaces used, not tabs
2017-05-31 12:52:12 -04:00
ThePhD
18a0455b91 _pattern was never set... but it was also never used. Intentional by @gabime, or a reflection of a refactor with some data member left behind? 2017-05-30 18:15:30 -04:00
ThePhD
5c5080d304 implement a flag (in this case, an enumeration) that allows control over the type; we make it an enum for possible expansions of time abstractions that might make it into the C++ standard in the future (see Howard Hinnant's date/timezone library) or might be usefully-available from the OS at some point in time 2017-05-30 18:05:25 -04:00
gabime
13fb2550c6 Fixed issue #449 2017-05-21 20:39:54 +03:00
Gabi Melman
c6ad598af9 Merge pull request #450 from stonedreamforest/master
Fixed issues 449
2017-05-21 13:27:13 +03:00
Tennn
f8d509d010 Fixed issues 449
Please check it
2017-05-21 17:44:44 +08:00
gabime
e1d4c4651b Minor formatting 2017-05-21 04:07:20 +03:00
gabime
8d164f47a8 tweakme disable counters by default 2017-05-21 04:03:36 +03:00
gabime
42a56f6669 fixed "final" keyword error 2017-05-21 04:02:32 +03:00
gabime
d56fa23eb9 fixed compilation errors 2017-05-21 03:48:54 +03:00
gabime
095cb1f560 Added _flush() to base_sink 2017-05-21 03:43:41 +03:00
Gabi Melman
e215758b42 Update ansicolor_sink.h 2017-05-21 03:08:03 +03:00
Gabi Melman
87f5a60b90 Update ansicolor_sink.h 2017-05-21 03:06:35 +03:00
gabime
361344912e Refactored message counter a little 2017-05-21 02:45:08 +03:00
gabime
7da3e47ddc fixed color comment 2017-05-21 02:33:19 +03:00
gabime
1f9f9c09a2 fixed flush 2017-05-21 02:25:33 +03:00
gabime
8c240faa7d changed info color to regular insted of bold 2017-05-21 02:11:09 +03:00
gabime
7bbab6889d use data() istead of c_str() in ansicolor_sink 2017-05-21 02:07:43 +03:00
gabime
6cc7e7382e astyle 2017-05-21 01:56:56 +03:00
gabime
40fc5becff fixed compilation 2017-05-21 01:56:41 +03:00
gabime
3899e8a560 fixed compilation warning 2017-05-21 01:54:21 +03:00
gabime
7f84daffd5 fixed compilation 2017-05-21 01:49:06 +03:00
gabime
98addad888 Disable colors if terminal no attached and simplfy ansicolor_sink 2017-05-21 01:36:03 +03:00
Gabi Melman
1ab63ffdca Merge pull request #445 from alzix/message_counter
implement message counter feature
2017-05-18 23:38:57 +03:00
Alexander Zilberkant
ef6eb376d3 disable message counter feature in tweakme.h 2017-05-18 22:48:45 +03:00
Alexander Zilberkant
f29ff77ae7 implement message counter feature
adds %i logger pattern for printing log message sequence ID
2017-05-18 22:46:16 +03:00
Gabi Melman
bf3a415b1d Merge pull request #447 from eliaskosunen/master
Fix OSX builds of details/os.h
2017-05-17 22:05:47 +03:00
Elias Kosunen
c6c5a46560 Fix OSX builds of details/os.h 2017-05-17 21:14:39 +03:00
gabime
def86e6e20 Fixed forgotten inline keyword 2017-05-17 00:17:46 +03:00
gabime
1d6842f0f9 bugfix in color detection and astyle 2017-05-17 00:06:11 +03:00
gabime
eb92cc35df Merge branch 'master' of https://github.com/gabime/spdlog.git 2017-05-17 00:01:52 +03:00
gabime
bd25f59a42 Don't use color escape codes if terminal doesn't support them in ansicolor_sink 2017-05-16 23:35:01 +03:00
Gabi Melman
a39f71dbd4 Merge pull request #444 from alzix/minor-fixes
Minor fixes
2017-05-15 22:40:29 +03:00
Alexander Zilberkant
8329d97d90 fix indentation 2017-05-15 21:38:22 +03:00
Gabi Melman
57dc87732f Merge pull request #443 from alzix/revert-411
Revert "Merge pull request #441 from alzix/count_discarded"
2017-05-15 21:20:44 +03:00
Alexander Zilberkant
6547675e43 Revert "Merge pull request #441 from alzix/count_discarded"
This reverts commit 038733345a, reversing
changes made to 862d2f6f35.
2017-05-15 20:07:24 +03:00
Gabi Melman
13199034f0 Update tweakme.h 2017-05-13 01:25:48 +03:00
Gabi Melman
038733345a Merge pull request #441 from alzix/count_discarded
add an option to warn about discarded messages
2017-05-13 01:22:46 +03:00
Alexander Zilberkant
2b008efb06 disable SPDLOG_ASYNC_COUNT_DISCARDED_MSG 2017-05-13 01:10:58 +03:00
Alexander Zilberkant
0f25b25b20 add async_logger tests
cover discarded messages use-case
2017-05-13 01:01:28 +03:00
Alexander Zilberkant
42258a1059 move discarded message handling to a dedicated function
fix - formatter new discarded message
2017-05-13 00:53:57 +03:00
Gabi Melman
862d2f6f35 Merge pull request #442 from sidyhe/feature
add wide string to utf8 string support
2017-05-12 20:58:07 +03:00
Alexander Zilberkant
0aeaf9e28e add an option to warn about discarded messages
when using async_logger with async_overflow_policy::discard_log_msg each discarded
message will be counted and warning will be printed by the worker thread

this new feature is disabled by default - as it may have a performance hit when discarding messages
2017-05-11 23:52:58 +03:00
Sidyhe
8ee6d38501 add wide string to utf8 string support 2017-05-10 21:02:41 +08:00
Gabi Melman
47006c4e8e Merge pull request #436 from bahostetterlewis/master
Allow compiler to select an strerror_r stringify
2017-05-10 12:57:14 +03:00
Barrett
84a4f56eae Allow compiler to select an strerror_r stringify
On Alpine (and potentially other systems) that don't identify their runtime correctly there is an issue with the string conversion
Specifically, alpine linux and musl where the errno_to_string is incorrectly called.
To fix this I have added two overloaded functions and use auto err to allow the compiler to detect the actual types returned and call the correct method for conversion
2017-05-09 18:31:44 -07:00
gabime
e9b8286714 Merge branch 'master' of https://github.com/gabime/spdlog.git 2017-05-06 15:47:24 +03:00
gabime
81965bc300 Fixed some analyzer warnings 2017-05-06 15:33:12 +03:00
Gabi Melman
52292fb526 Update android_sink.h 2017-05-03 01:18:40 +03:00
Gabi Melman
6927aa1544 Update android_sink.h 2017-05-03 01:17:00 +03:00
Gabi Melman
f0f4a52190 Merge pull request #427 from alzix/android_sink_retry
android sink - add retry mechanism
2017-05-02 22:46:25 +03:00
Alexander Zilberkant
2f205a6dbc android sink - add retry mechanism
- in some cases subsequent calls to __android_log_write() may result with -EAGAIN error code.
  in such cases spdlog will sleep and try again for number of times defined by
  SPDLOG_ANDROID_LOG_NUM_OF_RETRIES

- defeult SPDLOG_ANDROID_LOG_NUM_OF_RETRIES set to 2 - can be overridden at build time
2017-05-02 22:38:50 +03:00
Gabi Melman
4a25802312 Update README.md 2017-04-29 20:11:54 +03:00
Gabi Melman
260a74509a Merge pull request #425 from jcelerier/feature/final_qualifier
Add an optional final qualifier to types
2017-04-28 21:43:01 +03:00
Jean-Michaël Celerier
4da5fa256c add SPDLOG_FINAL information in tweakme.h 2017-04-28 19:25:31 +02:00
Jean-Michaël Celerier
53138c20fb Add an optional final qualifier to types
When building with GCC's -Wfinal-types, a lot of types of spdlog
are marked as being more optimizable if they were marked final.

This patch adds a possibility for the user of the library to `#define SPDLOG_FINAL final`
and enjoy potentially better performance : GCC is then able to replace virtual calls by true
function calls if it can ensure that there are no derived types).

By default SPDLOG_FINAL is defined to nothing to not break existing code that
may be inheriting of some of these types for some reason.
2017-04-28 17:24:55 +02:00
Gabi Melman
9e6d81de08 Merge pull request #422 from theamirocohen/android_log
Android_logger conditionally apply its own formatting
2017-04-26 00:01:34 +03:00
Amir Cohen
45e3e7041d Android_logger apply its own formatting to every print by adding timestamps, severity, thread and process ids, thus the option flag in the ctor 2017-04-25 19:47:47 +03:00
Gabi Melman
8b11ffe163 Merge pull request #413 from odeits/patch-3
Fix typo immediatly immediately
2017-04-07 10:40:21 +03:00
Gabi Melman
0c89beaa58 Merge pull request #415 from odeits/patch-5
fix typos in base_sink.h
2017-04-07 10:39:33 +03:00
Gabi Melman
d35e229c44 Merge pull request #414 from odeits/patch-4
fix typo potentialy to potentially
2017-04-07 10:38:54 +03:00
Gabi Melman
0a70ef8438 Merge pull request #412 from odeits/patch-2
Fix typo in comment Unkown to Unknown
2017-04-07 10:38:23 +03:00
odeits
6670d3b925 fix typos in base_sink.h 2017-04-06 20:16:49 -04:00
odeits
82404f6f65 fix typo potentialy to potentially 2017-04-06 20:13:53 -04:00
odeits
8d5ecc1b58 Fix typo immediatly immediately 2017-04-06 20:12:11 -04:00
odeits
682d2e057f Fix typo in comment Unkown to Unknown 2017-04-06 18:46:52 -04:00
Gabi Melman
15af514951 Update file_helper.h 2017-04-02 13:05:02 +03:00
Gabi Melman
129781fd17 Merge pull request #408 from odeits/patch-1
Fix typo Unkown to Unknown
2017-03-29 23:36:19 +03:00
Gabi Melman
b9e8fd209a Merge pull request #407 from eliaskosunen/master
Update example in README.md
2017-03-29 23:35:16 +03:00
odeits
ea359254d6 Fix typo Unkown to Unknown 2017-03-29 15:53:14 -04:00
Elias Kosunen
a3e84cb347 Update example in README.md 2017-03-29 22:28:37 +03:00
Gabi Melman
51b3cc0aef Merge pull request #405 from o-mdr/master
[#404] Reading past valid address with multisink logger
2017-03-29 18:48:39 +03:00
Oleksii Mandrychenko
d315bba1f8 Initialising members via constructor 2017-03-29 16:06:59 +01:00
Oleksii Mandrychenko
b5d838cc32 - Reverting changes to mpmc queue 2017-03-29 16:04:24 +01:00
Oleksii Mandrychenko
6a41bc40af [#404] Reading past valid address with multisink logger
- Initialising atomic value

See examples at http://stackoverflow.com/q/36320008/706456
This issue was discovered with dr memory tool on Windows platform, Visual Studio 2015 C++ 11
2017-03-29 13:53:11 +01:00
Oleksii Mandrychenko
b638c71d26 [#404] Reading past valid address with multisink logger
- Initialising atomic value

See examples at http://stackoverflow.com/q/36320008/706456
This issue was discovered with dr memory tool on Windows platform, Visual Studio 2015 C++ 11
2017-03-29 11:27:59 +01:00
Gabi Melman
2b5c3615fd Update async_log_helper.h 2017-03-28 03:25:53 +03:00
gabime
f85a08622e version 0.13.0 2017-03-28 02:09:01 +03:00
gabime
0c276beaaf astyle 2017-03-28 02:08:18 +03:00
gabime
5a8cecdfb6 fix unused warning message 2017-03-28 02:05:59 +03:00
gabime
397d4866b3 Fixed issue #396 and added some tests to catch it 2017-03-28 01:54:33 +03:00
Gabi Melman
27df6eb4ca Merge pull request #403 from Falconne/master
Disambiguate fmt logging methods that are using variadic templates.
2017-03-28 00:27:29 +03:00
Anuradha Dissanayake
ad1c18704d Disambiguate fmt logging methods that are using variadic templates.
As variadic template arguments can be zero length, we need to specify that at least one fmt argument is provided, to distinguish these methods from the existing trivial method that takes no fmt arguments.

Without this, static analysers such as ReSharper flag the logging calls as errors.
2017-03-27 08:58:03 +13:00
Gabi Melman
029e6ed40f Merge pull request #399 from devanshdalal/patch-1
Update README.md
2017-03-22 08:41:27 +00:00
Devansh D
a55615c984 Update README.md 2017-03-22 13:52:56 +05:30
Gabi Melman
e8da69ebe1 Merge pull request #394 from zamaudio/spdlog-updatefmt-3.0.1
fmt: update bundled fmt to 3.0.1 (7fa8f8f)
2017-03-20 14:41:06 +02:00
Damien Zammit
8192c13379 fmt: update bundled fmt to 3.0.1 (7fa8f8f)
Signed-off-by: Damien Zammit <damien@zamaudio.com>
2017-03-20 15:25:10 +11:00
Gabi Melman
270c08b275 Merge pull request #377 from tekezo/master
Use double-braces in std::array initialization.
2017-03-02 20:18:55 +02:00
Takayama Fumihiko
a4714a6571 use double-braces in std::array initialization 2017-03-03 01:37:53 +09:00
Gabi Melman
5585299b03 Merge pull request #375 from horar/master
Don't hardcode '.txt.' log file name suffix (resolve #333)
2017-02-28 09:19:07 +02:00
Ľubomír Carik
fd8df5b820 Don't hardcode '.txt.' log file name suffix (resolve #333)
Signed-off-by: Ľubomír Carik <Lubomir.Carik@gmail.com>
2017-02-28 00:59:23 +01:00
Gabi Melman
d7a8db8f63 Update README.md 2017-02-21 12:13:04 +02:00
189 changed files with 37189 additions and 21494 deletions

1
.gitattributes vendored Normal file
View File

@@ -0,0 +1 @@
* text=false

21
.gitignore vendored
View File

@@ -1,4 +1,5 @@
# Auto generated files
build/*
*.slo
*.lo
*.o
@@ -33,6 +34,9 @@
# Codelite
.codelite
# KDevelop
*.kdev4
# .orig files
*.orig
@@ -45,6 +49,7 @@ example/*
!example/example.sln
!example/example.vcxproj
!example/CMakeLists.txt
!example/meson.build
!example/multisink.cpp
!example/jni
@@ -61,4 +66,18 @@ install_manifest.txt
/tests/tests.VC.VC.opendb
/tests/tests.VC.db
/tests/tests
/tests/logs/file_helper_test.txt
/tests/logs/*
# idea
.idea/
cmake-build-*/
*.db
*.ipch
*.filters
*.db-wal
*.opendb
*.db-shm
*.vcxproj
*.tcl
*.user
*.sln

View File

@@ -1,90 +1,111 @@
# Adapted from various sources, including:
# - Louis Dionne's Hana: https://github.com/ldionne/hana
# - Paul Fultz II's FIT: https://github.com/pfultz2/Fit
# - Eric Niebler's range-v3: https://github.com/ericniebler/range-v3
language: cpp
# Test matrix:
# - Build matrix per compiler: C++11/C++14 + Debug/Release
# - Optionally: AddressSanitizer (ASAN)
# - Valgrind: all release builds are also tested with valgrind
# - clang 3.4, 3.5, 3.6, trunk
# - Note: 3.4 and trunk are tested with/without ASAN,
# the rest is only tested with ASAN=On.
# - gcc 4.9, 5.0
#
matrix:
include:
# Test gcc-4.8: C++11, Build=Debug/Release, ASAN=Off
- env: GCC_VERSION=4.8 BUILD_TYPE=Debug CPP=11 ASAN=Off LIBCXX=Off
os: linux
addons: &gcc48
apt:
packages:
- g++-4.8
- valgrind
sources:
- ubuntu-toolchain-r-test
- env: GCC_VERSION=4.8 BUILD_TYPE=Release CPP=11 ASAN=Off LIBCXX=Off
os: linux
addons: *gcc48
# Test gcc-4.9: C++11, Build=Debug/Release, ASAN=Off
- env: GCC_VERSION=4.9 BUILD_TYPE=Debug CPP=11 ASAN=Off LIBCXX=Off
os: linux
addons: &gcc49
apt:
packages:
- g++-4.9
- valgrind
sources:
- ubuntu-toolchain-r-test
- env: GCC_VERSION=4.9 BUILD_TYPE=Release CPP=11 ASAN=Off LIBCXX=Off
os: linux
addons: *gcc49
# Install dependencies
before_install:
- export CHECKOUT_PATH=`pwd`;
- if [ -n "$GCC_VERSION" ]; then export CXX="g++-${GCC_VERSION}" CC="gcc-${GCC_VERSION}"; fi
- if [ -n "$CLANG_VERSION" ]; then export CXX="clang++-${CLANG_VERSION}" CC="clang-${CLANG_VERSION}"; fi
- if [ "$CLANG_VERSION" == "3.4" ]; then export CXX="/usr/local/clang-3.4/bin/clang++" CC="/usr/local/clang-3.4/bin/clang"; fi
- which $CXX
- which $CC
- which valgrind
- if [ -n "$CLANG_VERSION" ]; then sudo CXX=$CXX CC=$CC ./tests/install_libcxx.sh; fi
install:
- cd $CHECKOUT_PATH
# Workaround for valgrind bug: https://bugs.kde.org/show_bug.cgi?id=326469.
# It is fixed in valgrind 3.10 so this won't be necessary if someone
# replaces the current valgrind (3.7) with valgrind-3.10
- sed -i 's/march=native/msse4.2/' example/Makefile
- if [ ! -d build ]; then mkdir build; fi
- export CXX_FLAGS="-I${CHECKOUT_PATH}/include"
- export CXX_LINKER_FLAGS=""
- if [ -z "$BUILD_TYPE" ]; then export BUILD_TYPE=Release; fi
- if [ "$ASAN" == "On"]; then export CXX_FLAGS="${CXX_FLAGS} -fsanitize=address,undefined,integer -fno-omit-frame-pointer -fno-sanitize=unsigned-integer-overflow"; fi
- if [ -n "$CLANG_VERSION" ]; then CXX_FLAGS="${CXX_FLAGS} -D__extern_always_inline=inline"; fi
- if [ "$LIBCXX" == "On" ]; then CXX_FLAGS="${CXX_FLAGS} -stdlib=libc++ -I/usr/include/c++/v1/"; fi
- if [ "$LIBCXX" == "On" ]; then CXX_LINKER_FLAGS="${CXX_FLAGS} -L/usr/lib/ -lc++"; fi
- CXX_FLAGS="${CXX_FLAGS} -std=c++${CPP}"
# Build examples
- cd example
- if [ "$BUILD_TYPE" == "Release" ]; then make rebuild CXXFLAGS="${CXX_FLAGS} ${CXX_LINKER_FLAGS}" VERBOSE=1; export BIN=example; fi
- if [ "$BUILD_TYPE" == "Debug" ]; then make rebuild debug CXXFLAGS="${CXX_FLAGS} ${CXX_LINKER_FLAGS}" VERBOSE=1; export BIN=example-debug; fi
script:
- ./"${BIN}"
- valgrind --trace-children=yes --leak-check=full ./"${BIN}"
- cd $CHECKOUT_PATH/tests; make rebuild; ./tests
notifications:
email: false
# Adapted from various sources, including:
# - Louis Dionne's Hana: https://github.com/ldionne/hana
# - Paul Fultz II's FIT: https://github.com/pfultz2/Fit
# - Eric Niebler's range-v3: https://github.com/ericniebler/range-v3
sudo: required
language: cpp
# gcc 4.8
addons: &gcc48
apt:
packages:
- g++-4.8
sources:
- ubuntu-toolchain-r-test
# gcc 7.0
addons: &gcc7
apt:
packages:
- g++-7
sources:
- ubuntu-toolchain-r-test
# Clang 3.5
addons: &clang35
apt:
packages:
- clang-3.5
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.5
# Clang 7.0
addons: &clang70
apt:
packages:
- clang-7
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-trusty-7
matrix:
include:
# Test gcc-4.8: C++11, Build=Debug/Release
- env: GCC_VERSION=4.8 BUILD_TYPE=Debug CPP=11
os: linux
addons: *gcc48
- env: GCC_VERSION=4.8 BUILD_TYPE=Release CPP=11
os: linux
addons: *gcc48
- env: GCC_VERSION=7 BUILD_TYPE=Release CPP=11
os: linux
addons: *gcc7
# Test clang-3.5: C++11, Build=Debug/Release
- env: CLANG_VERSION=3.5 BUILD_TYPE=Debug CPP=11
os: linux
addons: *clang35
- env: CLANG_VERSION=3.5 BUILD_TYPE=Release CPP=11
os: linux
addons: *clang35
# Test clang-7.0: C++11, Build=Debug, ASAN=On
- env: CLANG_VERSION=7 BUILD_TYPE=Debug CPP=11 ASAN=On TSAN=Off
dist: bionic
- env: CLANG_VERSION=7 BUILD_TYPE=Release CPP=11 ASAN=On TSAN=Off
dist: bionic
# osx
- env: BUILD_TYPE=Release CPP=11 ASAN=Off TSAN=Off
os: osx
before_script:
- if [ -n "$GCC_VERSION" ]; then export CXX="g++-${GCC_VERSION}" CC="gcc-${GCC_VERSION}"; fi
- if [ -n "$CLANG_VERSION" ]; then export CXX="clang++-${CLANG_VERSION}" CC="clang-${CLANG_VERSION}"; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export CXX="clang++" CC="clang"; fi
- which $CXX
- which $CC
- $CXX --version
- cmake --version
script:
- cd ${TRAVIS_BUILD_DIR}
- mkdir -p build && cd build
- |
cmake .. \
--warn-uninitialized \
-DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-DCMAKE_CXX_STANDARD=$CPP \
-DSPDLOG_BUILD_EXAMPLE=ON \
-DSPDLOG_BUILD_EXAMPLE_HO=ON \
-DSPDLOG_BUILD_BENCH=OFF \
-DSPDLOG_BUILD_TESTS=ON \
-DSPDLOG_BUILD_TESTS_HO=OFf \
-DSPDLOG_SANITIZE_ADDRESS=$ASAN
- make VERBOSE=1 -j2
- ctest -j2 --output-on-failure
notifications:
email: false

View File

@@ -1,87 +1,290 @@
#
# Copyright(c) 2015 Ruslan Baratov.
# Distributed under the MIT License (http://opensource.org/licenses/MIT)
#
cmake_minimum_required(VERSION 3.1)
project(spdlog VERSION 1.0.0)
include(CTest)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
set(CMAKE_CXX_FLAGS "-Wall ${CMAKE_CXX_FLAGS}")
endif()
add_library(spdlog INTERFACE)
option(SPDLOG_BUILD_EXAMPLES "Build examples" OFF)
option(SPDLOG_BUILD_TESTING "Build spdlog tests" ON)
target_include_directories(
spdlog
INTERFACE
"$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
"$<INSTALL_INTERFACE:include>"
)
set(HEADER_BASE "${CMAKE_CURRENT_SOURCE_DIR}/include")
if(SPDLOG_BUILD_EXAMPLES)
add_subdirectory(example)
endif()
if(SPDLOG_BUILD_TESTING)
add_subdirectory(tests)
endif()
### Install ###
# * https://github.com/forexample/package-example
set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
set(config_install_dir "lib/cmake/${PROJECT_NAME}")
set(include_install_dir "include")
set(pkgconfig_install_dir "lib/pkgconfig")
set(version_config "${generated_dir}/${PROJECT_NAME}ConfigVersion.cmake")
set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake")
set(pkg_config "${generated_dir}/${PROJECT_NAME}.pc")
set(targets_export_name "${PROJECT_NAME}Targets")
set(namespace "${PROJECT_NAME}::")
include(CMakePackageConfigHelpers)
write_basic_package_version_file(
"${version_config}" COMPATIBILITY SameMajorVersion
)
# Note: use 'targets_export_name'
configure_file("cmake/Config.cmake.in" "${project_config}" @ONLY)
configure_file("cmake/spdlog.pc.in" "${pkg_config}" @ONLY)
install(
TARGETS spdlog
EXPORT "${targets_export_name}"
INCLUDES DESTINATION "${include_install_dir}"
)
install(DIRECTORY "include/spdlog" DESTINATION "${include_install_dir}")
install(
FILES "${project_config}" "${version_config}"
DESTINATION "${config_install_dir}"
)
install(
FILES "${pkg_config}"
DESTINATION "${pkgconfig_install_dir}"
)
install(
EXPORT "${targets_export_name}"
NAMESPACE "${namespace}"
DESTINATION "${config_install_dir}"
)
file(GLOB_RECURSE spdlog_include_SRCS "${HEADER_BASE}/*.h")
add_custom_target(spdlog_headers_for_ide SOURCES ${spdlog_include_SRCS})
# Copyright(c) 2019 spdlog authors
# Distributed under the MIT License (http://opensource.org/licenses/MIT)
cmake_minimum_required(VERSION 3.2)
#---------------------------------------------------------------------------------------
# Start spdlog project
#---------------------------------------------------------------------------------------
include(GNUInstallDirs)
include(cmake/utils.cmake)
include(cmake/ide.cmake)
spdlog_extract_version()
#---------------------------------------------------------------------------------------
# Set default build to release
#---------------------------------------------------------------------------------------
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose Release or Debug" FORCE)
endif()
project(spdlog VERSION ${SPDLOG_VERSION} LANGUAGES CXX)
message(STATUS "Build spdlog: ${SPDLOG_VERSION}")
#---------------------------------------------------------------------------------------
# Compiler config
#---------------------------------------------------------------------------------------
if (NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
endif()
set(CMAKE_CXX_EXTENSIONS OFF)
if(CMAKE_SYSTEM_NAME MATCHES "CYGWIN")
set(CMAKE_CXX_EXTENSIONS ON)
endif()
#---------------------------------------------------------------------------------------
# Set SPDLOG_MASTER_PROJECT to ON if we are building spdlog
#---------------------------------------------------------------------------------------
# Check if spdlog is being used directly or via add_subdirectory, but allow overriding
if (NOT DEFINED SPDLOG_MASTER_PROJECT)
if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
set(SPDLOG_MASTER_PROJECT ON)
else()
set(SPDLOG_MASTER_PROJECT OFF)
endif()
endif ()
# build shared option
if(NOT WIN32)
option(SPDLOG_BUILD_SHARED "Build shared library" OFF)
endif()
# example options
option(SPDLOG_BUILD_EXAMPLE "Build example" ${SPDLOG_MASTER_PROJECT})
option(SPDLOG_BUILD_EXAMPLE_HO "Build header only example" OFF)
# testing options
option(SPDLOG_BUILD_TESTS "Build tests" ${SPDLOG_MASTER_PROJECT})
option(SPDLOG_BUILD_TESTS_HO "Build tests using the header only version" OFF)
# bench options
option(SPDLOG_BUILD_BENCH "Build benchmarks (Requires https://github.com/google/benchmark.git to be installed)" OFF)
# sanitizer options
option(SPDLOG_SANITIZE_ADDRESS "Enable address sanitizer in tests" OFF)
# install options
option(SPDLOG_INSTALL "Generate the install target" ${SPDLOG_MASTER_PROJECT})
option(SPDLOG_FMT_EXTERNAL "Use external fmt library instead of bundled" OFF)
option(SPDLOG_FMT_EXTERNAL_HO "Use external fmt header-only library instead of bundled" OFF)
option(SPDLOG_NO_EXCEPTIONS "Compile with -fno-exceptions. Call abort() on any spdlog exceptions" OFF)
if (SPDLOG_FMT_EXTERNAL AND SPDLOG_FMT_EXTERNAL_HO)
message(FATAL_ERROR "SPDLOG_FMT_EXTERNAL and SPDLOG_FMT_EXTERNAL_HO are mutually exclusive")
endif()
# misc tweakme options
if(WIN32)
option(SPDLOG_WCHAR_SUPPORT "Support wchar api" OFF)
option(SPDLOG_WCHAR_FILENAMES "Support wchar filenames" OFF)
endif()
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
option(SPDLOG_CLOCK_COARSE "Use the much faster (but much less accurate) CLOCK_REALTIME_COARSE instead of the regular clock," OFF)
endif()
option(SPDLOG_PREVENT_CHILD_FD "Prevent from child processes to inherit log file descriptors" OFF)
option(SPDLOG_NO_THREAD_ID "prevent spdlog from querying the thread id on each log call if thread id is not needed" OFF)
option(SPDLOG_NO_TLS "prevent spdlog from using thread local storage" OFF)
option(SPDLOG_NO_ATOMIC_LEVELS "prevent spdlog from using of std::atomic log levels (use only if your code never modifies log levels concurrently" OFF)
find_package(Threads REQUIRED)
message(STATUS "Build type: " ${CMAKE_BUILD_TYPE})
#---------------------------------------------------------------------------------------
# Static/Shared library (shared not supported in windows yet)
#---------------------------------------------------------------------------------------
set(SPDLOG_SRCS
src/spdlog.cpp
src/stdout_sinks.cpp
src/color_sinks.cpp
src/file_sinks.cpp
src/async.cpp)
if(NOT SPDLOG_FMT_EXTERNAL AND NOT SPDLOG_FMT_EXTERNAL_HO)
list(APPEND SPDLOG_SRCS src/fmt.cpp)
endif()
if (SPDLOG_BUILD_SHARED)
if(WIN32)
message(FATAL_ERROR "spdlog shared lib is not yet supported under windows")
endif()
add_library(spdlog SHARED ${SPDLOG_SRCS} ${SPDLOG_ALL_HEADERS})
else()
add_library(spdlog STATIC ${SPDLOG_SRCS} ${SPDLOG_ALL_HEADERS})
endif()
add_library(spdlog::spdlog ALIAS spdlog)
target_compile_definitions(spdlog PUBLIC SPDLOG_COMPILED_LIB)
target_include_directories(spdlog PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
target_link_libraries(spdlog PUBLIC Threads::Threads)
spdlog_enable_warnings(spdlog)
set_target_properties(spdlog PROPERTIES VERSION ${SPDLOG_VERSION} SOVERSION ${SPDLOG_VERSION_MAJOR})
set_target_properties(spdlog PROPERTIES DEBUG_POSTFIX d)
#---------------------------------------------------------------------------------------
# Header only version
#---------------------------------------------------------------------------------------
add_library(spdlog_header_only INTERFACE)
add_library(spdlog::spdlog_header_only ALIAS spdlog_header_only)
target_include_directories(spdlog_header_only INTERFACE
"$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
target_link_libraries(spdlog_header_only INTERFACE Threads::Threads)
#---------------------------------------------------------------------------------------
# Use fmt package if using external fmt
#---------------------------------------------------------------------------------------
if(SPDLOG_FMT_EXTERNAL OR SPDLOG_FMT_EXTERNAL_HO)
if (NOT TARGET fmt::fmt)
find_package(fmt REQUIRED)
endif ()
target_compile_definitions(spdlog PUBLIC SPDLOG_FMT_EXTERNAL)
target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_FMT_EXTERNAL)
# use external fmt-header-nly
if(SPDLOG_FMT_EXTERNAL_HO)
target_link_libraries(spdlog PUBLIC fmt::fmt-header-only)
target_link_libraries(spdlog_header_only INTERFACE fmt::fmt-header-only)
else() # use external compile fmt
target_link_libraries(spdlog PUBLIC fmt::fmt)
target_link_libraries(spdlog_header_only INTERFACE fmt::fmt)
endif()
set(PKG_CONFIG_REQUIRES fmt) # add dependency to pkg-config
endif()
#---------------------------------------------------------------------------------------
# Misc definitions according to tweak options
#---------------------------------------------------------------------------------------
if(SPDLOG_WCHAR_SUPPORT)
target_compile_definitions(spdlog PUBLIC SPDLOG_WCHAR_TO_UTF8_SUPPORT)
target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_WCHAR_TO_UTF8_SUPPORT)
endif()
if(SPDLOG_WCHAR_FILENAMES)
target_compile_definitions(spdlog PUBLIC SPDLOG_WCHAR_FILENAMES)
target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_WCHAR_FILENAMES)
endif()
if(SPDLOG_NO_EXCEPTIONS)
target_compile_definitions(spdlog PUBLIC SPDLOG_NO_EXCEPTIONS)
target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_NO_EXCEPTIONS)
if(NOT MSVC)
target_compile_options(spdlog PRIVATE -fno-exceptions)
endif()
endif()
if(SPDLOG_CLOCK_COARSE)
target_compile_definitions(spdlog PRIVATE SPDLOG_CLOCK_COARSE)
target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_CLOCK_COARSE)
endif()
if(SPDLOG_PREVENT_CHILD_FD)
target_compile_definitions(spdlog PRIVATE SPDLOG_PREVENT_CHILD_FD)
target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_PREVENT_CHILD_FD)
endif()
if(SPDLOG_NO_THREAD_ID)
target_compile_definitions(spdlog PRIVATE SPDLOG_NO_THREAD_ID)
target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_NO_THREAD_ID)
endif()
if(SPDLOG_NO_TLS)
target_compile_definitions(spdlog PRIVATE SPDLOG_NO_TLS)
target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_NO_TLS)
endif()
if(SPDLOG_NO_ATOMIC_LEVELS)
target_compile_definitions(spdlog PUBLIC SPDLOG_NO_ATOMIC_LEVELS)
target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_NO_ATOMIC_LEVELS)
endif()
#---------------------------------------------------------------------------------------
# Build binaries
#---------------------------------------------------------------------------------------
if(SPDLOG_BUILD_EXAMPLE OR SPDLOG_BUILD_EXAMPLE_HO)
message(STATUS "Generating examples")
add_subdirectory(example)
endif()
if(SPDLOG_BUILD_TESTS OR SPDLOG_BUILD_TESTS_HO)
message(STATUS "Generating tests")
enable_testing()
add_subdirectory(tests)
endif()
if(SPDLOG_BUILD_BENCH)
message(STATUS "Generating benchmarks")
add_subdirectory(bench)
endif()
#---------------------------------------------------------------------------------------
# Install
#---------------------------------------------------------------------------------------
if (SPDLOG_INSTALL)
message(STATUS "Generating install")
set(project_config_in "${CMAKE_CURRENT_LIST_DIR}/cmake/spdlogConfig.cmake.in")
set(project_config_out "${CMAKE_CURRENT_BINARY_DIR}/spdlogConfig.cmake")
set(config_targets_file "spdlogConfigTargets.cmake")
set(version_config_file "${CMAKE_CURRENT_BINARY_DIR}/spdlogConfigVersion.cmake")
set(export_dest_dir "${CMAKE_INSTALL_LIBDIR}/cmake/spdlog")
set(pkgconfig_install_dir "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
set(pkg_config "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc")
#---------------------------------------------------------------------------------------
# Include files
#---------------------------------------------------------------------------------------
install(DIRECTORY include/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" PATTERN "fmt/bundled" EXCLUDE)
install(TARGETS spdlog spdlog_header_only EXPORT spdlog DESTINATION "${CMAKE_INSTALL_LIBDIR}")
if(NOT SPDLOG_FMT_EXTERNAL AND NOT SPDLOG_FMT_EXTERNAL_HO)
install(DIRECTORY include/${PROJECT_NAME}/fmt/bundled/
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/fmt/bundled/")
endif()
#---------------------------------------------------------------------------------------
# Install pkg-config file
#---------------------------------------------------------------------------------------
get_target_property(PKG_CONFIG_DEFINES spdlog INTERFACE_COMPILE_DEFINITIONS)
string(REPLACE ";" " -D" PKG_CONFIG_DEFINES "${PKG_CONFIG_DEFINES}")
string(CONCAT PKG_CONFIG_DEFINES "-D" "${PKG_CONFIG_DEFINES}")
configure_file("cmake/${PROJECT_NAME}.pc.in" "${pkg_config}" @ONLY)
install(FILES "${pkg_config}" DESTINATION "${pkgconfig_install_dir}")
#---------------------------------------------------------------------------------------
# Install CMake config files
#---------------------------------------------------------------------------------------
install(EXPORT spdlog
DESTINATION ${export_dest_dir}
NAMESPACE spdlog::
FILE ${config_targets_file})
include(CMakePackageConfigHelpers)
configure_file("${project_config_in}" "${project_config_out}" @ONLY)
write_basic_package_version_file("${version_config_file}" COMPATIBILITY SameMajorVersion)
install(FILES
"${project_config_out}"
"${version_config_file}" DESTINATION "${export_dest_dir}")
#---------------------------------------------------------------------------------------
# Support creation of installable packages
#---------------------------------------------------------------------------------------
include(cmake/spdlogCPack.cmake)
endif ()

21
INSTALL
View File

@@ -1,13 +1,24 @@
spdlog is header only library.
Just copy the files to your build tree and use a C++11 compiler
Header only version:
==================================================================
Just copy the files to your build tree and use a C++11 compiler.
Or use CMake:
add_executable(example_header_only example.cpp)
target_link_libraries(example_header_only spdlog::spdlog_header_only)
Compiled library version:
==================================================================
CMake:
add_executable(example example.cpp)
target_link_libraries(example spdlog::spdlog)
Or copy src/spdlog.cpp to your build tree and pass the -DSPDLOG_COMPILED_LIB to the compiler.
Tested on:
gcc 4.8.1 and above
clang 3.5
Visual Studio 2013
gcc 4.8 flags: --std==c++11 -pthread -O3 -flto -Wl,--no-as-needed
gcc 4.9 flags: --std=c++11 -pthread -O3 -flto
see the makefile in the example folder

451
README.md
View File

@@ -1,34 +1,44 @@
# spdlog
Very fast, header only, C++ logging library. [![Build Status](https://travis-ci.org/gabime/spdlog.svg?branch=master)](https://travis-ci.org/gabime/spdlog)&nbsp; [![Build status](https://ci.appveyor.com/api/projects/status/d2jnxclg20vd0o50?svg=true)](https://ci.appveyor.com/project/gabime/spdlog)
Very fast, header-only/compiled, C++ logging library. [![Build Status](https://travis-ci.org/gabime/spdlog.svg?branch=master)](https://travis-ci.org/gabime/spdlog)&nbsp; [![Build status](https://ci.appveyor.com/api/projects/status/d2jnxclg20vd0o50?svg=true)](https://ci.appveyor.com/project/gabime/spdlog)
## Install
#### Just copy or clone the headers:
* Copy the source [folder](https://github.com/gabime/spdlog/tree/master/include/spdlog) to your build tree and use a C++11 compiler.
## Install
#### Header only version
Copy the source [folder](https://github.com/gabime/spdlog/tree/v1.x/include/spdlog) to your build tree and use a C++11 compiler.
#### Or use your favourite package manager:
#### Static lib version (recommended - much faster compile times)
```console
$ git clone https://github.com/gabime/spdlog.git
$ cd spdlog && mkdir build && cd build
$ cmake .. && make -j
```
see example [CMakeLists.txt](https://github.com/gabime/spdlog/blob/v1.x/example/CMakeLists.txt) on how to use.
* Ubuntu: `apt-get install libspdlog-dev`
## Platforms
* Linux, FreeBSD, OpenBSD, Solaris, AIX
* Windows (msvc 2013+, cygwin)
* macOS (clang 3.5+)
* Android
## Package managers:
* Homebrew: `brew install spdlog`
* FreeBSD: `cd /usr/ports/devel/spdlog/ && make install clean`
* Fedora: `yum install spdlog`
* Arch Linux: `pacman -S spdlog-git`
* Gentoo: `emerge dev-libs/spdlog`
* Arch Linux: `yaourt -S spdlog-git`
* vcpkg: `vcpkg install spdlog`
* conan: `spdlog/[>=1.4.1]`
## Platforms
* Linux, FreeBSD, Solaris
* Windows (vc 2013+, cygwin/mingw)
* Mac OSX (clang 3.5+)
* Android
##Features
* Very fast - performance is the primary goal (see [benchmarks](#benchmarks) below).
* Headers only, just copy and use.
* Feature rich [call style](#usage-example) using the excellent [fmt](https://github.com/fmtlib/fmt) library.
* Extremely fast asynchronous mode (optional) - using lockfree queues and other tricks to reach millions of calls/sec.
## Features
* Very fast (see [benchmarks](#benchmarks) below).
* Headers only, just copy and use. Or use as a compiled library.
* Feature rich formatting, using the excellent [fmt](https://github.com/fmtlib/fmt) library.
* **New!** [Backtrace](#backtrace-support) support - store debug messages in a ring buffer and display later on demand.
* Fast asynchronous mode (optional)
* [Custom](https://github.com/gabime/spdlog/wiki/3.-Custom-formatting) formatting.
* Multi/Single threaded loggers.
* Various log targets:
@@ -40,178 +50,307 @@ Very fast, header only, C++ logging library. [![Build Status](https://travis-ci.
* Easily extendable with custom log targets (just implement a single function in the [sink](include/spdlog/sinks/sink.h) interface).
* Severity based filtering - threshold levels can be modified in runtime as well as in compile time.
## Usage samples
## Benchmarks
Below are some [benchmarks](bench) comparing popular log libraries under Ubuntu 64 bit, Intel i7-4770 CPU @ 3.40GHz
#### Synchronous mode
Time needed to log 1,000,000 lines in synchronous mode (in seconds, the best of 3 runs):
|threads|boost log 1.54|glog |easylogging |spdlog|
|-------|:-------:|:-----:|----------:|------:|
|1| 4.169s |1.066s |0.975s |0.302s|
|10| 6.180s |3.032s |2.857s |0.968s|
|100| 5.981s |1.139s |4.512s |0.497s|
#### Asynchronous mode
Time needed to log 1,000,000 lines in asynchronous mode, i.e. the time it takes to put them in the async queue (in seconds, the best of 3 runs):
|threads|g2log <sup>async logger</sup> |spdlog <sup>async mode</sup>|
|:-------|:-----:|-------------------------:|
|1| 1.850s |0.216s |
|10| 0.943s |0.173s|
|100| 0.959s |0.202s|
## Usage Example
#### Basic usage
```c++
#include "spdlog/spdlog.h"
#include "spdlog/sinks/basic_file_sink.h"
#include <iostream>
#include <memory>
void async_example();
void syslog_example();
void user_defined_example();
void err_handler_example();
namespace spd = spdlog;
int main(int, char*[])
int main()
{
try
spdlog::info("Welcome to spdlog!");
spdlog::error("Some error message with arg: {}", 1);
spdlog::warn("Easy padding in numbers like {:08d}", 12);
spdlog::critical("Support for int: {0:d}; hex: {0:x}; oct: {0:o}; bin: {0:b}", 42);
spdlog::info("Support for floats {:03.2f}", 1.23456);
spdlog::info("Positional args are {1} {0}..", "too", "supported");
spdlog::info("{:<30}", "left aligned");
spdlog::set_level(spdlog::level::debug); // Set global log level to debug
spdlog::debug("This message should be displayed..");
// change log pattern
spdlog::set_pattern("[%H:%M:%S %z] [%n] [%^---%L---%$] [thread %t] %v");
// Compile time log levels
// define SPDLOG_ACTIVE_LEVEL to desired level
SPDLOG_TRACE("Some trace message with param {}", 42);
SPDLOG_DEBUG("Some debug message");
// Set the default logger to file logger
auto file_logger = spdlog::basic_logger_mt("basic_logger", "logs/basic.txt");
spdlog::set_default_logger(file_logger);
}
```
#### create stdout/stderr logger object
```c++
#include "spdlog/spdlog.h"
#include "spdlog/sinks/stdout_color_sinks.h"
void stdout_example()
{
// create color multi threaded logger
auto console = spdlog::stdout_color_mt("console");
auto err_logger = spdlog::stderr_color_mt("stderr");
spdlog::get("console")->info("loggers can be retrieved from a global registry using the spdlog::get(logger_name)");
}
```
---
#### Basic file logger
```c++
#include "spdlog/sinks/basic_file_sink.h"
void basic_logfile_example()
{
try
{
// Console logger with color
auto console = spd::stdout_color_mt("console");
console->info("Welcome to spdlog!");
console->error("Some error message with arg{}..", 1);
// Formatting examples
console->warn("Easy padding in numbers like {:08d}", 12);
console->critical("Support for int: {0:d}; hex: {0:x}; oct: {0:o}; bin: {0:b}", 42);
console->info("Support for floats {:03.2f}", 1.23456);
console->info("Positional args are {1} {0}..", "too", "supported");
console->info("{:<30}", "left aligned");
spd::get("console")->info("loggers can be retrieved from a global registry using the spdlog::get(logger_name) function");
// Create basic file logger (not rotated)
auto my_logger = spd::basic_logger_mt("basic_logger", "logs/basic.txt");
my_logger->info("Some log message");
// Create a file rotating logger with 5mb size max and 3 rotated files
auto rotating_logger = spd::rotating_logger_mt("some_logger_name", "logs/mylogfile", 1048576 * 5, 3);
for (int i = 0; i < 10; ++i)
rotating_logger->info("{} * {} equals {:>10}", i, i, i*i);
// Create a daily logger - a new file is created every day on 2:30am
auto daily_logger = spd::daily_logger_mt("daily_logger", "logs/daily", 2, 30);
// trigger flush if the log severity is error or higher
daily_logger->flush_on(spd::level::err);
daily_logger->info(123.44);
// Customize msg format for all messages
spd::set_pattern("*** [%H:%M:%S %z] [thread %t] %v ***");
rotating_logger->info("This is another message with custom format");
// Runtime log levels
spd::set_level(spd::level::info); //Set global log level to info
console->debug("This message shold not be displayed!");
console->set_level(spd::level::debug); // Set specific logger's log level
console->debug("This message shold be displayed..");
// Compile time log levels
// define SPDLOG_DEBUG_ON or SPDLOG_TRACE_ON
SPDLOG_TRACE(console, "Enabled only #ifdef SPDLOG_TRACE_ON..{} ,{}", 1, 3.23);
SPDLOG_DEBUG(console, "Enabled only #ifdef SPDLOG_DEBUG_ON.. {} ,{}", 1, 3.23);
// Asynchronous logging is very fast..
// Just call spdlog::set_async_mode(q_size) and all created loggers from now on will be asynchronous..
async_example();
// syslog example. linux/osx only
syslog_example();
// android example. compile with NDK
android_example();
// Log user-defined types example
user_defined_example();
// Change default log error handler
err_handler_example();
// Apply a function on all registered loggers
spd::apply_all([&](std::shared_ptr<spdlog::logger> l)
{
l->info("End of example.");
});
// Release and close all loggers
spdlog::drop_all();
auto my_logger = spdlog::basic_logger_mt("basic_logger", "logs/basic-log.txt");
}
// Exceptions will only be thrown upon failed logger or sink construction (not during logging)
catch (const spd::spdlog_ex& ex)
catch (const spdlog::spdlog_ex &ex)
{
std::cout << "Log init failed: " << ex.what() << std::endl;
return 1;
}
}
```
---
#### Rotating files
```c++
#include "spdlog/sinks/rotating_file_sink.h"
void rotating_example()
{
// Create a file rotating logger with 5mb size max and 3 rotated files
auto rotating_logger = spdlog::rotating_logger_mt("some_logger_name", "logs/rotating.txt", 1048576 * 5, 3);
}
```
---
#### Daily files
```c++
#include "spdlog/sinks/daily_file_sink.h"
void daily_example()
{
// Create a daily logger - a new file is created every day on 2:30am
auto daily_logger = spdlog::daily_logger_mt("daily_logger", "logs/daily.txt", 2, 30);
}
```
---
#### Backtrace support
```c++
// Loggers can store in a ring buffer all messages (including debug/trace) and display later on demand.
// When needed, call dump_backtrace() to see them
spdlog::enable_backtrace(32); // create ring buffer with capacity of 32 messages
// or my_logger->enable_backtrace(32)..
for(int i = 0; i < 100; i++)
{
spdlog::debug("Backtrace message {}", i); // not logged yet..
}
// e.g. if some error happened:
spdlog::dump_backtrace(); // log them now! show the last 32 messages
// or my_logger->dump_backtrace(32)..
```
---
#### Periodic flush
```c++
// periodically flush all *registered* loggers every 3 seconds:
// warning: only use if all your loggers are thread safe ("_mt" loggers)
spdlog::flush_every(std::chrono::seconds(3));
```
---
#### Log binary data in hex
```c++
// many types of std::container<char> types can be used.
// ranges are supported too.
// format flags:
// {:X} - print in uppercase.
// {:s} - don't separate each byte with space.
// {:p} - don't print the position on each line start.
// {:n} - don't split the output to lines.
#include "spdlog/fmt/bin_to_hex.h"
void binary_example()
{
auto console = spdlog::get("console");
std::array<char, 80> buf;
console->info("Binary example: {}", spdlog::to_hex(buf));
console->info("Another binary example:{:n}", spdlog::to_hex(std::begin(buf), std::begin(buf) + 10));
// more examples:
// logger->info("uppercase: {:X}", spdlog::to_hex(buf));
// logger->info("uppercase, no delimiters: {:Xs}", spdlog::to_hex(buf));
// logger->info("uppercase, no delimiters, no position info: {:Xsp}", spdlog::to_hex(buf));
}
```
---
#### Logger with multi sinks - each with different format and log level
```c++
// create logger with 2 targets with different log levels and formats.
// the console will show only warnings or errors, while the file will log all.
void multi_sink_example()
{
auto console_sink = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
console_sink->set_level(spdlog::level::warn);
console_sink->set_pattern("[multi_sink_example] [%^%l%$] %v");
auto file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>("logs/multisink.txt", true);
file_sink->set_level(spdlog::level::trace);
spdlog::logger logger("multi_sink", {console_sink, file_sink});
logger.set_level(spdlog::level::debug);
logger.warn("this should appear in both console and file");
logger.info("this message should not appear in the console, only in the file");
}
```
---
#### Asynchronous logging
```c++
#include "spdlog/async.h"
#include "spdlog/sinks/basic_file_sink.h"
void async_example()
{
size_t q_size = 4096; //queue size must be power of 2
spdlog::set_async_mode(q_size);
auto async_file = spd::daily_logger_st("async_file_logger", "logs/async_log.txt");
for (int i = 0; i < 100; ++i)
async_file->info("Async message #{}", i);
// default thread pool settings can be modified *before* creating the async logger:
// spdlog::init_thread_pool(8192, 1); // queue with 8k items and 1 backing thread.
auto async_file = spdlog::basic_logger_mt<spdlog::async_factory>("async_file_logger", "logs/async_log.txt");
// alternatively:
// auto async_file = spdlog::create_async<spdlog::sinks::basic_file_sink_mt>("async_file_logger", "logs/async_log.txt");
}
//syslog example
void syslog_example()
```
---
#### Asynchronous logger with multi sinks
```c++
#include "spdlog/sinks/stdout_color_sinks.h"
#include "spdlog/sinks/rotating_file_sink.h"
void multi_sink_example2()
{
#ifdef SPDLOG_ENABLE_SYSLOG
std::string ident = "spdlog-example";
auto syslog_logger = spd::syslog_logger("syslog", ident, LOG_PID);
syslog_logger->warn("This is warning that will end up in syslog..");
#endif
spdlog::init_thread_pool(8192, 1);
auto stdout_sink = std::make_shared<spdlog::sinks::stdout_color_sink_mt >();
auto rotating_sink = std::make_shared<spdlog::sinks::rotating_file_sink_mt>("mylog.txt", 1024*1024*10, 3);
std::vector<spdlog::sink_ptr> sinks {stdout_sink, rotating_sink};
auto logger = std::make_shared<spdlog::async_logger>("loggername", sinks.begin(), sinks.end(), spdlog::thread_pool(), spdlog::async_overflow_policy::block);
spdlog::register_logger(logger);
}
```
---
#### User defined types
```c++
// user defined types logging by implementing operator<<
#include "spdlog/fmt/ostr.h" // must be included
struct my_type
{
int i;
template<typename OStream>
friend OStream& operator<<(OStream& os, const my_type &c)
friend OStream &operator<<(OStream &os, const my_type &c)
{
return os << "[my_type i="<<c.i << "]";
return os << "[my_type i=" << c.i << "]";
}
};
#include <spdlog/fmt/ostr.h> // must be included
void user_defined_example()
{
spd::get("console")->info("user defined type: {}", my_type { 14 });
spdlog::get("console")->info("user defined type: {}", my_type{14});
}
//
//custom error handler
//
```
---
#### Custom error handler
```c++
void err_handler_example()
{
spdlog::set_error_handler([](const std::string& msg) {
std::cerr << "my err handler: " << msg << std::endl;
});
// (or logger->set_error_handler(..) to set for specific logger)
{
// can be set globally or per logger(logger->set_error_handler(..))
spdlog::set_error_handler([](const std::string &msg) { spdlog::get("console")->error("*** LOGGER ERROR ***: {}", msg); });
spdlog::get("console")->info("some invalid message to trigger an error {}{}{}{}", 3);
}
```
---
#### syslog
```c++
#include "spdlog/sinks/syslog_sink.h"
void syslog_example()
{
std::string ident = "spdlog-example";
auto syslog_logger = spdlog::syslog_logger_mt("syslog", ident, LOG_PID);
syslog_logger->warn("This is warning that will end up in syslog.");
}
```
---
#### Android example
```c++
#include "spdlog/sinks/android_sink.h"
void android_example()
{
std::string tag = "spdlog-android";
auto android_logger = spdlog::android_logger_mt("android", tag);
android_logger->critical("Use \"adb shell logcat\" to view this message.");
}
```
## Benchmarks
Below are some [benchmarks](https://github.com/gabime/spdlog/blob/v1.x/bench/bench.cpp) done in Ubuntu 64 bit, Intel i7-4770 CPU @ 3.40GHz
#### Synchronous mode
```
[info] **************************************************************
[info] Single thread, 1,000,000 iterations
[info] **************************************************************
[info] basic_st Elapsed: 0.17 secs 5,777,626/sec
[info] rotating_st Elapsed: 0.18 secs 5,475,894/sec
[info] daily_st Elapsed: 0.20 secs 5,062,659/sec
[info] empty_logger Elapsed: 0.07 secs 14,127,300/sec
[info] **************************************************************
[info] C-string (400 bytes). Single thread, 1,000,000 iterations
[info] **************************************************************
[info] basic_st Elapsed: 0.41 secs 2,412,483/sec
[info] rotating_st Elapsed: 0.72 secs 1,389,196/sec
[info] daily_st Elapsed: 0.42 secs 2,393,298/sec
[info] null_st Elapsed: 0.04 secs 27,446,957/sec
[info] **************************************************************
[info] 10 threads, competing over the same logger object, 1,000,000 iterations
[info] **************************************************************
[info] basic_mt Elapsed: 0.60 secs 1,659,613/sec
[info] rotating_mt Elapsed: 0.62 secs 1,612,493/sec
[info] daily_mt Elapsed: 0.61 secs 1,638,305/sec
[info] null_mt Elapsed: 0.16 secs 6,272,758/sec
```
#### ASynchronous mode
```
[info] -------------------------------------------------
[info] Messages : 1,000,000
[info] Threads : 10
[info] Queue : 8,192 slots
[info] Queue memory : 8,192 x 272 = 2,176 KB
[info] -------------------------------------------------
[info]
[info] *********************************
[info] Queue Overflow Policy: block
[info] *********************************
[info] Elapsed: 1.70784 secs 585,535/sec
[info] Elapsed: 1.69805 secs 588,910/sec
[info] Elapsed: 1.7026 secs 587,337/sec
[info]
[info] *********************************
[info] Queue Overflow Policy: overrun
[info] *********************************
[info] Elapsed: 0.372816 secs 2,682,285/sec
[info] Elapsed: 0.379758 secs 2,633,255/sec
[info] Elapsed: 0.373532 secs 2,677,147/sec
```
## Documentation

38
appveyor.yml Normal file
View File

@@ -0,0 +1,38 @@
version: 1.0.{build}
image: Visual Studio 2017
environment:
matrix:
- GENERATOR: '"Visual Studio 14 2015"'
BUILD_TYPE: Debug
WCHAR: 'OFF'
- GENERATOR: '"Visual Studio 14 2015"'
BUILD_TYPE: Release
WCHAR: 'ON'
- GENERATOR: '"Visual Studio 14 2015 Win64"'
BUILD_TYPE: Debug
WCHAR: 'ON'
- GENERATOR: '"Visual Studio 14 2015 Win64"'
BUILD_TYPE: Release
WCHAR: 'ON'
- GENERATOR: '"Visual Studio 15 2017 Win64"'
BUILD_TYPE: Debug
WCHAR: 'ON'
- GENERATOR: '"Visual Studio 15 2017 Win64"'
BUILD_TYPE: Release
WCHAR: 'OFf'
build_script:
- cmd: >-
set
mkdir build
cd build
set PATH=%PATH%:C:\Program Files\Git\usr\bin
cmake .. -G %GENERATOR% -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DSPDLOG_WCHAR_SUPPORT=%WCHAR% -DSPDLOG_BUILD_EXAMPLE=ON -DSPDLOG_BUILD_EXAMPLE_HO=ON -DSPDLOG_BUILD_TESTS=ON -DSPDLOG_BUILD_TESTS_HO=OFF
cmake --build . --config %BUILD_TYPE%
test_script:
- ctest -VV -C "%BUILD_TYPE%"

View File

@@ -1,5 +0,0 @@
#!/bin/bash
find . -name "*\.h" -o -name "*\.cpp"|xargs dos2unix
find . -name "*\.h" -o -name "*\.cpp"|xargs astyle -n -c -A1

26
bench/CMakeLists.txt Normal file
View File

@@ -0,0 +1,26 @@
# Copyright(c) 2019 spdlog authors
# Distributed under the MIT License (http://opensource.org/licenses/MIT)
cmake_minimum_required(VERSION 3.1)
project(spdlog_bench CXX)
if(NOT TARGET spdlog)
# Stand-alone build
find_package(spdlog CONFIG REQUIRED)
endif()
find_package(Threads REQUIRED)
find_package(benchmark CONFIG REQUIRED)
add_executable(bench bench.cpp)
spdlog_enable_warnings(bench)
target_link_libraries(bench PRIVATE spdlog::spdlog)
add_executable(async_bench async_bench.cpp)
target_link_libraries(async_bench PRIVATE spdlog::spdlog)
add_executable(latency latency.cpp)
target_link_libraries(latency PRIVATE benchmark::benchmark spdlog::spdlog)
add_executable(formatter-bench formatter-bench.cpp)
target_link_libraries(formatter-bench PRIVATE benchmark::benchmark spdlog::spdlog)

View File

@@ -1,62 +0,0 @@
CXX ?= g++
CXXFLAGS = -march=native -Wall -Wextra -pedantic -std=c++11 -pthread -I../include
CXX_RELEASE_FLAGS = -O3 -flto -DNDEBUG
binaries=spdlog-bench spdlog-bench-mt spdlog-async spdlog-null-async boost-bench boost-bench-mt glog-bench glog-bench-mt g2log-async easylogging-bench easylogging-bench-mt
all: $(binaries)
spdlog-bench: spdlog-bench.cpp
$(CXX) spdlog-bench.cpp -o spdlog-bench $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
spdlog-bench-mt: spdlog-bench-mt.cpp
$(CXX) spdlog-bench-mt.cpp -o spdlog-bench-mt $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
spdlog-async: spdlog-async.cpp
$(CXX) spdlog-async.cpp -o spdlog-async $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
spdlog-null-async: spdlog-null-async.cpp
$(CXX) spdlog-null-async.cpp -o spdlog-null-async $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
BOOST_FLAGS = -DBOOST_LOG_DYN_LINK -I/usr/include -lboost_log -lboost_log_setup -lboost_filesystem -lboost_system -lboost_thread -lboost_regex -lboost_date_time -lboost_chrono
boost-bench: boost-bench.cpp
$(CXX) boost-bench.cpp -o boost-bench $(CXXFLAGS) $(BOOST_FLAGS) $(CXX_RELEASE_FLAGS)
boost-bench-mt: boost-bench-mt.cpp
$(CXX) boost-bench-mt.cpp -o boost-bench-mt $(CXXFLAGS) $(BOOST_FLAGS) $(CXX_RELEASE_FLAGS)
GLOG_FLAGS = -lglog
glog-bench: glog-bench.cpp
$(CXX) glog-bench.cpp -o glog-bench $(CXXFLAGS) $(GLOG_FLAGS) $(CXX_RELEASE_FLAGS)
glog-bench-mt: glog-bench-mt.cpp
$(CXX) glog-bench-mt.cpp -o glog-bench-mt $(CXXFLAGS) $(GLOG_FLAGS) $(CXX_RELEASE_FLAGS)
G2LOG_FLAGS = -I/home/gabi/devel/g2log/g2log/src -L/home/gabi/devel/g2log/g2log -llib_g2logger
g2log-async: g2log-async.cpp
$(CXX) g2log-async.cpp -o g2log-async $(CXXFLAGS) $(G2LOG_FLAGS) $(CXX_RELEASE_FLAGS)
EASYL_FLAGS = -I../../easylogging/src/
easylogging-bench: easylogging-bench.cpp
$(CXX) easylogging-bench.cpp -o easylogging-bench $(CXXFLAGS) $(EASYL_FLAGS) $(CXX_RELEASE_FLAGS)
easylogging-bench-mt: easylogging-bench-mt.cpp
$(CXX) easylogging-bench-mt.cpp -o easylogging-bench-mt $(CXXFLAGS) $(EASYL_FLAGS) $(CXX_RELEASE_FLAGS)
.PHONY: clean
clean:
rm -f *.o logs/* $(binaries)
rebuild: clean all

View File

@@ -1,57 +0,0 @@
CXX ?= g++
CXXFLAGS = -D_WIN32_WINNT=0x600 -march=native -Wall -Wextra -pedantic -std=c++11 -pthread -Wl,--no-as-needed -I../include
CXX_RELEASE_FLAGS = -O3 -flto
binaries=spdlog-bench spdlog-bench-mt spdlog-async boost-bench boost-bench-mt glog-bench glog-bench-mt g2log-async easylogging-bench easylogging-bench-mt
all: $(binaries)
spdlog-bench: spdlog-bench.cpp
$(CXX) spdlog-bench.cpp -o spdlog-bench $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
spdlog-bench-mt: spdlog-bench-mt.cpp
$(CXX) spdlog-bench-mt.cpp -o spdlog-bench-mt $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
spdlog-async: spdlog-async.cpp
$(CXX) spdlog-async.cpp -o spdlog-async $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
BOOST_FLAGS = -DBOOST_LOG_DYN_LINK -I/home/gabi/devel/boost_1_56_0/ -L/home/gabi/devel/boost_1_56_0/stage/lib -lboost_log -lboost_log_setup -lboost_filesystem -lboost_system -lboost_thread -lboost_regex -lboost_date_time -lboost_chrono
boost-bench: boost-bench.cpp
$(CXX) boost-bench.cpp -o boost-bench $(CXXFLAGS) $(BOOST_FLAGS) $(CXX_RELEASE_FLAGS)
boost-bench-mt: boost-bench-mt.cpp
$(CXX) boost-bench-mt.cpp -o boost-bench-mt $(CXXFLAGS) $(BOOST_FLAGS) $(CXX_RELEASE_FLAGS)
GLOG_FLAGS = -lglog
glog-bench: glog-bench.cpp
$(CXX) glog-bench.cpp -o glog-bench $(CXXFLAGS) $(GLOG_FLAGS) $(CXX_RELEASE_FLAGS)
glog-bench-mt: glog-bench-mt.cpp
$(CXX) glog-bench-mt.cpp -o glog-bench-mt $(CXXFLAGS) $(GLOG_FLAGS) $(CXX_RELEASE_FLAGS)
G2LOG_FLAGS = -I/home/gabi/devel/g2log/g2log/src -L/home/gabi/devel/g2log/g2log -llib_g2logger
g2log-async: g2log-async.cpp
$(CXX) g2log-async.cpp -o g2log-async $(CXXFLAGS) $(G2LOG_FLAGS) $(CXX_RELEASE_FLAGS)
EASYL_FLAGS = -I../../easylogging/src/
easylogging-bench: easylogging-bench.cpp
$(CXX) easylogging-bench.cpp -o easylogging-bench $(CXXFLAGS) $(EASYL_FLAGS) $(CXX_RELEASE_FLAGS)
easylogging-bench-mt: easylogging-bench-mt.cpp
$(CXX) easylogging-bench-mt.cpp -o easylogging-bench-mt $(CXXFLAGS) $(EASYL_FLAGS) $(CXX_RELEASE_FLAGS)
.PHONY: clean
clean:
rm -f *.o logs/* $(binaries)
rebuild: clean all

179
bench/async_bench.cpp Normal file
View File

@@ -0,0 +1,179 @@
//
// Copyright(c) 2015 Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
//
// bench.cpp : spdlog benchmarks
//
#include "spdlog/spdlog.h"
#include "spdlog/async.h"
#include "spdlog/sinks/basic_file_sink.h"
#include "spdlog/sinks/stdout_color_sinks.h"
#include "utils.h"
#include <atomic>
#include <iostream>
#include <memory>
#include <string>
#include <thread>
using namespace std;
using namespace std::chrono;
using namespace spdlog;
using namespace spdlog::sinks;
using namespace utils;
void bench_mt(int howmany, std::shared_ptr<spdlog::logger> log, int thread_count);
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4996) // disable fopen warning under msvc
#endif // _MSC_VER
int count_lines(const char *filename)
{
int counter = 0;
auto *infile = fopen(filename, "r");
int ch;
while (EOF != (ch = getc(infile)))
{
if ('\n' == ch)
counter++;
}
fclose(infile);
return counter;
}
void verify_file(const char *filename, int expected_count)
{
spdlog::info("Verifying {} to contain {:n} line..", filename, expected_count);
auto count = count_lines(filename);
if (count != expected_count)
{
spdlog::error("Test failed. {} has {:n} lines instead of {:n}", filename, count, expected_count);
exit(1);
}
spdlog::info("Line count OK ({:n})\n", count);
}
#ifdef _MSC_VER
#pragma warning(pop)
#endif
int main(int argc, char *argv[])
{
int howmany = 1000000;
int queue_size = std::min(howmany + 2, 8192);
int threads = 10;
int iters = 3;
try
{
spdlog::set_pattern("[%^%l%$] %v");
if (argc == 1)
{
spdlog::info("Usage: {} <message_count> <threads> <q_size> <iterations>", argv[0]);
return 0;
}
if (argc > 1)
howmany = atoi(argv[1]);
if (argc > 2)
threads = atoi(argv[2]);
if (argc > 3)
{
queue_size = atoi(argv[3]);
if (queue_size > 500000)
{
spdlog::error("Max queue size allowed: 500,000");
exit(1);
}
}
if (argc > 4)
iters = atoi(argv[4]);
auto slot_size = sizeof(spdlog::details::async_msg);
spdlog::info("-------------------------------------------------");
spdlog::info("Messages : {:n}", howmany);
spdlog::info("Threads : {:n}", threads);
spdlog::info("Queue : {:n} slots", queue_size);
spdlog::info("Queue memory : {:n} x {} = {:n} KB ", queue_size, slot_size, (queue_size * slot_size) / 1024);
spdlog::info("Total iters : {:n}", iters);
spdlog::info("-------------------------------------------------");
const char *filename = "logs/basic_async.log";
spdlog::info("");
spdlog::info("*********************************");
spdlog::info("Queue Overflow Policy: block");
spdlog::info("*********************************");
for (int i = 0; i < iters; i++)
{
auto tp = std::make_shared<details::thread_pool>(queue_size, 1);
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);
}
spdlog::info("");
spdlog::info("*********************************");
spdlog::info("Queue Overflow Policy: overrun");
spdlog::info("*********************************");
// do same test but discard oldest if queue is full instead of blocking
filename = "logs/basic_async-overrun.log";
for (int i = 0; i < iters; i++)
{
auto tp = std::make_shared<details::thread_pool>(queue_size, 1);
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::overrun_oldest);
bench_mt(howmany, std::move(logger), threads);
}
spdlog::shutdown();
}
catch (std::exception &ex)
{
std::cerr << "Error: " << ex.what() << std::endl;
perror("Last error");
return 1;
}
return 0;
}
void thread_fun(std::shared_ptr<spdlog::logger> logger, int howmany)
{
for (int i = 0; i < howmany; i++)
{
logger->info("Hello logger: msg number {}", i);
}
}
void bench_mt(int howmany, std::shared_ptr<spdlog::logger> logger, int thread_count)
{
using std::chrono::high_resolution_clock;
vector<thread> threads;
auto start = high_resolution_clock::now();
int msgs_per_thread = howmany / thread_count;
int msgs_per_thread_mod = howmany % thread_count;
for (int t = 0; t < thread_count; ++t)
{
if (t == 0 && msgs_per_thread_mod)
threads.push_back(std::thread(thread_fun, logger, msgs_per_thread + msgs_per_thread_mod));
else
threads.push_back(std::thread(thread_fun, logger, msgs_per_thread));
}
for (auto &t : threads)
{
t.join();
};
auto delta = high_resolution_clock::now() - start;
auto delta_d = duration_cast<duration<double>>(delta).count();
spdlog::info("Elapsed: {} secs\t {:n}/sec", delta_d, int(howmany / delta_d));
}

216
bench/bench.cpp Normal file
View File

@@ -0,0 +1,216 @@
//
// Copyright(c) 2015 Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
//
// bench.cpp : spdlog benchmarks
//
#include "spdlog/spdlog.h"
#include "spdlog/sinks/basic_file_sink.h"
#include "spdlog/sinks/daily_file_sink.h"
#include "spdlog/sinks/null_sink.h"
#include "spdlog/sinks/rotating_file_sink.h"
#include "utils.h"
#include <atomic>
#include <cstdlib> // EXIT_FAILURE
#include <memory>
#include <string>
#include <thread>
using namespace std;
using namespace std::chrono;
using namespace spdlog;
using namespace spdlog::sinks;
using namespace utils;
void bench(int howmany, std::shared_ptr<spdlog::logger> log);
void bench_mt(int howmany, std::shared_ptr<spdlog::logger> log, int thread_count);
void bench_default_api(int howmany, std::shared_ptr<spdlog::logger> log);
void bench_c_string(int howmany, std::shared_ptr<spdlog::logger> log);
static size_t file_size = 30 * 1024 * 1024;
static size_t rotating_files = 5;
void bench_threaded_logging(int threads, int iters)
{
spdlog::info("**************************************************************");
spdlog::info("Multi threaded: {:n} threads, {:n} messages", threads, iters);
spdlog::info("**************************************************************");
auto basic_mt = spdlog::basic_logger_mt("basic_mt", "logs/basic_mt.log", true);
bench_mt(iters, std::move(basic_mt), threads);
auto basic_mt_tracing = spdlog::basic_logger_mt("basic_mt/backtrace-on", "logs/basic_mt.log", true);
basic_mt_tracing->enable_backtrace(32);
bench_mt(iters, std::move(basic_mt_tracing), threads);
spdlog::info("");
auto rotating_mt = spdlog::rotating_logger_mt("rotating_mt", "logs/rotating_mt.log", file_size, rotating_files);
bench_mt(iters, std::move(rotating_mt), threads);
auto rotating_mt_tracing = spdlog::rotating_logger_mt("rotating_mt/backtrace-on", "logs/rotating_mt.log", file_size, rotating_files);
rotating_mt_tracing->enable_backtrace(32);
bench_mt(iters, std::move(rotating_mt_tracing), threads);
spdlog::info("");
auto daily_mt = spdlog::daily_logger_mt("daily_mt", "logs/daily_mt.log");
bench_mt(iters, std::move(daily_mt), threads);
auto daily_mt_tracing = spdlog::daily_logger_mt("daily_mt/backtrace-on", "logs/daily_mt.log");
daily_mt_tracing->enable_backtrace(32);
bench_mt(iters, std::move(daily_mt_tracing), threads);
spdlog::info("");
auto empty_logger = std::make_shared<spdlog::logger>("level-off");
empty_logger->set_level(spdlog::level::off);
bench(iters, empty_logger);
auto empty_logger_tracing = std::make_shared<spdlog::logger>("level-off/backtrace-on");
empty_logger_tracing->set_level(spdlog::level::off);
empty_logger_tracing->enable_backtrace(32);
bench(iters, empty_logger_tracing);
}
void bench_single_threaded(int iters)
{
spdlog::info("**************************************************************");
spdlog::info("Single threaded: {:n} messages", iters);
spdlog::info("**************************************************************");
auto basic_st = spdlog::basic_logger_st("basic_st", "logs/basic_st.log", true);
bench(iters, std::move(basic_st));
auto basic_st_tracing = spdlog::basic_logger_st("basic_st/backtrace-on", "logs/basic_st.log", true);
bench(iters, std::move(basic_st_tracing));
spdlog::info("");
auto rotating_st = spdlog::rotating_logger_st("rotating_st", "logs/rotating_st.log", file_size, rotating_files);
bench(iters, std::move(rotating_st));
auto rotating_st_tracing = spdlog::rotating_logger_st("rotating_st/backtrace-on", "logs/rotating_st.log", file_size, rotating_files);
rotating_st_tracing->enable_backtrace(32);
bench(iters, std::move(rotating_st_tracing));
spdlog::info("");
auto daily_st = spdlog::daily_logger_st("daily_st", "logs/daily_st.log");
bench(iters, std::move(daily_st));
auto daily_st_tracing = spdlog::daily_logger_st("daily_st/backtrace-on", "logs/daily_st.log");
daily_st_tracing->enable_backtrace(32);
bench(iters, std::move(daily_st_tracing));
spdlog::info("");
auto empty_logger = std::make_shared<spdlog::logger>("level-off");
empty_logger->set_level(spdlog::level::off);
bench(iters, empty_logger);
auto empty_logger_tracing = std::make_shared<spdlog::logger>("level-off/backtrace-on");
empty_logger_tracing->set_level(spdlog::level::off);
empty_logger_tracing->enable_backtrace(32);
bench(iters, empty_logger_tracing);
}
int main(int argc, char *argv[])
{
spdlog::set_automatic_registration(false);
spdlog::default_logger()->set_pattern("[%^%l%$] %v");
int iters = 250000;
int threads = 4;
try
{
if (argc > 1)
iters = atoi(argv[1]);
if (argc > 2)
threads = atoi(argv[2]);
bench_single_threaded(iters);
bench_threaded_logging(1, iters);
bench_threaded_logging(threads, iters);
}
catch (std::exception &ex)
{
spdlog::error(ex.what());
return EXIT_FAILURE;
}
return EXIT_SUCCESS;
}
void bench(int howmany, std::shared_ptr<spdlog::logger> log)
{
using std::chrono::high_resolution_clock;
auto start = high_resolution_clock::now();
for (auto i = 0; i < howmany; ++i)
{
log->info("Hello logger: msg number {}", i);
}
auto delta = high_resolution_clock::now() - start;
auto delta_d = duration_cast<duration<double>>(delta).count();
spdlog::info("{:<30} Elapsed: {:0.2f} secs {:>16n}/sec", log->name(), delta_d, int(howmany / delta_d));
spdlog::drop(log->name());
}
void bench_mt(int howmany, std::shared_ptr<spdlog::logger> log, int thread_count)
{
using std::chrono::high_resolution_clock;
vector<thread> threads;
auto start = high_resolution_clock::now();
for (int t = 0; t < thread_count; ++t)
{
threads.push_back(std::thread([&]() {
for (int j = 0; j < howmany / thread_count; j++)
{
log->info("Hello logger: msg number {}", j);
}
}));
}
for (auto &t : threads)
{
t.join();
};
auto delta = high_resolution_clock::now() - start;
auto delta_d = duration_cast<duration<double>>(delta).count();
spdlog::info("{:<30} Elapsed: {:0.2f} secs {:>16n}/sec", log->name(), delta_d, int(howmany / delta_d));
spdlog::drop(log->name());
}
void bench_default_api(int howmany, std::shared_ptr<spdlog::logger> log)
{
using std::chrono::high_resolution_clock;
auto orig_default = spdlog::default_logger();
spdlog::set_default_logger(log);
auto start = high_resolution_clock::now();
for (auto i = 0; i < howmany; ++i)
{
spdlog::info("Hello logger: msg number {}", i);
}
auto delta = high_resolution_clock::now() - start;
auto delta_d = duration_cast<duration<double>>(delta).count();
spdlog::drop(log->name());
spdlog::set_default_logger(std::move(orig_default));
spdlog::info("{:<30} Elapsed: {:0.2f} secs {:>16n}/sec", log->name(), delta_d, int(howmany / delta_d));
}
void bench_c_string(int howmany, std::shared_ptr<spdlog::logger> log)
{
const char *msg = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum pharetra metus cursus "
"lacus placerat congue. Nulla egestas, mauris a tincidunt tempus, enim lectus volutpat mi, eu consequat sem "
"libero nec massa. In dapibus ipsum a diam rhoncus gravida. Etiam non dapibus eros. Donec fringilla dui sed "
"augue pretium, nec scelerisque est maximus. Nullam convallis, sem nec blandit maximus, nisi turpis ornare "
"nisl, sit amet volutpat neque massa eu odio. Maecenas malesuada quam ex, posuere congue nibh turpis duis.";
using std::chrono::high_resolution_clock;
auto orig_default = spdlog::default_logger();
spdlog::set_default_logger(log);
auto start = high_resolution_clock::now();
for (auto i = 0; i < howmany; ++i)
{
spdlog::log(level::info, msg);
}
auto delta = high_resolution_clock::now() - start;
auto delta_d = duration_cast<duration<double>>(delta).count();
spdlog::drop(log->name());
spdlog::set_default_logger(std::move(orig_default));
spdlog::info("{:<30} Elapsed: {:0.2f} secs {:>16n}/sec", log->name(), delta_d, int(howmany / delta_d));
}

View File

@@ -1,84 +0,0 @@
//
// Copyright(c) 2015 Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
#include <thread>
#include <vector>
#include <atomic>
#include <boost/log/core.hpp>
#include <boost/log/trivial.hpp>
#include <boost/log/expressions.hpp>
#include <boost/log/sinks/text_file_backend.hpp>
#include <boost/log/utility/setup/file.hpp>
#include <boost/log/utility/setup/common_attributes.hpp>
#include <boost/log/sources/severity_logger.hpp>
#include <boost/log/sources/record_ostream.hpp>
namespace logging = boost::log;
namespace src = boost::log::sources;
namespace sinks = boost::log::sinks;
namespace keywords = boost::log::keywords;
void init()
{
logging::add_file_log
(
keywords::file_name = "logs/boost-sample_%N.log", /*< file name pattern >*/
keywords::auto_flush = false,
keywords::format = "[%TimeStamp%]: %Message%"
);
logging::core::get()->set_filter
(
logging::trivial::severity >= logging::trivial::info
);
}
using namespace std;
int main(int argc, char* argv[])
{
int thread_count = 10;
if(argc > 1)
thread_count = atoi(argv[1]);
int howmany = 1000000;
init();
logging::add_common_attributes();
using namespace logging::trivial;
src::severity_logger_mt< severity_level > lg;
std::atomic<int > msg_counter {0};
vector<thread> threads;
for (int t = 0; t < thread_count; ++t)
{
threads.push_back(std::thread([&]()
{
while (true)
{
int counter = ++msg_counter;
if (counter > howmany) break;
BOOST_LOG_SEV(lg, info) << "boost message #" << counter << ": This is some text for your pleasure";
}
}));
}
for(auto &t:threads)
{
t.join();
};
return 0;
}

View File

@@ -1,47 +0,0 @@
//
// Copyright(c) 2015 Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
#include <boost/log/core.hpp>
#include <boost/log/trivial.hpp>
#include <boost/log/expressions.hpp>
#include <boost/log/sinks/text_file_backend.hpp>
#include <boost/log/utility/setup/file.hpp>
#include <boost/log/utility/setup/common_attributes.hpp>
#include <boost/log/sources/severity_logger.hpp>
#include <boost/log/sources/record_ostream.hpp>
namespace logging = boost::log;
namespace src = boost::log::sources;
namespace sinks = boost::log::sinks;
namespace keywords = boost::log::keywords;
void init()
{
logging::add_file_log
(
keywords::file_name = "logs/boost-sample_%N.log", /*< file name pattern >*/
keywords::auto_flush = false,
keywords::format = "[%TimeStamp%]: %Message%"
);
logging::core::get()->set_filter
(
logging::trivial::severity >= logging::trivial::info
);
}
int main(int argc, char* [])
{
int howmany = 1000000;
init();
logging::add_common_attributes();
using namespace logging::trivial;
src::severity_logger_mt< severity_level > lg;
for(int i = 0 ; i < howmany; ++i)
BOOST_LOG_SEV(lg, info) << "boost message #" << i << ": This is some text for your pleasure";
return 0;
}

View File

@@ -1,10 +0,0 @@
* GLOBAL:
FORMAT = "[%datetime]: %msg"
FILENAME = ./logs/easylogging.log
ENABLED = true
TO_FILE = true
TO_STANDARD_OUTPUT = false
MILLISECONDS_WIDTH = 3
PERFORMANCE_TRACKING = false
MAX_LOG_FILE_SIZE = 10485760
Log_Flush_Threshold = 10485760

View File

@@ -1,52 +0,0 @@
//
// Copyright(c) 2015 Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
#include <thread>
#include <vector>
#include <atomic>
#define _ELPP_THREAD_SAFE
#include "easylogging++.h"
_INITIALIZE_EASYLOGGINGPP
using namespace std;
int main(int argc, char* argv[])
{
int thread_count = 10;
if(argc > 1)
thread_count = atoi(argv[1]);
int howmany = 1000000;
// Load configuration from file
el::Configurations conf("easyl.conf");
el::Loggers::reconfigureLogger("default", conf);
std::atomic<int > msg_counter {0};
vector<thread> threads;
for (int t = 0; t < thread_count; ++t)
{
threads.push_back(std::thread([&]()
{
while (true)
{
int counter = ++msg_counter;
if (counter > howmany) break;
LOG(INFO) << "easylog message #" << counter << ": This is some text for your pleasure";
}
}));
}
for(auto &t:threads)
{
t.join();
};
return 0;
}

View File

@@ -1,22 +0,0 @@
//
// Copyright(c) 2015 Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
#include "easylogging++.h"
_INITIALIZE_EASYLOGGINGPP
int main(int, char* [])
{
int howmany = 1000000;
// Load configuration from file
el::Configurations conf("easyl.conf");
el::Loggers::reconfigureLogger("default", conf);
for(int i = 0 ; i < howmany; ++i)
LOG(INFO) << "easylog message #" << i << ": This is some text for your pleasure";
return 0;
}

80
bench/formatter-bench.cpp Normal file
View File

@@ -0,0 +1,80 @@
//
// Copyright(c) 2018 Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
#include "benchmark/benchmark.h"
#include "spdlog/spdlog.h"
#include "spdlog/details/pattern_formatter.h"
void bench_formatter(benchmark::State &state, std::string pattern)
{
auto formatter = spdlog::details::make_unique<spdlog::pattern_formatter>(pattern);
spdlog::memory_buf_t dest;
std::string logger_name = "logger-name";
const char *text = "Hello. This is some message with length of 80 ";
spdlog::source_loc source_loc{"a/b/c/d/myfile.cpp", 123, "some_func()"};
spdlog::details::log_msg msg(source_loc, logger_name, spdlog::level::info, text);
for (auto _ : state)
{
dest.clear();
formatter->format(msg, dest);
benchmark::DoNotOptimize(dest);
}
}
void bench_formatters()
{
// basic patterns(single flag)
std::string all_flags = "+vtPnlLaAbBcCYDmdHIMSefFprRTXzEisg@luioO%";
std::vector<std::string> basic_patterns;
for (auto &flag : all_flags)
{
auto pattern = std::string("%") + flag;
benchmark::RegisterBenchmark(pattern.c_str(), bench_formatter, pattern);
// pattern = std::string("%16") + flag;
// benchmark::RegisterBenchmark(pattern.c_str(), bench_formatter, pattern);
//
// // bench center padding
// pattern = std::string("%=16") + flag;
// benchmark::RegisterBenchmark(pattern.c_str(), bench_formatter, pattern);
}
// complex patterns
std::vector<std::string> patterns = {
"[%D %X] [%l] [%n] %v",
"[%Y-%m-%d %H:%M:%S.%e] [%l] [%n] %v",
"[%Y-%m-%d %H:%M:%S.%e] [%l] [%n] [%t] %v",
};
for (auto &pattern : patterns)
{
benchmark::RegisterBenchmark(pattern.c_str(), bench_formatter, pattern)->Iterations(2500000);
}
}
int main(int argc, char *argv[])
{
spdlog::set_pattern("[%^%l%$] %v");
if (argc != 2)
{
spdlog::error("Usage: {} <pattern> (or \"all\" to bench all)", argv[0]);
exit(1);
}
std::string pattern = argv[1];
if (pattern == "all")
{
bench_formatters();
}
else
{
benchmark::RegisterBenchmark(pattern.c_str(), bench_formatter, pattern);
}
benchmark::Initialize(&argc, argv);
benchmark::RunSpecifiedBenchmarks();
}

View File

@@ -1,62 +0,0 @@
//
// Copyright(c) 2015 Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
#include <thread>
#include <vector>
#include <atomic>
#include <iostream>
#include <chrono>
#include "g2logworker.h"
#include "g2log.h"
using namespace std;
template<typename T> std::string format(const T& value);
int main(int argc, char* argv[])
{
using namespace std::chrono;
using clock=steady_clock;
int thread_count = 10;
if(argc > 1)
thread_count = atoi(argv[1]);
int howmany = 1000000;
g2LogWorker g2log(argv[0], "logs");
g2::initializeLogging(&g2log);
std::atomic<int > msg_counter {0};
vector<thread> threads;
auto start = clock::now();
for (int t = 0; t < thread_count; ++t)
{
threads.push_back(std::thread([&]()
{
while (true)
{
int counter = ++msg_counter;
if (counter > howmany) break;
LOG(INFO) << "g2log message #" << counter << ": This is some text for your pleasure";
}
}));
}
for(auto &t:threads)
{
t.join();
};
duration<float> delta = clock::now() - start;
float deltaf = delta.count();
auto rate = howmany/deltaf;
cout << "Total: " << howmany << std::endl;
cout << "Threads: " << thread_count << std::endl;
std::cout << "Delta = " << deltaf << " seconds" << std::endl;
std::cout << "Rate = " << rate << "/sec" << std::endl;
}

View File

@@ -1,50 +0,0 @@
//
// Copyright(c) 2015 Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
#include <thread>
#include <vector>
#include <atomic>
#include "glog/logging.h"
using namespace std;
int main(int argc, char* argv[])
{
int thread_count = 10;
if(argc > 1)
thread_count = atoi(argv[1]);
int howmany = 1000000;
FLAGS_logtostderr = 0;
FLAGS_log_dir = "logs";
google::InitGoogleLogging(argv[0]);
std::atomic<int > msg_counter {0};
vector<thread> threads;
for (int t = 0; t < thread_count; ++t)
{
threads.push_back(std::thread([&]()
{
while (true)
{
int counter = ++msg_counter;
if (counter > howmany) break;
LOG(INFO) << "glog message #" << counter << ": This is some text for your pleasure";
}
}));
}
for(auto &t:threads)
{
t.join();
};
return 0;
}

View File

@@ -1,21 +0,0 @@
//
// Copyright(c) 2015 Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
#include "glog/logging.h"
int main(int, char* argv[])
{
int howmany = 1000000;
FLAGS_logtostderr = 0;
FLAGS_log_dir = "logs";
google::InitGoogleLogging(argv[0]);
for(int i = 0 ; i < howmany; ++i)
LOG(INFO) << "glog message # " << i << ": This is some text for your pleasure";
return 0;
}

147
bench/latency.cpp Normal file
View File

@@ -0,0 +1,147 @@
//
// Copyright(c) 2018 Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
//
// latency.cpp : spdlog latency benchmarks
//
#include "benchmark/benchmark.h"
#include "spdlog/spdlog.h"
#include "spdlog/async.h"
#include "spdlog/sinks/basic_file_sink.h"
#include "spdlog/sinks/daily_file_sink.h"
#include "spdlog/sinks/null_sink.h"
#include "spdlog/sinks/rotating_file_sink.h"
void bench_c_string(benchmark::State &state, std::shared_ptr<spdlog::logger> logger)
{
const char *msg = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum pharetra metus cursus "
"lacus placerat congue. Nulla egestas, mauris a tincidunt tempus, enim lectus volutpat mi, eu consequat sem "
"libero nec massa. In dapibus ipsum a diam rhoncus gravida. Etiam non dapibus eros. Donec fringilla dui sed "
"augue pretium, nec scelerisque est maximus. Nullam convallis, sem nec blandit maximus, nisi turpis ornare "
"nisl, sit amet volutpat neque massa eu odio. Maecenas malesuada quam ex, posuere congue nibh turpis duis.";
for (auto _ : state)
{
logger->info(msg);
}
}
void bench_logger(benchmark::State &state, std::shared_ptr<spdlog::logger> logger)
{
int i = 0;
for (auto _ : state)
{
logger->info("Hello logger: msg number {}...............", ++i);
}
}
void bench_disabled_macro(benchmark::State &state, std::shared_ptr<spdlog::logger> logger)
{
int i = 0;
benchmark::DoNotOptimize(i); // prevent unused warnings
benchmark::DoNotOptimize(logger); // prevent unused warnings
for (auto _ : state)
{
SPDLOG_LOGGER_DEBUG(logger, "Hello logger: msg number {}...............", i++);
SPDLOG_DEBUG("Hello logger: msg number {}...............", i++);
}
}
int main(int argc, char *argv[])
{
using spdlog::sinks::basic_file_sink_mt;
using spdlog::sinks::basic_file_sink_st;
using spdlog::sinks::null_sink_mt;
using spdlog::sinks::null_sink_st;
size_t file_size = 30 * 1024 * 1024;
size_t rotating_files = 5;
int n_threads = benchmark::CPUInfo::Get().num_cpus;
// disabled loggers
auto disabled_logger = std::make_shared<spdlog::logger>("bench", std::make_shared<null_sink_mt>());
disabled_logger->set_level(spdlog::level::off);
benchmark::RegisterBenchmark("disabled-at-compile-time", bench_disabled_macro, disabled_logger);
benchmark::RegisterBenchmark("disabled-at-runtime", bench_logger, disabled_logger);
// with backtrace of 64
auto tracing_disabled_logger = std::make_shared<spdlog::logger>("bench", std::make_shared<null_sink_mt>());
tracing_disabled_logger->enable_backtrace(64);
benchmark::RegisterBenchmark("disabled-at-runtime/backtrace", bench_logger, tracing_disabled_logger);
auto null_logger_st = std::make_shared<spdlog::logger>("bench", std::make_shared<null_sink_st>());
benchmark::RegisterBenchmark("null_sink_st (500_bytes c_str)", bench_c_string, std::move(null_logger_st));
benchmark::RegisterBenchmark("null_sink_st", bench_logger, null_logger_st);
// with backtrace of 64
auto tracing_null_logger_st = std::make_shared<spdlog::logger>("bench", std::make_shared<null_sink_st>());
tracing_null_logger_st->enable_backtrace(64);
benchmark::RegisterBenchmark("null_sink_st/backtrace", bench_logger, tracing_null_logger_st);
// basic_st
auto basic_st = spdlog::basic_logger_st("basic_st", "latency_logs/basic_st.log", true);
benchmark::RegisterBenchmark("basic_st", bench_logger, std::move(basic_st))->UseRealTime();
spdlog::drop("basic_st");
// with backtrace of 64
auto tracing_basic_st = spdlog::basic_logger_st("tracing_basic_st", "latency_logs/tracing_basic_st.log", true);
tracing_basic_st->enable_backtrace(64);
benchmark::RegisterBenchmark("basic_st/backtrace", bench_logger, std::move(tracing_basic_st))->UseRealTime();
spdlog::drop("tracing_basic_st");
// rotating st
auto rotating_st = spdlog::rotating_logger_st("rotating_st", "latency_logs/rotating_st.log", file_size, rotating_files);
benchmark::RegisterBenchmark("rotating_st", bench_logger, std::move(rotating_st))->UseRealTime();
spdlog::drop("rotating_st");
// with backtrace of 64
auto tracing_rotating_st =
spdlog::rotating_logger_st("tracing_rotating_st", "latency_logs/tracing_rotating_st.log", file_size, rotating_files);
benchmark::RegisterBenchmark("rotating_st/backtrace", bench_logger, std::move(tracing_rotating_st))->UseRealTime();
spdlog::drop("tracing_rotating_st");
// daily st
auto daily_st = spdlog::daily_logger_mt("daily_st", "latency_logs/daily_st.log");
benchmark::RegisterBenchmark("daily_st", bench_logger, std::move(daily_st))->UseRealTime();
spdlog::drop("daily_st");
auto tracing_daily_st = spdlog::daily_logger_mt("tracing_daily_st", "latency_logs/daily_st.log");
benchmark::RegisterBenchmark("daily_st/backtrace", bench_logger, std::move(tracing_daily_st))->UseRealTime();
spdlog::drop("tracing_daily_st");
//
// Multi threaded bench, 10 loggers using same logger concurrently
//
auto null_logger_mt = std::make_shared<spdlog::logger>("bench", std::make_shared<null_sink_mt>());
benchmark::RegisterBenchmark("null_sink_mt", bench_logger, null_logger_mt)->Threads(n_threads)->UseRealTime();
// basic_mt
auto basic_mt = spdlog::basic_logger_mt("basic_mt", "latency_logs/basic_mt.log", true);
benchmark::RegisterBenchmark("basic_mt", bench_logger, std::move(basic_mt))->Threads(n_threads)->UseRealTime();
spdlog::drop("basic_mt");
// rotating mt
auto rotating_mt = spdlog::rotating_logger_mt("rotating_mt", "latency_logs/rotating_mt.log", file_size, rotating_files);
benchmark::RegisterBenchmark("rotating_mt", bench_logger, std::move(rotating_mt))->Threads(n_threads)->UseRealTime();
spdlog::drop("rotating_mt");
// daily mt
auto daily_mt = spdlog::daily_logger_mt("daily_mt", "latency_logs/daily_mt.log");
benchmark::RegisterBenchmark("daily_mt", bench_logger, std::move(daily_mt))->Threads(n_threads)->UseRealTime();
spdlog::drop("daily_mt");
// async
auto queue_size = 1024 * 1024 * 3;
auto tp = std::make_shared<spdlog::details::thread_pool>(queue_size, 1);
auto async_logger = std::make_shared<spdlog::async_logger>(
"async_logger", std::make_shared<null_sink_mt>(), std::move(tp), spdlog::async_overflow_policy::overrun_oldest);
benchmark::RegisterBenchmark("async_logger", bench_logger, async_logger)->Threads(n_threads)->UseRealTime();
auto async_logger_tracing = std::make_shared<spdlog::async_logger>(
"async_logger_tracing", std::make_shared<null_sink_mt>(), std::move(tp), spdlog::async_overflow_policy::overrun_oldest);
async_logger_tracing->enable_backtrace(32);
benchmark::RegisterBenchmark("async_logger/tracing", bench_logger, async_logger_tracing)->Threads(n_threads)->UseRealTime();
benchmark::Initialize(&argc, argv);
benchmark::RunSpecifiedBenchmarks();
}

View File

@@ -1,32 +0,0 @@
CXX ?= g++
CXXFLAGS = -march=native -Wall -std=c++11 -pthread
CXX_RELEASE_FLAGS = -O2 -DNDEBUG
binaries=spdlog-latency g3log-latency g3log-crush
all: $(binaries)
spdlog-latency: spdlog-latency.cpp
$(CXX) spdlog-latency.cpp -o spdlog-latency $(CXXFLAGS) $(CXX_RELEASE_FLAGS) -I../../include
g3log-latency: g3log-latency.cpp
$(CXX) g3log-latency.cpp -o g3log-latency $(CXXFLAGS) $(CXX_RELEASE_FLAGS) -I../../../g3log/src -L. -lg3logger
g3log-crush: g3log-crush.cpp
$(CXX) g3log-crush.cpp -o g3log-crush $(CXXFLAGS) $(CXX_RELEASE_FLAGS) -I../../../g3log/src -L. -lg3logger
.PHONY: clean
clean:
rm -f *.o *.log $(binaries)
rebuild: clean all

View File

@@ -1,13 +0,0 @@
#!/bin/bash
echo "running spdlog and g3log tests 10 time with ${1:-10} threads each (total 1,000,000 entries).."
rm -f *.log
for i in {1..10}
do
echo
sleep 0.5
./spdlog-latency ${1:-10} 2>/dev/null || exit
sleep 0.5
./g3log-latency ${1:-10} 2>/dev/null || exit
done

View File

@@ -1,37 +0,0 @@
#include <iostream>
#include <g3log/g3log.hpp>
#include <g3log/logworker.hpp>
void CrusherLoop()
{
size_t counter = 0;
while (true)
{
LOGF(INFO, "Some text to crush you machine. thread:");
if(++counter % 1000000 == 0)
{
std::cout << "Wrote " << counter << " entries" << std::endl;
}
}
}
int main(int argc, char** argv)
{
std::cout << "WARNING: This test will exaust all your machine memory and will crush it!" << std::endl;
std::cout << "Are you sure you want to continue ? " << std::endl;
char c;
std::cin >> c;
if (toupper( c ) != 'Y')
return 0;
auto worker = g3::LogWorker::createLogWorker();
auto handle= worker->addDefaultLogger(argv[0], "g3log.txt");
g3::initializeLogging(worker.get());
CrusherLoop();
return 0;
}

View File

@@ -1,129 +0,0 @@
#include <thread>
#include <vector>
#include <atomic>
#include <iostream>
#include <chrono>
#include <algorithm>
#include <iomanip>
#include <iostream>
#include <sstream>
#include <fstream>
#include <cstdio>
#include <map>
#include <numeric>
#include <functional>
#include <thread>
#include "utils.h"
#include <g3log/g3log.hpp>
#include <g3log/logworker.hpp>
namespace
{
const uint64_t g_iterations = 1000000;
std::atomic<size_t> g_counter = {0};
void MeasurePeakDuringLogWrites(const size_t id, std::vector<uint64_t>& result)
{
while (true)
{
const size_t value_now = ++g_counter;
if (value_now > g_iterations)
{
return;
}
auto start_time = std::chrono::high_resolution_clock::now();
LOGF(INFO, "Some text to log for thread: %ld", id);
auto stop_time = std::chrono::high_resolution_clock::now();
uint64_t time_us = std::chrono::duration_cast<std::chrono::microseconds>(stop_time - start_time).count();
result.push_back(time_us);
}
}
void PrintResults(const std::map<size_t, std::vector<uint64_t>>& threads_result, size_t total_us)
{
std::vector<uint64_t> all_measurements;
all_measurements.reserve(g_iterations);
for (auto& t_result : threads_result)
{
all_measurements.insert(all_measurements.end(), t_result.second.begin(), t_result.second.end());
}
// calc worst latenct
auto worst = *std::max_element(all_measurements.begin(), all_measurements.end());
// calc avg
auto total = accumulate(begin(all_measurements), end(all_measurements), 0, std::plus<uint64_t>());
auto avg = double(total)/all_measurements.size();
std::cout << "[g3log] worst: " << std::setw(10) << std::right << worst << "\tAvg: " << avg << "\tTotal: " << utils::format(total_us) << " us" << std::endl;
}
}// anonymous
// The purpose of this test is NOT to see how fast
// each thread can possibly write. It is to see what
// the worst latency is for writing a log entry
//
// In the test 1 million log entries will be written
// an atomic counter is used to give each thread what
// it is to write next. The overhead of atomic
// synchronization between the threads are not counted in the worst case latency
int main(int argc, char** argv)
{
size_t number_of_threads {0};
if (argc == 2)
{
number_of_threads = atoi(argv[1]);
}
if (argc != 2 || number_of_threads == 0)
{
std::cerr << "USAGE is: " << argv[0] << " number_threads" << std::endl;
return 1;
}
std::vector<std::thread> threads(number_of_threads);
std::map<size_t, std::vector<uint64_t>> threads_result;
for (size_t idx = 0; idx < number_of_threads; ++idx)
{
// reserve to 1 million for all the result
// it's a test so let's not care about the wasted space
threads_result[idx].reserve(g_iterations);
}
const std::string g_path = "./" ;
const std::string g_prefix_log_name = "g3log-performance-";
const std::string g_measurement_dump = g_path + g_prefix_log_name + "_RESULT.txt";
auto worker = g3::LogWorker::createLogWorker();
auto handle= worker->addDefaultLogger(argv[0], "g3log.txt");
g3::initializeLogging(worker.get());
auto start_time_application_total = std::chrono::high_resolution_clock::now();
for (uint64_t idx = 0; idx < number_of_threads; ++idx)
{
threads[idx] = std::thread(MeasurePeakDuringLogWrites, idx, std::ref(threads_result[idx]));
}
for (size_t idx = 0; idx < number_of_threads; ++idx)
{
threads[idx].join();
}
auto stop_time_application_total = std::chrono::high_resolution_clock::now();
uint64_t total_time_in_us = std::chrono::duration_cast<std::chrono::microseconds>(stop_time_application_total - start_time_application_total).count();
PrintResults(threads_result, total_time_in_us);
return 0;
}

View File

@@ -1,128 +0,0 @@
#include <thread>
#include <vector>
#include <atomic>
#include <iostream>
#include <chrono>
#include <algorithm>
#include <iostream>
#include <cstdio>
#include <map>
#include <numeric>
#include <functional>
#include "utils.h"
#include <thread>
#include "spdlog/spdlog.h"
namespace spd = spdlog;
namespace
{
const uint64_t g_iterations = 1000000;
std::atomic<size_t> g_counter = {0};
void MeasurePeakDuringLogWrites(const size_t id, std::vector<uint64_t>& result)
{
auto logger = spd::get("file_logger");
while (true)
{
const size_t value_now = ++g_counter;
if (value_now > g_iterations)
{
return;
}
auto start_time = std::chrono::high_resolution_clock::now();
logger->info("Some text to log for thread: [somemore text...............................] {}", id);
auto stop_time = std::chrono::high_resolution_clock::now();
uint64_t time_us = std::chrono::duration_cast<std::chrono::microseconds>(stop_time - start_time).count();
result.push_back(time_us);
}
}
void PrintResults(const std::map<size_t, std::vector<uint64_t>>& threads_result, size_t total_us)
{
std::vector<uint64_t> all_measurements;
all_measurements.reserve(g_iterations);
for (auto& t_result : threads_result)
{
all_measurements.insert(all_measurements.end(), t_result.second.begin(), t_result.second.end());
}
// calc worst latenct
auto worst = *std::max_element(all_measurements.begin(), all_measurements.end());
// calc avg
auto total = accumulate(begin(all_measurements), end(all_measurements), 0, std::plus<uint64_t>());
auto avg = double(total)/all_measurements.size();
std::cout << "[spdlog] worst: " << std::setw(10) << std::right << worst << "\tAvg: " << avg << "\tTotal: " << utils::format(total_us) << " us" << std::endl;
}
}// anonymous
// The purpose of this test is NOT to see how fast
// each thread can possibly write. It is to see what
// the worst latency is for writing a log entry
//
// In the test 1 million log entries will be written
// an atomic counter is used to give each thread what
// it is to write next. The overhead of atomic
// synchronization between the threads are not counted in the worst case latency
int main(int argc, char** argv)
{
size_t number_of_threads {0};
if (argc == 2)
{
number_of_threads = atoi(argv[1]);
}
if (argc != 2 || number_of_threads == 0)
{
std::cerr << "usage: " << argv[0] << " number_threads" << std::endl;
return 1;
}
std::vector<std::thread> threads(number_of_threads);
std::map<size_t, std::vector<uint64_t>> threads_result;
for (size_t idx = 0; idx < number_of_threads; ++idx)
{
// reserve to 1 million for all the result
// it's a test so let's not care about the wasted space
threads_result[idx].reserve(g_iterations);
}
int queue_size = 1048576; // 2 ^ 20
spdlog::set_async_mode(queue_size);
auto logger = spdlog::create<spd::sinks::simple_file_sink_mt>("file_logger", "spdlog.log", true);
//force flush on every call to compare with g3log
auto s = (spd::sinks::simple_file_sink_mt*)logger->sinks()[0].get();
s->set_force_flush(true);
auto start_time_application_total = std::chrono::high_resolution_clock::now();
for (uint64_t idx = 0; idx < number_of_threads; ++idx)
{
threads[idx] = std::thread(MeasurePeakDuringLogWrites, idx, std::ref(threads_result[idx]));
}
for (size_t idx = 0; idx < number_of_threads; ++idx)
{
threads[idx].join();
}
auto stop_time_application_total = std::chrono::high_resolution_clock::now();
uint64_t total_time_in_us = std::chrono::duration_cast<std::chrono::microseconds>(stop_time_application_total - start_time_application_total).count();
PrintResults(threads_result, total_time_in_us);
return 0;
}

View File

@@ -1,35 +0,0 @@
//
// Copyright(c) 2015 Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
#pragma once
#include <sstream>
#include <iomanip>
#include <locale>
namespace utils
{
template<typename T>
inline std::string format(const T& value)
{
static std::locale loc("");
std::stringstream ss;
ss.imbue(loc);
ss << value;
return ss.str();
}
template<>
inline std::string format(const double & value)
{
static std::locale loc("");
std::stringstream ss;
ss.imbue(loc);
ss << std::fixed << std::setprecision(1) << value;
return ss.str();
}
}

View File

@@ -1,4 +0,0 @@
# Ignore everything in this directory
*
# Except this file
!.gitignore

14
bench/meson.build Normal file
View File

@@ -0,0 +1,14 @@
benchmark = dependency('benchmark')
bench_matrix = [
['bench', [spdlog_dep], []],
['async_bench', [spdlog_dep], []],
['formatter-bench', [spdlog_dep, benchmark], ['all']],
['latency', [spdlog_dep, benchmark], []],
]
foreach i : bench_matrix
bench_exe = executable(i[0], i[0] + '.cpp', dependencies: i[1])
benchmark('bench_' + i[0], bench_exe, args: i[2])
endforeach

View File

@@ -1,62 +0,0 @@
//
// Copyright(c) 2015 Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
#include <thread>
#include <vector>
#include <atomic>
#include <iostream>
#include <chrono>
#include <cstdlib>
#include "spdlog/spdlog.h"
using namespace std;
int main(int argc, char* argv[])
{
using namespace std::chrono;
using clock=steady_clock;
namespace spd = spdlog;
int thread_count = 10;
if(argc > 1)
thread_count = ::atoi(argv[1]);
int howmany = 1000000;
spd::set_async_mode(1048576);
auto logger = spdlog::create<spd::sinks::simple_file_sink_mt>("file_logger", "logs/spd-bench-async.txt", false);
logger->set_pattern("[%Y-%b-%d %T.%e]: %v");
std::atomic<int > msg_counter {0};
vector<thread> threads;
auto start = clock::now();
for (int t = 0; t < thread_count; ++t)
{
threads.push_back(std::thread([&]()
{
while (true)
{
int counter = ++msg_counter;
if (counter > howmany) break;
logger->info("spdlog message #{}: This is some text for your pleasure", counter);
}
}));
}
for(auto &t:threads)
{
t.join();
};
duration<float> delta = clock::now() - start;
float deltaf = delta.count();
auto rate = howmany/deltaf;
cout << "Total: " << howmany << std::endl;
cout << "Threads: " << thread_count << std::endl;
std::cout << "Delta = " << deltaf << " seconds" << std::endl;
std::cout << "Rate = " << rate << "/sec" << std::endl;
}

View File

@@ -1,55 +0,0 @@
//
// Copyright(c) 2015 Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
#include <thread>
#include <vector>
#include <atomic>
#include <cstdlib>
#include "spdlog/spdlog.h"
using namespace std;
int main(int argc, char* argv[])
{
int thread_count = 10;
if(argc > 1)
thread_count = std::atoi(argv[1]);
int howmany = 1000000;
namespace spd = spdlog;
auto logger = spdlog::create<spd::sinks::simple_file_sink_mt>("file_logger", "logs/spd-bench-mt.txt", false);
logger->set_pattern("[%Y-%b-%d %T.%e]: %v");
std::atomic<int > msg_counter {0};
std::vector<thread> threads;
for (int t = 0; t < thread_count; ++t)
{
threads.push_back(std::thread([&]()
{
while (true)
{
int counter = ++msg_counter;
if (counter > howmany) break;
logger->info("spdlog message #{}: This is some text for your pleasure", counter);
}
}));
}
for(auto &t:threads)
{
t.join();
};
return 0;
}

View File

@@ -1,20 +0,0 @@
//
// Copyright(c) 2015 Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
#include "spdlog/spdlog.h"
int main(int, char* [])
{
int howmany = 1000000;
namespace spd = spdlog;
///Create a file rotating logger with 5mb size max and 3 rotated files
auto logger = spdlog::create<spd::sinks::simple_file_sink_st>("file_logger", "logs/spd-bench-st.txt", false);
logger->set_pattern("[%Y-%b-%d %T.%e]: %v");
for(int i = 0 ; i < howmany; ++i)
logger->info("spdlog message #{} : This is some text for your pleasure", i);
return 0;
}

View File

@@ -1,112 +0,0 @@
//
// Copyright(c) 2015 Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
//
// bench.cpp : spdlog benchmarks
//
#include <atomic>
#include <cstdlib> // EXIT_FAILURE
#include <iostream>
#include <memory>
#include <string>
#include <thread>
#include "spdlog/spdlog.h"
#include "spdlog/async_logger.h"
#include "spdlog/sinks/null_sink.h"
#include "utils.h"
using namespace std;
using namespace std::chrono;
using namespace spdlog;
using namespace spdlog::sinks;
using namespace utils;
size_t bench_as(int howmany, std::shared_ptr<spdlog::logger> log, int thread_count);
int main(int argc, char* argv[])
{
int queue_size = 1048576;
int howmany = 1000000;
int threads = 10;
int iters = 10;
try
{
if(argc > 1)
howmany = atoi(argv[1]);
if (argc > 2)
threads = atoi(argv[2]);
if (argc > 3)
queue_size = atoi(argv[3]);
cout << "\n*******************************************************************************\n";
cout << "async logging.. " << threads << " threads sharing same logger, " << format(howmany) << " messages " << endl;
cout << "*******************************************************************************\n";
spdlog::set_async_mode(queue_size);
size_t total_rate = 0;
for(int i = 0; i < iters; ++i)
{
//auto as = spdlog::daily_logger_st("as", "logs/daily_async");
auto as = spdlog::create<null_sink_st>("async(null-sink)");
total_rate+= bench_as(howmany, as, threads);
spdlog::drop("async(null-sink)");
}
std::cout << endl;
std::cout << "Avg rate: " << format(total_rate/iters) << "/sec" <<std::endl;
}
catch (std::exception &ex)
{
std::cerr << "Error: " << ex.what() << std::endl;
perror("Last error");
return EXIT_FAILURE;
}
return EXIT_SUCCESS;
}
//return rate/sec
size_t bench_as(int howmany, std::shared_ptr<spdlog::logger> log, int thread_count)
{
cout << log->name() << "...\t\t" << flush;
std::atomic<int > msg_counter {0};
vector<thread> threads;
auto start = system_clock::now();
for (int t = 0; t < thread_count; ++t)
{
threads.push_back(std::thread([&]()
{
for(;;)
{
int counter = ++msg_counter;
if (counter > howmany) break;
log->info("Hello logger: msg number {}", counter);
}
}));
}
for(auto &t:threads)
{
t.join();
};
auto delta = system_clock::now() - start;
auto delta_d = duration_cast<duration<double>> (delta).count();
auto per_sec = size_t(howmany / delta_d);
cout << format(per_sec) << "/sec" << endl;
return per_sec;
}

View File

@@ -5,15 +5,14 @@
#pragma once
#include <sstream>
#include <iomanip>
#include <locale>
#include <sstream>
namespace utils
{
namespace utils {
template<typename T>
inline std::string format(const T& value)
inline std::string format(const T &value)
{
static std::locale loc("");
std::stringstream ss;
@@ -23,7 +22,7 @@ inline std::string format(const T& value)
}
template<>
inline std::string format(const double & value)
inline std::string format(const double &value)
{
static std::locale loc("");
std::stringstream ss;
@@ -32,4 +31,4 @@ inline std::string format(const double & value)
return ss.str();
}
}
} // namespace utils

View File

@@ -1,24 +0,0 @@
# *************************************************************************/
# * Copyright (c) 2015 Ruslan Baratov. */
# * */
# * Permission is hereby granted, free of charge, to any person obtaining */
# * a copy of this software and associated documentation files (the */
# * "Software"), to deal in the Software without restriction, including */
# * without limitation the rights to use, copy, modify, merge, publish, */
# * distribute, sublicense, and/or sell copies of the Software, and to */
# * permit persons to whom the Software is furnished to do so, subject to */
# * the following conditions: */
# * */
# * The above copyright notice and this permission notice shall be */
# * included in all copies or substantial portions of the Software. */
# * */
# * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
# * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
# * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
# * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
# * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
# * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
# * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
# *************************************************************************/
include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake")

18
cmake/ide.cmake Normal file
View File

@@ -0,0 +1,18 @@
#---------------------------------------------------------------------------------------
# IDE support for headers
#---------------------------------------------------------------------------------------
set(SPDLOG_HEADERS_DIR "${CMAKE_CURRENT_LIST_DIR}/../include")
file(GLOB SPDLOG_TOP_HEADERS "${SPDLOG_HEADERS_DIR}/spdlog/*.h")
file(GLOB SPDLOG_DETAILS_HEADERS "${SPDLOG_HEADERS_DIR}/spdlog/details/*.h")
file(GLOB SPDLOG_SINKS_HEADERS "${SPDLOG_HEADERS_DIR}/spdlog/sinks/*.h")
file(GLOB SPDLOG_FMT_HEADERS "${SPDLOG_HEADERS_DIR}/spdlog/fmt/*.h")
file(GLOB SPDLOG_FMT_BUNDELED_HEADERS "${SPDLOG_HEADERS_DIR}/spdlog/fmt/bundled/*.h")
set(SPDLOG_ALL_HEADERS ${SPDLOG_TOP_HEADERS} ${SPDLOG_DETAILS_HEADERS} ${SPDLOG_SINKS_HEADERS} ${SPDLOG_FMT_HEADERS} ${SPDLOG_FMT_BUNDELED_HEADERS})
source_group("Header Files\\spdlog" FILES ${SPDLOG_TOP_HEADERS})
source_group("Header Files\\spdlog\\details" FILES ${SPDLOG_DETAILS_HEADERS})
source_group("Header Files\\spdlog\\sinks" FILES ${SPDLOG_SINKS_HEADERS})
source_group("Header Files\\spdlog\\fmt" FILES ${SPDLOG_FMT_HEADERS})
source_group("Header Files\\spdlog\\fmt\\bundled\\" FILES ${SPDLOG_FMT_BUNDELED_HEADERS})

View File

@@ -1,6 +1,13 @@
prefix=@CMAKE_INSTALL_PREFIX@
includedir=${prefix}/include
Name: @PROJECT_NAME@
Description: Super fast C++ logging library.
Version: @PROJECT_VERSION@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
includedir=${prefix}/include
libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
Name: lib@PROJECT_NAME@
Description: Fast C++ logging library.
URL: https://github.com/gabime/@PROJECT_NAME@
Version: @SPDLOG_VERSION@
CFlags: -I${includedir} @PKG_CONFIG_DEFINES@
Libs: -L${libdir} -lspdlog -pthread
Requires: @PKG_CONFIG_REQUIRES@

32
cmake/spdlogCPack.cmake Normal file
View File

@@ -0,0 +1,32 @@
set(CPACK_GENERATOR
TGZ
ZIP
)
set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)
set(CPACK_INSTALL_CMAKE_PROJECTS
"${CMAKE_BINARY_DIR}"
"${PROJECT_NAME}"
ALL
.
)
set(CPACK_PROJECT_URL "https://github.com/gabime/spdlog")
set(CPACK_PACKAGE_VENDOR "Gabi Melman")
set(CPACK_PACKAGE_CONTACT "Gabi Melman <gmelman1@gmail.com>")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast C++ logging library")
set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
if (PROJECT_VERSION_TWEAK)
set(CPACK_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION}.${PROJECT_VERSION_TWEAK})
endif ()
set(CPACK_PACKAGE_RELOCATABLE ON)
set(CPACK_RPM_PACKAGE_LICENSE "MIT")
set(CPACK_RPM_PACKAGE_GROUP "System Environment/Libraries")
set(CPACK_RPM_PACKAGE_URL ${CPACK_PROJECT_URL})
set(CPACK_RPM_PACKAGE_DESCRIPTION "Very fast, header-only/compiled, C++ logging library.")
include(CPack)

View File

@@ -0,0 +1,15 @@
# Copyright(c) 2019 spdlog authors
# Distributed under the MIT License (http://opensource.org/licenses/MIT)
find_package(Threads REQUIRED)
set(SPDLOG_FMT_EXTERNAL @SPDLOG_FMT_EXTERNAL@)
set(config_targets_file @config_targets_file@)
if(SPDLOG_FMT_EXTERNAL)
include(CMakeFindDependencyMacro)
find_dependency(fmt CONFIG)
endif()
include("${CMAKE_CURRENT_LIST_DIR}/${config_targets_file}")

50
cmake/utils.cmake Normal file
View File

@@ -0,0 +1,50 @@
# Get spdlog version from include/spdlog/version.h and put it in SPDLOG_VERSION
function(spdlog_extract_version)
file(READ "${CMAKE_CURRENT_LIST_DIR}/include/spdlog/version.h" file_contents)
string(REGEX MATCH "SPDLOG_VER_MAJOR ([0-9]+)" _ "${file_contents}")
if(NOT CMAKE_MATCH_COUNT EQUAL 1)
message(FATAL_ERROR "Could not extract major version number from spdlog/version.h")
endif()
set(ver_major ${CMAKE_MATCH_1})
string(REGEX MATCH "SPDLOG_VER_MINOR ([0-9]+)" _ "${file_contents}")
if(NOT CMAKE_MATCH_COUNT EQUAL 1)
message(FATAL_ERROR "Could not extract minor version number from spdlog/version.h")
endif()
set(ver_minor ${CMAKE_MATCH_1})
string(REGEX MATCH "SPDLOG_VER_PATCH ([0-9]+)" _ "${file_contents}")
if(NOT CMAKE_MATCH_COUNT EQUAL 1)
message(FATAL_ERROR "Could not extract patch version number from spdlog/version.h")
endif()
set(ver_patch ${CMAKE_MATCH_1})
set(SPDLOG_VERSION_MAJOR ${ver_major} PARENT_SCOPE)
set (SPDLOG_VERSION "${ver_major}.${ver_minor}.${ver_patch}" PARENT_SCOPE)
endfunction()
# Turn on warnings on the given target
function(spdlog_enable_warnings target_name)
target_compile_options(${target_name} PRIVATE
$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
-Wall -Wextra -Wconversion -pedantic -Wfatal-errors>
$<$<CXX_COMPILER_ID:MSVC>:/W4>)
if(MSVC_VERSION GREATER 1900) #Allow non fatal security wanrnings for msvc 2015
target_compile_options(${target_name} PRIVATE /WX)
endif()
endfunction()
# Enable address sanitizer (gcc/clang only)
function(spdlog_enable_sanitizer target_name)
if (NOT CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
message(FATAL_ERROR "Sanitizer supported only for gcc/clang")
endif()
message(STATUS "Address sanitizer enabled")
target_compile_options(${target_name} PRIVATE -fsanitize=address,undefined)
target_compile_options(${target_name} PRIVATE -fno-sanitize=signed-integer-overflow)
target_compile_options(${target_name} PRIVATE -fno-sanitize-recover=all)
target_compile_options(${target_name} PRIVATE -fno-omit-frame-pointer)
target_link_libraries(${target_name} PRIVATE -fsanitize=address,undefined -fuse-ld=gold)
endfunction()

View File

@@ -1,49 +1,27 @@
# *************************************************************************/
# * Copyright (c) 2015 Ruslan Baratov. */
# * */
# * Permission is hereby granted, free of charge, to any person obtaining */
# * a copy of this software and associated documentation files (the */
# * "Software"), to deal in the Software without restriction, including */
# * without limitation the rights to use, copy, modify, merge, publish, */
# * distribute, sublicense, and/or sell copies of the Software, and to */
# * permit persons to whom the Software is furnished to do so, subject to */
# * the following conditions: */
# * */
# * The above copyright notice and this permission notice shall be */
# * included in all copies or substantial portions of the Software. */
# * */
# * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
# * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
# * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
# * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
# * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
# * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
# * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
# *************************************************************************/
cmake_minimum_required(VERSION 3.0)
project(SpdlogExamples)
if(TARGET spdlog)
# Part of the main project
add_library(spdlog::spdlog ALIAS spdlog)
else()
# Stand-alone build
find_package(spdlog CONFIG REQUIRED)
endif()
find_package(Threads)
add_executable(example example.cpp)
target_link_libraries(example spdlog::spdlog ${CMAKE_THREAD_LIBS_INIT})
add_executable(benchmark bench.cpp)
target_link_libraries(benchmark spdlog::spdlog ${CMAKE_THREAD_LIBS_INIT})
add_executable(multisink multisink.cpp)
target_link_libraries(multisink spdlog::spdlog ${CMAKE_THREAD_LIBS_INIT})
enable_testing()
file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/logs")
add_test(NAME RunExample COMMAND example)
add_test(NAME RunBenchmark COMMAND benchmark)
# Copyright(c) 2019 spdlog authors
# Distributed under the MIT License (http://opensource.org/licenses/MIT)
cmake_minimum_required(VERSION 3.1)
project(spdlog_examples CXX)
if(NOT TARGET spdlog)
# Stand-alone build
find_package(spdlog REQUIRED)
endif()
#---------------------------------------------------------------------------------------
# Example of using pre-compiled library
#---------------------------------------------------------------------------------------
add_executable(example example.cpp)
spdlog_enable_warnings(example)
target_link_libraries(example PRIVATE spdlog::spdlog)
#---------------------------------------------------------------------------------------
# Example of using header-only library
#---------------------------------------------------------------------------------------
if(SPDLOG_BUILD_EXAMPLE_HO)
add_executable(example_header_only example.cpp)
spdlog_enable_warnings(example_header_only)
target_link_libraries(example_header_only PRIVATE spdlog::spdlog_header_only)
endif()

View File

@@ -1,29 +0,0 @@
CXX ?= g++
CXXFLAGS =
CXX_FLAGS = -Wall -Wshadow -Wextra -pedantic -std=c++11 -pthread -I../include
CXX_RELEASE_FLAGS = -O3 -march=native
CXX_DEBUG_FLAGS= -g
all: example bench
debug: example-debug bench-debug
example: example.cpp
$(CXX) example.cpp -o example $(CXX_FLAGS) $(CXX_RELEASE_FLAGS) $(CXXFLAGS)
bench: bench.cpp
$(CXX) bench.cpp -o bench $(CXX_FLAGS) $(CXX_RELEASE_FLAGS) $(CXXFLAGS)
example-debug: example.cpp
$(CXX) example.cpp -o example-debug $(CXX_FLAGS) $(CXX_DEBUG_FLAGS) $(CXXFLAGS)
bench-debug: bench.cpp
$(CXX) bench.cpp -o bench-debug $(CXX_FLAGS) $(CXX_DEBUG_FLAGS) $(CXXFLAGS)
clean:
rm -f *.o logs/*.txt example example-debug bench bench-debug
rebuild: clean all
rebuild-debug: clean debug

View File

@@ -1,32 +0,0 @@
CXX ?= clang++
CXXFLAGS = -march=native -Wall -Wextra -Wshadow -pedantic -std=c++11 -pthread -I../include
CXX_RELEASE_FLAGS = -O2
CXX_DEBUG_FLAGS= -g
all: example bench
debug: example-debug bench-debug
example: example.cpp
$(CXX) example.cpp -o example-clang $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
bench: bench.cpp
$(CXX) bench.cpp -o bench-clang $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
example-debug: example.cpp
$(CXX) example.cpp -o example-clang-debug $(CXXFLAGS) $(CXX_DEBUG_FLAGS)
bench-debug: bench.cpp
$(CXX) bench.cpp -o bench-clang-debug $(CXXFLAGS) $(CXX_DEBUG_FLAGS)
clean:
rm -f *.o logs/*.txt example-clang example-clang-debug bench-clang bench-clang-debug
rebuild: clean all
rebuild-debug: clean debug

View File

@@ -1,32 +0,0 @@
CXX ?= g++
CXXFLAGS = -D_WIN32_WINNT=0x600 -march=native -Wall -Wextra -Wshadow -pedantic -std=c++11 -pthread -Wl,--no-as-needed -I../include
CXX_RELEASE_FLAGS = -O3
CXX_DEBUG_FLAGS= -g
all: example bench
debug: example-debug bench-debug
example: example.cpp
$(CXX) example.cpp -o example $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
bench: bench.cpp
$(CXX) bench.cpp -o bench $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
example-debug: example.cpp
$(CXX) example.cpp -o example-debug $(CXXFLAGS) $(CXX_DEBUG_FLAGS)
bench-debug: bench.cpp
$(CXX) bench.cpp -o bench-debug $(CXXFLAGS) $(CXX_DEBUG_FLAGS)
clean:
rm -f *.o logs/*.txt example example-debug bench bench-debug
rebuild: clean all
rebuild-debug: clean debug

View File

@@ -1,144 +0,0 @@
//
// Copyright(c) 2015 Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
//
// bench.cpp : spdlog benchmarks
//
#include <atomic>
#include <cstdlib> // EXIT_FAILURE
#include <iostream>
#include <memory>
#include <string>
#include <thread>
#include "spdlog/spdlog.h"
#include "spdlog/async_logger.h"
#include "spdlog/sinks/file_sinks.h"
#include "spdlog/sinks/null_sink.h"
#include "utils.h"
using namespace std;
using namespace std::chrono;
using namespace spdlog;
using namespace spdlog::sinks;
using namespace utils;
void bench(int howmany, std::shared_ptr<spdlog::logger> log);
void bench_mt(int howmany, std::shared_ptr<spdlog::logger> log, int thread_count);
int main(int argc, char* argv[])
{
int queue_size = 1048576;
int howmany = 1000000;
int threads = 10;
int file_size = 30 * 1024 * 1024;
int rotating_files = 5;
try
{
if(argc > 1)
howmany = atoi(argv[1]);
if (argc > 2)
threads = atoi(argv[2]);
if (argc > 3)
queue_size = atoi(argv[3]);
cout << "*******************************************************************************\n";
cout << "Single thread, " << format(howmany) << " iterations" << endl;
cout << "*******************************************************************************\n";
auto rotating_st = spdlog::rotating_logger_st("rotating_st", "logs/rotating_st", file_size, rotating_files);
bench(howmany, rotating_st);
auto daily_st = spdlog::daily_logger_st("daily_st", "logs/daily_st");
bench(howmany, daily_st);
bench(howmany, spdlog::create<null_sink_st>("null_st"));
cout << "\n*******************************************************************************\n";
cout << threads << " threads sharing same logger, " << format(howmany) << " iterations" << endl;
cout << "*******************************************************************************\n";
auto rotating_mt = spdlog::rotating_logger_mt("rotating_mt", "logs/rotating_mt", file_size, rotating_files);
bench_mt(howmany, rotating_mt, threads);
auto daily_mt = spdlog::daily_logger_mt("daily_mt", "logs/daily_mt");
bench_mt(howmany, daily_mt, threads);
bench(howmany, spdlog::create<null_sink_st>("null_mt"));
cout << "\n*******************************************************************************\n";
cout << "async logging.. " << threads << " threads sharing same logger, " << format(howmany) << " iterations " << endl;
cout << "*******************************************************************************\n";
spdlog::set_async_mode(queue_size);
for(int i = 0; i < 3; ++i)
{
auto as = spdlog::daily_logger_st("as", "logs/daily_async");
bench_mt(howmany, as, threads);
spdlog::drop("as");
}
}
catch (std::exception &ex)
{
std::cerr << "Error: " << ex.what() << std::endl;
perror("Last error");
return EXIT_FAILURE;
}
return EXIT_SUCCESS;
}
void bench(int howmany, std::shared_ptr<spdlog::logger> log)
{
cout << log->name() << "...\t\t" << flush;
auto start = system_clock::now();
for (auto i = 0; i < howmany; ++i)
{
log->info("Hello logger: msg number {}", i);
}
auto delta = system_clock::now() - start;
auto delta_d = duration_cast<duration<double>> (delta).count();
cout << format(int(howmany / delta_d)) << "/sec" << endl;
}
void bench_mt(int howmany, std::shared_ptr<spdlog::logger> log, int thread_count)
{
cout << log->name() << "...\t\t" << flush;
std::atomic<int > msg_counter {0};
vector<thread> threads;
auto start = system_clock::now();
for (int t = 0; t < thread_count; ++t)
{
threads.push_back(std::thread([&]()
{
for(;;)
{
int counter = ++msg_counter;
if (counter > howmany) break;
log->info("Hello logger: msg number {}", counter);
}
}));
}
for(auto &t:threads)
{
t.join();
};
auto delta = system_clock::now() - start;
auto delta_d = duration_cast<duration<double>> (delta).count();
cout << format(int(howmany / delta_d)) << "/sec" << endl;
}

View File

@@ -1,163 +1,234 @@
//
// Copyright(c) 2015 Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
//
// spdlog usage example
//
//
#include "spdlog/spdlog.h"
#include <iostream>
#include <memory>
#include <cstdio>
void stdout_logger_example();
void basic_example();
void rotating_example();
void daily_example();
void async_example();
void syslog_example();
void android_example();
void binary_example();
void trace_example();
void multi_sink_example();
void user_defined_example();
void err_handler_example();
void syslog_example();
namespace spd = spdlog;
int main(int, char*[])
#include "spdlog/spdlog.h"
int main(int, char *[])
{
spdlog::info("Welcome to spdlog version {}.{}.{} !", SPDLOG_VER_MAJOR, SPDLOG_VER_MINOR, SPDLOG_VER_PATCH);
spdlog::warn("Easy padding in numbers like {:08d}", 12);
spdlog::critical("Support for int: {0:d}; hex: {0:x}; oct: {0:o}; bin: {0:b}", 42);
spdlog::info("Support for floats {:03.2f}", 1.23456);
spdlog::info("Positional args are {1} {0}..", "too", "supported");
spdlog::info("{:>8} aligned, {:<8} aligned", "right", "left");
// Runtime log levels
spdlog::set_level(spdlog::level::info); // Set global log level to info
spdlog::debug("This message should not be displayed!");
spdlog::set_level(spdlog::level::trace); // Set specific logger's log level
spdlog::debug("This message should be displayed..");
// Customize msg format for all loggers
spdlog::set_pattern("[%H:%M:%S %z] [%^%L%$] [thread %t] %v");
spdlog::info("This an info message with custom format");
spdlog::set_pattern("%+"); // back to default format
spdlog::set_level(spdlog::level::info);
// Backtrace support
// 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++)
{
spdlog::debug("Backtrace message {}", i); // not logged..
}
// e.g. if some error happened:
spdlog::dump_backtrace(); // log them now!
try
{
// Console logger with color
auto console = spd::stdout_color_mt("console");
console->info("Welcome to spdlog!");
console->error("Some error message with arg{}..", 1);
// Formatting examples
console->warn("Easy padding in numbers like {:08d}", 12);
console->critical("Support for int: {0:d}; hex: {0:x}; oct: {0:o}; bin: {0:b}", 42);
console->info("Support for floats {:03.2f}", 1.23456);
console->info("Positional args are {1} {0}..", "too", "supported");
console->info("{:<30}", "left aligned");
spd::get("console")->info("loggers can be retrieved from a global registry using the spdlog::get(logger_name) function");
// Create basic file logger (not rotated)
auto my_logger = spd::basic_logger_mt("basic_logger", "logs/basic.txt");
my_logger->info("Some log message");
// Create a file rotating logger with 5mb size max and 3 rotated files
auto rotating_logger = spd::rotating_logger_mt("some_logger_name", "logs/mylogfile", 1048576 * 5, 3);
for (int i = 0; i < 10; ++i)
rotating_logger->info("{} * {} equals {:>10}", i, i, i*i);
// Create a daily logger - a new file is created every day on 2:30am
auto daily_logger = spd::daily_logger_mt("daily_logger", "logs/daily", 2, 30);
// trigger flush if the log severity is error or higher
daily_logger->flush_on(spd::level::err);
daily_logger->info(123.44);
// Customize msg format for all messages
spd::set_pattern("*** [%H:%M:%S %z] [thread %t] %v ***");
rotating_logger->info("This is another message with custom format");
// Runtime log levels
spd::set_level(spd::level::info); //Set global log level to info
console->debug("This message shold not be displayed!");
console->set_level(spd::level::debug); // Set specific logger's log level
console->debug("This message shold be displayed..");
// Compile time log levels
// define SPDLOG_DEBUG_ON or SPDLOG_TRACE_ON
SPDLOG_TRACE(console, "Enabled only #ifdef SPDLOG_TRACE_ON..{} ,{}", 1, 3.23);
SPDLOG_DEBUG(console, "Enabled only #ifdef SPDLOG_DEBUG_ON.. {} ,{}", 1, 3.23);
// Asynchronous logging is very fast..
// Just call spdlog::set_async_mode(q_size) and all created loggers from now on will be asynchronous..
stdout_logger_example();
basic_example();
rotating_example();
daily_example();
async_example();
// syslog example. linux/osx only
syslog_example();
// android example. compile with NDK
android_example();
// Log user-defined types example
binary_example();
multi_sink_example();
user_defined_example();
// Change default log error handler
err_handler_example();
trace_example();
// Apply a function on all registered loggers
spd::apply_all([&](std::shared_ptr<spdlog::logger> l)
{
l->info("End of example.");
});
// Flush all *registered* loggers using a worker thread every 3 seconds.
// note: registered loggers *must* be thread safe for this to work correctly!
spdlog::flush_every(std::chrono::seconds(3));
// Release and close all loggers
spdlog::drop_all();
// Apply some function on all registered loggers
spdlog::apply_all([&](std::shared_ptr<spdlog::logger> l) { l->info("End of example."); });
// Release all spdlog resources, and drop all loggers in the registry.
// This is optional (only mandatory if using windows + async log).
spdlog::shutdown();
}
// Exceptions will only be thrown upon failed logger or sink construction (not during logging)
catch (const spd::spdlog_ex& ex)
// Exceptions will only be thrown upon failed logger or sink construction (not during logging).
catch (const spdlog::spdlog_ex &ex)
{
std::cout << "Log init failed: " << ex.what() << std::endl;
std::printf("Log initialization failed: %s\n", ex.what());
return 1;
}
}
#include "spdlog/sinks/stdout_color_sinks.h"
// or #include "spdlog/sinks/stdout_sinks.h" if no colors needed.
void stdout_logger_example()
{
// Create color multi threaded logger.
auto console = spdlog::stdout_color_mt("console");
// or for stderr:
// auto console = spdlog::stderr_color_mt("error-logger");
}
#include "spdlog/sinks/basic_file_sink.h"
void basic_example()
{
// Create basic file logger (not rotated).
auto my_logger = spdlog::basic_logger_mt("file_logger", "logs/basic-log.txt");
}
#include "spdlog/sinks/rotating_file_sink.h"
void rotating_example()
{
// Create a file rotating logger with 5mb size max and 3 rotated files.
auto rotating_logger = spdlog::rotating_logger_mt("some_logger_name", "logs/rotating.txt", 1048576 * 5, 3);
}
#include "spdlog/sinks/daily_file_sink.h"
void daily_example()
{
// Create a daily logger - a new file is created every day on 2:30am.
auto daily_logger = spdlog::daily_logger_mt("daily_logger", "logs/daily.txt", 2, 30);
}
#include "spdlog/async.h"
void async_example()
{
size_t q_size = 4096; //queue size must be power of 2
spdlog::set_async_mode(q_size);
auto async_file = spd::daily_logger_st("async_file_logger", "logs/async_log.txt");
// Default thread pool settings can be modified *before* creating the async logger:
// spdlog::init_thread_pool(32768, 1); // queue with max 32k items 1 backing thread.
auto async_file = spdlog::basic_logger_mt<spdlog::async_factory>("async_file_logger", "logs/async_log.txt");
// alternatively:
// auto async_file = spdlog::create_async<spdlog::sinks::basic_file_sink_mt>("async_file_logger", "logs/async_log.txt");
for (int i = 0; i < 100; ++i)
for (int i = 1; i < 101; ++i)
{
async_file->info("Async message #{}", i);
}
}
//syslog example (linux/osx/freebsd)
void syslog_example()
// Log binary data as hex.
// Many types of std::container<char> types can be used.
// Iterator ranges are supported too.
// Format flags:
// {:X} - print in uppercase.
// {:s} - don't separate each byte with space.
// {:p} - don't print the position on each line start.
// {:n} - don't split the output to lines.
#include "spdlog/fmt/bin_to_hex.h"
void binary_example()
{
#ifdef SPDLOG_ENABLE_SYSLOG
std::string ident = "spdlog-example";
auto syslog_logger = spd::syslog_logger("syslog", ident, LOG_PID);
syslog_logger->warn("This is warning that will end up in syslog.");
#endif
std::vector<char> buf(80);
for (int i = 0; i < 80; i++)
{
buf.push_back(static_cast<char>(i & 0xff));
}
spdlog::info("Binary example: {}", spdlog::to_hex(buf));
spdlog::info("Another binary example:{:n}", spdlog::to_hex(std::begin(buf), std::begin(buf) + 10));
// more examples:
// logger->info("uppercase: {:X}", spdlog::to_hex(buf));
// logger->info("uppercase, no delimiters: {:Xs}", spdlog::to_hex(buf));
// logger->info("uppercase, no delimiters, no position info: {:Xsp}", spdlog::to_hex(buf));
}
// Android example
void android_example()
// Compile time log levels.
// define SPDLOG_ACTIVE_LEVEL to required level (e.g. SPDLOG_LEVEL_TRACE)
void trace_example()
{
#if defined(__ANDROID__)
std::string tag = "spdlog-android";
auto android_logger = spd::android_logger("android", tag);
android_logger->critical("Use \"adb shell logcat\" to view this message.");
#endif
// trace from default logger
SPDLOG_TRACE("Some trace message.. {} ,{}", 1, 3.23);
// debug from default logger
SPDLOG_DEBUG("Some debug message.. {} ,{}", 1, 3.23);
// trace from logger object
auto logger = spdlog::get("file_logger");
SPDLOG_LOGGER_TRACE(logger, "another trace message");
}
// user defined types logging by implementing operator<<
// A logger with multiple sinks (stdout and file) - each with a different format and log level.
void multi_sink_example()
{
auto console_sink = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
console_sink->set_level(spdlog::level::warn);
console_sink->set_pattern("[multi_sink_example] [%^%l%$] %v");
auto file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>("logs/multisink.txt", true);
file_sink->set_level(spdlog::level::trace);
spdlog::logger logger("multi_sink", {console_sink, file_sink});
logger.set_level(spdlog::level::debug);
logger.warn("this should appear in both console and file");
logger.info("this message should not appear in the console, only in the file");
}
// User defined types logging by implementing operator<<
#include "spdlog/fmt/ostr.h" // must be included
struct my_type
{
int i;
template<typename OStream>
friend OStream& operator<<(OStream& os, const my_type &c)
friend OStream &operator<<(OStream &os, const my_type &c)
{
return os << "[my_type i="<<c.i << "]";
return os << "[my_type i=" << c.i << "]";
}
};
#include <spdlog/fmt/ostr.h> // must be included
void user_defined_example()
{
spd::get("console")->info("user defined type: {}", my_type { 14 });
spdlog::info("user defined type: {}", my_type{14});
}
//
//custom error handler
//
// Custom error handler. Will be triggered on log failure.
void err_handler_example()
{
//can be set globaly or per logger(logger->set_error_handler(..))
spdlog::set_error_handler([](const std::string& msg)
{
std::cerr << "my err handler: " << msg << std::endl;
});
spd::get("console")->info("some invalid message to trigger an error {}{}{}{}", 3);
// can be set globally or per logger(logger->set_error_handler(..))
spdlog::set_error_handler([](const std::string &msg) { printf("*** Custom log error handler: %s ***\n", msg.c_str()); });
}
// syslog example (linux/osx/freebsd)
#ifndef _WIN32
#include "spdlog/sinks/syslog_sink.h"
void syslog_example()
{
std::string ident = "spdlog-example";
auto syslog_logger = spdlog::syslog_logger_mt("syslog", ident, LOG_PID);
syslog_logger->warn("This is warning that will end up in syslog.");
}
#endif
// Android example.
#if defined(__ANDROID__)
#include "spdlog/sinks/android_sink.h"
void android_example()
{
std::string tag = "spdlog-android";
auto android_logger = spdlog::android_logger_mt("android", tag);
android_logger->critical("Use \"adb shell logcat\" to view this message.");
}
#endif

View File

@@ -1,26 +0,0 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example", "example.vcxproj", "{9E5AB93A-0CCE-4BAC-9FCB-0FC9CB5EB8D2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9E5AB93A-0CCE-4BAC-9FCB-0FC9CB5EB8D2}.Debug|Win32.ActiveCfg = Debug|Win32
{9E5AB93A-0CCE-4BAC-9FCB-0FC9CB5EB8D2}.Debug|Win32.Build.0 = Debug|Win32
{9E5AB93A-0CCE-4BAC-9FCB-0FC9CB5EB8D2}.Debug|x64.ActiveCfg = Debug|Win32
{9E5AB93A-0CCE-4BAC-9FCB-0FC9CB5EB8D2}.Release|Win32.ActiveCfg = Release|Win32
{9E5AB93A-0CCE-4BAC-9FCB-0FC9CB5EB8D2}.Release|Win32.Build.0 = Release|Win32
{9E5AB93A-0CCE-4BAC-9FCB-0FC9CB5EB8D2}.Release|x64.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

View File

@@ -1,126 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="example.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\include\spdlog\async_logger.h" />
<ClInclude Include="..\include\spdlog\common.h" />
<ClInclude Include="..\include\spdlog\details\async_logger_impl.h" />
<ClInclude Include="..\include\spdlog\details\async_log_helper.h" />
<ClInclude Include="..\include\spdlog\details\file_helper.h" />
<ClInclude Include="..\include\spdlog\details\logger_impl.h" />
<ClInclude Include="..\include\spdlog\details\log_msg.h" />
<ClInclude Include="..\include\spdlog\details\mpmc_bounded_q.h" />
<ClInclude Include="..\include\spdlog\details\null_mutex.h" />
<ClInclude Include="..\include\spdlog\details\os.h" />
<ClInclude Include="..\include\spdlog\details\pattern_formatter_impl.h" />
<ClInclude Include="..\include\spdlog\details\registry.h" />
<ClInclude Include="..\include\spdlog\details\spdlog_impl.h" />
<ClInclude Include="..\include\spdlog\fmt\fmt.h" />
<ClInclude Include="..\include\spdlog\fmt\ostr.h" />
<ClInclude Include="..\include\spdlog\formatter.h" />
<ClInclude Include="..\include\spdlog\logger.h" />
<ClInclude Include="..\include\spdlog\sinks\android_sink.h" />
<ClInclude Include="..\include\spdlog\sinks\ansicolor_sink.h" />
<ClInclude Include="..\include\spdlog\sinks\base_sink.h" />
<ClInclude Include="..\include\spdlog\sinks\dist_sink.h" />
<ClInclude Include="..\include\spdlog\sinks\file_sinks.h" />
<ClInclude Include="..\include\spdlog\sinks\msvc_sink.h" />
<ClInclude Include="..\include\spdlog\sinks\null_sink.h" />
<ClInclude Include="..\include\spdlog\sinks\ostream_sink.h" />
<ClInclude Include="..\include\spdlog\sinks\sink.h" />
<ClInclude Include="..\include\spdlog\sinks\stdout_sinks.h" />
<ClInclude Include="..\include\spdlog\sinks\syslog_sink.h" />
<ClInclude Include="..\include\spdlog\sinks\wincolor_sink.h" />
<ClInclude Include="..\include\spdlog\spdlog.h" />
<ClInclude Include="..\include\spdlog\tweakme.h" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{9E5AB93A-0CCE-4BAC-9FCB-0FC9CB5EB8D2}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>.</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeaderFile />
<PrecompiledHeaderOutputFile />
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeaderFile />
<PrecompiledHeaderOutputFile />
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

View File

@@ -1,15 +0,0 @@
# Setup a project
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := example
LOCAL_SRC_FILES := example.cpp
LOCAL_CPPFLAGS += -Wall -Wshadow -Wextra -pedantic -std=c++11 -fPIE -pie
LOCAL_LDFLAGS += -fPIE -pie
# Add exception support and set path for spdlog's headers
LOCAL_CPPFLAGS += -fexceptions -I../include
# Use android's log library
LOCAL_LDFLAGS += -llog
include $(BUILD_EXECUTABLE)

View File

@@ -1,2 +0,0 @@
# Exceptions are used in spdlog. Link to an exception-ready C++ runtime.
APP_STL = gnustl_static

View File

@@ -1 +0,0 @@
../example.cpp

View File

@@ -1 +0,0 @@
*.txt

4
example/meson.build Normal file
View File

@@ -0,0 +1,4 @@
executable('example', 'example.cpp', dependencies: spdlog_dep)
executable('example_header_only', 'example.cpp', dependencies: spdlog_headeronly_dep)

View File

@@ -1,47 +0,0 @@
#include "spdlog/spdlog.h"
#include <iostream>
#include <memory>
namespace spd = spdlog;
int main(int, char*[])
{
bool enable_debug = true;
try
{
// This other example use a single logger with multiple sinks.
// This means that the same log_msg is forwarded to multiple sinks;
// Each sink can have it's own log level and a message will be logged.
std::vector<spdlog::sink_ptr> sinks;
sinks.push_back( std::make_shared<spdlog::sinks::stdout_sink_mt>() );
sinks.push_back( std::make_shared<spdlog::sinks::simple_file_sink_mt>("./log_regular_file.txt") );
sinks.push_back( std::make_shared<spdlog::sinks::simple_file_sink_mt>("./log_debug_file.txt") );
spdlog::logger console_multisink("multisink", sinks.begin(), sinks.end() );
console_multisink.set_level( spdlog::level::warn);
sinks[0]->set_level( spdlog::level::trace); // console. Allow everything. Default value
sinks[1]->set_level( spdlog::level::trace); // regular file. Allow everything. Default value
sinks[2]->set_level( spdlog::level::off); // regular file. Ignore everything.
console_multisink.warn("warn: will print only on console and regular file");
if( enable_debug )
{
console_multisink.set_level( spdlog::level::debug); // level of the logger
sinks[1]->set_level( spdlog::level::debug); // regular file
sinks[2]->set_level( spdlog::level::debug); // debug file
}
console_multisink.debug("Debug: you should see this on console and both files");
// Release and close all loggers
spdlog::drop_all();
}
// Exceptions will only be thrown upon failed logger or sink construction (not during logging)
catch (const spd::spdlog_ex& ex)
{
std::cout << "Log init failed: " << ex.what() << std::endl;
return 1;
}
}

View File

@@ -1,35 +0,0 @@
//
// Copyright(c) 2015 Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
#pragma once
#include <sstream>
#include <iomanip>
#include <locale>
namespace utils
{
template<typename T>
inline std::string format(const T& value)
{
static std::locale loc("");
std::stringstream ss;
ss.imbue(loc);
ss << value;
return ss.str();
}
template<>
inline std::string format(const double & value)
{
static std::locale loc("");
std::stringstream ss;
ss.imbue(loc);
ss << std::fixed << std::setprecision(1) << value;
return ss.str();
}
}

93
include/spdlog/async.h Normal file
View File

@@ -0,0 +1,93 @@
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
#pragma once
//
// Async logging using global thread pool
// All loggers created here share same global thread pool.
// Each log message is pushed to a queue along with 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.
// This is because each message in the queue holds a shared_ptr to the
// originating logger.
#include <spdlog/async_logger.h>
#include <spdlog/details/registry.h>
#include <spdlog/details/thread_pool.h>
#include <memory>
#include <mutex>
#include <functional>
namespace spdlog {
namespace details {
static const size_t default_async_q_size = 8192;
}
// async logger factory - creates async loggers backed with thread pool.
// if a global thread pool doesn't already exist, create it with default queue
// size of 8192 items and single thread.
template<async_overflow_policy OverflowPolicy = async_overflow_policy::block>
struct async_factory_impl
{
template<typename Sink, typename... SinkArgs>
static std::shared_ptr<async_logger> create(std::string logger_name, SinkArgs &&... args)
{
auto &registry_inst = details::registry::instance();
// create global thread pool if not already exists..
auto &mutex = registry_inst.tp_mutex();
std::lock_guard<std::recursive_mutex> tp_lock(mutex);
auto tp = registry_inst.get_tp();
if (tp == nullptr)
{
tp = std::make_shared<details::thread_pool>(details::default_async_q_size, 1);
registry_inst.set_tp(tp);
}
auto sink = std::make_shared<Sink>(std::forward<SinkArgs>(args)...);
auto new_logger = std::make_shared<async_logger>(std::move(logger_name), std::move(sink), std::move(tp), OverflowPolicy);
registry_inst.initialize_logger(new_logger);
return new_logger;
}
};
using async_factory = async_factory_impl<async_overflow_policy::block>;
using async_factory_nonblock = async_factory_impl<async_overflow_policy::overrun_oldest>;
template<typename Sink, typename... SinkArgs>
inline std::shared_ptr<spdlog::logger> create_async(std::string logger_name, SinkArgs &&... sink_args)
{
return async_factory::create<Sink>(std::move(logger_name), std::forward<SinkArgs>(sink_args)...);
}
template<typename Sink, typename... SinkArgs>
inline std::shared_ptr<spdlog::logger> create_async_nb(std::string logger_name, SinkArgs &&... sink_args)
{
return async_factory_nonblock::create<Sink>(std::move(logger_name), std::forward<SinkArgs>(sink_args)...);
}
// set global thread pool.
inline void init_thread_pool(size_t q_size, size_t thread_count, std::function<void()> on_thread_start)
{
auto tp = std::make_shared<details::thread_pool>(q_size, thread_count, on_thread_start);
details::registry::instance().set_tp(std::move(tp));
}
// set global thread pool.
inline void init_thread_pool(size_t q_size, size_t thread_count)
{
init_thread_pool(q_size, thread_count, [] {});
}
// get the global thread pool.
inline std::shared_ptr<spdlog::details::thread_pool> thread_pool()
{
return details::registry::instance().get_tp();
}
} // namespace spdlog

View File

@@ -0,0 +1,92 @@
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
#pragma once
#ifndef SPDLOG_HEADER_ONLY
#include <spdlog/async_logger.h>
#endif
#include <spdlog/sinks/sink.h>
#include <spdlog/details/thread_pool.h>
#include <memory>
#include <string>
SPDLOG_INLINE spdlog::async_logger::async_logger(
std::string logger_name, sinks_init_list sinks_list, std::weak_ptr<details::thread_pool> tp, async_overflow_policy 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(
std::string logger_name, sink_ptr single_sink, std::weak_ptr<details::thread_pool> tp, async_overflow_policy 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
SPDLOG_INLINE void spdlog::async_logger::sink_it_(const details::log_msg &msg)
{
if (auto pool_ptr = thread_pool_.lock())
{
pool_ptr->post_log(shared_from_this(), msg, overflow_policy_);
}
else
{
SPDLOG_THROW(spdlog_ex("async log: thread pool doesn't exist anymore"));
}
}
// send flush request to the thread pool
SPDLOG_INLINE void spdlog::async_logger::flush_()
{
if (auto pool_ptr = thread_pool_.lock())
{
pool_ptr->post_flush(shared_from_this(), overflow_policy_);
}
else
{
SPDLOG_THROW(spdlog_ex("async flush: thread pool doesn't exist anymore"));
}
}
//
// backend functions - called from the thread pool to do the actual job
//
SPDLOG_INLINE void spdlog::async_logger::backend_sink_it_(const details::log_msg &msg)
{
for (auto &sink : sinks_)
{
if (sink->should_log(msg.level))
{
SPDLOG_TRY
{
sink->log(msg);
}
SPDLOG_LOGGER_CATCH()
}
}
if (should_flush_(msg))
{
backend_flush_();
}
}
SPDLOG_INLINE void spdlog::async_logger::backend_flush_()
{
for (auto &sink : sinks_)
{
SPDLOG_TRY
{
sink->flush();
}
SPDLOG_LOGGER_CATCH()
}
}
SPDLOG_INLINE std::shared_ptr<spdlog::logger> spdlog::async_logger::clone(std::string new_name)
{
auto cloned = std::make_shared<spdlog::async_logger>(*this);
cloned->name_ = std::move(new_name);
return cloned;
}

View File

@@ -1,77 +1,68 @@
//
// Copyright(c) 2015 Gabi Melman.
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
#pragma once
// Very fast asynchronous logger (millions of logs per second on an average desktop)
// Uses pre allocated lockfree queue for maximum throughput even under large number of threads.
// Fast asynchronous logger.
// Uses pre allocated queue.
// Creates a single back thread to pop messages from the queue and log them.
//
// Upon each log write the logger:
// 1. Checks if its log level is enough to log the message
// 2. Push a new copy of the message to a queue (or block the caller until space is available in the queue)
// 3. will throw spdlog_ex upon log exceptions
// Upon destruction, logs all remaining messages in the queue before destructing..
// 2. Push a new copy of the message to a queue (or block the caller until
// space is available in the queue)
// Upon destruction, logs all remaining messages in the queue before
// destructing..
#include <spdlog/common.h>
#include <spdlog/logger.h>
#include <chrono>
#include <functional>
#include <string>
#include <memory>
namespace spdlog {
namespace spdlog
// Async overflow policy - block by default.
enum class async_overflow_policy
{
block, // Block until message can be enqueued
overrun_oldest // Discard oldest message in the queue if full when trying to
// add new item.
};
namespace details
{
class async_log_helper;
namespace details {
class thread_pool;
}
class async_logger :public logger
class async_logger final : public std::enable_shared_from_this<async_logger>, public logger
{
friend class details::thread_pool;
public:
template<class It>
async_logger(const std::string& name,
const It& begin,
const It& end,
size_t queue_size,
const async_overflow_policy overflow_policy = async_overflow_policy::block_retry,
const std::function<void()>& worker_warmup_cb = nullptr,
const std::chrono::milliseconds& flush_interval_ms = std::chrono::milliseconds::zero(),
const std::function<void()>& worker_teardown_cb = nullptr);
template<typename It>
async_logger(std::string logger_name, It begin, It end, std::weak_ptr<details::thread_pool> tp,
async_overflow_policy overflow_policy = async_overflow_policy::block)
: logger(std::move(logger_name), begin, end)
, thread_pool_(std::move(tp))
, overflow_policy_(overflow_policy)
{}
async_logger(const std::string& logger_name,
sinks_init_list sinks,
size_t queue_size,
const async_overflow_policy overflow_policy = async_overflow_policy::block_retry,
const std::function<void()>& worker_warmup_cb = nullptr,
const std::chrono::milliseconds& flush_interval_ms = std::chrono::milliseconds::zero(),
const std::function<void()>& worker_teardown_cb = nullptr);
async_logger(std::string logger_name, sinks_init_list sinks_list, std::weak_ptr<details::thread_pool> tp,
async_overflow_policy overflow_policy = async_overflow_policy::block);
async_logger(const std::string& logger_name,
sink_ptr single_sink,
size_t queue_size,
const async_overflow_policy overflow_policy = async_overflow_policy::block_retry,
const std::function<void()>& worker_warmup_cb = nullptr,
const std::chrono::milliseconds& flush_interval_ms = std::chrono::milliseconds::zero(),
const std::function<void()>& worker_teardown_cb = nullptr);
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);
std::shared_ptr<logger> clone(std::string new_name) override;
//Wait for the queue to be empty, and flush synchronously
//Warning: this can potentialy last forever as we wait it to complete
void flush() override;
protected:
void _sink_it(details::log_msg& msg) override;
void _set_formatter(spdlog::formatter_ptr msg_formatter) override;
void _set_pattern(const std::string& pattern) override;
void sink_it_(const details::log_msg &msg) override;
void flush_() override;
void backend_sink_it_(const details::log_msg &incoming_log_msg);
void backend_flush_();
private:
std::unique_ptr<details::async_log_helper> _async_log_helper;
std::weak_ptr<details::thread_pool> thread_pool_;
async_overflow_policy overflow_policy_;
};
}
} // namespace spdlog
#include <spdlog/details/async_logger_impl.h>
#ifdef SPDLOG_HEADER_ONLY
#include "async_logger-inl.h"
#endif

View File

@@ -0,0 +1,57 @@
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
#pragma once
#ifndef SPDLOG_HEADER_ONLY
#include <spdlog/common.h>
#endif
namespace spdlog {
namespace level {
static string_view_t level_string_views[] SPDLOG_LEVEL_NAMES;
static const char *short_level_names[] SPDLOG_SHORT_LEVEL_NAMES;
SPDLOG_INLINE string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT
{
return level_string_views[l];
}
SPDLOG_INLINE const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT
{
return short_level_names[l];
}
SPDLOG_INLINE spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT
{
int level = 0;
for (const auto &level_str : level_string_views)
{
if (level_str == name)
{
return static_cast<level::level_enum>(level);
}
level++;
}
return level::off;
}
} // namespace level
SPDLOG_INLINE spdlog_ex::spdlog_ex(std::string msg)
: msg_(std::move(msg))
{}
SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno)
{
memory_buf_t outbuf;
fmt::format_system_error(outbuf, last_errno, msg);
msg_ = fmt::to_string(outbuf);
}
SPDLOG_INLINE const char *spdlog_ex::what() const SPDLOG_NOEXCEPT
{
return msg_.c_str();
}
} // namespace spdlog

View File

@@ -1,35 +1,52 @@
//
// Copyright(c) 2015 Gabi Melman.
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
#pragma once
#include <string>
#include <initializer_list>
#include <chrono>
#include <memory>
#include <atomic>
#include <exception>
#include<functional>
#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
#include <codecvt>
#include <locale>
#endif
#include <spdlog/tweakme.h>
#include <spdlog/details/null_mutex.h>
//visual studio upto 2013 does not support noexcept nor constexpr
#include <atomic>
#include <chrono>
#include <initializer_list>
#include <memory>
#include <exception>
#include <string>
#include <type_traits>
#include <functional>
#ifdef _WIN32
#ifndef NOMINMAX
#define NOMINMAX // prevent windows redefining min/max
#endif
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#endif //_WIN32
#ifdef SPDLOG_COMPILED_LIB
#undef SPDLOG_HEADER_ONLY
#define SPDLOG_INLINE
#else
#define SPDLOG_HEADER_ONLY
#define SPDLOG_INLINE inline
#endif
#include <spdlog/fmt/fmt.h>
// visual studio upto 2013 does not support noexcept nor constexpr
#if defined(_MSC_VER) && (_MSC_VER < 1900)
#define SPDLOG_NOEXCEPT throw()
#define SPDLOG_NOEXCEPT _NOEXCEPT
#define SPDLOG_CONSTEXPR
#else
#define SPDLOG_NOEXCEPT noexcept
#define SPDLOG_CONSTEXPR constexpr
#endif
#if defined(__GNUC__) || defined(__clang__)
#if defined(__GNUC__) || defined(__clang__)
#define SPDLOG_DEPRECATED __attribute__((deprecated))
#elif defined(_MSC_VER)
#define SPDLOG_DEPRECATED __declspec(deprecated)
@@ -37,107 +54,192 @@
#define SPDLOG_DEPRECATED
#endif
// disable thread local on msvc 2013
#ifndef SPDLOG_NO_TLS
#if (defined(_MSC_VER) && (_MSC_VER < 1900)) || defined(__cplusplus_winrt)
#define SPDLOG_NO_TLS 1
#endif
#endif
#include <spdlog/fmt/fmt.h>
#ifndef SPDLOG_FUNCTION
#define SPDLOG_FUNCTION static_cast<const char *>(__FUNCTION__)
#endif
namespace spdlog
{
#ifdef SPDLOG_NO_EXCEPTIONS
#define SPDLOG_TRY
#define SPDLOG_THROW(ex) \
do \
{ \
printf("spdlog fatal error: %s\n", ex.what()); \
std::abort(); \
} while (0)
#define SPDLOG_CATCH_ALL()
#else
#define SPDLOG_TRY try
#define SPDLOG_THROW(ex) throw(ex)
#define SPDLOG_CATCH_ALL() catch (...)
#endif
namespace spdlog {
class formatter;
namespace sinks
{
namespace sinks {
class sink;
}
#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
using filename_t = std::wstring;
#define SPDLOG_FILENAME_T(s) L##s
#else
using filename_t = std::string;
#define SPDLOG_FILENAME_T(s) s
#endif
using log_clock = std::chrono::system_clock;
using sink_ptr = std::shared_ptr < sinks::sink >;
using sinks_init_list = std::initializer_list < sink_ptr >;
using formatter_ptr = std::shared_ptr<spdlog::formatter>;
using sink_ptr = std::shared_ptr<sinks::sink>;
using sinks_init_list = std::initializer_list<sink_ptr>;
using err_handler = std::function<void(const std::string &err_msg)>;
using string_view_t = fmt::basic_string_view<char>;
using wstring_view_t = fmt::basic_string_view<wchar_t>;
using memory_buf_t = fmt::basic_memory_buffer<char, 250>;
#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
#ifndef _WIN32
#error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows
#else
template<typename T>
struct is_convertible_to_wstring_view : std::is_convertible<T, wstring_view_t>
{};
#endif // _WIN32
#else
template<typename>
struct is_convertible_to_wstring_view : std::false_type
{};
#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT
#if defined(SPDLOG_NO_ATOMIC_LEVELS)
using level_t = details::null_atomic_int;
#else
using level_t = std::atomic<int>;
#endif
using log_err_handler = std::function<void(const std::string &err_msg)>;
#define SPDLOG_LEVEL_TRACE 0
#define SPDLOG_LEVEL_DEBUG 1
#define SPDLOG_LEVEL_INFO 2
#define SPDLOG_LEVEL_WARN 3
#define SPDLOG_LEVEL_ERROR 4
#define SPDLOG_LEVEL_CRITICAL 5
#define SPDLOG_LEVEL_OFF 6
//Log level enum
namespace level
#if !defined(SPDLOG_ACTIVE_LEVEL)
#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO
#endif
// Log level enum
namespace level {
enum level_enum
{
typedef enum
{
trace = 0,
debug = 1,
info = 2,
warn = 3,
err = 4,
critical = 5,
off = 6
} level_enum;
static const char* level_names[] { "trace", "debug", "info", "warning", "error", "critical", "off" };
static const char* short_level_names[] { "T", "D", "I", "W", "E", "C", "O" };
inline const char* to_str(spdlog::level::level_enum l)
{
return level_names[l];
}
inline const char* to_short_str(spdlog::level::level_enum l)
{
return short_level_names[l];
}
} //level
//
// Async overflow policy - block by default.
//
enum class async_overflow_policy
{
block_retry, // Block / yield / sleep until message can be enqueued
discard_log_msg // Discard the message it enqueue fails
trace = SPDLOG_LEVEL_TRACE,
debug = SPDLOG_LEVEL_DEBUG,
info = SPDLOG_LEVEL_INFO,
warn = SPDLOG_LEVEL_WARN,
err = SPDLOG_LEVEL_ERROR,
critical = SPDLOG_LEVEL_CRITICAL,
off = SPDLOG_LEVEL_OFF,
};
#if !defined(SPDLOG_LEVEL_NAMES)
#define SPDLOG_LEVEL_NAMES \
{ \
"trace", "debug", "info", "warning", "error", "critical", "off" \
}
#endif
#if !defined(SPDLOG_SHORT_LEVEL_NAMES)
#define SPDLOG_SHORT_LEVEL_NAMES \
{ \
"T", "D", "I", "W", "E", "C", "O" \
}
#endif
string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT;
const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT;
spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT;
using level_hasher = std::hash<int>;
} // namespace level
//
// Color mode used by sinks with color support.
//
enum class color_mode
{
always,
automatic,
never
};
//
// Pattern time - specific time getting to use for pattern_formatter.
// local time by default
//
enum class pattern_time_type
{
local, // log localtime
utc // log utc
};
//
// Log exception
//
namespace details
{
namespace os
{
std::string errno_str(int err_num);
}
}
class spdlog_ex: public std::exception
class spdlog_ex : public std::exception
{
public:
spdlog_ex(const std::string& msg):_msg(msg)
{}
spdlog_ex(const std::string& msg, int last_errno)
{
_msg = msg + ": " + details::os::errno_str(last_errno);
}
const char* what() const SPDLOG_NOEXCEPT override
{
return _msg.c_str();
}
private:
std::string _msg;
explicit spdlog_ex(std::string msg);
spdlog_ex(const std::string &msg, int last_errno);
const char *what() const SPDLOG_NOEXCEPT override;
private:
std::string msg_;
};
//
// wchar support for windows file names (SPDLOG_WCHAR_FILENAMES must be defined)
//
#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
using filename_t = std::wstring;
struct source_loc
{
SPDLOG_CONSTEXPR source_loc() = default;
SPDLOG_CONSTEXPR source_loc(const char *filename_in, int line_in, const char *funcname_in)
: filename{filename_in}
, line{line_in}
, funcname{funcname_in}
{}
SPDLOG_CONSTEXPR bool empty() const SPDLOG_NOEXCEPT
{
return line == 0;
}
const char *filename{nullptr};
int line{0};
const char *funcname{nullptr};
};
namespace details {
// make_unique support for pre c++14
#if __cplusplus >= 201402L // C++14 and beyond
using std::make_unique;
#else
using filename_t = std::string;
template<typename T, typename... Args>
std::unique_ptr<T> make_unique(Args &&... args)
{
static_assert(!std::is_array<T>::value, "arrays not supported");
return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
}
#endif
} // namespace details
} // namespace spdlog
} //spdlog
#ifdef SPDLOG_HEADER_ONLY
#include "common-inl.h"
#endif

View File

@@ -1,378 +0,0 @@
//
// Copyright(c) 2015 Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
// async log helper :
// Process logs asynchronously using a back thread.
//
// If the internal queue of log messages reaches its max size,
// then the client call will block until there is more room.
//
// If the back thread throws during logging, a spdlog::spdlog_ex exception
// will be thrown in client's thread when tries to log the next message
#pragma once
#include <spdlog/common.h>
#include <spdlog/sinks/sink.h>
#include <spdlog/details/mpmc_bounded_q.h>
#include <spdlog/details/log_msg.h>
#include <spdlog/details/os.h>
#include <spdlog/formatter.h>
#include <chrono>
#include <exception>
#include <functional>
#include <memory>
#include <string>
#include <thread>
#include <utility>
#include <vector>
namespace spdlog
{
namespace details
{
class async_log_helper
{
// Async msg to move to/from the queue
// Movable only. should never be copied
enum class async_msg_type
{
log,
flush,
terminate
};
struct async_msg
{
std::string logger_name;
level::level_enum level;
log_clock::time_point time;
size_t thread_id;
std::string txt;
async_msg_type msg_type;
async_msg() = default;
~async_msg() = default;
async_msg(async_msg&& other) SPDLOG_NOEXCEPT:
logger_name(std::move(other.logger_name)),
level(std::move(other.level)),
time(std::move(other.time)),
txt(std::move(other.txt)),
msg_type(std::move(other.msg_type))
{}
async_msg(async_msg_type m_type) :msg_type(m_type)
{}
async_msg& operator=(async_msg&& other) SPDLOG_NOEXCEPT
{
logger_name = std::move(other.logger_name);
level = other.level;
time = std::move(other.time);
thread_id = other.thread_id;
txt = std::move(other.txt);
msg_type = other.msg_type;
return *this;
}
// never copy or assign. should only be moved..
async_msg(const async_msg&) = delete;
async_msg& operator=(const async_msg& other) = delete;
// construct from log_msg
async_msg(const details::log_msg& m) :
level(m.level),
time(m.time),
thread_id(m.thread_id),
txt(m.raw.data(), m.raw.size()),
msg_type(async_msg_type::log)
{
#ifndef SPDLOG_NO_NAME
logger_name = *m.logger_name;
#endif
}
// copy into log_msg
void fill_log_msg(log_msg &msg)
{
msg.logger_name = &logger_name;
msg.level = level;
msg.time = time;
msg.thread_id = thread_id;
msg.raw << txt;
}
};
public:
using item_type = async_msg;
using q_type = details::mpmc_bounded_queue<item_type>;
using clock = std::chrono::steady_clock;
async_log_helper(formatter_ptr formatter,
const std::vector<sink_ptr>& sinks,
size_t queue_size,
const log_err_handler err_handler,
const async_overflow_policy overflow_policy = async_overflow_policy::block_retry,
const std::function<void()>& worker_warmup_cb = nullptr,
const std::chrono::milliseconds& flush_interval_ms = std::chrono::milliseconds::zero(),
const std::function<void()>& worker_teardown_cb = nullptr);
void log(const details::log_msg& msg);
// stop logging and join the back thread
~async_log_helper();
void set_formatter(formatter_ptr);
void flush(bool wait_for_q);
private:
formatter_ptr _formatter;
std::vector<std::shared_ptr<sinks::sink>> _sinks;
// queue of messages to log
q_type _q;
log_err_handler _err_handler;
bool _flush_requested;
bool _terminate_requested;
// overflow policy
const async_overflow_policy _overflow_policy;
// worker thread warmup callback - one can set thread priority, affinity, etc
const std::function<void()> _worker_warmup_cb;
// auto periodic sink flush parameter
const std::chrono::milliseconds _flush_interval_ms;
// worker thread teardown callback
const std::function<void()> _worker_teardown_cb;
// worker thread
std::thread _worker_thread;
void push_msg(async_msg&& new_msg);
// worker thread main loop
void worker_loop();
// pop next message from the queue and process it. will set the last_pop to the pop time
// return false if termination of the queue is required
bool process_next_msg(log_clock::time_point& last_pop, log_clock::time_point& last_flush);
void handle_flush_interval(log_clock::time_point& now, log_clock::time_point& last_flush);
// sleep,yield or return immediatly using the time passed since last message as a hint
static void sleep_or_yield(const spdlog::log_clock::time_point& now, const log_clock::time_point& last_op_time);
// wait until the queue is empty
void wait_empty_q();
};
}
}
///////////////////////////////////////////////////////////////////////////////
// async_sink class implementation
///////////////////////////////////////////////////////////////////////////////
inline spdlog::details::async_log_helper::async_log_helper(
formatter_ptr formatter,
const std::vector<sink_ptr>& sinks,
size_t queue_size,
log_err_handler err_handler,
const async_overflow_policy overflow_policy,
const std::function<void()>& worker_warmup_cb,
const std::chrono::milliseconds& flush_interval_ms,
const std::function<void()>& worker_teardown_cb):
_formatter(formatter),
_sinks(sinks),
_q(queue_size),
_err_handler(err_handler),
_flush_requested(false),
_terminate_requested(false),
_overflow_policy(overflow_policy),
_worker_warmup_cb(worker_warmup_cb),
_flush_interval_ms(flush_interval_ms),
_worker_teardown_cb(worker_teardown_cb),
_worker_thread(&async_log_helper::worker_loop, this)
{}
// Send to the worker thread termination message(level=off)
// and wait for it to finish gracefully
inline spdlog::details::async_log_helper::~async_log_helper()
{
try
{
push_msg(async_msg(async_msg_type::terminate));
_worker_thread.join();
}
catch (...) // don't crash in destructor
{}
}
//Try to push and block until succeeded (if the policy is not to discard when the queue is full)
inline void spdlog::details::async_log_helper::log(const details::log_msg& msg)
{
push_msg(async_msg(msg));
}
inline void spdlog::details::async_log_helper::push_msg(details::async_log_helper::async_msg&& new_msg)
{
if (!_q.enqueue(std::move(new_msg)) && _overflow_policy != async_overflow_policy::discard_log_msg)
{
auto last_op_time = details::os::now();
auto now = last_op_time;
do
{
now = details::os::now();
sleep_or_yield(now, last_op_time);
}
while (!_q.enqueue(std::move(new_msg)));
}
}
// optionally wait for the queue be empty and request flush from the sinks
inline void spdlog::details::async_log_helper::flush(bool wait_for_q)
{
push_msg(async_msg(async_msg_type::flush));
if(wait_for_q)
wait_empty_q(); //return only make after the above flush message was processed
}
inline void spdlog::details::async_log_helper::worker_loop()
{
try
{
if (_worker_warmup_cb) _worker_warmup_cb();
auto last_pop = details::os::now();
auto last_flush = last_pop;
while(process_next_msg(last_pop, last_flush));
if (_worker_teardown_cb) _worker_teardown_cb();
}
catch (const std::exception &ex)
{
_err_handler(ex.what());
}
catch (...)
{
_err_handler("Unknown exception");
}
}
// process next message in the queue
// return true if this thread should still be active (while no terminate msg was received)
inline bool spdlog::details::async_log_helper::process_next_msg(log_clock::time_point& last_pop, log_clock::time_point& last_flush)
{
async_msg incoming_async_msg;
if (_q.dequeue(incoming_async_msg))
{
last_pop = details::os::now();
switch (incoming_async_msg.msg_type)
{
case async_msg_type::flush:
_flush_requested = true;
break;
case async_msg_type::terminate:
_flush_requested = true;
_terminate_requested = true;
break;
default:
log_msg incoming_log_msg;
incoming_async_msg.fill_log_msg(incoming_log_msg);
_formatter->format(incoming_log_msg);
for (auto &s : _sinks)
{
if(s->should_log( incoming_log_msg.level))
{
s->log(incoming_log_msg);
}
}
}
return true;
}
// Handle empty queue..
// This is the only place where the queue can terminate or flush to avoid losing messages already in the queue
else
{
auto now = details::os::now();
handle_flush_interval(now, last_flush);
sleep_or_yield(now, last_pop);
return !_terminate_requested;
}
}
// flush all sinks if _flush_interval_ms has expired
inline void spdlog::details::async_log_helper::handle_flush_interval(log_clock::time_point& now, log_clock::time_point& last_flush)
{
auto should_flush = _flush_requested || (_flush_interval_ms != std::chrono::milliseconds::zero() && now - last_flush >= _flush_interval_ms);
if (should_flush)
{
for (auto &s : _sinks)
s->flush();
now = last_flush = details::os::now();
_flush_requested = false;
}
}
inline void spdlog::details::async_log_helper::set_formatter(formatter_ptr msg_formatter)
{
_formatter = msg_formatter;
}
// spin, yield or sleep. use the time passed since last message as a hint
inline void spdlog::details::async_log_helper::sleep_or_yield(const spdlog::log_clock::time_point& now, const spdlog::log_clock::time_point& last_op_time)
{
using namespace std::this_thread;
using std::chrono::milliseconds;
using std::chrono::microseconds;
auto time_since_op = now - last_op_time;
// spin upto 50 micros
if (time_since_op <= microseconds(50))
return;
// yield upto 150 micros
if (time_since_op <= microseconds(100))
return std::this_thread::yield();
// sleep for 20 ms upto 200 ms
if (time_since_op <= milliseconds(200))
return sleep_for(milliseconds(20));
// sleep for 200 ms
return sleep_for(milliseconds(200));
}
// wait for the queue to be empty
inline void spdlog::details::async_log_helper::wait_empty_q()
{
auto last_op = details::os::now();
while (_q.approx_size() > 0)
{
sleep_or_yield(details::os::now(), last_op);
}
}

View File

@@ -1,89 +0,0 @@
//
// Copyright(c) 2015 Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
#pragma once
// Async Logger implementation
// Use an async_sink (queue per logger) to perform the logging in a worker thread
#include <spdlog/details/async_log_helper.h>
#include <spdlog/async_logger.h>
#include <string>
#include <functional>
#include <chrono>
#include <memory>
template<class It>
inline spdlog::async_logger::async_logger(const std::string& logger_name,
const It& begin,
const It& end,
size_t queue_size,
const async_overflow_policy overflow_policy,
const std::function<void()>& worker_warmup_cb,
const std::chrono::milliseconds& flush_interval_ms,
const std::function<void()>& worker_teardown_cb) :
logger(logger_name, begin, end),
_async_log_helper(new details::async_log_helper(_formatter, _sinks, queue_size, _err_handler, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb))
{
}
inline spdlog::async_logger::async_logger(const std::string& logger_name,
sinks_init_list sinks_list,
size_t queue_size,
const async_overflow_policy overflow_policy,
const std::function<void()>& worker_warmup_cb,
const std::chrono::milliseconds& flush_interval_ms,
const std::function<void()>& worker_teardown_cb) :
async_logger(logger_name, sinks_list.begin(), sinks_list.end(), queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb) {}
inline spdlog::async_logger::async_logger(const std::string& logger_name,
sink_ptr single_sink,
size_t queue_size,
const async_overflow_policy overflow_policy,
const std::function<void()>& worker_warmup_cb,
const std::chrono::milliseconds& flush_interval_ms,
const std::function<void()>& worker_teardown_cb) :
async_logger(logger_name,
{
single_sink
}, queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb) {}
inline void spdlog::async_logger::flush()
{
_async_log_helper->flush(true);
}
inline void spdlog::async_logger::_set_formatter(spdlog::formatter_ptr msg_formatter)
{
_formatter = msg_formatter;
_async_log_helper->set_formatter(_formatter);
}
inline void spdlog::async_logger::_set_pattern(const std::string& pattern)
{
_formatter = std::make_shared<pattern_formatter>(pattern);
_async_log_helper->set_formatter(_formatter);
}
inline void spdlog::async_logger::_sink_it(details::log_msg& msg)
{
try
{
_async_log_helper->log(msg);
if (_should_flush_on(msg))
_async_log_helper->flush(false); // do async flush
}
catch (const std::exception &ex)
{
_err_handler(ex.what());
}
catch (...)
{
_err_handler("Unknown exception");
}
}

View File

@@ -0,0 +1,69 @@
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
#pragma once
#ifndef SPDLOG_HEADER_ONLY
#include <spdlog/details/backtracer.h>
#endif
namespace spdlog {
namespace details {
SPDLOG_INLINE backtracer::backtracer(const backtracer &other)
{
std::lock_guard<std::mutex> lock(other.mutex_);
enabled_ = other.enabled();
messages_ = other.messages_;
}
SPDLOG_INLINE backtracer::backtracer(backtracer &&other) SPDLOG_NOEXCEPT
{
std::lock_guard<std::mutex> lock(other.mutex_);
enabled_ = other.enabled();
messages_ = std::move(other.messages_);
}
SPDLOG_INLINE backtracer &backtracer::operator=(backtracer other)
{
std::lock_guard<std::mutex> lock(mutex_);
enabled_ = other.enabled();
messages_ = std::move(other.messages_);
return *this;
}
SPDLOG_INLINE void backtracer::enable(size_t size)
{
std::lock_guard<std::mutex> lock{mutex_};
enabled_.store(true, std::memory_order_relaxed);
messages_ = circular_q<log_msg_buffer>{size};
}
SPDLOG_INLINE void backtracer::disable()
{
std::lock_guard<std::mutex> lock{mutex_};
enabled_.store(false, std::memory_order_relaxed);
}
SPDLOG_INLINE bool backtracer::enabled() const
{
return enabled_.load(std::memory_order_relaxed);
}
SPDLOG_INLINE void backtracer::push_back(const log_msg &msg)
{
std::lock_guard<std::mutex> lock{mutex_};
messages_.push_back(log_msg_buffer{msg});
}
// pop all items in the q and apply the given fun on each of them.
SPDLOG_INLINE void backtracer::foreach_pop(std::function<void(const details::log_msg &)> fun)
{
std::lock_guard<std::mutex> lock{mutex_};
while (!messages_.empty())
{
auto &front_msg = messages_.front();
fun(front_msg);
messages_.pop_front();
}
}
} // namespace details
} // namespace spdlog

View File

@@ -0,0 +1,45 @@
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
#pragma once
#include <spdlog/details/log_msg_buffer.h>
#include <spdlog/details/circular_q.h>
#include <atomic>
#include <mutex>
#include <functional>
// Store log messages in circular buffer.
// Useful for storing debug data in case of error/warning happens.
namespace spdlog {
namespace details {
class backtracer
{
mutable std::mutex mutex_;
std::atomic<bool> enabled_{false};
circular_q<log_msg_buffer> messages_;
public:
backtracer() = default;
backtracer(const backtracer &other);
backtracer(backtracer &&other) SPDLOG_NOEXCEPT;
backtracer &operator=(backtracer other);
void enable(size_t size);
void disable();
bool enabled() const;
void push_back(const log_msg &msg);
// pop all items in the q and apply the given fun on each of them.
void foreach_pop(std::function<void(const details::log_msg &)> fun);
};
} // namespace details
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
#include "backtracer-inl.h"
#endif

View File

@@ -0,0 +1,141 @@
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
// circular q view of std::vector.
#pragma once
#include <vector>
#include <cassert>
namespace spdlog {
namespace details {
template<typename T>
class circular_q
{
size_t max_items_ = 0;
typename std::vector<T>::size_type head_ = 0;
typename std::vector<T>::size_type tail_ = 0;
size_t overrun_counter_ = 0;
std::vector<T> v_;
public:
using value_type = T;
// empty ctor - create a disabled queue with no elements allocated at all
circular_q() = default;
explicit circular_q(size_t max_items)
: max_items_(max_items + 1) // one item is reserved as marker for full q
, v_(max_items_)
{}
circular_q(const circular_q &) = default;
circular_q &operator=(const circular_q &) = default;
// move cannot be default,
// since we need to reset head_, tail_, etc to zero in the moved object
circular_q(circular_q &&other) SPDLOG_NOEXCEPT
{
copy_moveable(std::move(other));
}
circular_q &operator=(circular_q &&other) SPDLOG_NOEXCEPT
{
copy_moveable(std::move(other));
return *this;
}
// push back, overrun (oldest) item if no room left
void push_back(T &&item)
{
if (max_items_ > 0)
{
v_[tail_] = std::move(item);
tail_ = (tail_ + 1) % max_items_;
if (tail_ == head_) // overrun last item if full
{
head_ = (head_ + 1) % max_items_;
++overrun_counter_;
}
}
}
// Return reference to the front item.
// If there are no elements in the container, the behavior is undefined.
const T &front() const
{
return v_[head_];
}
T &front()
{
return v_[head_];
}
// Return number of elements actually stored
size_t size() const
{
if (tail_ >= head_)
{
return tail_ - head_;
}
else
{
return max_items_ - (head_ - tail_);
}
}
// Return const reference to item by index.
// If index is out of range 0…size()-1, the behavior is undefined.
const T &at(size_t i) const
{
assert(i < size());
return v_[(head_ + i) % max_items_];
}
// Pop item from front.
// If there are no elements in the container, the behavior is undefined.
void pop_front()
{
head_ = (head_ + 1) % max_items_;
}
bool empty() const
{
return tail_ == head_;
}
bool full() const
{
// head is ahead of the tail by 1
if (max_items_ > 0)
{
return ((tail_ + 1) % max_items_) == head_;
}
return false;
}
size_t overrun_counter() const
{
return overrun_counter_;
}
private:
// copy from other&& and reset it to disabled state
void copy_moveable(circular_q &&other) SPDLOG_NOEXCEPT
{
max_items_ = other.max_items_;
head_ = other.head_;
tail_ = other.tail_;
overrun_counter_ = other.overrun_counter_;
v_ = std::move(other.v_);
// put &&other in disabled, but valid state
other.max_items_ = 0;
other.head_ = other.tail_ = 0;
other.overrun_counter_ = 0;
}
};
} // namespace details
} // namespace spdlog

View File

@@ -0,0 +1,32 @@
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
#pragma once
#include <spdlog/details/null_mutex.h>
#include <mutex>
namespace spdlog {
namespace details {
struct console_mutex
{
using mutex_t = std::mutex;
static mutex_t &mutex()
{
static mutex_t s_mutex;
return s_mutex;
}
};
struct console_nullmutex
{
using mutex_t = null_mutex;
static mutex_t &mutex()
{
static mutex_t s_mutex;
return s_mutex;
}
};
} // namespace details
} // namespace spdlog

View File

@@ -0,0 +1,132 @@
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
#pragma once
#ifndef SPDLOG_HEADER_ONLY
#include <spdlog/details/file_helper.h>
#endif
#include <spdlog/details/os.h>
#include <spdlog/common.h>
#include <cerrno>
#include <chrono>
#include <cstdio>
#include <string>
#include <thread>
#include <tuple>
namespace spdlog {
namespace details {
SPDLOG_INLINE file_helper::~file_helper()
{
close();
}
SPDLOG_INLINE void file_helper::open(const filename_t &fname, bool truncate)
{
close();
filename_ = fname;
auto *mode = truncate ? SPDLOG_FILENAME_T("wb") : SPDLOG_FILENAME_T("ab");
for (int tries = 0; tries < open_tries_; ++tries)
{
// create containing folder if not exists already.
os::create_dir(os::dir_name(fname));
if (!os::fopen_s(&fd_, fname, mode))
{
return;
}
details::os::sleep_for_millis(open_interval_);
}
SPDLOG_THROW(spdlog_ex("Failed opening file " + os::filename_to_str(filename_) + " for writing", errno));
}
SPDLOG_INLINE void file_helper::reopen(bool truncate)
{
if (filename_.empty())
{
SPDLOG_THROW(spdlog_ex("Failed re opening file - was not opened before"));
}
this->open(filename_, truncate);
}
SPDLOG_INLINE void file_helper::flush()
{
std::fflush(fd_);
}
SPDLOG_INLINE void file_helper::close()
{
if (fd_ != nullptr)
{
std::fclose(fd_);
fd_ = nullptr;
}
}
SPDLOG_INLINE void file_helper::write(const memory_buf_t &buf)
{
size_t msg_size = buf.size();
auto data = buf.data();
if (std::fwrite(data, 1, msg_size, fd_) != msg_size)
{
SPDLOG_THROW(spdlog_ex("Failed writing to file " + os::filename_to_str(filename_), errno));
}
}
SPDLOG_INLINE size_t file_helper::size() const
{
if (fd_ == nullptr)
{
SPDLOG_THROW(spdlog_ex("Cannot use size() on closed file " + os::filename_to_str(filename_)));
}
return os::filesize(fd_);
}
SPDLOG_INLINE const filename_t &file_helper::filename() const
{
return filename_;
}
//
// return file path and its extension:
//
// "mylog.txt" => ("mylog", ".txt")
// "mylog" => ("mylog", "")
// "mylog." => ("mylog.", "")
// "/dir1/dir2/mylog.txt" => ("/dir1/dir2/mylog", ".txt")
//
// the starting dot in filenames is ignored (hidden files):
//
// ".mylog" => (".mylog". "")
// "my_folder/.mylog" => ("my_folder/.mylog", "")
// "my_folder/.mylog.txt" => ("my_folder/.mylog", ".txt")
SPDLOG_INLINE std::tuple<filename_t, filename_t> file_helper::split_by_extension(const filename_t &fname)
{
auto ext_index = fname.rfind('.');
// no valid extension found - return whole path and empty string as
// extension
if (ext_index == filename_t::npos || ext_index == 0 || ext_index == fname.size() - 1)
{
return std::make_tuple(fname, filename_t());
}
// treat cases like "/etc/rc.d/somelogfile or "/abc/.hiddenfile"
auto folder_index = fname.rfind(details::os::folder_sep);
if (folder_index != filename_t::npos && folder_index >= ext_index - 1)
{
return std::make_tuple(fname, filename_t());
}
// finally - return a valid base and extension tuple
return std::make_tuple(fname.substr(0, ext_index), fname.substr(ext_index));
}
} // namespace details
} // namespace spdlog

View File

@@ -1,118 +1,59 @@
//
// Copyright(c) 2015 Gabi Melman.
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
#pragma once
// Helper class for file sink
// When failing to open a file, retry several times(5) with small delay between the tries(10 ms)
// Can be set to auto flush on every line
// Throw spdlog_ex exception on errors
#include <spdlog/common.h>
#include <tuple>
#include <spdlog/details/os.h>
#include <spdlog/details/log_msg.h>
namespace spdlog {
namespace details {
#include <chrono>
#include <cstdio>
#include <string>
#include <thread>
#include <cerrno>
namespace spdlog
{
namespace details
{
// Helper class for file sinks.
// When failing to open a file, retry several times(5) with a delay interval(10 ms).
// Throw spdlog_ex exception on errors.
class file_helper
{
public:
const int open_tries = 5;
const int open_interval = 10;
explicit file_helper() = default;
explicit file_helper() :
_fd(nullptr)
{}
file_helper(const file_helper &) = delete;
file_helper &operator=(const file_helper &) = delete;
~file_helper();
file_helper(const file_helper&) = delete;
file_helper& operator=(const file_helper&) = delete;
void open(const filename_t &fname, bool truncate = false);
void reopen(bool truncate);
void flush();
void close();
void write(const memory_buf_t &buf);
size_t size() const;
const filename_t &filename() const;
~file_helper()
{
close();
}
void open(const filename_t& fname, bool truncate = false)
{
close();
auto *mode = truncate ? SPDLOG_FILENAME_T("wb") : SPDLOG_FILENAME_T("ab");
_filename = fname;
for (int tries = 0; tries < open_tries; ++tries)
{
if (!os::fopen_s(&_fd, fname, mode))
return;
std::this_thread::sleep_for(std::chrono::milliseconds(open_interval));
}
throw spdlog_ex("Failed opening file " + os::filename_to_str(_filename) + " for writing", errno);
}
void reopen(bool truncate)
{
if (_filename.empty())
throw spdlog_ex("Failed re opening file - was not opened before");
open(_filename, truncate);
}
void flush()
{
std::fflush(_fd);
}
void close()
{
if (_fd)
{
std::fclose(_fd);
_fd = nullptr;
}
}
void write(const log_msg& msg)
{
size_t msg_size = msg.formatted.size();
auto data = msg.formatted.data();
if (std::fwrite(data, 1, msg_size, _fd) != msg_size)
throw spdlog_ex("Failed writing to file " + os::filename_to_str(_filename), errno);
}
size_t size()
{
if (!_fd)
throw spdlog_ex("Cannot use size() on closed file " + os::filename_to_str(_filename));
return os::filesize(_fd);
}
const filename_t& filename() const
{
return _filename;
}
static bool file_exists(const filename_t& name)
{
return os::file_exists(name);
}
//
// return file path and its extension:
//
// "mylog.txt" => ("mylog", ".txt")
// "mylog" => ("mylog", "")
// "mylog." => ("mylog.", "")
// "/dir1/dir2/mylog.txt" => ("/dir1/dir2/mylog", ".txt")
//
// the starting dot in filenames is ignored (hidden files):
//
// ".mylog" => (".mylog". "")
// "my_folder/.mylog" => ("my_folder/.mylog", "")
// "my_folder/.mylog.txt" => ("my_folder/.mylog", ".txt")
static std::tuple<filename_t, filename_t> split_by_extension(const filename_t &fname);
private:
FILE* _fd;
filename_t _filename;
const int open_tries_ = 5;
const int open_interval_ = 10;
std::FILE *fd_{nullptr};
filename_t filename_;
};
}
}
} // namespace details
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
#include "file_helper-inl.h"
#endif

View File

@@ -0,0 +1,111 @@
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
#pragma once
#include <chrono>
#include <type_traits>
#include <spdlog/fmt/fmt.h>
#include <spdlog/common.h>
// Some fmt helpers to efficiently format and pad ints and strings
namespace spdlog {
namespace details {
namespace fmt_helper {
inline spdlog::string_view_t to_string_view(const memory_buf_t &buf) SPDLOG_NOEXCEPT
{
return spdlog::string_view_t{buf.data(), buf.size()};
}
inline void append_string_view(spdlog::string_view_t view, memory_buf_t &dest)
{
auto *buf_ptr = view.data();
if (buf_ptr != nullptr)
{
dest.append(buf_ptr, buf_ptr + view.size());
}
}
template<typename T>
inline void append_int(T n, memory_buf_t &dest)
{
fmt::format_int i(n);
dest.append(i.data(), i.data() + i.size());
}
template<typename T>
inline unsigned count_digits(T n)
{
using count_type = typename std::conditional<(sizeof(T) > sizeof(uint32_t)), uint64_t, uint32_t>::type;
return static_cast<unsigned>(fmt::internal::count_digits(static_cast<count_type>(n)));
}
inline void pad2(int n, memory_buf_t &dest)
{
if (n > 99)
{
append_int(n, dest);
}
else if (n > 9) // 10-99
{
dest.push_back(static_cast<char>('0' + n / 10));
dest.push_back(static_cast<char>('0' + n % 10));
}
else if (n >= 0) // 0-9
{
dest.push_back('0');
dest.push_back(static_cast<char>('0' + n));
}
else // negatives (unlikely, but just in case, let fmt deal with it)
{
fmt::format_to(dest, "{:02}", n);
}
}
template<typename T>
inline void pad_uint(T n, unsigned int width, memory_buf_t &dest)
{
static_assert(std::is_unsigned<T>::value, "pad_uint must get unsigned T");
auto digits = count_digits(n);
if (width > digits)
{
const char *zeroes = "0000000000000000000";
dest.append(zeroes, zeroes + width - digits);
}
append_int(n, dest);
}
template<typename T>
inline void pad3(T n, memory_buf_t &dest)
{
pad_uint(n, 3, dest);
}
template<typename T>
inline void pad6(T n, memory_buf_t &dest)
{
pad_uint(n, 6, dest);
}
template<typename T>
inline void pad9(T n, memory_buf_t &dest)
{
pad_uint(n, 9, dest);
}
// return fraction of a second of the given time_point.
// e.g.
// fraction<std::milliseconds>(tp) -> will return the millis part of the second
template<typename ToDuration>
inline ToDuration time_fraction(log_clock::time_point tp)
{
using std::chrono::duration_cast;
using std::chrono::seconds;
auto duration = tp.time_since_epoch();
auto secs = duration_cast<seconds>(duration);
return duration_cast<ToDuration>(duration) - duration_cast<ToDuration>(secs);
}
} // namespace fmt_helper
} // namespace details
} // namespace spdlog

View File

@@ -0,0 +1,32 @@
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
#pragma once
#ifndef SPDLOG_HEADER_ONLY
#include <spdlog/details/log_msg.h>
#endif
#include <spdlog/details/os.h>
namespace spdlog {
namespace details {
SPDLOG_INLINE log_msg::log_msg(
spdlog::source_loc loc, string_view_t a_logger_name, spdlog::level::level_enum lvl, spdlog::string_view_t msg)
: logger_name(a_logger_name)
, level(lvl)
, time(os::now())
#ifndef SPDLOG_NO_THREAD_ID
, thread_id(os::thread_id())
#endif
, source(loc)
, payload(msg)
{}
SPDLOG_INLINE log_msg::log_msg(string_view_t a_logger_name, spdlog::level::level_enum lvl, spdlog::string_view_t msg)
: log_msg(source_loc{}, a_logger_name, lvl, msg)
{}
} // namespace details
} // namespace spdlog

View File

@@ -1,46 +1,35 @@
//
// Copyright(c) 2015 Gabi Melman.
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
#pragma once
#include <spdlog/common.h>
#include <spdlog/details/os.h>
#include <string>
#include <utility>
namespace spdlog
{
namespace details
{
namespace spdlog {
namespace details {
struct log_msg
{
log_msg() = default;
log_msg(const std::string *loggers_name, level::level_enum lvl) : logger_name(loggers_name), level(lvl)
{
#ifndef SPDLOG_NO_DATETIME
time = os::now();
#endif
log_msg(source_loc loc, string_view_t logger_name, level::level_enum lvl, string_view_t msg);
log_msg(string_view_t logger_name, level::level_enum lvl, string_view_t msg);
log_msg(const log_msg &other) = default;
#ifndef SPDLOG_NO_THREAD_ID
thread_id = os::thread_id();
#endif
}
log_msg(const log_msg& other) = delete;
log_msg& operator=(log_msg&& other) = delete;
log_msg(log_msg&& other) = delete;
const std::string *logger_name;
level::level_enum level;
string_view_t logger_name;
level::level_enum level{level::off};
log_clock::time_point time;
size_t thread_id;
fmt::MemoryWriter raw;
fmt::MemoryWriter formatted;
size_t thread_id{0};
// wrapping the formatted text with color (updated by pattern_formatter).
mutable size_t color_range_start{0};
mutable size_t color_range_end{0};
source_loc source;
string_view_t payload;
};
}
}
} // namespace details
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
#include "log_msg-inl.h"
#endif

View File

@@ -0,0 +1,58 @@
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
#pragma once
#ifndef SPDLOG_HEADER_ONLY
#include <spdlog/details/log_msg_buffer.h>
#endif
namespace spdlog {
namespace details {
SPDLOG_INLINE log_msg_buffer::log_msg_buffer(const log_msg &orig_msg)
: log_msg{orig_msg}
{
buffer.append(logger_name.begin(), logger_name.end());
buffer.append(payload.begin(), payload.end());
update_string_views();
}
SPDLOG_INLINE log_msg_buffer::log_msg_buffer(const log_msg_buffer &other)
: log_msg{other}
{
buffer.append(logger_name.begin(), logger_name.end());
buffer.append(payload.begin(), payload.end());
update_string_views();
}
SPDLOG_INLINE log_msg_buffer::log_msg_buffer(log_msg_buffer &&other) SPDLOG_NOEXCEPT : log_msg{other}, buffer{std::move(other.buffer)}
{
update_string_views();
}
SPDLOG_INLINE log_msg_buffer &log_msg_buffer::operator=(const log_msg_buffer &other)
{
log_msg::operator=(other);
buffer.clear();
buffer.append(other.buffer.data(), other.buffer.data() + other.buffer.size());
update_string_views();
return *this;
}
SPDLOG_INLINE log_msg_buffer &log_msg_buffer::operator=(log_msg_buffer &&other) SPDLOG_NOEXCEPT
{
log_msg::operator=(other);
buffer = std::move(other.buffer);
update_string_views();
return *this;
}
SPDLOG_INLINE void log_msg_buffer::update_string_views()
{
logger_name = string_view_t{buffer.data(), logger_name.size()};
payload = string_view_t{buffer.data() + logger_name.size(), payload.size()};
}
} // namespace details
} // namespace spdlog

View File

@@ -0,0 +1,33 @@
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
#pragma once
#include <spdlog/details/log_msg.h>
namespace spdlog {
namespace details {
// Extend log_msg with internal buffer to store its payload.
// THis is needed since log_msg holds string_views that points to stack data.
class log_msg_buffer : public log_msg
{
memory_buf_t buffer;
void update_string_views();
public:
log_msg_buffer() = default;
explicit log_msg_buffer(const log_msg &orig_msg);
log_msg_buffer(const log_msg_buffer &other);
log_msg_buffer(log_msg_buffer &&other) SPDLOG_NOEXCEPT;
log_msg_buffer &operator=(const log_msg_buffer &other);
log_msg_buffer &operator=(log_msg_buffer &&other) SPDLOG_NOEXCEPT;
};
} // namespace details
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
#include "log_msg_buffer-inl.h"
#endif

View File

@@ -1,298 +0,0 @@
//
// Copyright(c) 2015 Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
#pragma once
#include <spdlog/logger.h>
#include <spdlog/sinks/stdout_sinks.h>
#include <memory>
#include <string>
// create logger with given name, sinks and the default pattern formatter
// all other ctors will call this one
template<class It>
inline spdlog::logger::logger(const std::string& logger_name, const It& begin, const It& end):
_name(logger_name),
_sinks(begin, end),
_formatter(std::make_shared<pattern_formatter>("%+"))
{
_level = level::info;
_flush_level = level::off;
_last_err_time = 0;
_err_handler = [this](const std::string &msg)
{
this->_default_err_handler(msg);
};
}
// ctor with sinks as init list
inline spdlog::logger::logger(const std::string& logger_name, sinks_init_list sinks_list):
logger(logger_name, sinks_list.begin(), sinks_list.end())
{}
// ctor with single sink
inline spdlog::logger::logger(const std::string& logger_name, spdlog::sink_ptr single_sink):
logger(logger_name,
{
single_sink
})
{}
inline spdlog::logger::~logger() = default;
inline void spdlog::logger::set_formatter(spdlog::formatter_ptr msg_formatter)
{
_set_formatter(msg_formatter);
}
inline void spdlog::logger::set_pattern(const std::string& pattern)
{
_set_pattern(pattern);
}
template <typename... Args>
inline void spdlog::logger::log(level::level_enum lvl, const char* fmt, const Args&... args)
{
if (!should_log(lvl)) return;
try
{
details::log_msg log_msg(&_name, lvl);
log_msg.raw.write(fmt, args...);
_sink_it(log_msg);
}
catch (const std::exception &ex)
{
_err_handler(ex.what());
}
catch (...)
{
_err_handler("Unknown exception");
}
}
template <typename... Args>
inline void spdlog::logger::log(level::level_enum lvl, const char* msg)
{
if (!should_log(lvl)) return;
try
{
details::log_msg log_msg(&_name, lvl);
log_msg.raw << msg;
_sink_it(log_msg);
}
catch (const std::exception &ex)
{
_err_handler(ex.what());
}
catch (...)
{
_err_handler("Unknown exception");
}
}
template<typename T>
inline void spdlog::logger::log(level::level_enum lvl, const T& msg)
{
if (!should_log(lvl)) return;
try
{
details::log_msg log_msg(&_name, lvl);
log_msg.raw << msg;
_sink_it(log_msg);
}
catch (const std::exception &ex)
{
_err_handler(ex.what());
}
catch (...)
{
_err_handler("Unknown exception");
}
}
template <typename... Args>
inline void spdlog::logger::trace(const char* fmt, const Args&... args)
{
log(level::trace, fmt, args...);
}
template <typename... Args>
inline void spdlog::logger::debug(const char* fmt, const Args&... args)
{
log(level::debug, fmt, args...);
}
template <typename... Args>
inline void spdlog::logger::info(const char* fmt, const Args&... args)
{
log(level::info, fmt, args...);
}
template <typename... Args>
inline void spdlog::logger::warn(const char* fmt, const Args&... args)
{
log(level::warn, fmt, args...);
}
template <typename... Args>
inline void spdlog::logger::error(const char* fmt, const Args&... args)
{
log(level::err, fmt, args...);
}
template <typename... Args>
inline void spdlog::logger::critical(const char* fmt, const Args&... args)
{
log(level::critical, fmt, args...);
}
template<typename T>
inline void spdlog::logger::trace(const T& msg)
{
log(level::trace, msg);
}
template<typename T>
inline void spdlog::logger::debug(const T& msg)
{
log(level::debug, msg);
}
template<typename T>
inline void spdlog::logger::info(const T& msg)
{
log(level::info, msg);
}
template<typename T>
inline void spdlog::logger::warn(const T& msg)
{
log(level::warn, msg);
}
template<typename T>
inline void spdlog::logger::error(const T& msg)
{
log(level::err, msg);
}
template<typename T>
inline void spdlog::logger::critical(const T& msg)
{
log(level::critical, msg);
}
//
// name and level
//
inline const std::string& spdlog::logger::name() const
{
return _name;
}
inline void spdlog::logger::set_level(spdlog::level::level_enum log_level)
{
_level.store(log_level);
}
inline void spdlog::logger::set_error_handler(spdlog::log_err_handler err_handler)
{
_err_handler = err_handler;
}
inline spdlog::log_err_handler spdlog::logger::error_handler()
{
return _err_handler;
}
inline void spdlog::logger::flush_on(level::level_enum log_level)
{
_flush_level.store(log_level);
}
inline spdlog::level::level_enum spdlog::logger::level() const
{
return static_cast<spdlog::level::level_enum>(_level.load(std::memory_order_relaxed));
}
inline bool spdlog::logger::should_log(spdlog::level::level_enum msg_level) const
{
return msg_level >= _level.load(std::memory_order_relaxed);
}
//
// protected virtual called at end of each user log call (if enabled) by the line_logger
//
inline void spdlog::logger::_sink_it(details::log_msg& msg)
{
_formatter->format(msg);
for (auto &sink : _sinks)
{
if( sink->should_log( msg.level))
{
sink->log(msg);
}
}
if(_should_flush_on(msg))
flush();
}
inline void spdlog::logger::_set_pattern(const std::string& pattern)
{
_formatter = std::make_shared<pattern_formatter>(pattern);
}
inline void spdlog::logger::_set_formatter(formatter_ptr msg_formatter)
{
_formatter = msg_formatter;
}
inline void spdlog::logger::flush()
{
for (auto& sink : _sinks)
sink->flush();
}
inline void spdlog::logger::_default_err_handler(const std::string &msg)
{
auto now = time(nullptr);
if (now - _last_err_time < 60)
return;
auto tm_time = details::os::localtime(now);
char date_buf[100];
std::strftime(date_buf, sizeof(date_buf), "%Y-%m-%d %H:%M:%S", &tm_time);
details::log_msg err_msg;
err_msg.formatted.write("[*** LOG ERROR ***] [{}] [{}] [{}]{}", name(), msg, date_buf, details::os::eol);
sinks::stderr_sink_mt::instance()->log(err_msg);
_last_err_time = now;
}
inline bool spdlog::logger::_should_flush_on(const details::log_msg &msg)
{
const auto flush_level = _flush_level.load(std::memory_order_relaxed);
return (msg.level >= flush_level) && (msg.level != level::off);
}
inline const std::vector<spdlog::sink_ptr>& spdlog::logger::sinks() const
{
return _sinks;
}

View File

@@ -0,0 +1,120 @@
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
#pragma once
// multi producer-multi consumer blocking queue.
// enqueue(..) - will block until room found to put the new message.
// enqueue_nowait(..) - will return immediately with false if no room left in
// the queue.
// dequeue_for(..) - will block until the queue is not empty or timeout have
// passed.
#include <spdlog/details/circular_q.h>
#include <condition_variable>
#include <mutex>
namespace spdlog {
namespace details {
template<typename T>
class mpmc_blocking_queue
{
public:
using item_type = T;
explicit mpmc_blocking_queue(size_t max_items)
: q_(max_items)
{}
#ifndef __MINGW32__
// try to enqueue and block if no room left
void enqueue(T &&item)
{
{
std::unique_lock<std::mutex> lock(queue_mutex_);
pop_cv_.wait(lock, [this] { return !this->q_.full(); });
q_.push_back(std::move(item));
}
push_cv_.notify_one();
}
// enqueue immediately. overrun oldest message in the queue if no room left.
void enqueue_nowait(T &&item)
{
{
std::unique_lock<std::mutex> lock(queue_mutex_);
q_.push_back(std::move(item));
}
push_cv_.notify_one();
}
// try to dequeue item. if no item found. wait upto timeout and try again
// Return true, if succeeded dequeue item, false otherwise
bool dequeue_for(T &popped_item, std::chrono::milliseconds wait_duration)
{
{
std::unique_lock<std::mutex> lock(queue_mutex_);
if (!push_cv_.wait_for(lock, wait_duration, [this] { return !this->q_.empty(); }))
{
return false;
}
popped_item = std::move(q_.front());
q_.pop_front();
}
pop_cv_.notify_one();
return true;
}
#else
// apparently mingw deadlocks if the mutex is released before cv.notify_one(),
// so release the mutex at the very end each function.
// try to enqueue and block if no room left
void enqueue(T &&item)
{
std::unique_lock<std::mutex> lock(queue_mutex_);
pop_cv_.wait(lock, [this] { return !this->q_.full(); });
q_.push_back(std::move(item));
push_cv_.notify_one();
}
// enqueue immediately. overrun oldest message in the queue if no room left.
void enqueue_nowait(T &&item)
{
std::unique_lock<std::mutex> lock(queue_mutex_);
q_.push_back(std::move(item));
push_cv_.notify_one();
}
// try to dequeue item. if no item found. wait upto timeout and try again
// Return true, if succeeded dequeue item, false otherwise
bool dequeue_for(T &popped_item, std::chrono::milliseconds wait_duration)
{
std::unique_lock<std::mutex> lock(queue_mutex_);
if (!push_cv_.wait_for(lock, wait_duration, [this] { return !this->q_.empty(); }))
{
return false;
}
popped_item = std::move(q_.front());
q_.pop_front();
pop_cv_.notify_one();
return true;
}
#endif
size_t overrun_counter()
{
std::unique_lock<std::mutex> lock(queue_mutex_);
return q_.overrun_counter();
}
private:
std::mutex queue_mutex_;
std::condition_variable push_cv_;
std::condition_variable pop_cv_;
spdlog::details::circular_q<T> q_;
};
} // namespace details
} // namespace spdlog

View File

@@ -1,172 +0,0 @@
/*
A modified version of Bounded MPMC queue by Dmitry Vyukov.
Original code from:
http://www.1024cores.net/home/lock-free-algorithms/queues/bounded-mpmc-queue
licensed by Dmitry Vyukov under the terms below:
Simplified BSD license
Copyright (c) 2010-2011 Dmitry Vyukov. All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this list of
conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice, this list
of conditions and the following disclaimer in the documentation and/or other materials
provided with the distribution.
THIS SOFTWARE IS PROVIDED BY DMITRY VYUKOV "AS IS" AND ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
SHALL DMITRY VYUKOV OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
The views and conclusions contained in the software and documentation are those of the authors and
should not be interpreted as representing official policies, either expressed or implied, of Dmitry Vyukov.
*/
/*
The code in its current form adds the license below:
Copyright(c) 2015 Gabi Melman.
Distributed under the MIT License (http://opensource.org/licenses/MIT)
*/
#pragma once
#include <spdlog/common.h>
#include <atomic>
#include <utility>
namespace spdlog
{
namespace details
{
template<typename T>
class mpmc_bounded_queue
{
public:
using item_type = T;
mpmc_bounded_queue(size_t buffer_size)
:max_size_(buffer_size),
buffer_(new cell_t [buffer_size]),
buffer_mask_(buffer_size - 1)
{
//queue size must be power of two
if(!((buffer_size >= 2) && ((buffer_size & (buffer_size - 1)) == 0)))
throw spdlog_ex("async logger queue size must be power of two");
for (size_t i = 0; i != buffer_size; i += 1)
buffer_[i].sequence_.store(i, std::memory_order_relaxed);
enqueue_pos_.store(0, std::memory_order_relaxed);
dequeue_pos_.store(0, std::memory_order_relaxed);
}
~mpmc_bounded_queue()
{
delete [] buffer_;
}
bool enqueue(T&& data)
{
cell_t* cell;
size_t pos = enqueue_pos_.load(std::memory_order_relaxed);
for (;;)
{
cell = &buffer_[pos & buffer_mask_];
size_t seq = cell->sequence_.load(std::memory_order_acquire);
intptr_t dif = (intptr_t)seq - (intptr_t)pos;
if (dif == 0)
{
if (enqueue_pos_.compare_exchange_weak(pos, pos + 1, std::memory_order_relaxed))
break;
}
else if (dif < 0)
{
return false;
}
else
{
pos = enqueue_pos_.load(std::memory_order_relaxed);
}
}
cell->data_ = std::move(data);
cell->sequence_.store(pos + 1, std::memory_order_release);
return true;
}
bool dequeue(T& data)
{
cell_t* cell;
size_t pos = dequeue_pos_.load(std::memory_order_relaxed);
for (;;)
{
cell = &buffer_[pos & buffer_mask_];
size_t seq =
cell->sequence_.load(std::memory_order_acquire);
intptr_t dif = (intptr_t)seq - (intptr_t)(pos + 1);
if (dif == 0)
{
if (dequeue_pos_.compare_exchange_weak(pos, pos + 1, std::memory_order_relaxed))
break;
}
else if (dif < 0)
return false;
else
pos = dequeue_pos_.load(std::memory_order_relaxed);
}
data = std::move(cell->data_);
cell->sequence_.store(pos + buffer_mask_ + 1, std::memory_order_release);
return true;
}
size_t approx_size()
{
size_t first_pos = dequeue_pos_.load(std::memory_order_relaxed);
size_t last_pos = enqueue_pos_.load(std::memory_order_relaxed);
if (last_pos <= first_pos)
return 0;
auto size = last_pos - first_pos;
return size < max_size_ ? size : max_size_;
}
private:
struct cell_t
{
std::atomic<size_t> sequence_;
T data_;
};
size_t const max_size_;
static size_t const cacheline_size = 64;
typedef char cacheline_pad_t [cacheline_size];
cacheline_pad_t pad0_;
cell_t* const buffer_;
size_t const buffer_mask_;
cacheline_pad_t pad1_;
std::atomic<size_t> enqueue_pos_;
cacheline_pad_t pad2_;
std::atomic<size_t> dequeue_pos_;
cacheline_pad_t pad3_;
mpmc_bounded_queue(mpmc_bounded_queue const&) = delete;
void operator= (mpmc_bounded_queue const&) = delete;
};
} // ns details
} // ns spdlog

View File

@@ -1,22 +1,19 @@
//
// Copyright(c) 2015 Gabi Melman.
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
#pragma once
#include <atomic>
#include <utility>
// null, no cost dummy "mutex" and dummy "atomic" int
namespace spdlog
{
namespace details
{
namespace spdlog {
namespace details {
struct null_mutex
{
void lock() {}
void unlock() {}
bool try_lock()
void lock() const {}
void unlock() const {}
bool try_lock() const
{
return true;
}
@@ -27,19 +24,26 @@ struct null_atomic_int
int value;
null_atomic_int() = default;
null_atomic_int(int val):value(val)
explicit null_atomic_int(int new_value)
: value(new_value)
{}
int load(std::memory_order) const
int load(std::memory_order = std::memory_order_relaxed) const
{
return value;
}
void store(int val)
void store(int new_value, std::memory_order = std::memory_order_relaxed)
{
value = val;
value = new_value;
}
int exchange(int new_value, std::memory_order = std::memory_order_relaxed)
{
std::swap(new_value, value);
return new_value; // return value before the call
}
};
}
}
} // namespace details
} // namespace spdlog

View File

@@ -0,0 +1,541 @@
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
#pragma once
#ifndef SPDLOG_HEADER_ONLY
#include <spdlog/details/os.h>
#endif
#include <spdlog/common.h>
#include <algorithm>
#include <chrono>
#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <ctime>
#include <string>
#include <thread>
#include <array>
#include <sys/stat.h>
#include <sys/types.h>
#ifdef _WIN32
#ifndef NOMINMAX
#define NOMINMAX // prevent windows redefining min/max
#endif
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include <io.h> // _get_osfhandle and _isatty support
#include <process.h> // _get_pid support
#include <windows.h>
#ifdef __MINGW32__
#include <share.h>
#endif
#if defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) || defined(SPDLOG_WCHAR_FILENAMES)
#include <limits>
#endif
#include <direct.h> // for _mkdir/_wmkdir
#else // unix
#include <fcntl.h>
#include <unistd.h>
#ifdef __linux__
#include <sys/syscall.h> //Use gettid() syscall under linux to get thread id
#elif defined(_AIX)
#include <pthread.h> // for pthread_getthreadid_np
#elif defined(__DragonFly__) || defined(__FreeBSD__)
#include <pthread_np.h> // for pthread_getthreadid_np
#elif defined(__NetBSD__)
#include <lwp.h> // for _lwp_self
#elif defined(__sun)
#include <thread.h> // for thr_self
#endif
#endif // unix
#ifndef __has_feature // Clang - feature checking macros.
#define __has_feature(x) 0 // Compatibility with non-clang compilers.
#endif
namespace spdlog {
namespace details {
namespace os {
SPDLOG_INLINE spdlog::log_clock::time_point now() SPDLOG_NOEXCEPT
{
#if defined __linux__ && defined SPDLOG_CLOCK_COARSE
timespec ts;
::clock_gettime(CLOCK_REALTIME_COARSE, &ts);
return std::chrono::time_point<log_clock, typename log_clock::duration>(
std::chrono::duration_cast<typename log_clock::duration>(std::chrono::seconds(ts.tv_sec) + std::chrono::nanoseconds(ts.tv_nsec)));
#else
return log_clock::now();
#endif
}
SPDLOG_INLINE std::tm localtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT
{
#ifdef _WIN32
std::tm tm;
::localtime_s(&tm, &time_tt);
#else
std::tm tm;
::localtime_r(&time_tt, &tm);
#endif
return tm;
}
SPDLOG_INLINE std::tm localtime() SPDLOG_NOEXCEPT
{
std::time_t now_t = ::time(nullptr);
return localtime(now_t);
}
SPDLOG_INLINE std::tm gmtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT
{
#ifdef _WIN32
std::tm tm;
::gmtime_s(&tm, &time_tt);
#else
std::tm tm;
::gmtime_r(&time_tt, &tm);
#endif
return tm;
}
SPDLOG_INLINE std::tm gmtime() SPDLOG_NOEXCEPT
{
std::time_t now_t = ::time(nullptr);
return gmtime(now_t);
}
#ifdef SPDLOG_PREVENT_CHILD_FD
SPDLOG_INLINE void prevent_child_fd(FILE *f)
{
#ifdef _WIN32
auto file_handle = reinterpret_cast<HANDLE>(_get_osfhandle(::_fileno(f)));
if (!::SetHandleInformation(file_handle, HANDLE_FLAG_INHERIT, 0))
SPDLOG_THROW(spdlog_ex("SetHandleInformation failed", errno));
#else
auto fd = ::fileno(f);
if (::fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
{
SPDLOG_THROW(spdlog_ex("fcntl with FD_CLOEXEC failed", errno));
}
#endif
}
#endif // SPDLOG_PREVENT_CHILD_FD
// fopen_s on non windows for writing
SPDLOG_INLINE bool fopen_s(FILE **fp, const filename_t &filename, const filename_t &mode)
{
#ifdef _WIN32
#ifdef SPDLOG_WCHAR_FILENAMES
*fp = ::_wfsopen((filename.c_str()), mode.c_str(), _SH_DENYNO);
#else
*fp = ::_fsopen((filename.c_str()), mode.c_str(), _SH_DENYNO);
#endif
#else // unix
*fp = ::fopen((filename.c_str()), mode.c_str());
#endif
#ifdef SPDLOG_PREVENT_CHILD_FD
// prevent child processes from inheriting log file descriptors
if (*fp != nullptr)
{
prevent_child_fd(*fp);
}
#endif
return *fp == nullptr;
}
SPDLOG_INLINE int remove(const filename_t &filename) SPDLOG_NOEXCEPT
{
#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
return ::_wremove(filename.c_str());
#else
return std::remove(filename.c_str());
#endif
}
SPDLOG_INLINE int remove_if_exists(const filename_t &filename) SPDLOG_NOEXCEPT
{
return path_exists(filename) ? remove(filename) : 0;
}
SPDLOG_INLINE int rename(const filename_t &filename1, const filename_t &filename2) SPDLOG_NOEXCEPT
{
#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
return ::_wrename(filename1.c_str(), filename2.c_str());
#else
return std::rename(filename1.c_str(), filename2.c_str());
#endif
}
// Return true if path exists (file or directory)
SPDLOG_INLINE bool path_exists(const filename_t &filename) SPDLOG_NOEXCEPT
{
#ifdef _WIN32
#ifdef SPDLOG_WCHAR_FILENAMES
auto attribs = ::GetFileAttributesW(filename.c_str());
#else
auto attribs = ::GetFileAttributesA(filename.c_str());
#endif
return attribs != INVALID_FILE_ATTRIBUTES;
#else // common linux/unix all have the stat system call
struct stat buffer;
return (::stat(filename.c_str(), &buffer) == 0);
#endif
}
// Return file size according to open FILE* object
SPDLOG_INLINE size_t filesize(FILE *f)
{
if (f == nullptr)
{
SPDLOG_THROW(spdlog_ex("Failed getting file size. fd is null"));
}
#if defined(_WIN32) && !defined(__CYGWIN__)
int fd = ::_fileno(f);
#if _WIN64 // 64 bits
__int64 ret = ::_filelengthi64(fd);
if (ret >= 0)
{
return static_cast<size_t>(ret);
}
#else // windows 32 bits
long ret = ::_filelength(fd);
if (ret >= 0)
{
return static_cast<size_t>(ret);
}
#endif
#else // unix
// OpenBSD doesn't compile with :: before the fileno(..)
#if defined(__OpenBSD__)
int fd = fileno(f);
#else
int fd = ::fileno(f);
#endif
// 64 bits(but not in osx or cygwin, where fstat64 is deprecated)
#if (defined(__linux__) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64))
struct stat64 st;
if (::fstat64(fd, &st) == 0)
{
return static_cast<size_t>(st.st_size);
}
#else // other unix or linux 32 bits or cygwin
struct stat st;
if (::fstat(fd, &st) == 0)
{
return static_cast<size_t>(st.st_size);
}
#endif
#endif
SPDLOG_THROW(spdlog_ex("Failed getting file size from fd", errno));
}
// Return utc offset in minutes or throw spdlog_ex on failure
SPDLOG_INLINE int utc_minutes_offset(const std::tm &tm)
{
#ifdef _WIN32
#if _WIN32_WINNT < _WIN32_WINNT_WS08
TIME_ZONE_INFORMATION tzinfo;
auto rv = ::GetTimeZoneInformation(&tzinfo);
#else
DYNAMIC_TIME_ZONE_INFORMATION tzinfo;
auto rv = ::GetDynamicTimeZoneInformation(&tzinfo);
#endif
if (rv == TIME_ZONE_ID_INVALID)
SPDLOG_THROW(spdlog::spdlog_ex("Failed getting timezone info. ", errno));
int offset = -tzinfo.Bias;
if (tm.tm_isdst)
{
offset -= tzinfo.DaylightBias;
}
else
{
offset -= tzinfo.StandardBias;
}
return offset;
#else
#if defined(sun) || defined(__sun) || defined(_AIX) || (!defined(_BSD_SOURCE) && !defined(_GNU_SOURCE))
// 'tm_gmtoff' field is BSD extension and it's missing on SunOS/Solaris
struct helper
{
static long int calculate_gmt_offset(const std::tm &localtm = details::os::localtime(), const std::tm &gmtm = details::os::gmtime())
{
int local_year = localtm.tm_year + (1900 - 1);
int gmt_year = gmtm.tm_year + (1900 - 1);
long int days = (
// difference in day of year
localtm.tm_yday -
gmtm.tm_yday
// + intervening leap days
+ ((local_year >> 2) - (gmt_year >> 2)) - (local_year / 100 - gmt_year / 100) +
((local_year / 100 >> 2) - (gmt_year / 100 >> 2))
// + difference in years * 365 */
+ (long int)(local_year - gmt_year) * 365);
long int hours = (24 * days) + (localtm.tm_hour - gmtm.tm_hour);
long int mins = (60 * hours) + (localtm.tm_min - gmtm.tm_min);
long int secs = (60 * mins) + (localtm.tm_sec - gmtm.tm_sec);
return secs;
}
};
auto offset_seconds = helper::calculate_gmt_offset(tm);
#else
auto offset_seconds = tm.tm_gmtoff;
#endif
return static_cast<int>(offset_seconds / 60);
#endif
}
// Return current thread id as size_t
// It exists because the std::this_thread::get_id() is much slower(especially
// under VS 2013)
SPDLOG_INLINE size_t _thread_id() SPDLOG_NOEXCEPT
{
#ifdef _WIN32
return static_cast<size_t>(::GetCurrentThreadId());
#elif defined(__linux__)
#if defined(__ANDROID__) && defined(__ANDROID_API__) && (__ANDROID_API__ < 21)
#define SYS_gettid __NR_gettid
#endif
return static_cast<size_t>(::syscall(SYS_gettid));
#elif defined(_AIX) || defined(__DragonFly__) || defined(__FreeBSD__)
return static_cast<size_t>(::pthread_getthreadid_np());
#elif defined(__NetBSD__)
return static_cast<size_t>(::_lwp_self());
#elif defined(__OpenBSD__)
return static_cast<size_t>(::getthrid());
#elif defined(__sun)
return static_cast<size_t>(::thr_self());
#elif __APPLE__
uint64_t tid;
pthread_threadid_np(nullptr, &tid);
return static_cast<size_t>(tid);
#else // Default to standard C++11 (other Unix)
return static_cast<size_t>(std::hash<std::thread::id>()(std::this_thread::get_id()));
#endif
}
// Return current thread id as size_t (from thread local storage)
SPDLOG_INLINE size_t thread_id() SPDLOG_NOEXCEPT
{
#if defined(SPDLOG_NO_TLS)
return _thread_id();
#else // cache thread id in tls
static thread_local const size_t tid = _thread_id();
return tid;
#endif
}
// This is avoid msvc issue in sleep_for that happens if the clock changes.
// See https://github.com/gabime/spdlog/issues/609
SPDLOG_INLINE void sleep_for_millis(int milliseconds) SPDLOG_NOEXCEPT
{
#if defined(_WIN32)
::Sleep(milliseconds);
#else
std::this_thread::sleep_for(std::chrono::milliseconds(milliseconds));
#endif
}
// wchar support for windows file names (SPDLOG_WCHAR_FILENAMES must be defined)
#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
SPDLOG_INLINE std::string filename_to_str(const filename_t &filename)
{
memory_buf_t buf;
wstr_to_utf8buf(filename, buf);
return fmt::to_string(buf);
}
#else
SPDLOG_INLINE std::string filename_to_str(const filename_t &filename)
{
return filename;
}
#endif
SPDLOG_INLINE int pid() SPDLOG_NOEXCEPT
{
#ifdef _WIN32
return static_cast<int>(::GetCurrentProcessId());
#else
return static_cast<int>(::getpid());
#endif
}
// Determine if the terminal supports colors
// Source: https://github.com/agauniyal/rang/
SPDLOG_INLINE bool is_color_terminal() SPDLOG_NOEXCEPT
{
#ifdef _WIN32
return true;
#else
static constexpr std::array<const char *, 14> Terms = {
{"ansi", "color", "console", "cygwin", "gnome", "konsole", "kterm", "linux", "msys", "putty", "rxvt", "screen", "vt100", "xterm"}};
const char *env_p = std::getenv("TERM");
if (env_p == nullptr)
{
return false;
}
static const bool result =
std::any_of(std::begin(Terms), std::end(Terms), [&](const char *term) { return std::strstr(env_p, term) != nullptr; });
return result;
#endif
}
// Detrmine if the terminal attached
// Source: https://github.com/agauniyal/rang/
SPDLOG_INLINE bool in_terminal(FILE *file) SPDLOG_NOEXCEPT
{
#ifdef _WIN32
return ::_isatty(_fileno(file)) != 0;
#else
return ::isatty(fileno(file)) != 0;
#endif
}
#if (defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) || defined(SPDLOG_WCHAR_FILENAMES)) && defined(_WIN32)
SPDLOG_INLINE void wstr_to_utf8buf(wstring_view_t wstr, memory_buf_t &target)
{
if (wstr.size() > static_cast<size_t>((std::numeric_limits<int>::max)()))
{
SPDLOG_THROW(spdlog::spdlog_ex("UTF-16 string is too big to be converted to UTF-8"));
}
int wstr_size = static_cast<int>(wstr.size());
if (wstr_size == 0)
{
target.resize(0);
return;
}
int result_size = static_cast<int>(target.capacity());
if ((wstr_size + 1) * 2 > result_size)
{
result_size = ::WideCharToMultiByte(CP_UTF8, 0, wstr.data(), wstr_size, NULL, 0, NULL, NULL);
}
if (result_size > 0)
{
target.resize(result_size);
result_size = ::WideCharToMultiByte(CP_UTF8, 0, wstr.data(), wstr_size, target.data(), result_size, NULL, NULL);
if (result_size > 0)
{
target.resize(result_size);
return;
}
}
SPDLOG_THROW(spdlog::spdlog_ex(fmt::format("WideCharToMultiByte failed. Last error: {}", ::GetLastError())));
}
#endif // (defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) || defined(SPDLOG_WCHAR_FILENAMES)) && defined(_WIN32)
// return true on success
static SPDLOG_INLINE bool mkdir_(const filename_t &path)
{
#ifdef _WIN32
#ifdef SPDLOG_WCHAR_FILENAMES
return ::_wmkdir(path.c_str()) == 0;
#else
return ::_mkdir(path.c_str()) == 0;
#endif
#else
return ::mkdir(path.c_str(), mode_t(0755)) == 0;
#endif
}
// create the given directory - and all directories leading to it
// return true on success or if the directory already exists
SPDLOG_INLINE bool create_dir(filename_t path)
{
if (path_exists(path))
{
return true;
}
if (path.empty())
{
return false;
}
#ifdef _WIN32
// support forward slash in windows
std::replace(path.begin(), path.end(), '/', folder_sep);
#endif
size_t search_offset = 0;
do
{
auto token_pos = path.find(folder_sep, search_offset);
// treat the entire path as a folder if no folder separator not found
if (token_pos == filename_t::npos)
{
token_pos = path.size();
}
auto subdir = path.substr(0, token_pos);
if (!subdir.empty() && !path_exists(subdir) && !mkdir_(subdir))
{
return false; // return error if failed creating dir
}
search_offset = token_pos + 1;
} while (search_offset < path.size());
return true;
}
// Return directory name from given path or empty string
// "abc/file" => "abc"
// "abc/" => "abc"
// "abc" => ""
// "abc///" => "abc//"
SPDLOG_INLINE filename_t dir_name(filename_t path)
{
#ifdef _WIN32
// support forward slash in windows
std::replace(path.begin(), path.end(), '/', folder_sep);
#endif
auto pos = path.find_last_of(folder_sep);
return pos != filename_t::npos ? path.substr(0, pos) : filename_t{};
}
} // namespace os
} // namespace details
} // namespace spdlog

View File

@@ -1,137 +1,27 @@
//
// Copyright(c) 2015 Gabi Melman.
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
#pragma once
#include <spdlog/common.h>
#include <ctime> // std::time_t
#include <cstdio>
#include <ctime>
#include <functional>
#include <string>
#include <chrono>
#include <thread>
#include <stdio.h>
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
namespace spdlog {
namespace details {
namespace os {
#ifdef _WIN32
spdlog::log_clock::time_point now() SPDLOG_NOEXCEPT;
#ifndef NOMINMAX
#define NOMINMAX //prevent windows redefining min/max
#endif
std::tm localtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT;
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <process.h> // _get_pid support
#include <io.h> // _get_osfhandle support
std::tm localtime() SPDLOG_NOEXCEPT;
#ifdef __MINGW32__
#include <share.h>
#endif
std::tm gmtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT;
#else // unix
#include <unistd.h>
#include <fcntl.h>
#ifdef __linux__
#include <sys/syscall.h> //Use gettid() syscall under linux to get thread id
#elif __FreeBSD__
#include <sys/thr.h> //Use thr_self() syscall under FreeBSD to get thread id
#endif
#endif //unix
#ifndef __has_feature // Clang - feature checking macros.
#define __has_feature(x) 0 // Compatibility with non-clang compilers.
#endif
namespace spdlog
{
namespace details
{
namespace os
{
inline spdlog::log_clock::time_point now()
{
#if defined __linux__ && defined SPDLOG_CLOCK_COARSE
timespec ts;
::clock_gettime(CLOCK_REALTIME_COARSE, &ts);
return std::chrono::time_point<log_clock, typename log_clock::duration>(
std::chrono::duration_cast<typename log_clock::duration>(
std::chrono::seconds(ts.tv_sec) + std::chrono::nanoseconds(ts.tv_nsec)));
#else
return log_clock::now();
#endif
}
inline std::tm localtime(const std::time_t &time_tt)
{
#ifdef _WIN32
std::tm tm;
localtime_s(&tm, &time_tt);
#else
std::tm tm;
localtime_r(&time_tt, &tm);
#endif
return tm;
}
inline std::tm localtime()
{
std::time_t now_t = time(nullptr);
return localtime(now_t);
}
inline std::tm gmtime(const std::time_t &time_tt)
{
#ifdef _WIN32
std::tm tm;
gmtime_s(&tm, &time_tt);
#else
std::tm tm;
gmtime_r(&time_tt, &tm);
#endif
return tm;
}
inline std::tm gmtime()
{
std::time_t now_t = time(nullptr);
return gmtime(now_t);
}
inline bool operator==(const std::tm& tm1, const std::tm& tm2)
{
return (tm1.tm_sec == tm2.tm_sec &&
tm1.tm_min == tm2.tm_min &&
tm1.tm_hour == tm2.tm_hour &&
tm1.tm_mday == tm2.tm_mday &&
tm1.tm_mon == tm2.tm_mon &&
tm1.tm_year == tm2.tm_year &&
tm1.tm_isdst == tm2.tm_isdst);
}
inline bool operator!=(const std::tm& tm1, const std::tm& tm2)
{
return !(tm1 == tm2);
}
std::tm gmtime() SPDLOG_NOEXCEPT;
// eol definition
#if !defined (SPDLOG_EOL)
#if !defined(SPDLOG_EOL)
#ifdef _WIN32
#define SPDLOG_EOL "\r\n"
#else
@@ -139,268 +29,83 @@ inline bool operator!=(const std::tm& tm1, const std::tm& tm2)
#endif
#endif
SPDLOG_CONSTEXPR static const char* eol = SPDLOG_EOL;
SPDLOG_CONSTEXPR static int eol_size = sizeof(SPDLOG_EOL) - 1;
SPDLOG_CONSTEXPR static const char *default_eol = SPDLOG_EOL;
inline void prevent_child_fd(FILE *f)
{
// folder separator
#ifdef _WIN32
auto file_handle = (HANDLE)_get_osfhandle(_fileno(f));
if (!::SetHandleInformation(file_handle, HANDLE_FLAG_INHERIT, 0))
throw spdlog_ex("SetHandleInformation failed", errno);
static const char folder_sep = '\\';
#else
auto fd = fileno(f);
if(fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
throw spdlog_ex("fcntl with FD_CLOEXEC failed", errno);
#endif
}
//fopen_s on non windows for writing
inline int fopen_s(FILE** fp, const filename_t& filename, const filename_t& mode)
{
#ifdef _WIN32
#ifdef SPDLOG_WCHAR_FILENAMES
*fp = _wfsopen((filename.c_str()), mode.c_str(), _SH_DENYWR);
#else
*fp = _fsopen((filename.c_str()), mode.c_str(), _SH_DENYWR);
#endif
#else //unix
*fp = fopen((filename.c_str()), mode.c_str());
SPDLOG_CONSTEXPR static const char folder_sep = '/';
#endif
#ifdef SPDLOG_PREVENT_CHILD_FD
if(*fp != nullptr)
prevent_child_fd(*fp);
#endif
return *fp == nullptr;
}
inline int remove(const filename_t &filename)
{
#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
return _wremove(filename.c_str());
#else
return std::remove(filename.c_str());
#endif
}
inline int rename(const filename_t& filename1, const filename_t& filename2)
{
#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
return _wrename(filename1.c_str(), filename2.c_str());
#else
return std::rename(filename1.c_str(), filename2.c_str());
#endif
}
//Return if file exists
inline bool file_exists(const filename_t& filename)
{
#ifdef _WIN32
#ifdef SPDLOG_WCHAR_FILENAMES
auto attribs = GetFileAttributesW(filename.c_str());
#else
auto attribs = GetFileAttributesA(filename.c_str());
#endif
return (attribs != INVALID_FILE_ATTRIBUTES && !(attribs & FILE_ATTRIBUTE_DIRECTORY));
#else //common linux/unix all have the stat system call
struct stat buffer;
return (stat (filename.c_str(), &buffer) == 0);
#endif
}
//Return file size according to open FILE* object
inline size_t filesize(FILE *f)
{
if (f == nullptr)
throw spdlog_ex("Failed getting file size. fd is null");
#ifdef _WIN32
int fd = _fileno(f);
#if _WIN64 //64 bits
struct _stat64 st;
if (_fstat64(fd, &st) == 0)
return st.st_size;
#else //windows 32 bits
long ret = _filelength(fd);
if (ret >= 0)
return static_cast<size_t>(ret);
void prevent_child_fd(FILE *f);
#endif
#else // unix
int fd = fileno(f);
//64 bits(but not in osx, where fstat64 is deprecated)
#if !defined(__FreeBSD__) && !defined(__APPLE__) && (defined(__x86_64__) || defined(__ppc64__))
struct stat64 st;
if (fstat64(fd, &st) == 0)
return static_cast<size_t>(st.st_size);
#else // unix 32 bits or osx
struct stat st;
if (fstat(fd, &st) == 0)
return static_cast<size_t>(st.st_size);
#endif
#endif
throw spdlog_ex("Failed getting file size from fd", errno);
}
// fopen_s on non windows for writing
bool fopen_s(FILE **fp, const filename_t &filename, const filename_t &mode);
// Remove filename. return 0 on success
int remove(const filename_t &filename) SPDLOG_NOEXCEPT;
// Remove file if exists. return 0 on success
// Note: Non atomic (might return failure to delete if concurrently deleted by other process/thread)
int remove_if_exists(const filename_t &filename) SPDLOG_NOEXCEPT;
int rename(const filename_t &filename1, const filename_t &filename2) SPDLOG_NOEXCEPT;
//Return utc offset in minutes or throw spdlog_ex on failure
inline int utc_minutes_offset(const std::tm& tm = details::os::localtime())
{
// Return if file exists.
bool path_exists(const filename_t &filename) SPDLOG_NOEXCEPT;
#ifdef _WIN32
#if _WIN32_WINNT < _WIN32_WINNT_WS08
TIME_ZONE_INFORMATION tzinfo;
auto rv = GetTimeZoneInformation(&tzinfo);
#else
DYNAMIC_TIME_ZONE_INFORMATION tzinfo;
auto rv = GetDynamicTimeZoneInformation(&tzinfo);
#endif
if (rv == TIME_ZONE_ID_INVALID)
throw spdlog::spdlog_ex("Failed getting timezone info. ", errno);
// Return file size according to open FILE* object
size_t filesize(FILE *f);
int offset = -tzinfo.Bias;
if (tm.tm_isdst)
offset -= tzinfo.DaylightBias;
else
offset -= tzinfo.StandardBias;
return offset;
#else
// Return utc offset in minutes or throw spdlog_ex on failure
int utc_minutes_offset(const std::tm &tm = details::os::localtime());
#if defined(sun) || defined(__sun)
// 'tm_gmtoff' field is BSD extension and it's missing on SunOS/Solaris
struct helper
{
static long int calculate_gmt_offset(const std::tm & localtm = details::os::localtime(), const std::tm & gmtm = details::os::gmtime())
{
int local_year = localtm.tm_year + (1900 - 1);
int gmt_year = gmtm.tm_year + (1900 - 1);
// Return current thread id as size_t
// It exists because the std::this_thread::get_id() is much slower(especially
// under VS 2013)
size_t _thread_id() SPDLOG_NOEXCEPT;
long int days = (
// difference in day of year
localtm.tm_yday - gmtm.tm_yday
// Return current thread id as size_t (from thread local storage)
size_t thread_id() SPDLOG_NOEXCEPT;
// + intervening leap days
+ ((local_year >> 2) - (gmt_year >> 2))
- (local_year / 100 - gmt_year / 100)
+ ((local_year / 100 >> 2) - (gmt_year / 100 >> 2))
// This is avoid msvc issue in sleep_for that happens if the clock changes.
// See https://github.com/gabime/spdlog/issues/609
void sleep_for_millis(int milliseconds) SPDLOG_NOEXCEPT;
// + difference in years * 365 */
+ (long int)(local_year - gmt_year) * 365
);
std::string filename_to_str(const filename_t &filename);
long int hours = (24 * days) + (localtm.tm_hour - gmtm.tm_hour);
long int mins = (60 * hours) + (localtm.tm_min - gmtm.tm_min);
long int secs = (60 * mins) + (localtm.tm_sec - gmtm.tm_sec);
int pid() SPDLOG_NOEXCEPT;
return secs;
}
};
// Determine if the terminal supports colors
// Source: https://github.com/agauniyal/rang/
bool is_color_terminal() SPDLOG_NOEXCEPT;
long int offset_seconds = helper::calculate_gmt_offset(tm);
#else
long int offset_seconds = tm.tm_gmtoff;
// Determine if the terminal attached
// Source: https://github.com/agauniyal/rang/
bool in_terminal(FILE *file) SPDLOG_NOEXCEPT;
#if (defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) || defined(SPDLOG_WCHAR_FILENAMES)) && defined(_WIN32)
void wstr_to_utf8buf(wstring_view_t wstr, memory_buf_t &target);
#endif
return static_cast<int>(offset_seconds / 60);
// Return directory name from given path or empty string
// "abc/file" => "abc"
// "abc/" => "abc"
// "abc" => ""
// "abc///" => "abc//"
filename_t dir_name(filename_t path);
// Create a dir from the given path.
// Return true if succeeded or if this dir already exists.
bool create_dir(filename_t path);
} // namespace os
} // namespace details
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
#include "os-inl.h"
#endif
}
//Return current thread id as size_t
//It exists because the std::this_thread::get_id() is much slower(espcially under VS 2013)
inline size_t _thread_id()
{
#ifdef _WIN32
return static_cast<size_t>(::GetCurrentThreadId());
#elif __linux__
# if defined(__ANDROID__) && defined(__ANDROID_API__) && (__ANDROID_API__ < 21)
# define SYS_gettid __NR_gettid
# endif
return static_cast<size_t>(syscall(SYS_gettid));
#elif __FreeBSD__
long tid;
thr_self(&tid);
return static_cast<size_t>(tid);
#else //Default to standard C++11 (OSX and other Unix)
return static_cast<size_t>(std::hash<std::thread::id>()(std::this_thread::get_id()));
#endif
}
//Return current thread id as size_t (from thread local storage)
inline size_t thread_id()
{
#if defined(_MSC_VER) && (_MSC_VER < 1900) || defined(__clang__) && !__has_feature(cxx_thread_local)
return _thread_id();
#else
static thread_local const size_t tid = _thread_id();
return tid;
#endif
}
// wchar support for windows file names (SPDLOG_WCHAR_FILENAMES must be defined)
#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
#define SPDLOG_FILENAME_T(s) L ## s
inline std::string filename_to_str(const filename_t& filename)
{
std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> c;
return c.to_bytes(filename);
}
#else
#define SPDLOG_FILENAME_T(s) s
inline std::string filename_to_str(const filename_t& filename)
{
return filename;
}
#endif
// Return errno string (thread safe)
inline std::string errno_str(int err_num)
{
char buf[256];
SPDLOG_CONSTEXPR auto buf_size = sizeof(buf);
#ifdef _WIN32
if(strerror_s(buf, buf_size, err_num) == 0)
return std::string(buf);
else
return "Unkown error";
#elif defined(__FreeBSD__) || defined(__APPLE__) || defined(ANDROID) || defined(__SUNPRO_CC) || \
((_POSIX_C_SOURCE >= 200112L) && ! defined(_GNU_SOURCE)) // posix version
if (strerror_r(err_num, buf, buf_size) == 0)
return std::string(buf);
else
return "Unkown error";
#else // gnu version (might not use the given buf, so its retval pointer must be used)
return std::string(strerror_r(err_num, buf, buf_size));
#endif
}
inline int pid()
{
#ifdef _WIN32
return ::_getpid();
#else
return static_cast<int>(::getpid());
#endif
}
} //os
} //details
} //spdlog

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,103 @@
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
#pragma once
#include <spdlog/common.h>
#include <spdlog/details/log_msg.h>
#include <spdlog/details/os.h>
#include <spdlog/formatter.h>
#include <chrono>
#include <ctime>
#include <memory>
#include <string>
#include <vector>
namespace spdlog {
namespace details {
// padding information.
struct padding_info
{
enum pad_side
{
left,
right,
center
};
padding_info() = default;
padding_info(size_t width, padding_info::pad_side side, bool truncate)
: width_(width)
, side_(side)
, truncate_(truncate)
, enabled_(true)
{}
bool enabled() const
{
return enabled_;
}
const size_t width_ = 0;
const pad_side side_ = left;
bool truncate_ = false;
bool enabled_ = false;
};
class flag_formatter
{
public:
explicit flag_formatter(padding_info padinfo)
: padinfo_(padinfo)
{}
flag_formatter() = default;
virtual ~flag_formatter() = default;
virtual void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) = 0;
protected:
padding_info padinfo_;
};
} // namespace details
class pattern_formatter final : public formatter
{
public:
explicit pattern_formatter(
std::string pattern, pattern_time_type time_type = pattern_time_type::local, std::string eol = spdlog::details::os::default_eol);
// use default pattern is not given
explicit pattern_formatter(pattern_time_type time_type = pattern_time_type::local, std::string eol = spdlog::details::os::default_eol);
pattern_formatter(const pattern_formatter &other) = delete;
pattern_formatter &operator=(const pattern_formatter &other) = delete;
std::unique_ptr<formatter> clone() const override;
void format(const details::log_msg &msg, memory_buf_t &dest) override;
private:
std::string pattern_;
std::string eol_;
pattern_time_type pattern_time_type_;
std::tm cached_tm_;
std::chrono::seconds last_log_secs_;
std::vector<std::unique_ptr<details::flag_formatter>> formatters_;
std::tm get_time_(const details::log_msg &msg);
template<typename Padder>
void handle_flag_(char flag, details::padding_info padding);
// Extract given pad spec (e.g. %8X)
// Advance the given it pass the end of the padding spec found (if any)
// Return padding.
details::padding_info handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end);
void compile_pattern_(const std::string &pattern);
};
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
#include "pattern_formatter-inl.h"
#endif

View File

@@ -1,670 +0,0 @@
//
// Copyright(c) 2015 Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
#pragma once
#include <spdlog/formatter.h>
#include <spdlog/details/log_msg.h>
#include <spdlog/details/os.h>
#include <spdlog/fmt/fmt.h>
#include <chrono>
#include <ctime>
#include <memory>
#include <mutex>
#include <string>
#include <thread>
#include <utility>
#include <vector>
#include <array>
namespace spdlog
{
namespace details
{
class flag_formatter
{
public:
virtual ~flag_formatter()
{}
virtual void format(details::log_msg& msg, const std::tm& tm_time) = 0;
};
///////////////////////////////////////////////////////////////////////
// name & level pattern appenders
///////////////////////////////////////////////////////////////////////
namespace
{
class name_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm&) override
{
msg.formatted << *msg.logger_name;
}
};
}
// log level appender
class level_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm&) override
{
msg.formatted << level::to_str(msg.level);
}
};
// short log level appender
class short_level_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm&) override
{
msg.formatted << level::to_short_str(msg.level);
}
};
///////////////////////////////////////////////////////////////////////
// Date time pattern appenders
///////////////////////////////////////////////////////////////////////
static const char* ampm(const tm& t)
{
return t.tm_hour >= 12 ? "PM" : "AM";
}
static int to12h(const tm& t)
{
return t.tm_hour > 12 ? t.tm_hour - 12 : t.tm_hour;
}
//Abbreviated weekday name
using days_array = std::array<std::string, 7>;
static const days_array& days()
{
static const days_array arr{ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
return arr;
}
class a_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm& tm_time) override
{
msg.formatted << days()[tm_time.tm_wday];
}
};
//Full weekday name
static const days_array& full_days()
{
static const days_array arr{ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" };
return arr;
}
class A_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm& tm_time) override
{
msg.formatted << full_days()[tm_time.tm_wday];
}
};
//Abbreviated month
using months_array = std::array<std::string, 12>;
static const months_array& months()
{
static const months_array arr{ "Jan", "Feb", "Mar", "Apr", "May", "June", "July", "Aug", "Sept", "Oct", "Nov", "Dec" };
return arr;
}
class b_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm& tm_time) override
{
msg.formatted << months()[tm_time.tm_mon];
}
};
//Full month name
static const months_array& full_months()
{
static const months_array arr{ "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" };
return arr;
}
class B_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm& tm_time) override
{
msg.formatted << full_months()[tm_time.tm_mon];
}
};
//write 2 ints seperated by sep with padding of 2
static fmt::MemoryWriter& pad_n_join(fmt::MemoryWriter& w, int v1, int v2, char sep)
{
w << fmt::pad(v1, 2, '0') << sep << fmt::pad(v2, 2, '0');
return w;
}
//write 3 ints seperated by sep with padding of 2
static fmt::MemoryWriter& pad_n_join(fmt::MemoryWriter& w, int v1, int v2, int v3, char sep)
{
w << fmt::pad(v1, 2, '0') << sep << fmt::pad(v2, 2, '0') << sep << fmt::pad(v3, 2, '0');
return w;
}
//Date and time representation (Thu Aug 23 15:35:46 2014)
class c_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm& tm_time) override
{
msg.formatted << days()[tm_time.tm_wday] << ' ' << months()[tm_time.tm_mon] << ' ' << tm_time.tm_mday << ' ';
pad_n_join(msg.formatted, tm_time.tm_hour, tm_time.tm_min, tm_time.tm_sec, ':') << ' ' << tm_time.tm_year + 1900;
}
};
// year - 2 digit
class C_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm& tm_time) override
{
msg.formatted << fmt::pad(tm_time.tm_year % 100, 2, '0');
}
};
// Short MM/DD/YY date, equivalent to %m/%d/%y 08/23/01
class D_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm& tm_time) override
{
pad_n_join(msg.formatted, tm_time.tm_mon + 1, tm_time.tm_mday, tm_time.tm_year % 100, '/');
}
};
// year - 4 digit
class Y_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm& tm_time) override
{
msg.formatted << tm_time.tm_year + 1900;
}
};
// month 1-12
class m_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm& tm_time) override
{
msg.formatted << fmt::pad(tm_time.tm_mon + 1, 2, '0');
}
};
// day of month 1-31
class d_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm& tm_time) override
{
msg.formatted << fmt::pad(tm_time.tm_mday, 2, '0');
}
};
// hours in 24 format 0-23
class H_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm& tm_time) override
{
msg.formatted << fmt::pad(tm_time.tm_hour, 2, '0');
}
};
// hours in 12 format 1-12
class I_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm& tm_time) override
{
msg.formatted << fmt::pad(to12h(tm_time), 2, '0');
}
};
// minutes 0-59
class M_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm& tm_time) override
{
msg.formatted << fmt::pad(tm_time.tm_min, 2, '0');
}
};
// seconds 0-59
class S_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm& tm_time) override
{
msg.formatted << fmt::pad(tm_time.tm_sec, 2, '0');
}
};
// milliseconds
class e_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm&) override
{
auto duration = msg.time.time_since_epoch();
auto millis = std::chrono::duration_cast<std::chrono::milliseconds>(duration).count() % 1000;
msg.formatted << fmt::pad(static_cast<int>(millis), 3, '0');
}
};
// microseconds
class f_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm&) override
{
auto duration = msg.time.time_since_epoch();
auto micros = std::chrono::duration_cast<std::chrono::microseconds>(duration).count() % 1000000;
msg.formatted << fmt::pad(static_cast<int>(micros), 6, '0');
}
};
// nanoseconds
class F_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm&) override
{
auto duration = msg.time.time_since_epoch();
auto ns = std::chrono::duration_cast<std::chrono::nanoseconds>(duration).count() % 1000000000;
msg.formatted << fmt::pad(static_cast<int>(ns), 9, '0');
}
};
// AM/PM
class p_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm& tm_time) override
{
msg.formatted << ampm(tm_time);
}
};
// 12 hour clock 02:55:02 pm
class r_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm& tm_time) override
{
pad_n_join(msg.formatted, to12h(tm_time), tm_time.tm_min, tm_time.tm_sec, ':') << ' ' << ampm(tm_time);
}
};
// 24-hour HH:MM time, equivalent to %H:%M
class R_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm& tm_time) override
{
pad_n_join(msg.formatted, tm_time.tm_hour, tm_time.tm_min, ':');
}
};
// ISO 8601 time format (HH:MM:SS), equivalent to %H:%M:%S
class T_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm& tm_time) override
{
pad_n_join(msg.formatted, tm_time.tm_hour, tm_time.tm_min, tm_time.tm_sec, ':');
}
};
// ISO 8601 offset from UTC in timezone (+-HH:MM)
class z_formatter:public flag_formatter
{
public:
const std::chrono::seconds cache_refresh = std::chrono::seconds(5);
z_formatter():_last_update(std::chrono::seconds(0))
{}
z_formatter(const z_formatter&) = delete;
z_formatter& operator=(const z_formatter&) = delete;
void format(details::log_msg& msg, const std::tm& tm_time) override
{
#ifdef _WIN32
int total_minutes = get_cached_offset(msg, tm_time);
#else
// No need to chache under gcc,
// it is very fast (already stored in tm.tm_gmtoff)
int total_minutes = os::utc_minutes_offset(tm_time);
#endif
bool is_negative = total_minutes < 0;
char sign;
if (is_negative)
{
total_minutes = -total_minutes;
sign = '-';
}
else
{
sign = '+';
}
int h = total_minutes / 60;
int m = total_minutes % 60;
msg.formatted << sign;
pad_n_join(msg.formatted, h, m, ':');
}
private:
log_clock::time_point _last_update;
int _offset_minutes;
std::mutex _mutex;
int get_cached_offset(const log_msg& msg, const std::tm& tm_time)
{
using namespace std::chrono;
std::lock_guard<std::mutex> l(_mutex);
if (msg.time - _last_update >= cache_refresh)
{
_offset_minutes = os::utc_minutes_offset(tm_time);
_last_update = msg.time;
}
return _offset_minutes;
}
};
// Thread id
class t_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm&) override
{
msg.formatted << msg.thread_id;
}
};
// Current pid
class pid_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm&) override
{
msg.formatted << details::os::pid();
}
};
class v_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm&) override
{
msg.formatted << fmt::StringRef(msg.raw.data(), msg.raw.size());
}
};
class ch_formatter:public flag_formatter
{
public:
explicit ch_formatter(char ch): _ch(ch)
{}
void format(details::log_msg& msg, const std::tm&) override
{
msg.formatted << _ch;
}
private:
char _ch;
};
//aggregate user chars to display as is
class aggregate_formatter:public flag_formatter
{
public:
aggregate_formatter()
{}
void add_ch(char ch)
{
_str += ch;
}
void format(details::log_msg& msg, const std::tm&) override
{
msg.formatted << _str;
}
private:
std::string _str;
};
// Full info formatter
// pattern: [%Y-%m-%d %H:%M:%S.%e] [%n] [%l] %v
class full_formatter:public flag_formatter
{
void format(details::log_msg& msg, const std::tm& tm_time) override
{
#ifndef SPDLOG_NO_DATETIME
auto duration = msg.time.time_since_epoch();
auto millis = std::chrono::duration_cast<std::chrono::milliseconds>(duration).count() % 1000;
/* Slower version(while still very fast - about 3.2 million lines/sec under 10 threads),
msg.formatted.write("[{:d}-{:02d}-{:02d} {:02d}:{:02d}:{:02d}.{:03d}] [{}] [{}] {} ",
tm_time.tm_year + 1900,
tm_time.tm_mon + 1,
tm_time.tm_mday,
tm_time.tm_hour,
tm_time.tm_min,
tm_time.tm_sec,
static_cast<int>(millis),
msg.logger_name,
level::to_str(msg.level),
msg.raw.str());*/
// Faster (albeit uglier) way to format the line (5.6 million lines/sec under 10 threads)
msg.formatted << '[' << static_cast<unsigned int>(tm_time.tm_year + 1900) << '-'
<< fmt::pad(static_cast<unsigned int>(tm_time.tm_mon + 1), 2, '0') << '-'
<< fmt::pad(static_cast<unsigned int>(tm_time.tm_mday), 2, '0') << ' '
<< fmt::pad(static_cast<unsigned int>(tm_time.tm_hour), 2, '0') << ':'
<< fmt::pad(static_cast<unsigned int>(tm_time.tm_min), 2, '0') << ':'
<< fmt::pad(static_cast<unsigned int>(tm_time.tm_sec), 2, '0') << '.'
<< fmt::pad(static_cast<unsigned int>(millis), 3, '0') << "] ";
//no datetime needed
#else
(void)tm_time;
#endif
#ifndef SPDLOG_NO_NAME
msg.formatted << '[' << *msg.logger_name << "] ";
#endif
msg.formatted << '[' << level::to_str(msg.level) << "] ";
msg.formatted << fmt::StringRef(msg.raw.data(), msg.raw.size());
}
};
}
}
///////////////////////////////////////////////////////////////////////////////
// pattern_formatter inline impl
///////////////////////////////////////////////////////////////////////////////
inline spdlog::pattern_formatter::pattern_formatter(const std::string& pattern)
{
compile_pattern(pattern);
}
inline void spdlog::pattern_formatter::compile_pattern(const std::string& pattern)
{
auto end = pattern.end();
std::unique_ptr<details::aggregate_formatter> user_chars;
for (auto it = pattern.begin(); it != end; ++it)
{
if (*it == '%')
{
if (user_chars) //append user chars found so far
_formatters.push_back(std::move(user_chars));
if (++it != end)
handle_flag(*it);
else
break;
}
else // chars not following the % sign should be displayed as is
{
if (!user_chars)
user_chars = std::unique_ptr<details::aggregate_formatter>(new details::aggregate_formatter());
user_chars->add_ch(*it);
}
}
if (user_chars) //append raw chars found so far
{
_formatters.push_back(std::move(user_chars));
}
}
inline void spdlog::pattern_formatter::handle_flag(char flag)
{
switch (flag)
{
// logger name
case 'n':
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::name_formatter()));
break;
case 'l':
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::level_formatter()));
break;
case 'L':
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::short_level_formatter()));
break;
case('t'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::t_formatter()));
break;
case('v'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::v_formatter()));
break;
case('a'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::a_formatter()));
break;
case('A'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::A_formatter()));
break;
case('b'):
case('h'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::b_formatter()));
break;
case('B'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::B_formatter()));
break;
case('c'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::c_formatter()));
break;
case('C'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::C_formatter()));
break;
case('Y'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::Y_formatter()));
break;
case('D'):
case('x'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::D_formatter()));
break;
case('m'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::m_formatter()));
break;
case('d'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::d_formatter()));
break;
case('H'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::H_formatter()));
break;
case('I'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::I_formatter()));
break;
case('M'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::M_formatter()));
break;
case('S'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::S_formatter()));
break;
case('e'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::e_formatter()));
break;
case('f'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::f_formatter()));
break;
case('F'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::F_formatter()));
break;
case('p'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::p_formatter()));
break;
case('r'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::r_formatter()));
break;
case('R'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::R_formatter()));
break;
case('T'):
case('X'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::T_formatter()));
break;
case('z'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::z_formatter()));
break;
case ('+'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::full_formatter()));
break;
case ('P'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::pid_formatter()));
break;
default: //Unkown flag appears as is
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::ch_formatter('%')));
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::ch_formatter(flag)));
break;
}
}
inline void spdlog::pattern_formatter::format(details::log_msg& msg)
{
#ifndef SPDLOG_NO_DATETIME
auto tm_time = details::os::localtime(log_clock::to_time_t(msg.time));
#else
std::tm tm_time;
#endif
for (auto &f : _formatters)
{
f->format(msg, tm_time);
}
//write eol
msg.formatted.write(details::os::eol, details::os::eol_size);
}

View File

@@ -0,0 +1,49 @@
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
#pragma once
#ifndef SPDLOG_HEADER_ONLY
#include <spdlog/details/periodic_worker.h>
#endif
namespace spdlog {
namespace details {
SPDLOG_INLINE periodic_worker::periodic_worker(const std::function<void()> &callback_fun, std::chrono::seconds interval)
{
active_ = (interval > std::chrono::seconds::zero());
if (!active_)
{
return;
}
worker_thread_ = std::thread([this, callback_fun, interval]() {
for (;;)
{
std::unique_lock<std::mutex> lock(this->mutex_);
if (this->cv_.wait_for(lock, interval, [this] { return !this->active_; }))
{
return; // active_ == false, so exit this thread
}
callback_fun();
}
});
}
// stop the worker thread and join it
SPDLOG_INLINE periodic_worker::~periodic_worker()
{
if (worker_thread_.joinable())
{
{
std::lock_guard<std::mutex> lock(mutex_);
active_ = false;
}
cv_.notify_one();
worker_thread_.join();
}
}
} // namespace details
} // namespace spdlog

View File

@@ -0,0 +1,40 @@
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
#pragma once
// periodic worker thread - periodically executes the given callback function.
//
// RAII over the owned thread:
// creates the thread on construction.
// stops and joins the thread on destruction (if the thread is executing a callback, wait for it to finish first).
#include <chrono>
#include <condition_variable>
#include <functional>
#include <mutex>
#include <thread>
namespace spdlog {
namespace details {
class periodic_worker
{
public:
periodic_worker(const std::function<void()> &callback_fun, std::chrono::seconds interval);
periodic_worker(const periodic_worker &) = delete;
periodic_worker &operator=(const periodic_worker &) = delete;
// stop the worker thread and join it
~periodic_worker();
private:
bool active_;
std::thread worker_thread_;
std::mutex mutex_;
std::condition_variable cv_;
};
} // namespace details
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
#include "periodic_worker-inl.h"
#endif

View File

@@ -0,0 +1,284 @@
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
#pragma once
#ifndef SPDLOG_HEADER_ONLY
#include <spdlog/details/registry.h>
#endif
#include <spdlog/common.h>
#include <spdlog/details/periodic_worker.h>
#include <spdlog/logger.h>
#include <spdlog/details/pattern_formatter.h>
#ifndef SPDLOG_DISABLE_DEFAULT_LOGGER
// support for the default stdout color logger
#ifdef _WIN32
#include <spdlog/sinks/wincolor_sink.h>
#else
#include <spdlog/sinks/ansicolor_sink.h>
#endif
#endif // SPDLOG_DISABLE_DEFAULT_LOGGER
#include <chrono>
#include <functional>
#include <memory>
#include <string>
#include <unordered_map>
namespace spdlog {
namespace details {
SPDLOG_INLINE registry::registry()
: formatter_(new pattern_formatter())
{
#ifndef SPDLOG_DISABLE_DEFAULT_LOGGER
// create default logger (ansicolor_stdout_sink_mt or wincolor_stdout_sink_mt in windows).
#ifdef _WIN32
auto color_sink = std::make_shared<sinks::wincolor_stdout_sink_mt>();
#else
auto color_sink = std::make_shared<sinks::ansicolor_stdout_sink_mt>();
#endif
const char *default_logger_name = "";
default_logger_ = std::make_shared<spdlog::logger>(default_logger_name, std::move(color_sink));
loggers_[default_logger_name] = default_logger_;
#endif // SPDLOG_DISABLE_DEFAULT_LOGGER
}
SPDLOG_INLINE void registry::register_logger(std::shared_ptr<logger> new_logger)
{
std::lock_guard<std::mutex> lock(logger_map_mutex_);
register_logger_(std::move(new_logger));
}
SPDLOG_INLINE void registry::initialize_logger(std::shared_ptr<logger> new_logger)
{
std::lock_guard<std::mutex> lock(logger_map_mutex_);
new_logger->set_formatter(formatter_->clone());
if (err_handler_)
{
new_logger->set_error_handler(err_handler_);
}
new_logger->set_level(level_);
new_logger->flush_on(flush_level_);
if (backtrace_n_messages_ > 0)
{
new_logger->enable_backtrace(backtrace_n_messages_);
}
if (automatic_registration_)
{
register_logger_(std::move(new_logger));
}
}
SPDLOG_INLINE std::shared_ptr<logger> registry::get(const std::string &logger_name)
{
std::lock_guard<std::mutex> lock(logger_map_mutex_);
auto found = loggers_.find(logger_name);
return found == loggers_.end() ? nullptr : found->second;
}
SPDLOG_INLINE std::shared_ptr<logger> registry::default_logger()
{
std::lock_guard<std::mutex> lock(logger_map_mutex_);
return default_logger_;
}
// Return raw ptr to the default logger.
// To be used directly by the spdlog default api (e.g. spdlog::info)
// This make the default API faster, but cannot be used concurrently with set_default_logger().
// e.g do not call set_default_logger() from one thread while calling spdlog::info() from another.
SPDLOG_INLINE logger *registry::get_default_raw()
{
return default_logger_.get();
}
// set default logger.
// default logger is stored in default_logger_ (for faster retrieval) and in the loggers_ map.
SPDLOG_INLINE void registry::set_default_logger(std::shared_ptr<logger> new_default_logger)
{
std::lock_guard<std::mutex> lock(logger_map_mutex_);
// remove previous default logger from the map
if (default_logger_ != nullptr)
{
loggers_.erase(default_logger_->name());
}
if (new_default_logger != nullptr)
{
loggers_[new_default_logger->name()] = new_default_logger;
}
default_logger_ = std::move(new_default_logger);
}
SPDLOG_INLINE void registry::set_tp(std::shared_ptr<thread_pool> tp)
{
std::lock_guard<std::recursive_mutex> lock(tp_mutex_);
tp_ = std::move(tp);
}
SPDLOG_INLINE std::shared_ptr<thread_pool> registry::get_tp()
{
std::lock_guard<std::recursive_mutex> lock(tp_mutex_);
return tp_;
}
// Set global formatter. Each sink in each logger will get a clone of this object
SPDLOG_INLINE void registry::set_formatter(std::unique_ptr<formatter> formatter)
{
std::lock_guard<std::mutex> lock(logger_map_mutex_);
formatter_ = std::move(formatter);
for (auto &l : loggers_)
{
l.second->set_formatter(formatter_->clone());
}
}
SPDLOG_INLINE void registry::enable_backtrace(size_t n_messages)
{
std::lock_guard<std::mutex> lock(logger_map_mutex_);
backtrace_n_messages_ = n_messages;
for (auto &l : loggers_)
{
l.second->enable_backtrace(n_messages);
}
}
SPDLOG_INLINE void registry::disable_backtrace()
{
std::lock_guard<std::mutex> lock(logger_map_mutex_);
backtrace_n_messages_ = 0;
for (auto &l : loggers_)
{
l.second->disable_backtrace();
}
}
SPDLOG_INLINE void registry::set_level(level::level_enum log_level)
{
std::lock_guard<std::mutex> lock(logger_map_mutex_);
for (auto &l : loggers_)
{
l.second->set_level(log_level);
}
level_ = log_level;
}
SPDLOG_INLINE void registry::flush_on(level::level_enum log_level)
{
std::lock_guard<std::mutex> lock(logger_map_mutex_);
for (auto &l : loggers_)
{
l.second->flush_on(log_level);
}
flush_level_ = log_level;
}
SPDLOG_INLINE void registry::flush_every(std::chrono::seconds interval)
{
std::lock_guard<std::mutex> lock(flusher_mutex_);
std::function<void()> clbk = std::bind(&registry::flush_all, this);
periodic_flusher_ = details::make_unique<periodic_worker>(clbk, interval);
}
SPDLOG_INLINE void registry::set_error_handler(void (*handler)(const std::string &msg))
{
std::lock_guard<std::mutex> lock(logger_map_mutex_);
for (auto &l : loggers_)
{
l.second->set_error_handler(handler);
}
err_handler_ = handler;
}
SPDLOG_INLINE void registry::apply_all(const std::function<void(const std::shared_ptr<logger>)> &fun)
{
std::lock_guard<std::mutex> lock(logger_map_mutex_);
for (auto &l : loggers_)
{
fun(l.second);
}
}
SPDLOG_INLINE void registry::flush_all()
{
std::lock_guard<std::mutex> lock(logger_map_mutex_);
for (auto &l : loggers_)
{
l.second->flush();
}
}
SPDLOG_INLINE void registry::drop(const std::string &logger_name)
{
std::lock_guard<std::mutex> lock(logger_map_mutex_);
loggers_.erase(logger_name);
if (default_logger_ && default_logger_->name() == logger_name)
{
default_logger_.reset();
}
}
SPDLOG_INLINE void registry::drop_all()
{
std::lock_guard<std::mutex> lock(logger_map_mutex_);
loggers_.clear();
default_logger_.reset();
}
// clean all resources and threads started by the registry
SPDLOG_INLINE void registry::shutdown()
{
{
std::lock_guard<std::mutex> lock(flusher_mutex_);
periodic_flusher_.reset();
}
drop_all();
{
std::lock_guard<std::recursive_mutex> lock(tp_mutex_);
tp_.reset();
}
}
SPDLOG_INLINE std::recursive_mutex &registry::tp_mutex()
{
return tp_mutex_;
}
SPDLOG_INLINE void registry::set_automatic_registration(bool automatic_registration)
{
std::lock_guard<std::mutex> lock(logger_map_mutex_);
automatic_registration_ = automatic_registration;
}
SPDLOG_INLINE registry &registry::instance()
{
static registry s_instance;
return s_instance;
}
SPDLOG_INLINE void registry::throw_if_exists_(const std::string &logger_name)
{
if (loggers_.find(logger_name) != loggers_.end())
{
SPDLOG_THROW(spdlog_ex("logger with name '" + logger_name + "' already exists"));
}
}
SPDLOG_INLINE void registry::register_logger_(std::shared_ptr<logger> new_logger)
{
auto logger_name = new_logger->name();
throw_if_exists_(logger_name);
loggers_[logger_name] = std::move(new_logger);
}
} // namespace details
} // namespace spdlog

View File

@@ -1,185 +1,109 @@
//
// Copyright(c) 2015 Gabi Melman.
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
#pragma once
// Loggers registy of unique name->logger pointer
// An attempt to create a logger with an already existing name will be ignored
// Loggers registry of unique name->logger pointer
// An attempt to create a logger with an already existing name will result with spdlog_ex exception.
// If user requests a non existing logger, nullptr will be returned
// This class is thread safe
#include <spdlog/details/null_mutex.h>
#include <spdlog/logger.h>
#include <spdlog/async_logger.h>
#include <spdlog/common.h>
#include <chrono>
#include <functional>
#include <memory>
#include <mutex>
#include <string>
#include <unordered_map>
#include <mutex>
namespace spdlog
{
namespace details
{
template <class Mutex> class registry_t
namespace spdlog {
class logger;
namespace details {
class thread_pool;
class periodic_worker;
class registry
{
public:
registry(const registry &) = delete;
registry &operator=(const registry &) = delete;
void register_logger(std::shared_ptr<logger> logger)
{
std::lock_guard<Mutex> lock(_mutex);
auto logger_name = logger->name();
throw_if_exists(logger_name);
_loggers[logger_name] = logger;
}
void register_logger(std::shared_ptr<logger> new_logger);
void initialize_logger(std::shared_ptr<logger> new_logger);
std::shared_ptr<logger> get(const std::string &logger_name);
std::shared_ptr<logger> default_logger();
// Return raw ptr to the default logger.
// To be used directly by the spdlog default api (e.g. spdlog::info)
// This make the default API faster, but cannot be used concurrently with set_default_logger().
// e.g do not call set_default_logger() from one thread while calling spdlog::info() from another.
logger *get_default_raw();
std::shared_ptr<logger> get(const std::string& logger_name)
{
std::lock_guard<Mutex> lock(_mutex);
auto found = _loggers.find(logger_name);
return found == _loggers.end() ? nullptr : found->second;
}
// set default logger.
// default logger is stored in default_logger_ (for faster retrieval) and in the loggers_ map.
void set_default_logger(std::shared_ptr<logger> new_default_logger);
template<class It>
std::shared_ptr<logger> create(const std::string& logger_name, const It& sinks_begin, const It& sinks_end)
{
std::lock_guard<Mutex> lock(_mutex);
throw_if_exists(logger_name);
std::shared_ptr<logger> new_logger;
if (_async_mode)
new_logger = std::make_shared<async_logger>(logger_name, sinks_begin, sinks_end, _async_q_size, _overflow_policy, _worker_warmup_cb, _flush_interval_ms, _worker_teardown_cb);
else
new_logger = std::make_shared<logger>(logger_name, sinks_begin, sinks_end);
void set_tp(std::shared_ptr<thread_pool> tp);
if (_formatter)
new_logger->set_formatter(_formatter);
std::shared_ptr<thread_pool> get_tp();
if (_err_handler)
new_logger->set_error_handler(_err_handler);
// Set global formatter. Each sink in each logger will get a clone of this object
void set_formatter(std::unique_ptr<formatter> formatter);
new_logger->set_level(_level);
void enable_backtrace(size_t n_messages);
void disable_backtrace();
//Add to registry
_loggers[logger_name] = new_logger;
return new_logger;
}
void set_level(level::level_enum log_level);
void apply_all(std::function<void(std::shared_ptr<logger>)> fun)
{
std::lock_guard<Mutex> lock(_mutex);
for (auto &l : _loggers)
fun(l.second);
}
void flush_on(level::level_enum log_level);
void drop(const std::string& logger_name)
{
std::lock_guard<Mutex> lock(_mutex);
_loggers.erase(logger_name);
}
void flush_every(std::chrono::seconds interval);
void drop_all()
{
std::lock_guard<Mutex> lock(_mutex);
_loggers.clear();
}
std::shared_ptr<logger> create(const std::string& logger_name, sinks_init_list sinks)
{
return create(logger_name, sinks.begin(), sinks.end());
}
void set_error_handler(void (*handler)(const std::string &msg));
std::shared_ptr<logger> create(const std::string& logger_name, sink_ptr sink)
{
return create(logger_name, { sink });
}
void apply_all(const std::function<void(const std::shared_ptr<logger>)> &fun);
void flush_all();
void formatter(formatter_ptr f)
{
std::lock_guard<Mutex> lock(_mutex);
_formatter = f;
for (auto& l : _loggers)
l.second->set_formatter(_formatter);
}
void drop(const std::string &logger_name);
void set_pattern(const std::string& pattern)
{
std::lock_guard<Mutex> lock(_mutex);
_formatter = std::make_shared<pattern_formatter>(pattern);
for (auto& l : _loggers)
l.second->set_formatter(_formatter);
}
void drop_all();
void set_level(level::level_enum log_level)
{
std::lock_guard<Mutex> lock(_mutex);
for (auto& l : _loggers)
l.second->set_level(log_level);
_level = log_level;
}
// clean all resources and threads started by the registry
void shutdown();
void set_error_handler(log_err_handler handler)
{
for (auto& l : _loggers)
l.second->set_error_handler(handler);
_err_handler = handler;
}
std::recursive_mutex &tp_mutex();
void set_async_mode(size_t q_size, const async_overflow_policy overflow_policy, const std::function<void()>& worker_warmup_cb, const std::chrono::milliseconds& flush_interval_ms, const std::function<void()>& worker_teardown_cb)
{
std::lock_guard<Mutex> lock(_mutex);
_async_mode = true;
_async_q_size = q_size;
_overflow_policy = overflow_policy;
_worker_warmup_cb = worker_warmup_cb;
_flush_interval_ms = flush_interval_ms;
_worker_teardown_cb = worker_teardown_cb;
}
void set_automatic_registration(bool automatic_registration);
void set_sync_mode()
{
std::lock_guard<Mutex> lock(_mutex);
_async_mode = false;
}
static registry_t<Mutex>& instance()
{
static registry_t<Mutex> s_instance;
return s_instance;
}
static registry &instance();
private:
registry_t<Mutex>() {}
registry_t<Mutex>(const registry_t<Mutex>&) = delete;
registry_t<Mutex>& operator=(const registry_t<Mutex>&) = delete;
registry();
~registry() = default;
void throw_if_exists(const std::string &logger_name)
{
if (_loggers.find(logger_name) != _loggers.end())
throw spdlog_ex("logger with name '" + logger_name + "' already exists");
}
Mutex _mutex;
std::unordered_map <std::string, std::shared_ptr<logger>> _loggers;
formatter_ptr _formatter;
level::level_enum _level = level::info;
log_err_handler _err_handler;
bool _async_mode = false;
size_t _async_q_size = 0;
async_overflow_policy _overflow_policy = async_overflow_policy::block_retry;
std::function<void()> _worker_warmup_cb = nullptr;
std::chrono::milliseconds _flush_interval_ms;
std::function<void()> _worker_teardown_cb = nullptr;
void throw_if_exists_(const std::string &logger_name);
void register_logger_(std::shared_ptr<logger> new_logger);
std::mutex logger_map_mutex_, flusher_mutex_;
std::recursive_mutex tp_mutex_;
std::unordered_map<std::string, std::shared_ptr<logger>> loggers_;
std::unique_ptr<formatter> formatter_;
level::level_enum level_ = level::info;
level::level_enum flush_level_ = level::off;
void (*err_handler_)(const std::string &msg);
std::shared_ptr<thread_pool> tp_;
std::unique_ptr<periodic_worker> periodic_flusher_;
std::shared_ptr<logger> default_logger_;
bool automatic_registration_ = true;
size_t backtrace_n_messages_ = 0;
};
#ifdef SPDLOG_NO_REGISTRY_MUTEX
typedef registry_t<spdlog::details::null_mutex> registry;
#else
typedef registry_t<std::mutex> registry;
} // namespace details
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
#include "registry-inl.h"
#endif
}
}

View File

@@ -1,245 +0,0 @@
//
// Copyright(c) 2015 Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
#pragma once
//
// Global registry functions
//
#include <spdlog/spdlog.h>
#include <spdlog/details/registry.h>
#include <spdlog/sinks/file_sinks.h>
#include <spdlog/sinks/stdout_sinks.h>
#ifdef SPDLOG_ENABLE_SYSLOG
#include <spdlog/sinks/syslog_sink.h>
#endif
#ifdef _WIN32
#include <spdlog/sinks/wincolor_sink.h>
#else
#include <spdlog/sinks/ansicolor_sink.h>
#endif
#ifdef __ANDROID__
#include <spdlog/sinks/android_sink.h>
#endif
#include <chrono>
#include <functional>
#include <memory>
#include <string>
inline void spdlog::register_logger(std::shared_ptr<logger> logger)
{
return details::registry::instance().register_logger(logger);
}
inline std::shared_ptr<spdlog::logger> spdlog::get(const std::string& name)
{
return details::registry::instance().get(name);
}
inline void spdlog::drop(const std::string &name)
{
details::registry::instance().drop(name);
}
// Create multi/single threaded simple file logger
inline std::shared_ptr<spdlog::logger> spdlog::basic_logger_mt(const std::string& logger_name, const filename_t& filename, bool truncate)
{
return create<spdlog::sinks::simple_file_sink_mt>(logger_name, filename, truncate);
}
inline std::shared_ptr<spdlog::logger> spdlog::basic_logger_st(const std::string& logger_name, const filename_t& filename, bool truncate)
{
return create<spdlog::sinks::simple_file_sink_st>(logger_name, filename, truncate);
}
// Create multi/single threaded rotating file logger
inline std::shared_ptr<spdlog::logger> spdlog::rotating_logger_mt(const std::string& logger_name, const filename_t& filename, size_t max_file_size, size_t max_files)
{
return create<spdlog::sinks::rotating_file_sink_mt>(logger_name, filename, SPDLOG_FILENAME_T("txt"), max_file_size, max_files);
}
inline std::shared_ptr<spdlog::logger> spdlog::rotating_logger_st(const std::string& logger_name, const filename_t& filename, size_t max_file_size, size_t max_files)
{
return create<spdlog::sinks::rotating_file_sink_st>(logger_name, filename, SPDLOG_FILENAME_T("txt"), max_file_size, max_files);
}
// Create file logger which creates new file at midnight):
inline std::shared_ptr<spdlog::logger> spdlog::daily_logger_mt(const std::string& logger_name, const filename_t& filename, int hour, int minute)
{
return create<spdlog::sinks::daily_file_sink_mt>(logger_name, filename, SPDLOG_FILENAME_T("txt"), hour, minute);
}
inline std::shared_ptr<spdlog::logger> spdlog::daily_logger_st(const std::string& logger_name, const filename_t& filename, int hour, int minute)
{
return create<spdlog::sinks::daily_file_sink_st>(logger_name, filename, SPDLOG_FILENAME_T("txt"), hour, minute);
}
//
// stdout/stderr loggers
//
inline std::shared_ptr<spdlog::logger> spdlog::stdout_logger_mt(const std::string& logger_name)
{
return spdlog::details::registry::instance().create(logger_name, spdlog::sinks::stdout_sink_mt::instance());
}
inline std::shared_ptr<spdlog::logger> spdlog::stdout_logger_st(const std::string& logger_name)
{
return spdlog::details::registry::instance().create(logger_name, spdlog::sinks::stdout_sink_st::instance());
}
inline std::shared_ptr<spdlog::logger> spdlog::stderr_logger_mt(const std::string& logger_name)
{
return spdlog::details::registry::instance().create(logger_name, spdlog::sinks::stderr_sink_mt::instance());
}
inline std::shared_ptr<spdlog::logger> spdlog::stderr_logger_st(const std::string& logger_name)
{
return spdlog::details::registry::instance().create(logger_name, spdlog::sinks::stderr_sink_st::instance());
}
//
// stdout/stderr color loggers
//
#ifdef _WIN32
inline std::shared_ptr<spdlog::logger> spdlog::stdout_color_mt(const std::string& logger_name)
{
auto sink = std::make_shared<spdlog::sinks::wincolor_stdout_sink_mt>();
return spdlog::details::registry::instance().create(logger_name, sink);
}
inline std::shared_ptr<spdlog::logger> spdlog::stdout_color_st(const std::string& logger_name)
{
auto sink = std::make_shared<spdlog::sinks::wincolor_stdout_sink_st>();
return spdlog::details::registry::instance().create(logger_name, sink);
}
inline std::shared_ptr<spdlog::logger> spdlog::stderr_color_mt(const std::string& logger_name)
{
auto sink = std::make_shared<spdlog::sinks::wincolor_stderr_sink_mt>();
return spdlog::details::registry::instance().create(logger_name, sink);
}
inline std::shared_ptr<spdlog::logger> spdlog::stderr_color_st(const std::string& logger_name)
{
auto sink = std::make_shared<spdlog::sinks::wincolor_stderr_sink_st>();
return spdlog::details::registry::instance().create(logger_name, sink);
}
#else //ansi terminal colors
inline std::shared_ptr<spdlog::logger> spdlog::stdout_color_mt(const std::string& logger_name)
{
auto sink = std::make_shared<spdlog::sinks::ansicolor_sink>(spdlog::sinks::stdout_sink_mt::instance());
return spdlog::details::registry::instance().create(logger_name, sink);
}
inline std::shared_ptr<spdlog::logger> spdlog::stdout_color_st(const std::string& logger_name)
{
auto sink = std::make_shared<spdlog::sinks::ansicolor_sink>(spdlog::sinks::stdout_sink_st::instance());
return spdlog::details::registry::instance().create(logger_name, sink);
}
inline std::shared_ptr<spdlog::logger> spdlog::stderr_color_mt(const std::string& logger_name)
{
auto sink = std::make_shared<spdlog::sinks::ansicolor_sink>(spdlog::sinks::stderr_sink_mt::instance());
return spdlog::details::registry::instance().create(logger_name, sink);
}
inline std::shared_ptr<spdlog::logger> spdlog::stderr_color_st(const std::string& logger_name)
{
auto sink = std::make_shared<spdlog::sinks::ansicolor_sink>(spdlog::sinks::stderr_sink_st::instance());
return spdlog::details::registry::instance().create(logger_name, sink);
}
#endif
#ifdef SPDLOG_ENABLE_SYSLOG
// Create syslog logger
inline std::shared_ptr<spdlog::logger> spdlog::syslog_logger(const std::string& logger_name, const std::string& syslog_ident, int syslog_option)
{
return create<spdlog::sinks::syslog_sink>(logger_name, syslog_ident, syslog_option);
}
#endif
#ifdef __ANDROID__
inline std::shared_ptr<spdlog::logger> spdlog::android_logger(const std::string& logger_name, const std::string& tag)
{
return create<spdlog::sinks::android_sink>(logger_name, tag);
}
#endif
// Create and register a logger a single sink
inline std::shared_ptr<spdlog::logger> spdlog::create(const std::string& logger_name, const spdlog::sink_ptr& sink)
{
return details::registry::instance().create(logger_name, sink);
}
//Create logger with multiple sinks
inline std::shared_ptr<spdlog::logger> spdlog::create(const std::string& logger_name, spdlog::sinks_init_list sinks)
{
return details::registry::instance().create(logger_name, sinks);
}
template <typename Sink, typename... Args>
inline std::shared_ptr<spdlog::logger> spdlog::create(const std::string& logger_name, Args... args)
{
sink_ptr sink = std::make_shared<Sink>(args...);
return details::registry::instance().create(logger_name, { sink });
}
template<class It>
inline std::shared_ptr<spdlog::logger> spdlog::create(const std::string& logger_name, const It& sinks_begin, const It& sinks_end)
{
return details::registry::instance().create(logger_name, sinks_begin, sinks_end);
}
inline void spdlog::set_formatter(spdlog::formatter_ptr f)
{
details::registry::instance().formatter(f);
}
inline void spdlog::set_pattern(const std::string& format_string)
{
return details::registry::instance().set_pattern(format_string);
}
inline void spdlog::set_level(level::level_enum log_level)
{
return details::registry::instance().set_level(log_level);
}
inline void spdlog::set_error_handler(log_err_handler handler)
{
return details::registry::instance().set_error_handler(handler);
}
inline void spdlog::set_async_mode(size_t queue_size, const async_overflow_policy overflow_policy, const std::function<void()>& worker_warmup_cb, const std::chrono::milliseconds& flush_interval_ms, const std::function<void()>& worker_teardown_cb)
{
details::registry::instance().set_async_mode(queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb);
}
inline void spdlog::set_sync_mode()
{
details::registry::instance().set_sync_mode();
}
inline void spdlog::apply_all(std::function<void(std::shared_ptr<logger>)> fun)
{
details::registry::instance().apply_all(fun);
}
inline void spdlog::drop_all()
{
details::registry::instance().drop_all();
}

View File

@@ -0,0 +1,24 @@
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
#pragma once
#include "registry.h"
namespace spdlog {
// Default logger factory- creates synchronous loggers
class logger;
struct synchronous_factory
{
template<typename Sink, typename... SinkArgs>
static std::shared_ptr<spdlog::logger> create(std::string logger_name, SinkArgs &&... args)
{
auto sink = std::make_shared<Sink>(std::forward<SinkArgs>(args)...);
auto new_logger = std::make_shared<spdlog::logger>(std::move(logger_name), std::move(sink));
details::registry::instance().initialize_logger(new_logger);
return new_logger;
}
};
} // namespace spdlog

View File

@@ -0,0 +1,124 @@
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
#pragma once
#ifndef SPDLOG_HEADER_ONLY
#include <spdlog/details/thread_pool.h>
#endif
#include <spdlog/common.h>
#include <cassert>
namespace spdlog {
namespace details {
SPDLOG_INLINE thread_pool::thread_pool(size_t q_max_items, size_t threads_n, std::function<void()> on_thread_start)
: q_(q_max_items)
{
if (threads_n == 0 || threads_n > 1000)
{
SPDLOG_THROW(spdlog_ex("spdlog::thread_pool(): invalid threads_n param (valid "
"range is 1-1000)"));
}
for (size_t i = 0; i < threads_n; i++)
{
threads_.emplace_back([this, on_thread_start] {
on_thread_start();
this->thread_pool::worker_loop_();
});
}
}
SPDLOG_INLINE thread_pool::thread_pool(size_t q_max_items, size_t threads_n)
: thread_pool(q_max_items, threads_n, [] {})
{}
// message all threads to terminate gracefully join them
SPDLOG_INLINE thread_pool::~thread_pool()
{
SPDLOG_TRY
{
for (size_t i = 0; i < threads_.size(); i++)
{
post_async_msg_(async_msg(async_msg_type::terminate), async_overflow_policy::block);
}
for (auto &t : threads_)
{
t.join();
}
}
SPDLOG_CATCH_ALL() {}
}
void SPDLOG_INLINE thread_pool::post_log(async_logger_ptr &&worker_ptr, const details::log_msg &msg, async_overflow_policy overflow_policy)
{
async_msg async_m(std::move(worker_ptr), async_msg_type::log, msg);
post_async_msg_(std::move(async_m), overflow_policy);
}
void SPDLOG_INLINE thread_pool::post_flush(async_logger_ptr &&worker_ptr, async_overflow_policy overflow_policy)
{
post_async_msg_(async_msg(std::move(worker_ptr), async_msg_type::flush), overflow_policy);
}
size_t SPDLOG_INLINE thread_pool::overrun_counter()
{
return q_.overrun_counter();
}
void SPDLOG_INLINE thread_pool::post_async_msg_(async_msg &&new_msg, async_overflow_policy overflow_policy)
{
if (overflow_policy == async_overflow_policy::block)
{
q_.enqueue(std::move(new_msg));
}
else
{
q_.enqueue_nowait(std::move(new_msg));
}
}
void SPDLOG_INLINE thread_pool::worker_loop_()
{
while (process_next_msg_()) {}
}
// process next message in the queue
// return true if this thread should still be active (while no terminate msg
// was received)
bool SPDLOG_INLINE thread_pool::process_next_msg_()
{
async_msg incoming_async_msg;
bool dequeued = q_.dequeue_for(incoming_async_msg, std::chrono::seconds(10));
if (!dequeued)
{
return true;
}
switch (incoming_async_msg.msg_type)
{
case async_msg_type::log: {
incoming_async_msg.worker_ptr->backend_sink_it_(incoming_async_msg);
return true;
}
case async_msg_type::flush: {
incoming_async_msg.worker_ptr->backend_flush_();
return true;
}
case async_msg_type::terminate: {
return false;
}
default: {
assert(false && "Unexpected async_msg_type");
}
}
return true;
}
} // namespace details
} // namespace spdlog

View File

@@ -0,0 +1,120 @@
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
#pragma once
#include <spdlog/details/log_msg_buffer.h>
#include <spdlog/details/mpmc_blocking_q.h>
#include <spdlog/details/os.h>
#include <chrono>
#include <memory>
#include <thread>
#include <vector>
#include <functional>
namespace spdlog {
class async_logger;
namespace details {
using async_logger_ptr = std::shared_ptr<spdlog::async_logger>;
enum class async_msg_type
{
log,
flush,
terminate
};
#include <spdlog/details/log_msg_buffer.h>
// Async msg to move to/from the queue
// Movable only. should never be copied
struct async_msg : log_msg_buffer
{
async_msg_type msg_type{async_msg_type::log};
async_logger_ptr worker_ptr;
async_msg() = default;
~async_msg() = default;
// should only be moved in or out of the queue..
async_msg(const async_msg &) = delete;
// support for vs2013 move
#if defined(_MSC_VER) && _MSC_VER <= 1800
async_msg(async_msg &&other)
: log_msg_buffer(std::move(other))
, msg_type(other.msg_type)
, worker_ptr(std::move(other.worker_ptr))
{}
async_msg &operator=(async_msg &&other)
{
*static_cast<log_msg_buffer *>(this) = std::move(other);
msg_type = other.msg_type;
worker_ptr = std::move(other.worker_ptr);
return *this;
}
#else // (_MSC_VER) && _MSC_VER <= 1800
async_msg(async_msg &&) = default;
async_msg &operator=(async_msg &&) = default;
#endif
// construct from log_msg with given type
async_msg(async_logger_ptr &&worker, async_msg_type the_type, const details::log_msg &m)
: log_msg_buffer{m}
, msg_type{the_type}
, worker_ptr{std::move(worker)}
{}
async_msg(async_logger_ptr &&worker, async_msg_type the_type)
: log_msg_buffer{}
, msg_type{the_type}
, worker_ptr{std::move(worker)}
{}
explicit async_msg(async_msg_type the_type)
: async_msg{nullptr, the_type}
{}
};
class thread_pool
{
public:
using item_type = async_msg;
using q_type = details::mpmc_blocking_queue<item_type>;
thread_pool(size_t q_max_items, size_t threads_n, std::function<void()> on_thread_start);
thread_pool(size_t q_max_items, size_t threads_n);
// message all threads to terminate gracefully join them
~thread_pool();
thread_pool(const thread_pool &) = delete;
thread_pool &operator=(thread_pool &&) = delete;
void post_log(async_logger_ptr &&worker_ptr, const details::log_msg &msg, async_overflow_policy overflow_policy);
void post_flush(async_logger_ptr &&worker_ptr, async_overflow_policy overflow_policy);
size_t overrun_counter();
private:
q_type q_;
std::vector<std::thread> threads_;
void post_async_msg_(async_msg &&new_msg, async_overflow_policy overflow_policy);
void worker_loop_();
// process next message in the queue
// return true if this thread should still be active (while no terminate msg
// was received)
bool process_next_msg_();
};
} // namespace details
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
#include "thread_pool-inl.h"
#endif

View File

@@ -0,0 +1,175 @@
//
// Copyright(c) 2015 Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
//
#pragma once
//
// Support for logging binary data as hex
// format flags:
// {:X} - print in uppercase.
// {:s} - don't separate each byte with space.
// {:p} - don't print the position on each line start.
// {:n} - don't split the output to lines.
//
// Examples:
//
// std::vector<char> v(200, 0x0b);
// logger->info("Some buffer {}", spdlog::to_hex(v));
// char buf[128];
// logger->info("Some buffer {:X}", spdlog::to_hex(std::begin(buf), std::end(buf)));
namespace spdlog {
namespace details {
template<typename It>
class bytes_range
{
public:
bytes_range(It range_begin, It range_end)
: begin_(range_begin)
, end_(range_end)
{}
It begin() const
{
return begin_;
}
It end() const
{
return end_;
}
private:
It begin_, end_;
};
} // namespace details
// create a bytes_range that wraps the given container
template<typename Container>
inline details::bytes_range<typename Container::const_iterator> to_hex(const Container &container)
{
static_assert(sizeof(typename Container::value_type) == 1, "sizeof(Container::value_type) != 1");
using Iter = typename Container::const_iterator;
return details::bytes_range<Iter>(std::begin(container), std::end(container));
}
// create bytes_range from ranges
template<typename It>
inline details::bytes_range<It> to_hex(const It range_begin, const It range_end)
{
return details::bytes_range<It>(range_begin, range_end);
}
} // namespace spdlog
namespace fmt {
template<typename T>
struct formatter<spdlog::details::bytes_range<T>>
{
const std::size_t line_size = 100;
const char delimiter = ' ';
bool put_newlines = true;
bool put_delimiters = true;
bool use_uppercase = false;
bool put_positions = true; // position on start of each line
// parse the format string flags
template<typename ParseContext>
auto parse(ParseContext &ctx) -> decltype(ctx.begin())
{
auto it = ctx.begin();
while (*it && *it != '}')
{
switch (*it)
{
case 'X':
use_uppercase = true;
break;
case 's':
put_delimiters = false;
break;
case 'p':
put_positions = false;
break;
case 'n':
put_newlines = false;
break;
}
++it;
}
return it;
}
// format the given bytes range as hex
template<typename FormatContext, typename Container>
auto format(const spdlog::details::bytes_range<Container> &the_range, FormatContext &ctx) -> decltype(ctx.out())
{
SPDLOG_CONSTEXPR const char *hex_upper = "0123456789ABCDEF";
SPDLOG_CONSTEXPR const char *hex_lower = "0123456789abcdef";
const char *hex_chars = use_uppercase ? hex_upper : hex_lower;
std::size_t pos = 0;
std::size_t column = line_size;
#if FMT_VERSION < 60000
auto inserter = ctx.begin();
#else
auto inserter = ctx.out();
#endif
for (auto &item : the_range)
{
auto ch = static_cast<unsigned char>(item);
pos++;
if (put_newlines && column >= line_size)
{
column = put_newline(inserter, pos);
// put first byte without delimiter in front of it
*inserter++ = hex_chars[(ch >> 4) & 0x0f];
*inserter++ = hex_chars[ch & 0x0f];
column += 2;
continue;
}
if (put_delimiters)
{
*inserter++ = delimiter;
++column;
}
*inserter++ = hex_chars[(ch >> 4) & 0x0f];
*inserter++ = hex_chars[ch & 0x0f];
column += 2;
}
return inserter;
}
// put newline(and position header)
// return the next column
template<typename It>
std::size_t put_newline(It inserter, std::size_t pos)
{
#ifdef _WIN32
*inserter++ = '\r';
#endif
*inserter++ = '\n';
if (put_positions)
{
fmt::format_to(inserter, "{:<04X}: ", pos - 1);
return 7;
}
else
{
return 1;
}
}
};
} // namespace fmt

View File

@@ -0,0 +1,27 @@
Copyright (c) 2012 - present, Victor Zverovich
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- Optional exception to the license ---
As an exception, if, as a result of your compiling your source code, portions
of this Software are embedded into a machine-executable object form of such
source code, you may redistribute such embedded portions in such object form
without including the above copyright and permission notices.

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,570 @@
// Formatting library for C++ - color support
//
// Copyright (c) 2018 - present, Victor Zverovich and fmt contributors
// All rights reserved.
//
// For the license information refer to format.h.
#ifndef FMT_COLOR_H_
#define FMT_COLOR_H_
#include "format.h"
FMT_BEGIN_NAMESPACE
enum class color : uint32_t {
alice_blue = 0xF0F8FF, // rgb(240,248,255)
antique_white = 0xFAEBD7, // rgb(250,235,215)
aqua = 0x00FFFF, // rgb(0,255,255)
aquamarine = 0x7FFFD4, // rgb(127,255,212)
azure = 0xF0FFFF, // rgb(240,255,255)
beige = 0xF5F5DC, // rgb(245,245,220)
bisque = 0xFFE4C4, // rgb(255,228,196)
black = 0x000000, // rgb(0,0,0)
blanched_almond = 0xFFEBCD, // rgb(255,235,205)
blue = 0x0000FF, // rgb(0,0,255)
blue_violet = 0x8A2BE2, // rgb(138,43,226)
brown = 0xA52A2A, // rgb(165,42,42)
burly_wood = 0xDEB887, // rgb(222,184,135)
cadet_blue = 0x5F9EA0, // rgb(95,158,160)
chartreuse = 0x7FFF00, // rgb(127,255,0)
chocolate = 0xD2691E, // rgb(210,105,30)
coral = 0xFF7F50, // rgb(255,127,80)
cornflower_blue = 0x6495ED, // rgb(100,149,237)
cornsilk = 0xFFF8DC, // rgb(255,248,220)
crimson = 0xDC143C, // rgb(220,20,60)
cyan = 0x00FFFF, // rgb(0,255,255)
dark_blue = 0x00008B, // rgb(0,0,139)
dark_cyan = 0x008B8B, // rgb(0,139,139)
dark_golden_rod = 0xB8860B, // rgb(184,134,11)
dark_gray = 0xA9A9A9, // rgb(169,169,169)
dark_green = 0x006400, // rgb(0,100,0)
dark_khaki = 0xBDB76B, // rgb(189,183,107)
dark_magenta = 0x8B008B, // rgb(139,0,139)
dark_olive_green = 0x556B2F, // rgb(85,107,47)
dark_orange = 0xFF8C00, // rgb(255,140,0)
dark_orchid = 0x9932CC, // rgb(153,50,204)
dark_red = 0x8B0000, // rgb(139,0,0)
dark_salmon = 0xE9967A, // rgb(233,150,122)
dark_sea_green = 0x8FBC8F, // rgb(143,188,143)
dark_slate_blue = 0x483D8B, // rgb(72,61,139)
dark_slate_gray = 0x2F4F4F, // rgb(47,79,79)
dark_turquoise = 0x00CED1, // rgb(0,206,209)
dark_violet = 0x9400D3, // rgb(148,0,211)
deep_pink = 0xFF1493, // rgb(255,20,147)
deep_sky_blue = 0x00BFFF, // rgb(0,191,255)
dim_gray = 0x696969, // rgb(105,105,105)
dodger_blue = 0x1E90FF, // rgb(30,144,255)
fire_brick = 0xB22222, // rgb(178,34,34)
floral_white = 0xFFFAF0, // rgb(255,250,240)
forest_green = 0x228B22, // rgb(34,139,34)
fuchsia = 0xFF00FF, // rgb(255,0,255)
gainsboro = 0xDCDCDC, // rgb(220,220,220)
ghost_white = 0xF8F8FF, // rgb(248,248,255)
gold = 0xFFD700, // rgb(255,215,0)
golden_rod = 0xDAA520, // rgb(218,165,32)
gray = 0x808080, // rgb(128,128,128)
green = 0x008000, // rgb(0,128,0)
green_yellow = 0xADFF2F, // rgb(173,255,47)
honey_dew = 0xF0FFF0, // rgb(240,255,240)
hot_pink = 0xFF69B4, // rgb(255,105,180)
indian_red = 0xCD5C5C, // rgb(205,92,92)
indigo = 0x4B0082, // rgb(75,0,130)
ivory = 0xFFFFF0, // rgb(255,255,240)
khaki = 0xF0E68C, // rgb(240,230,140)
lavender = 0xE6E6FA, // rgb(230,230,250)
lavender_blush = 0xFFF0F5, // rgb(255,240,245)
lawn_green = 0x7CFC00, // rgb(124,252,0)
lemon_chiffon = 0xFFFACD, // rgb(255,250,205)
light_blue = 0xADD8E6, // rgb(173,216,230)
light_coral = 0xF08080, // rgb(240,128,128)
light_cyan = 0xE0FFFF, // rgb(224,255,255)
light_golden_rod_yellow = 0xFAFAD2, // rgb(250,250,210)
light_gray = 0xD3D3D3, // rgb(211,211,211)
light_green = 0x90EE90, // rgb(144,238,144)
light_pink = 0xFFB6C1, // rgb(255,182,193)
light_salmon = 0xFFA07A, // rgb(255,160,122)
light_sea_green = 0x20B2AA, // rgb(32,178,170)
light_sky_blue = 0x87CEFA, // rgb(135,206,250)
light_slate_gray = 0x778899, // rgb(119,136,153)
light_steel_blue = 0xB0C4DE, // rgb(176,196,222)
light_yellow = 0xFFFFE0, // rgb(255,255,224)
lime = 0x00FF00, // rgb(0,255,0)
lime_green = 0x32CD32, // rgb(50,205,50)
linen = 0xFAF0E6, // rgb(250,240,230)
magenta = 0xFF00FF, // rgb(255,0,255)
maroon = 0x800000, // rgb(128,0,0)
medium_aquamarine = 0x66CDAA, // rgb(102,205,170)
medium_blue = 0x0000CD, // rgb(0,0,205)
medium_orchid = 0xBA55D3, // rgb(186,85,211)
medium_purple = 0x9370DB, // rgb(147,112,219)
medium_sea_green = 0x3CB371, // rgb(60,179,113)
medium_slate_blue = 0x7B68EE, // rgb(123,104,238)
medium_spring_green = 0x00FA9A, // rgb(0,250,154)
medium_turquoise = 0x48D1CC, // rgb(72,209,204)
medium_violet_red = 0xC71585, // rgb(199,21,133)
midnight_blue = 0x191970, // rgb(25,25,112)
mint_cream = 0xF5FFFA, // rgb(245,255,250)
misty_rose = 0xFFE4E1, // rgb(255,228,225)
moccasin = 0xFFE4B5, // rgb(255,228,181)
navajo_white = 0xFFDEAD, // rgb(255,222,173)
navy = 0x000080, // rgb(0,0,128)
old_lace = 0xFDF5E6, // rgb(253,245,230)
olive = 0x808000, // rgb(128,128,0)
olive_drab = 0x6B8E23, // rgb(107,142,35)
orange = 0xFFA500, // rgb(255,165,0)
orange_red = 0xFF4500, // rgb(255,69,0)
orchid = 0xDA70D6, // rgb(218,112,214)
pale_golden_rod = 0xEEE8AA, // rgb(238,232,170)
pale_green = 0x98FB98, // rgb(152,251,152)
pale_turquoise = 0xAFEEEE, // rgb(175,238,238)
pale_violet_red = 0xDB7093, // rgb(219,112,147)
papaya_whip = 0xFFEFD5, // rgb(255,239,213)
peach_puff = 0xFFDAB9, // rgb(255,218,185)
peru = 0xCD853F, // rgb(205,133,63)
pink = 0xFFC0CB, // rgb(255,192,203)
plum = 0xDDA0DD, // rgb(221,160,221)
powder_blue = 0xB0E0E6, // rgb(176,224,230)
purple = 0x800080, // rgb(128,0,128)
rebecca_purple = 0x663399, // rgb(102,51,153)
red = 0xFF0000, // rgb(255,0,0)
rosy_brown = 0xBC8F8F, // rgb(188,143,143)
royal_blue = 0x4169E1, // rgb(65,105,225)
saddle_brown = 0x8B4513, // rgb(139,69,19)
salmon = 0xFA8072, // rgb(250,128,114)
sandy_brown = 0xF4A460, // rgb(244,164,96)
sea_green = 0x2E8B57, // rgb(46,139,87)
sea_shell = 0xFFF5EE, // rgb(255,245,238)
sienna = 0xA0522D, // rgb(160,82,45)
silver = 0xC0C0C0, // rgb(192,192,192)
sky_blue = 0x87CEEB, // rgb(135,206,235)
slate_blue = 0x6A5ACD, // rgb(106,90,205)
slate_gray = 0x708090, // rgb(112,128,144)
snow = 0xFFFAFA, // rgb(255,250,250)
spring_green = 0x00FF7F, // rgb(0,255,127)
steel_blue = 0x4682B4, // rgb(70,130,180)
tan = 0xD2B48C, // rgb(210,180,140)
teal = 0x008080, // rgb(0,128,128)
thistle = 0xD8BFD8, // rgb(216,191,216)
tomato = 0xFF6347, // rgb(255,99,71)
turquoise = 0x40E0D0, // rgb(64,224,208)
violet = 0xEE82EE, // rgb(238,130,238)
wheat = 0xF5DEB3, // rgb(245,222,179)
white = 0xFFFFFF, // rgb(255,255,255)
white_smoke = 0xF5F5F5, // rgb(245,245,245)
yellow = 0xFFFF00, // rgb(255,255,0)
yellow_green = 0x9ACD32 // rgb(154,205,50)
}; // enum class color
enum class terminal_color : uint8_t {
black = 30,
red,
green,
yellow,
blue,
magenta,
cyan,
white,
bright_black = 90,
bright_red,
bright_green,
bright_yellow,
bright_blue,
bright_magenta,
bright_cyan,
bright_white
};
enum class emphasis : uint8_t {
bold = 1,
italic = 1 << 1,
underline = 1 << 2,
strikethrough = 1 << 3
};
// rgb is a struct for red, green and blue colors.
// Using the name "rgb" makes some editors show the color in a tooltip.
struct rgb {
FMT_CONSTEXPR rgb() : r(0), g(0), b(0) {}
FMT_CONSTEXPR rgb(uint8_t r_, uint8_t g_, uint8_t b_) : r(r_), g(g_), b(b_) {}
FMT_CONSTEXPR rgb(uint32_t hex)
: r((hex >> 16) & 0xFF), g((hex >> 8) & 0xFF), b(hex & 0xFF) {}
FMT_CONSTEXPR rgb(color hex)
: r((uint32_t(hex) >> 16) & 0xFF),
g((uint32_t(hex) >> 8) & 0xFF),
b(uint32_t(hex) & 0xFF) {}
uint8_t r;
uint8_t g;
uint8_t b;
};
namespace internal {
// color is a struct of either a rgb color or a terminal color.
struct color_type {
FMT_CONSTEXPR color_type() FMT_NOEXCEPT : is_rgb(), value{} {}
FMT_CONSTEXPR color_type(color rgb_color) FMT_NOEXCEPT : is_rgb(true),
value{} {
value.rgb_color = static_cast<uint32_t>(rgb_color);
}
FMT_CONSTEXPR color_type(rgb rgb_color) FMT_NOEXCEPT : is_rgb(true), value{} {
value.rgb_color = (static_cast<uint32_t>(rgb_color.r) << 16) |
(static_cast<uint32_t>(rgb_color.g) << 8) | rgb_color.b;
}
FMT_CONSTEXPR color_type(terminal_color term_color) FMT_NOEXCEPT : is_rgb(),
value{} {
value.term_color = static_cast<uint8_t>(term_color);
}
bool is_rgb;
union color_union {
uint8_t term_color;
uint32_t rgb_color;
} value;
};
} // namespace internal
// Experimental text formatting support.
class text_style {
public:
FMT_CONSTEXPR text_style(emphasis em = emphasis()) FMT_NOEXCEPT
: set_foreground_color(),
set_background_color(),
ems(em) {}
FMT_CONSTEXPR text_style& operator|=(const text_style& rhs) {
if (!set_foreground_color) {
set_foreground_color = rhs.set_foreground_color;
foreground_color = rhs.foreground_color;
} else if (rhs.set_foreground_color) {
if (!foreground_color.is_rgb || !rhs.foreground_color.is_rgb)
FMT_THROW(format_error("can't OR a terminal color"));
foreground_color.value.rgb_color |= rhs.foreground_color.value.rgb_color;
}
if (!set_background_color) {
set_background_color = rhs.set_background_color;
background_color = rhs.background_color;
} else if (rhs.set_background_color) {
if (!background_color.is_rgb || !rhs.background_color.is_rgb)
FMT_THROW(format_error("can't OR a terminal color"));
background_color.value.rgb_color |= rhs.background_color.value.rgb_color;
}
ems = static_cast<emphasis>(static_cast<uint8_t>(ems) |
static_cast<uint8_t>(rhs.ems));
return *this;
}
friend FMT_CONSTEXPR text_style operator|(text_style lhs,
const text_style& rhs) {
return lhs |= rhs;
}
FMT_CONSTEXPR text_style& operator&=(const text_style& rhs) {
if (!set_foreground_color) {
set_foreground_color = rhs.set_foreground_color;
foreground_color = rhs.foreground_color;
} else if (rhs.set_foreground_color) {
if (!foreground_color.is_rgb || !rhs.foreground_color.is_rgb)
FMT_THROW(format_error("can't AND a terminal color"));
foreground_color.value.rgb_color &= rhs.foreground_color.value.rgb_color;
}
if (!set_background_color) {
set_background_color = rhs.set_background_color;
background_color = rhs.background_color;
} else if (rhs.set_background_color) {
if (!background_color.is_rgb || !rhs.background_color.is_rgb)
FMT_THROW(format_error("can't AND a terminal color"));
background_color.value.rgb_color &= rhs.background_color.value.rgb_color;
}
ems = static_cast<emphasis>(static_cast<uint8_t>(ems) &
static_cast<uint8_t>(rhs.ems));
return *this;
}
friend FMT_CONSTEXPR text_style operator&(text_style lhs,
const text_style& rhs) {
return lhs &= rhs;
}
FMT_CONSTEXPR bool has_foreground() const FMT_NOEXCEPT {
return set_foreground_color;
}
FMT_CONSTEXPR bool has_background() const FMT_NOEXCEPT {
return set_background_color;
}
FMT_CONSTEXPR bool has_emphasis() const FMT_NOEXCEPT {
return static_cast<uint8_t>(ems) != 0;
}
FMT_CONSTEXPR internal::color_type get_foreground() const FMT_NOEXCEPT {
FMT_ASSERT(has_foreground(), "no foreground specified for this style");
return foreground_color;
}
FMT_CONSTEXPR internal::color_type get_background() const FMT_NOEXCEPT {
FMT_ASSERT(has_background(), "no background specified for this style");
return background_color;
}
FMT_CONSTEXPR emphasis get_emphasis() const FMT_NOEXCEPT {
FMT_ASSERT(has_emphasis(), "no emphasis specified for this style");
return ems;
}
private:
FMT_CONSTEXPR text_style(bool is_foreground,
internal::color_type text_color) FMT_NOEXCEPT
: set_foreground_color(),
set_background_color(),
ems() {
if (is_foreground) {
foreground_color = text_color;
set_foreground_color = true;
} else {
background_color = text_color;
set_background_color = true;
}
}
friend FMT_CONSTEXPR_DECL text_style fg(internal::color_type foreground)
FMT_NOEXCEPT;
friend FMT_CONSTEXPR_DECL text_style bg(internal::color_type background)
FMT_NOEXCEPT;
internal::color_type foreground_color;
internal::color_type background_color;
bool set_foreground_color;
bool set_background_color;
emphasis ems;
};
FMT_CONSTEXPR text_style fg(internal::color_type foreground) FMT_NOEXCEPT {
return text_style(/*is_foreground=*/true, foreground);
}
FMT_CONSTEXPR text_style bg(internal::color_type background) FMT_NOEXCEPT {
return text_style(/*is_foreground=*/false, background);
}
FMT_CONSTEXPR text_style operator|(emphasis lhs, emphasis rhs) FMT_NOEXCEPT {
return text_style(lhs) | rhs;
}
namespace internal {
template <typename Char> struct ansi_color_escape {
FMT_CONSTEXPR ansi_color_escape(internal::color_type text_color,
const char* esc) FMT_NOEXCEPT {
// If we have a terminal color, we need to output another escape code
// sequence.
if (!text_color.is_rgb) {
bool is_background = esc == internal::data::background_color;
uint32_t value = text_color.value.term_color;
// Background ASCII codes are the same as the foreground ones but with
// 10 more.
if (is_background) value += 10u;
std::size_t index = 0;
buffer[index++] = static_cast<Char>('\x1b');
buffer[index++] = static_cast<Char>('[');
if (value >= 100u) {
buffer[index++] = static_cast<Char>('1');
value %= 100u;
}
buffer[index++] = static_cast<Char>('0' + value / 10u);
buffer[index++] = static_cast<Char>('0' + value % 10u);
buffer[index++] = static_cast<Char>('m');
buffer[index++] = static_cast<Char>('\0');
return;
}
for (int i = 0; i < 7; i++) {
buffer[i] = static_cast<Char>(esc[i]);
}
rgb color(text_color.value.rgb_color);
to_esc(color.r, buffer + 7, ';');
to_esc(color.g, buffer + 11, ';');
to_esc(color.b, buffer + 15, 'm');
buffer[19] = static_cast<Char>(0);
}
FMT_CONSTEXPR ansi_color_escape(emphasis em) FMT_NOEXCEPT {
uint8_t em_codes[4] = {};
uint8_t em_bits = static_cast<uint8_t>(em);
if (em_bits & static_cast<uint8_t>(emphasis::bold)) em_codes[0] = 1;
if (em_bits & static_cast<uint8_t>(emphasis::italic)) em_codes[1] = 3;
if (em_bits & static_cast<uint8_t>(emphasis::underline)) em_codes[2] = 4;
if (em_bits & static_cast<uint8_t>(emphasis::strikethrough))
em_codes[3] = 9;
std::size_t index = 0;
for (int i = 0; i < 4; ++i) {
if (!em_codes[i]) continue;
buffer[index++] = static_cast<Char>('\x1b');
buffer[index++] = static_cast<Char>('[');
buffer[index++] = static_cast<Char>('0' + em_codes[i]);
buffer[index++] = static_cast<Char>('m');
}
buffer[index++] = static_cast<Char>(0);
}
FMT_CONSTEXPR operator const Char*() const FMT_NOEXCEPT { return buffer; }
FMT_CONSTEXPR const Char* begin() const FMT_NOEXCEPT { return buffer; }
FMT_CONSTEXPR const Char* end() const FMT_NOEXCEPT {
return buffer + std::strlen(buffer);
}
private:
Char buffer[7u + 3u * 4u + 1u];
static FMT_CONSTEXPR void to_esc(uint8_t c, Char* out,
char delimiter) FMT_NOEXCEPT {
out[0] = static_cast<Char>('0' + c / 100);
out[1] = static_cast<Char>('0' + c / 10 % 10);
out[2] = static_cast<Char>('0' + c % 10);
out[3] = static_cast<Char>(delimiter);
}
};
template <typename Char>
FMT_CONSTEXPR ansi_color_escape<Char> make_foreground_color(
internal::color_type foreground) FMT_NOEXCEPT {
return ansi_color_escape<Char>(foreground, internal::data::foreground_color);
}
template <typename Char>
FMT_CONSTEXPR ansi_color_escape<Char> make_background_color(
internal::color_type background) FMT_NOEXCEPT {
return ansi_color_escape<Char>(background, internal::data::background_color);
}
template <typename Char>
FMT_CONSTEXPR ansi_color_escape<Char> make_emphasis(emphasis em) FMT_NOEXCEPT {
return ansi_color_escape<Char>(em);
}
template <typename Char>
inline void fputs(const Char* chars, FILE* stream) FMT_NOEXCEPT {
std::fputs(chars, stream);
}
template <>
inline void fputs<wchar_t>(const wchar_t* chars, FILE* stream) FMT_NOEXCEPT {
std::fputws(chars, stream);
}
template <typename Char> inline void reset_color(FILE* stream) FMT_NOEXCEPT {
fputs(internal::data::reset_color, stream);
}
template <> inline void reset_color<wchar_t>(FILE* stream) FMT_NOEXCEPT {
fputs(internal::data::wreset_color, stream);
}
template <typename Char>
inline void reset_color(basic_memory_buffer<Char>& buffer) FMT_NOEXCEPT {
const char* begin = data::reset_color;
const char* end = begin + sizeof(data::reset_color) - 1;
buffer.append(begin, end);
}
template <typename Char>
void vformat_to(basic_memory_buffer<Char>& buf, const text_style& ts,
basic_string_view<Char> format_str,
basic_format_args<buffer_context<Char>> args) {
bool has_style = false;
if (ts.has_emphasis()) {
has_style = true;
auto emphasis = internal::make_emphasis<Char>(ts.get_emphasis());
buf.append(emphasis.begin(), emphasis.end());
}
if (ts.has_foreground()) {
has_style = true;
auto foreground =
internal::make_foreground_color<Char>(ts.get_foreground());
buf.append(foreground.begin(), foreground.end());
}
if (ts.has_background()) {
has_style = true;
auto background =
internal::make_background_color<Char>(ts.get_background());
buf.append(background.begin(), background.end());
}
vformat_to(buf, format_str, args);
if (has_style) {
internal::reset_color<Char>(buf);
}
}
} // namespace internal
template <typename S, typename Char = char_t<S>>
void vprint(std::FILE* f, const text_style& ts, const S& format,
basic_format_args<buffer_context<Char>> args) {
basic_memory_buffer<Char> buf;
internal::vformat_to(buf, ts, to_string_view(format), args);
buf.push_back(Char(0));
internal::fputs(buf.data(), f);
}
/**
Formats a string and prints it to the specified file stream using ANSI
escape sequences to specify text formatting.
Example:
fmt::print(fmt::emphasis::bold | fg(fmt::color::red),
"Elapsed time: {0:.2f} seconds", 1.23);
*/
template <typename S, typename... Args,
FMT_ENABLE_IF(internal::is_string<S>::value)>
void print(std::FILE* f, const text_style& ts, const S& format_str,
const Args&... args) {
internal::check_format_string<Args...>(format_str);
using context = buffer_context<char_t<S>>;
format_arg_store<context, Args...> as{args...};
vprint(f, ts, format_str, basic_format_args<context>(as));
}
/**
Formats a string and prints it to stdout using ANSI escape sequences to
specify text formatting.
Example:
fmt::print(fmt::emphasis::bold | fg(fmt::color::red),
"Elapsed time: {0:.2f} seconds", 1.23);
*/
template <typename S, typename... Args,
FMT_ENABLE_IF(internal::is_string<S>::value)>
void print(const text_style& ts, const S& format_str, const Args&... args) {
return print(stdout, ts, format_str, args...);
}
template <typename S, typename Char = char_t<S>>
inline std::basic_string<Char> vformat(
const text_style& ts, const S& format_str,
basic_format_args<buffer_context<Char>> args) {
basic_memory_buffer<Char> buf;
internal::vformat_to(buf, ts, to_string_view(format_str), args);
return fmt::to_string(buf);
}
/**
\rst
Formats arguments and returns the result as a string using ANSI
escape sequences to specify text formatting.
**Example**::
#include <fmt/color.h>
std::string message = fmt::format(fmt::emphasis::bold | fg(fmt::color::red),
"The answer is {}", 42);
\endrst
*/
template <typename S, typename... Args, typename Char = char_t<S>>
inline std::basic_string<Char> format(const text_style& ts, const S& format_str,
const Args&... args) {
return vformat(ts, to_string_view(format_str),
{internal::make_args_checked<Args...>(format_str, args...)});
}
FMT_END_NAMESPACE
#endif // FMT_COLOR_H_

View File

@@ -0,0 +1,585 @@
// Formatting library for C++ - experimental format string compilation
//
// Copyright (c) 2012 - present, Victor Zverovich and fmt contributors
// All rights reserved.
//
// For the license information refer to format.h.
#ifndef FMT_COMPILE_H_
#define FMT_COMPILE_H_
#include <vector>
#include "format.h"
FMT_BEGIN_NAMESPACE
namespace internal {
// Part of a compiled format string. It can be either literal text or a
// replacement field.
template <typename Char> struct format_part {
enum class kind { arg_index, arg_name, text, replacement };
struct replacement {
arg_ref<Char> arg_id;
dynamic_format_specs<Char> specs;
};
kind part_kind;
union value {
int arg_index;
basic_string_view<Char> str;
replacement repl;
FMT_CONSTEXPR value(int index = 0) : arg_index(index) {}
FMT_CONSTEXPR value(basic_string_view<Char> s) : str(s) {}
FMT_CONSTEXPR value(replacement r) : repl(r) {}
} val;
// Position past the end of the argument id.
const Char* arg_id_end = nullptr;
FMT_CONSTEXPR format_part(kind k = kind::arg_index, value v = {})
: part_kind(k), val(v) {}
static FMT_CONSTEXPR format_part make_arg_index(int index) {
return format_part(kind::arg_index, index);
}
static FMT_CONSTEXPR format_part make_arg_name(basic_string_view<Char> name) {
return format_part(kind::arg_name, name);
}
static FMT_CONSTEXPR format_part make_text(basic_string_view<Char> text) {
return format_part(kind::text, text);
}
static FMT_CONSTEXPR format_part make_replacement(replacement repl) {
return format_part(kind::replacement, repl);
}
};
template <typename Char> struct part_counter {
unsigned num_parts = 0;
FMT_CONSTEXPR void on_text(const Char* begin, const Char* end) {
if (begin != end) ++num_parts;
}
FMT_CONSTEXPR void on_arg_id() { ++num_parts; }
FMT_CONSTEXPR void on_arg_id(int) { ++num_parts; }
FMT_CONSTEXPR void on_arg_id(basic_string_view<Char>) { ++num_parts; }
FMT_CONSTEXPR void on_replacement_field(const Char*) {}
FMT_CONSTEXPR const Char* on_format_specs(const Char* begin,
const Char* end) {
// Find the matching brace.
unsigned brace_counter = 0;
for (; begin != end; ++begin) {
if (*begin == '{') {
++brace_counter;
} else if (*begin == '}') {
if (brace_counter == 0u) break;
--brace_counter;
}
}
return begin;
}
FMT_CONSTEXPR void on_error(const char*) {}
};
// Counts the number of parts in a format string.
template <typename Char>
FMT_CONSTEXPR unsigned count_parts(basic_string_view<Char> format_str) {
part_counter<Char> counter;
parse_format_string<true>(format_str, counter);
return counter.num_parts;
}
template <typename Char, typename PartHandler>
class format_string_compiler : public error_handler {
private:
using part = format_part<Char>;
PartHandler handler_;
part part_;
basic_string_view<Char> format_str_;
basic_format_parse_context<Char> parse_context_;
public:
FMT_CONSTEXPR format_string_compiler(basic_string_view<Char> format_str,
PartHandler handler)
: handler_(handler),
format_str_(format_str),
parse_context_(format_str) {}
FMT_CONSTEXPR void on_text(const Char* begin, const Char* end) {
if (begin != end)
handler_(part::make_text({begin, to_unsigned(end - begin)}));
}
FMT_CONSTEXPR void on_arg_id() {
part_ = part::make_arg_index(parse_context_.next_arg_id());
}
FMT_CONSTEXPR void on_arg_id(int id) {
parse_context_.check_arg_id(id);
part_ = part::make_arg_index(id);
}
FMT_CONSTEXPR void on_arg_id(basic_string_view<Char> id) {
part_ = part::make_arg_name(id);
}
FMT_CONSTEXPR void on_replacement_field(const Char* ptr) {
part_.arg_id_end = ptr;
handler_(part_);
}
FMT_CONSTEXPR const Char* on_format_specs(const Char* begin,
const Char* end) {
auto repl = typename part::replacement();
dynamic_specs_handler<basic_format_parse_context<Char>> handler(
repl.specs, parse_context_);
auto it = parse_format_specs(begin, end, handler);
if (*it != '}') on_error("missing '}' in format string");
repl.arg_id = part_.part_kind == part::kind::arg_index
? arg_ref<Char>(part_.val.arg_index)
: arg_ref<Char>(part_.val.str);
auto part = part::make_replacement(repl);
part.arg_id_end = begin;
handler_(part);
return it;
}
};
// Compiles a format string and invokes handler(part) for each parsed part.
template <bool IS_CONSTEXPR, typename Char, typename PartHandler>
FMT_CONSTEXPR void compile_format_string(basic_string_view<Char> format_str,
PartHandler handler) {
parse_format_string<IS_CONSTEXPR>(
format_str,
format_string_compiler<Char, PartHandler>(format_str, handler));
}
template <typename Range, typename Context, typename Id>
void format_arg(
basic_format_parse_context<typename Range::value_type>& parse_ctx,
Context& ctx, Id arg_id) {
ctx.advance_to(
visit_format_arg(arg_formatter<Range>(ctx, &parse_ctx), ctx.arg(arg_id)));
}
// vformat_to is defined in a subnamespace to prevent ADL.
namespace cf {
template <typename Context, typename Range, typename CompiledFormat>
auto vformat_to(Range out, CompiledFormat& cf, basic_format_args<Context> args)
-> typename Context::iterator {
using char_type = typename Context::char_type;
basic_format_parse_context<char_type> parse_ctx(
to_string_view(cf.format_str_));
Context ctx(out.begin(), args);
const auto& parts = cf.parts();
for (auto part_it = std::begin(parts); part_it != std::end(parts);
++part_it) {
const auto& part = *part_it;
const auto& value = part.val;
using format_part_t = format_part<char_type>;
switch (part.part_kind) {
case format_part_t::kind::text: {
const auto text = value.str;
auto output = ctx.out();
auto&& it = reserve(output, text.size());
it = std::copy_n(text.begin(), text.size(), it);
ctx.advance_to(output);
break;
}
case format_part_t::kind::arg_index:
advance_to(parse_ctx, part.arg_id_end);
internal::format_arg<Range>(parse_ctx, ctx, value.arg_index);
break;
case format_part_t::kind::arg_name:
advance_to(parse_ctx, part.arg_id_end);
internal::format_arg<Range>(parse_ctx, ctx, value.str);
break;
case format_part_t::kind::replacement: {
const auto& arg_id_value = value.repl.arg_id.val;
const auto arg = value.repl.arg_id.kind == arg_id_kind::index
? ctx.arg(arg_id_value.index)
: ctx.arg(arg_id_value.name);
auto specs = value.repl.specs;
handle_dynamic_spec<width_checker>(specs.width, specs.width_ref, ctx);
handle_dynamic_spec<precision_checker>(specs.precision,
specs.precision_ref, ctx);
error_handler h;
numeric_specs_checker<error_handler> checker(h, arg.type());
if (specs.align == align::numeric) checker.require_numeric_argument();
if (specs.sign != sign::none) checker.check_sign();
if (specs.alt) checker.require_numeric_argument();
if (specs.precision >= 0) checker.check_precision();
advance_to(parse_ctx, part.arg_id_end);
ctx.advance_to(
visit_format_arg(arg_formatter<Range>(ctx, nullptr, &specs), arg));
break;
}
}
}
return ctx.out();
}
} // namespace cf
struct basic_compiled_format {};
template <typename S, typename = void>
struct compiled_format_base : basic_compiled_format {
using char_type = char_t<S>;
using parts_container = std::vector<internal::format_part<char_type>>;
parts_container compiled_parts;
explicit compiled_format_base(basic_string_view<char_type> format_str) {
compile_format_string<false>(format_str,
[this](const format_part<char_type>& part) {
compiled_parts.push_back(part);
});
}
const parts_container& parts() const { return compiled_parts; }
};
template <typename Char, unsigned N> struct format_part_array {
format_part<Char> data[N] = {};
FMT_CONSTEXPR format_part_array() = default;
};
template <typename Char, unsigned N>
FMT_CONSTEXPR format_part_array<Char, N> compile_to_parts(
basic_string_view<Char> format_str) {
format_part_array<Char, N> parts;
unsigned counter = 0;
// This is not a lambda for compatibility with older compilers.
struct {
format_part<Char>* parts;
unsigned* counter;
FMT_CONSTEXPR void operator()(const format_part<Char>& part) {
parts[(*counter)++] = part;
}
} collector{parts.data, &counter};
compile_format_string<true>(format_str, collector);
if (counter < N) {
parts.data[counter] =
format_part<Char>::make_text(basic_string_view<Char>());
}
return parts;
}
template <typename T> constexpr const T& constexpr_max(const T& a, const T& b) {
return (a < b) ? b : a;
}
template <typename S>
struct compiled_format_base<S, enable_if_t<is_compile_string<S>::value>>
: basic_compiled_format {
using char_type = char_t<S>;
FMT_CONSTEXPR explicit compiled_format_base(basic_string_view<char_type>) {}
// Workaround for old compilers. Format string compilation will not be
// performed there anyway.
#if FMT_USE_CONSTEXPR
static FMT_CONSTEXPR_DECL const unsigned num_format_parts =
constexpr_max(count_parts(to_string_view(S())), 1u);
#else
static const unsigned num_format_parts = 1;
#endif
using parts_container = format_part<char_type>[num_format_parts];
const parts_container& parts() const {
static FMT_CONSTEXPR_DECL const auto compiled_parts =
compile_to_parts<char_type, num_format_parts>(
internal::to_string_view(S()));
return compiled_parts.data;
}
};
template <typename S, typename... Args>
class compiled_format : private compiled_format_base<S> {
public:
using typename compiled_format_base<S>::char_type;
private:
basic_string_view<char_type> format_str_;
template <typename Context, typename Range, typename CompiledFormat>
friend auto cf::vformat_to(Range out, CompiledFormat& cf,
basic_format_args<Context> args) ->
typename Context::iterator;
public:
compiled_format() = delete;
explicit constexpr compiled_format(basic_string_view<char_type> format_str)
: compiled_format_base<S>(format_str), format_str_(format_str) {}
};
#ifdef __cpp_if_constexpr
template <typename... Args> struct type_list {};
// Returns a reference to the argument at index N from [first, rest...].
template <int N, typename T, typename... Args>
constexpr const auto& get(const T& first, const Args&... rest) {
static_assert(N < 1 + sizeof...(Args), "index is out of bounds");
if constexpr (N == 0)
return first;
else
return get<N - 1>(rest...);
}
template <int N, typename> struct get_type_impl;
template <int N, typename... Args> struct get_type_impl<N, type_list<Args...>> {
using type = remove_cvref_t<decltype(get<N>(std::declval<Args>()...))>;
};
template <int N, typename T>
using get_type = typename get_type_impl<N, T>::type;
template <typename Char> struct text {
basic_string_view<Char> data;
using char_type = Char;
template <typename OutputIt, typename... Args>
OutputIt format(OutputIt out, const Args&...) const {
// TODO: reserve
return copy_str<Char>(data.begin(), data.end(), out);
}
};
template <typename Char>
constexpr text<Char> make_text(basic_string_view<Char> s, size_t pos,
size_t size) {
return {{&s[pos], size}};
}
template <typename Char, typename OutputIt, typename T,
std::enable_if_t<std::is_integral_v<T>, int> = 0>
OutputIt format_default(OutputIt out, T value) {
// TODO: reserve
format_int fi(value);
return std::copy(fi.data(), fi.data() + fi.size(), out);
}
template <typename Char, typename OutputIt>
OutputIt format_default(OutputIt out, double value) {
writer w(out);
w.write(value);
return w.out();
}
template <typename Char, typename OutputIt>
OutputIt format_default(OutputIt out, Char value) {
*out++ = value;
return out;
}
template <typename Char, typename OutputIt>
OutputIt format_default(OutputIt out, const Char* value) {
auto length = std::char_traits<Char>::length(value);
return copy_str<Char>(value, value + length, out);
}
// A replacement field that refers to argument N.
template <typename Char, typename T, int N> struct field {
using char_type = Char;
template <typename OutputIt, typename... Args>
OutputIt format(OutputIt out, const Args&... args) const {
// This ensures that the argument type is convertile to `const T&`.
const T& arg = get<N>(args...);
return format_default<Char>(out, arg);
}
};
template <typename L, typename R> struct concat {
L lhs;
R rhs;
using char_type = typename L::char_type;
template <typename OutputIt, typename... Args>
OutputIt format(OutputIt out, const Args&... args) const {
out = lhs.format(out, args...);
return rhs.format(out, args...);
}
};
template <typename L, typename R>
constexpr concat<L, R> make_concat(L lhs, R rhs) {
return {lhs, rhs};
}
struct unknown_format {};
template <typename Char>
constexpr size_t parse_text(basic_string_view<Char> str, size_t pos) {
for (size_t size = str.size(); pos != size; ++pos) {
if (str[pos] == '{' || str[pos] == '}') break;
}
return pos;
}
template <typename Args, size_t POS, int ID, typename S>
constexpr auto compile_format_string(S format_str);
template <typename Args, size_t POS, int ID, typename T, typename S>
constexpr auto parse_tail(T head, S format_str) {
if constexpr (POS != to_string_view(format_str).size()) {
constexpr auto tail = compile_format_string<Args, POS, ID>(format_str);
if constexpr (std::is_same<remove_cvref_t<decltype(tail)>,
unknown_format>())
return tail;
else
return make_concat(head, tail);
} else {
return head;
}
}
// Compiles a non-empty format string and returns the compiled representation
// or unknown_format() on unrecognized input.
template <typename Args, size_t POS, int ID, typename S>
constexpr auto compile_format_string(S format_str) {
using char_type = typename S::char_type;
constexpr basic_string_view<char_type> str = format_str;
if constexpr (str[POS] == '{') {
if (POS + 1 == str.size())
throw format_error("unmatched '{' in format string");
if constexpr (str[POS + 1] == '{') {
return parse_tail<Args, POS + 2, ID>(make_text(str, POS, 1), format_str);
} else if constexpr (str[POS + 1] == '}') {
using type = get_type<ID, Args>;
if constexpr (std::is_same<type, int>::value) {
return parse_tail<Args, POS + 2, ID + 1>(field<char_type, type, ID>(),
format_str);
} else {
return unknown_format();
}
} else {
return unknown_format();
}
} else if constexpr (str[POS] == '}') {
if (POS + 1 == str.size())
throw format_error("unmatched '}' in format string");
return parse_tail<Args, POS + 2, ID>(make_text(str, POS, 1), format_str);
} else {
constexpr auto end = parse_text(str, POS + 1);
return parse_tail<Args, end, ID>(make_text(str, POS, end - POS),
format_str);
}
}
#endif // __cpp_if_constexpr
} // namespace internal
#if FMT_USE_CONSTEXPR
# ifdef __cpp_if_constexpr
template <typename... Args, typename S,
FMT_ENABLE_IF(is_compile_string<S>::value)>
constexpr auto compile(S format_str) {
constexpr basic_string_view<typename S::char_type> str = format_str;
if constexpr (str.size() == 0) {
return internal::make_text(str, 0, 0);
} else {
constexpr auto result =
internal::compile_format_string<internal::type_list<Args...>, 0, 0>(
format_str);
if constexpr (std::is_same<remove_cvref_t<decltype(result)>,
internal::unknown_format>()) {
return internal::compiled_format<S, Args...>(to_string_view(format_str));
} else {
return result;
}
}
}
template <typename CompiledFormat, typename... Args,
typename Char = typename CompiledFormat::char_type,
FMT_ENABLE_IF(!std::is_base_of<internal::basic_compiled_format,
CompiledFormat>::value)>
std::basic_string<Char> format(const CompiledFormat& cf, const Args&... args) {
basic_memory_buffer<Char> buffer;
cf.format(std::back_inserter(buffer), args...);
return to_string(buffer);
}
template <typename OutputIt, typename CompiledFormat, typename... Args,
FMT_ENABLE_IF(!std::is_base_of<internal::basic_compiled_format,
CompiledFormat>::value)>
OutputIt format_to(OutputIt out, const CompiledFormat& cf,
const Args&... args) {
return cf.format(out, args...);
}
# else
template <typename... Args, typename S,
FMT_ENABLE_IF(is_compile_string<S>::value)>
constexpr auto compile(S format_str) -> internal::compiled_format<S, Args...> {
return internal::compiled_format<S, Args...>(to_string_view(format_str));
}
# endif // __cpp_if_constexpr
#endif // FMT_USE_CONSTEXPR
// Compiles the format string which must be a string literal.
template <typename... Args, typename Char, size_t N>
auto compile(const Char (&format_str)[N])
-> internal::compiled_format<const Char*, Args...> {
return internal::compiled_format<const Char*, Args...>(
basic_string_view<Char>(format_str, N - 1));
}
template <typename CompiledFormat, typename... Args,
typename Char = typename CompiledFormat::char_type,
FMT_ENABLE_IF(std::is_base_of<internal::basic_compiled_format,
CompiledFormat>::value)>
std::basic_string<Char> format(const CompiledFormat& cf, const Args&... args) {
basic_memory_buffer<Char> buffer;
using range = buffer_range<Char>;
using context = buffer_context<Char>;
internal::cf::vformat_to<context>(range(buffer), cf,
{make_format_args<context>(args...)});
return to_string(buffer);
}
template <typename OutputIt, typename CompiledFormat, typename... Args,
FMT_ENABLE_IF(std::is_base_of<internal::basic_compiled_format,
CompiledFormat>::value)>
OutputIt format_to(OutputIt out, const CompiledFormat& cf,
const Args&... args) {
using char_type = typename CompiledFormat::char_type;
using range = internal::output_range<OutputIt, char_type>;
using context = format_context_t<OutputIt, char_type>;
return internal::cf::vformat_to<context>(
range(out), cf, {make_format_args<context>(args...)});
}
template <typename OutputIt, typename CompiledFormat, typename... Args,
FMT_ENABLE_IF(internal::is_output_iterator<OutputIt>::value)>
format_to_n_result<OutputIt> format_to_n(OutputIt out, size_t n,
const CompiledFormat& cf,
const Args&... args) {
auto it =
format_to(internal::truncating_iterator<OutputIt>(out, n), cf, args...);
return {it.base(), it.count()};
}
template <typename CompiledFormat, typename... Args>
std::size_t formatted_size(const CompiledFormat& cf, const Args&... args) {
return format_to(internal::counting_iterator(), cf, args...).count();
}
FMT_END_NAMESPACE
#endif // FMT_COMPILE_H_

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,583 +0,0 @@
/*
Formatting library for C++
Copyright (c) 2012 - 2016, Victor Zverovich
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "format.h"
#include <string.h>
#include <cctype>
#include <cerrno>
#include <climits>
#include <cmath>
#include <cstdarg>
#include <cstddef> // for std::ptrdiff_t
#if defined(_WIN32) && defined(__MINGW32__)
# include <cstring>
#endif
#if FMT_USE_WINDOWS_H
# if defined(NOMINMAX) || defined(FMT_WIN_MINMAX)
# include <windows.h>
# else
# define NOMINMAX
# include <windows.h>
# undef NOMINMAX
# endif
#endif
using fmt::internal::Arg;
#if FMT_EXCEPTIONS
# define FMT_TRY try
# define FMT_CATCH(x) catch (x)
#else
# define FMT_TRY if (true)
# define FMT_CATCH(x) if (false)
#endif
#ifdef _MSC_VER
# pragma warning(push)
# pragma warning(disable: 4127) // conditional expression is constant
# pragma warning(disable: 4702) // unreachable code
// Disable deprecation warning for strerror. The latter is not called but
// MSVC fails to detect it.
# pragma warning(disable: 4996)
#endif
// Dummy implementations of strerror_r and strerror_s called if corresponding
// system functions are not available.
static inline fmt::internal::Null<> strerror_r(int, char *, ...)
{
return fmt::internal::Null<>();
}
static inline fmt::internal::Null<> strerror_s(char *, std::size_t, ...)
{
return fmt::internal::Null<>();
}
namespace fmt {
FMT_FUNC internal::RuntimeError::~RuntimeError() FMT_DTOR_NOEXCEPT
{}
FMT_FUNC FormatError::~FormatError() FMT_DTOR_NOEXCEPT
{}
FMT_FUNC SystemError::~SystemError() FMT_DTOR_NOEXCEPT
{}
namespace {
#ifndef _MSC_VER
# define FMT_SNPRINTF snprintf
#else // _MSC_VER
inline int fmt_snprintf(char *buffer, size_t size, const char *format, ...)
{
va_list args;
va_start(args, format);
int result = vsnprintf_s(buffer, size, _TRUNCATE, format, args);
va_end(args);
return result;
}
# define FMT_SNPRINTF fmt_snprintf
#endif // _MSC_VER
#if defined(_WIN32) && defined(__MINGW32__) && !defined(__NO_ISOCEXT)
# define FMT_SWPRINTF snwprintf
#else
# define FMT_SWPRINTF swprintf
#endif // defined(_WIN32) && defined(__MINGW32__) && !defined(__NO_ISOCEXT)
const char RESET_COLOR[] = "\x1b[0m";
typedef void(*FormatFunc)(Writer &, int, StringRef);
// Portable thread-safe version of strerror.
// Sets buffer to point to a string describing the error code.
// This can be either a pointer to a string stored in buffer,
// or a pointer to some static immutable string.
// Returns one of the following values:
// 0 - success
// ERANGE - buffer is not large enough to store the error message
// other - failure
// Buffer should be at least of size 1.
int safe_strerror(
int error_code, char *&buffer, std::size_t buffer_size) FMT_NOEXCEPT
{
FMT_ASSERT(buffer != 0 && buffer_size != 0, "invalid buffer");
class StrError
{
private:
int error_code_;
char *&buffer_;
std::size_t buffer_size_;
// A noop assignment operator to avoid bogus warnings.
void operator=(const StrError &)
{}
// Handle the result of XSI-compliant version of strerror_r.
int handle(int result)
{
// glibc versions before 2.13 return result in errno.
return result == -1 ? errno : result;
}
// Handle the result of GNU-specific version of strerror_r.
int handle(char *message)
{
// If the buffer is full then the message is probably truncated.
if (message == buffer_ && strlen(buffer_) == buffer_size_ - 1)
return ERANGE;
buffer_ = message;
return 0;
}
// Handle the case when strerror_r is not available.
int handle(internal::Null<>)
{
return fallback(strerror_s(buffer_, buffer_size_, error_code_));
}
// Fallback to strerror_s when strerror_r is not available.
int fallback(int result)
{
// If the buffer is full then the message is probably truncated.
return result == 0 && strlen(buffer_) == buffer_size_ - 1 ?
ERANGE : result;
}
// Fallback to strerror if strerror_r and strerror_s are not available.
int fallback(internal::Null<>)
{
errno = 0;
buffer_ = strerror(error_code_);
return errno;
}
public:
StrError(int err_code, char *&buf, std::size_t buf_size)
: error_code_(err_code), buffer_(buf), buffer_size_(buf_size)
{}
int run()
{
// Suppress a warning about unused strerror_r.
strerror_r(0, FMT_NULL, "");
return handle(strerror_r(error_code_, buffer_, buffer_size_));
}
};
return StrError(error_code, buffer, buffer_size).run();
}
void format_error_code(Writer &out, int error_code,
StringRef message) FMT_NOEXCEPT
{
// Report error code making sure that the output fits into
// INLINE_BUFFER_SIZE to avoid dynamic memory allocation and potential
// bad_alloc.
out.clear();
static const char SEP[] = ": ";
static const char ERROR_STR[] = "error ";
// Subtract 2 to account for terminating null characters in SEP and ERROR_STR.
std::size_t error_code_size = sizeof(SEP) + sizeof(ERROR_STR) - 2;
typedef internal::IntTraits<int>::MainType MainType;
MainType abs_value = static_cast<MainType>(error_code);
if (internal::is_negative(error_code)) {
abs_value = 0 - abs_value;
++error_code_size;
}
error_code_size += internal::count_digits(abs_value);
if (message.size() <= internal::INLINE_BUFFER_SIZE - error_code_size)
out << message << SEP;
out << ERROR_STR << error_code;
assert(out.size() <= internal::INLINE_BUFFER_SIZE);
}
void report_error(FormatFunc func, int error_code,
StringRef message) FMT_NOEXCEPT
{
MemoryWriter full_message;
func(full_message, error_code, message);
// Use Writer::data instead of Writer::c_str to avoid potential memory
// allocation.
std::fwrite(full_message.data(), full_message.size(), 1, stderr);
std::fputc('\n', stderr);
}
} // namespace
namespace internal {
// This method is used to preserve binary compatibility with fmt 3.0.
// It can be removed in 4.0.
FMT_FUNC void format_system_error(
Writer &out, int error_code, StringRef message) FMT_NOEXCEPT
{
fmt::format_system_error(out, error_code, message);
}
} // namespace internal
FMT_FUNC void SystemError::init(
int err_code, CStringRef format_str, ArgList args)
{
error_code_ = err_code;
MemoryWriter w;
format_system_error(w, err_code, format(format_str, args));
std::runtime_error &base = *this;
base = std::runtime_error(w.str());
}
template <typename T>
int internal::CharTraits<char>::format_float(
char *buffer, std::size_t size, const char *format,
unsigned width, int precision, T value)
{
if (width == 0) {
return precision < 0 ?
FMT_SNPRINTF(buffer, size, format, value) :
FMT_SNPRINTF(buffer, size, format, precision, value);
}
return precision < 0 ?
FMT_SNPRINTF(buffer, size, format, width, value) :
FMT_SNPRINTF(buffer, size, format, width, precision, value);
}
template <typename T>
int internal::CharTraits<wchar_t>::format_float(
wchar_t *buffer, std::size_t size, const wchar_t *format,
unsigned width, int precision, T value)
{
if (width == 0) {
return precision < 0 ?
FMT_SWPRINTF(buffer, size, format, value) :
FMT_SWPRINTF(buffer, size, format, precision, value);
}
return precision < 0 ?
FMT_SWPRINTF(buffer, size, format, width, value) :
FMT_SWPRINTF(buffer, size, format, width, precision, value);
}
template <typename T>
const char internal::BasicData<T>::DIGITS[] =
"0001020304050607080910111213141516171819"
"2021222324252627282930313233343536373839"
"4041424344454647484950515253545556575859"
"6061626364656667686970717273747576777879"
"8081828384858687888990919293949596979899";
#define FMT_POWERS_OF_10(factor) \
factor * 10, \
factor * 100, \
factor * 1000, \
factor * 10000, \
factor * 100000, \
factor * 1000000, \
factor * 10000000, \
factor * 100000000, \
factor * 1000000000
template <typename T>
const uint32_t internal::BasicData<T>::POWERS_OF_10_32[] = {
0, FMT_POWERS_OF_10(1)
};
template <typename T>
const uint64_t internal::BasicData<T>::POWERS_OF_10_64[] = {
0,
FMT_POWERS_OF_10(1),
FMT_POWERS_OF_10(ULongLong(1000000000)),
// Multiply several constants instead of using a single long long constant
// to avoid warnings about C++98 not supporting long long.
ULongLong(1000000000) * ULongLong(1000000000) * 10
};
FMT_FUNC void internal::report_unknown_type(char code, const char *type)
{
(void)type;
if (std::isprint(static_cast<unsigned char>(code))) {
FMT_THROW(FormatError(
format("unknown format code '{}' for {}", code, type)));
}
FMT_THROW(FormatError(
format("unknown format code '\\x{:02x}' for {}",
static_cast<unsigned>(code), type)));
}
#if FMT_USE_WINDOWS_H
FMT_FUNC internal::UTF8ToUTF16::UTF8ToUTF16(StringRef s)
{
static const char ERROR_MSG[] = "cannot convert string from UTF-8 to UTF-16";
if (s.size() > INT_MAX)
FMT_THROW(WindowsError(ERROR_INVALID_PARAMETER, ERROR_MSG));
int s_size = static_cast<int>(s.size());
int length = MultiByteToWideChar(
CP_UTF8, MB_ERR_INVALID_CHARS, s.data(), s_size, FMT_NULL, 0);
if (length == 0)
FMT_THROW(WindowsError(GetLastError(), ERROR_MSG));
buffer_.resize(length + 1);
length = MultiByteToWideChar(
CP_UTF8, MB_ERR_INVALID_CHARS, s.data(), s_size, &buffer_[0], length);
if (length == 0)
FMT_THROW(WindowsError(GetLastError(), ERROR_MSG));
buffer_[length] = 0;
}
FMT_FUNC internal::UTF16ToUTF8::UTF16ToUTF8(WStringRef s)
{
if (int error_code = convert(s)) {
FMT_THROW(WindowsError(error_code,
"cannot convert string from UTF-16 to UTF-8"));
}
}
FMT_FUNC int internal::UTF16ToUTF8::convert(WStringRef s)
{
if (s.size() > INT_MAX)
return ERROR_INVALID_PARAMETER;
int s_size = static_cast<int>(s.size());
int length = WideCharToMultiByte(
CP_UTF8, 0, s.data(), s_size, FMT_NULL, 0, FMT_NULL, FMT_NULL);
if (length == 0)
return GetLastError();
buffer_.resize(length + 1);
length = WideCharToMultiByte(
CP_UTF8, 0, s.data(), s_size, &buffer_[0], length, FMT_NULL, FMT_NULL);
if (length == 0)
return GetLastError();
buffer_[length] = 0;
return 0;
}
FMT_FUNC void WindowsError::init(
int err_code, CStringRef format_str, ArgList args)
{
error_code_ = err_code;
MemoryWriter w;
internal::format_windows_error(w, err_code, format(format_str, args));
std::runtime_error &base = *this;
base = std::runtime_error(w.str());
}
FMT_FUNC void internal::format_windows_error(
Writer &out, int error_code, StringRef message) FMT_NOEXCEPT
{
FMT_TRY{
MemoryBuffer<wchar_t, INLINE_BUFFER_SIZE> buffer;
buffer.resize(INLINE_BUFFER_SIZE);
for (;;) {
wchar_t *system_message = &buffer[0];
int result = FormatMessageW(
FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
FMT_NULL, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
system_message, static_cast<uint32_t>(buffer.size()), FMT_NULL);
if (result != 0) {
UTF16ToUTF8 utf8_message;
if (utf8_message.convert(system_message) == ERROR_SUCCESS) {
out << message << ": " << utf8_message;
return;
}
break;
}
if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
break; // Can't get error message, report error code instead.
buffer.resize(buffer.size() * 2);
}
} FMT_CATCH(...)
{}
fmt::format_error_code(out, error_code, message); // 'fmt::' is for bcc32.
}
#endif // FMT_USE_WINDOWS_H
FMT_FUNC void format_system_error(
Writer &out, int error_code, StringRef message) FMT_NOEXCEPT
{
FMT_TRY{
internal::MemoryBuffer<char, internal::INLINE_BUFFER_SIZE> buffer;
buffer.resize(internal::INLINE_BUFFER_SIZE);
for (;;) {
char *system_message = &buffer[0];
int result = safe_strerror(error_code, system_message, buffer.size());
if (result == 0) {
out << message << ": " << system_message;
return;
}
if (result != ERANGE)
break; // Can't get error message, report error code instead.
buffer.resize(buffer.size() * 2);
}
} FMT_CATCH(...)
{}
fmt::format_error_code(out, error_code, message); // 'fmt::' is for bcc32.
}
template <typename Char>
void internal::ArgMap<Char>::init(const ArgList &args)
{
if (!map_.empty())
return;
typedef internal::NamedArg<Char> NamedArg;
const NamedArg *named_arg = FMT_NULL;
bool use_values =
args.type(ArgList::MAX_PACKED_ARGS - 1) == internal::Arg::NONE;
if (use_values) {
for (unsigned i = 0;/*nothing*/; ++i) {
internal::Arg::Type arg_type = args.type(i);
switch (arg_type) {
case internal::Arg::NONE:
return;
case internal::Arg::NAMED_ARG:
named_arg = static_cast<const NamedArg*>(args.values_[i].pointer);
map_.push_back(Pair(named_arg->name, *named_arg));
break;
default:
/*nothing*/;
}
}
return;
}
for (unsigned i = 0; i != ArgList::MAX_PACKED_ARGS; ++i) {
internal::Arg::Type arg_type = args.type(i);
if (arg_type == internal::Arg::NAMED_ARG) {
named_arg = static_cast<const NamedArg*>(args.args_[i].pointer);
map_.push_back(Pair(named_arg->name, *named_arg));
}
}
for (unsigned i = ArgList::MAX_PACKED_ARGS;/*nothing*/; ++i) {
switch (args.args_[i].type) {
case internal::Arg::NONE:
return;
case internal::Arg::NAMED_ARG:
named_arg = static_cast<const NamedArg*>(args.args_[i].pointer);
map_.push_back(Pair(named_arg->name, *named_arg));
break;
default:
/*nothing*/;
}
}
}
template <typename Char>
void internal::FixedBuffer<Char>::grow(std::size_t)
{
FMT_THROW(std::runtime_error("buffer overflow"));
}
FMT_FUNC Arg internal::FormatterBase::do_get_arg(
unsigned arg_index, const char *&error)
{
Arg arg = args_[arg_index];
switch (arg.type) {
case Arg::NONE:
error = "argument index out of range";
break;
case Arg::NAMED_ARG:
arg = *static_cast<const internal::Arg*>(arg.pointer);
break;
default:
/*nothing*/;
}
return arg;
}
FMT_FUNC void report_system_error(
int error_code, fmt::StringRef message) FMT_NOEXCEPT
{
// 'fmt::' is for bcc32.
report_error(format_system_error, error_code, message);
}
#if FMT_USE_WINDOWS_H
FMT_FUNC void report_windows_error(
int error_code, fmt::StringRef message) FMT_NOEXCEPT
{
// 'fmt::' is for bcc32.
report_error(internal::format_windows_error, error_code, message);
}
#endif
FMT_FUNC void print(std::FILE *f, CStringRef format_str, ArgList args)
{
MemoryWriter w;
w.write(format_str, args);
std::fwrite(w.data(), 1, w.size(), f);
}
FMT_FUNC void print(CStringRef format_str, ArgList args)
{
print(stdout, format_str, args);
}
FMT_FUNC void print_colored(Color c, CStringRef format, ArgList args)
{
char escape[] = "\x1b[30m";
escape[3] = static_cast<char>('0' + c);
std::fputs(escape, stdout);
print(format, args);
std::fputs(RESET_COLOR, stdout);
}
#ifndef FMT_HEADER_ONLY
template struct internal::BasicData<void>;
// Explicit instantiations for char.
template void internal::FixedBuffer<char>::grow(std::size_t);
template void internal::ArgMap<char>::init(const ArgList &args);
template int internal::CharTraits<char>::format_float(
char *buffer, std::size_t size, const char *format,
unsigned width, int precision, double value);
template int internal::CharTraits<char>::format_float(
char *buffer, std::size_t size, const char *format,
unsigned width, int precision, long double value);
// Explicit instantiations for wchar_t.
template void internal::FixedBuffer<wchar_t>::grow(std::size_t);
template void internal::ArgMap<wchar_t>::init(const ArgList &args);
template int internal::CharTraits<wchar_t>::format_float(
wchar_t *buffer, std::size_t size, const wchar_t *format,
unsigned width, int precision, double value);
template int internal::CharTraits<wchar_t>::format_float(
wchar_t *buffer, std::size_t size, const wchar_t *format,
unsigned width, int precision, long double value);
#endif // FMT_HEADER_ONLY
} // namespace fmt
#ifdef _MSC_VER
# pragma warning(pop)
#endif

Some files were not shown because too many files have changed in this diff Show More