Merge branch 'develop' into next
This commit is contained in:
Sebastian Messmer
commit
d4b56406a3
@ -24,5 +24,6 @@ endif(NOT CRYFS_UPDATE_CHECKS)
|
|||||||
|
|
||||||
add_subdirectory(vendor)
|
add_subdirectory(vendor)
|
||||||
add_subdirectory(src)
|
add_subdirectory(src)
|
||||||
|
add_subdirectory(doc)
|
||||||
add_subdirectory(test)
|
add_subdirectory(test)
|
||||||
add_subdirectory(cpack)
|
add_subdirectory(cpack)
|
||||||
|
|||||||
@ -5,3 +5,6 @@ GPGHOMEDIR=$2
|
|||||||
|
|
||||||
git archive --format=tgz "$1" > cryfs-$1.tar.gz
|
git archive --format=tgz "$1" > cryfs-$1.tar.gz
|
||||||
gpg --homedir "$GPGHOMEDIR" --armor --detach-sign cryfs-$1.tar.gz
|
gpg --homedir "$GPGHOMEDIR" --armor --detach-sign cryfs-$1.tar.gz
|
||||||
|
|
||||||
|
git archive --format=tar "$1" | xz -9 > cryfs-$1.tar.xz
|
||||||
|
gpg --homedir "$GPGHOMEDIR" --armor --detach-sign cryfs-$1.tar.xz
|
||||||
|
|||||||
@ -39,8 +39,8 @@ if(BUILDTYPE MATCHES RELEASE AND NOT BUILD_TESTING)
|
|||||||
set(CPACK_PACKAGE_EXECUTABLES "cryfs" "CryFS")
|
set(CPACK_PACKAGE_EXECUTABLES "cryfs" "CryFS")
|
||||||
set(CPACK_DEBIAN_PACKAGE_SECTION "utils")
|
set(CPACK_DEBIAN_PACKAGE_SECTION "utils")
|
||||||
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
|
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
|
||||||
# Needs gnupg2 for postinst script
|
# Needs gnupg2, lsb-release for postinst script
|
||||||
set(CPACK_DEBIAN_PACKAGE_DEPENDS "fuse, gnupg2")
|
set(CPACK_DEBIAN_PACKAGE_DEPENDS "fuse, gnupg2, lsb-release")
|
||||||
|
|
||||||
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://www.cryfs.org")
|
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://www.cryfs.org")
|
||||||
set(CPACK_RPM_PACKAGE_LICENSE "LGPLv3")
|
set(CPACK_RPM_PACKAGE_LICENSE "LGPLv3")
|
||||||
|
|||||||
15
doc/CMakeLists.txt
Normal file
15
doc/CMakeLists.txt
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
project (doc)
|
||||||
|
INCLUDE(GNUInstallDirs)
|
||||||
|
|
||||||
|
find_program(GZIP gzip)
|
||||||
|
|
||||||
|
add_custom_command(
|
||||||
|
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/cryfs.1.gz
|
||||||
|
COMMAND ${GZIP} -c ${CMAKE_CURRENT_SOURCE_DIR}/man/cryfs.1 > ${CMAKE_CURRENT_BINARY_DIR}/cryfs.1.gz
|
||||||
|
)
|
||||||
|
add_custom_target(man ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/cryfs.1.gz)
|
||||||
|
|
||||||
|
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cryfs.1.gz
|
||||||
|
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
|
||||||
|
CONFIGURATIONS Release
|
||||||
|
)
|
||||||
216
doc/man/cryfs.1
Normal file
216
doc/man/cryfs.1
Normal file
@ -0,0 +1,216 @@
|
|||||||
|
.\" cryfs(1) man page
|
||||||
|
.
|
||||||
|
.TH cryfs 1
|
||||||
|
.
|
||||||
|
.
|
||||||
|
.
|
||||||
|
.SH NAME
|
||||||
|
cryfs \- cryptographic filesystem for the cloud
|
||||||
|
.
|
||||||
|
.
|
||||||
|
.
|
||||||
|
.SH SYNOPSIS
|
||||||
|
.\" mount/create syntax
|
||||||
|
.B cryfs
|
||||||
|
[\fB\-c\fR \fIfile\fR]
|
||||||
|
[\fB\-f\fR]
|
||||||
|
[\fIoptions\fR]
|
||||||
|
.I basedir mountpoint
|
||||||
|
[\fB\-\-\fR \fIfuse-options\fR]
|
||||||
|
.br
|
||||||
|
.\" show-ciphers syntax
|
||||||
|
.B cryfs \-\-help\fR|\fB\-\-show-ciphers
|
||||||
|
.
|
||||||
|
.
|
||||||
|
.
|
||||||
|
.SH DESCRIPTION
|
||||||
|
.
|
||||||
|
.B CryFS
|
||||||
|
encrypts your files, so you can safely store them anywhere.
|
||||||
|
.PP
|
||||||
|
.
|
||||||
|
The goal of CryFS is not only to keep file contents, but also
|
||||||
|
file sizes, metadata and directory structure confidential.
|
||||||
|
CryFS uses
|
||||||
|
.B encrypted same-size blocks
|
||||||
|
to store both the files themselves and the block's relations to another.
|
||||||
|
These blocks are stored as individual files in the base directory,
|
||||||
|
which can then be synchronized with cloud services such as Dropbox.
|
||||||
|
.PP
|
||||||
|
.
|
||||||
|
The blocks are encrypted using a random key, which is stored in a
|
||||||
|
.B configuration file
|
||||||
|
encrypted by the user's passphrase.
|
||||||
|
By default, it will be stored together with the data in the base directory,
|
||||||
|
but you can choose a different location if you do not want it in your cloud
|
||||||
|
or when using a weak passphrase.
|
||||||
|
.
|
||||||
|
.
|
||||||
|
.
|
||||||
|
.SH USING CRYFS
|
||||||
|
.
|
||||||
|
.SS Selecting base and mount directories
|
||||||
|
.
|
||||||
|
While you can access your files through your
|
||||||
|
.B mount directory,
|
||||||
|
CryFS actually places them in your
|
||||||
|
.B base directory
|
||||||
|
after encrypting.
|
||||||
|
CryFS will encrypt and decrypt your files 'on the fly' as they are accessed,
|
||||||
|
so files will never be stored on the disk in unencrypted form.
|
||||||
|
.PP
|
||||||
|
.
|
||||||
|
You can choose any empty directory as your base, but your mount directory
|
||||||
|
should be outside of any cloud storage, as your cloud may try to sync your
|
||||||
|
(temporarily mounted) unencrypted files as well.
|
||||||
|
.
|
||||||
|
.SS Setup and usage of your encrypted directory
|
||||||
|
.
|
||||||
|
.TP
|
||||||
|
Creating and mounting your encrypted storage use the same command-line syntax:
|
||||||
|
.B cryfs
|
||||||
|
.I basedir mountpoint
|
||||||
|
.PP
|
||||||
|
.
|
||||||
|
If CryFS detects an encrypted storage in the given base directory, you will
|
||||||
|
be asked for the passphrase to unlock and mount it. Otherwise, CryFS will
|
||||||
|
help you with creating one, just follow the on-screen instructions.
|
||||||
|
.PP
|
||||||
|
.
|
||||||
|
.TP
|
||||||
|
After you are done working with your encrypted files, unmount your storage \
|
||||||
|
with the command
|
||||||
|
.B fusermount -u
|
||||||
|
.I mountpoint
|
||||||
|
.
|
||||||
|
.
|
||||||
|
.SS Changing your passphrase
|
||||||
|
.
|
||||||
|
As the encryption key to your CryFS storage is stored in your configuration
|
||||||
|
file, it would be possible to re-encrypt it using a different passphrase
|
||||||
|
(although this feature has not been implemented yet).
|
||||||
|
.PP
|
||||||
|
.
|
||||||
|
However, this does not change the actual encryption key of your storage, so
|
||||||
|
someone with access to the old passphrase and configuration file (for example
|
||||||
|
through the file history of your cloud or your file system) could still access
|
||||||
|
your files, even those created after the password change.
|
||||||
|
.PP
|
||||||
|
.
|
||||||
|
For this reason, the recommended way to change your passphrase is to create a
|
||||||
|
new CryFS storage with the new passphrase and move your files from the old to
|
||||||
|
the new one.
|
||||||
|
.
|
||||||
|
.
|
||||||
|
.
|
||||||
|
.SH OPTIONS
|
||||||
|
.
|
||||||
|
.SS Getting help
|
||||||
|
.
|
||||||
|
.TP
|
||||||
|
\fB\-h\fR, \fB\-\-help\fR
|
||||||
|
.
|
||||||
|
Show a help message containing short descriptions for all options.
|
||||||
|
.
|
||||||
|
.
|
||||||
|
.TP
|
||||||
|
\fB\-\-show\-ciphers\fR
|
||||||
|
.
|
||||||
|
Show a list of all supported encryption ciphers.
|
||||||
|
.
|
||||||
|
.
|
||||||
|
.SS Encryption parameters
|
||||||
|
.
|
||||||
|
.TP
|
||||||
|
\fB\-\-blocksize\fR \fIarg\fR
|
||||||
|
.
|
||||||
|
Set the block size to \fIarg\fR bytes. Defaults to
|
||||||
|
.BR 32768 .
|
||||||
|
.br
|
||||||
|
\" Intentional space
|
||||||
|
.br
|
||||||
|
A higher block size may help reducing the file count in your base directory
|
||||||
|
(especially when storing large files), but will also waste more space when
|
||||||
|
storing smaller files.
|
||||||
|
.
|
||||||
|
.
|
||||||
|
.TP
|
||||||
|
\fB\-\-cipher\fR \fIarg\fR
|
||||||
|
.
|
||||||
|
Use \fIarg\fR as the cipher for the encryption. Defaults to
|
||||||
|
.BR aes-256-gcm .
|
||||||
|
.
|
||||||
|
.
|
||||||
|
.TP
|
||||||
|
\fB\-c\fR \fIfile\fR, \fB\-\-config\fR \fIfile\fR
|
||||||
|
.
|
||||||
|
Use \fIfile\fR as configuration file for this CryFS storage instead of
|
||||||
|
\fIbasedir\fR/cryfs.config
|
||||||
|
.
|
||||||
|
.
|
||||||
|
.SS General options
|
||||||
|
.
|
||||||
|
.TP
|
||||||
|
\fB\-f\fR, \fB\-\-foreground\fI
|
||||||
|
.
|
||||||
|
Run CryFS in the foreground. Stop using CTRL-C.
|
||||||
|
.
|
||||||
|
.
|
||||||
|
.TP
|
||||||
|
\fB\-\-logfile\fR \fIfile\fR
|
||||||
|
.
|
||||||
|
Write status information to \fIfile\fR. If no logfile is given, CryFS will
|
||||||
|
write them to syslog in background mode, or to stdout in foreground mode.
|
||||||
|
.
|
||||||
|
.
|
||||||
|
.TP
|
||||||
|
\fB\-\-unmount\-idle\fR \fIarg\fR
|
||||||
|
.
|
||||||
|
Unmount automatically after \fIarg\fR minutes of inactivity.
|
||||||
|
.
|
||||||
|
.
|
||||||
|
.
|
||||||
|
.SH ENVIRONMENT
|
||||||
|
.
|
||||||
|
.TP
|
||||||
|
\fBCRYFS_FRONTEND\fR=noninteractive
|
||||||
|
.
|
||||||
|
With this option set, CryFS will only ask for the encryption passphrase once.
|
||||||
|
Instead of asking the user for parameters not specified on the command line,
|
||||||
|
it will just use the default values. CryFS will also not ask you to confirm
|
||||||
|
your passphrase when creating a new CryFS storage.
|
||||||
|
.br
|
||||||
|
\" Intentional space
|
||||||
|
.br
|
||||||
|
Set this environment variable when automating CryFS using external tools or
|
||||||
|
shell scripts.
|
||||||
|
.
|
||||||
|
.
|
||||||
|
.TP
|
||||||
|
\fBCRYFS_NO_UPDATE_CHECK\fR=true
|
||||||
|
.
|
||||||
|
By default, CryFS connects to the internet to check for known security
|
||||||
|
vulnerabilities and new versions. This option disables this.
|
||||||
|
.
|
||||||
|
.
|
||||||
|
.
|
||||||
|
.SH SEE ALSO
|
||||||
|
.
|
||||||
|
.BR mount.fuse (1),
|
||||||
|
.BR fusermount (1)
|
||||||
|
.PP
|
||||||
|
.
|
||||||
|
For more information about the design of CryFS, visit
|
||||||
|
.B https://www.cryfs.org
|
||||||
|
.PP
|
||||||
|
.
|
||||||
|
Visit the development repository at
|
||||||
|
.B https://github.com/cryfs/cryfs
|
||||||
|
for the source code and the full list of contributors to CryFS.
|
||||||
|
.
|
||||||
|
.
|
||||||
|
.
|
||||||
|
.SH AUTHORS
|
||||||
|
.
|
||||||
|
CryFS was created by Sebastian Messmer and contributors.
|
||||||
|
This man page was written by Maximilian Wende.
|
||||||
@ -1,4 +1,5 @@
|
|||||||
project (cryfs-cli)
|
project (cryfs-cli)
|
||||||
|
INCLUDE(GNUInstallDirs)
|
||||||
|
|
||||||
set(SOURCES
|
set(SOURCES
|
||||||
Cli.cpp
|
Cli.cpp
|
||||||
@ -26,6 +27,6 @@ target_enable_style_warnings(${PROJECT_NAME}_bin)
|
|||||||
target_activate_cpp14(${PROJECT_NAME}_bin)
|
target_activate_cpp14(${PROJECT_NAME}_bin)
|
||||||
|
|
||||||
install(TARGETS ${PROJECT_NAME}_bin
|
install(TARGETS ${PROJECT_NAME}_bin
|
||||||
DESTINATION bin
|
DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||||
CONFIGURATIONS Release
|
CONFIGURATIONS Release
|
||||||
)
|
)
|
||||||
|
|||||||
2
vendor/README
vendored
2
vendor/README
vendored
@ -1,4 +1,4 @@
|
|||||||
This directory contains external projects, taken from the following locations:
|
This directory contains external projects, taken from the following locations:
|
||||||
scrypt: http://www.tarsnap.com/scrypt.html
|
scrypt: http://www.tarsnap.com/scrypt.html
|
||||||
googletest: https://github.com/google/googletest/tree/release-1.8.0
|
googletest: https://github.com/google/googletest/tree/release-1.8.0
|
||||||
spdlog: https://github.com/gabime/spdlog/tree/v0.11.0/include/spdlog
|
spdlog: https://github.com/gabime/spdlog/tree/v0.12.0/include/spdlog
|
||||||
|
|||||||
8
vendor/spdlog/spdlog/common.h
vendored
8
vendor/spdlog/spdlog/common.h
vendored
@ -30,11 +30,11 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__GNUC__) || defined(__clang__)
|
#if defined(__GNUC__) || defined(__clang__)
|
||||||
#define DEPRECATED __attribute__((deprecated))
|
#define SPDLOG_DEPRECATED __attribute__((deprecated))
|
||||||
#elif defined(_MSC_VER)
|
#elif defined(_MSC_VER)
|
||||||
#define DEPRECATED __declspec(deprecated)
|
#define SPDLOG_DEPRECATED __declspec(deprecated)
|
||||||
#else
|
#else
|
||||||
#define DEPRECATED
|
#define SPDLOG_DEPRECATED
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
@ -57,7 +57,7 @@ using formatter_ptr = std::shared_ptr<spdlog::formatter>;
|
|||||||
#if defined(SPDLOG_NO_ATOMIC_LEVELS)
|
#if defined(SPDLOG_NO_ATOMIC_LEVELS)
|
||||||
using level_t = details::null_atomic_int;
|
using level_t = details::null_atomic_int;
|
||||||
#else
|
#else
|
||||||
using level_t = std::atomic_int;
|
using level_t = std::atomic<int>;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
using log_err_handler = std::function<void(const std::string &err_msg)>;
|
using log_err_handler = std::function<void(const std::string &err_msg)>;
|
||||||
|
|||||||
18
vendor/spdlog/spdlog/details/async_log_helper.h
vendored
18
vendor/spdlog/spdlog/details/async_log_helper.h
vendored
@ -67,7 +67,7 @@ async_msg(async_msg&& other) SPDLOG_NOEXCEPT:
|
|||||||
{}
|
{}
|
||||||
|
|
||||||
async_msg(async_msg_type m_type) :msg_type(m_type)
|
async_msg(async_msg_type m_type) :msg_type(m_type)
|
||||||
{};
|
{}
|
||||||
|
|
||||||
async_msg& operator=(async_msg&& other) SPDLOG_NOEXCEPT
|
async_msg& operator=(async_msg&& other) SPDLOG_NOEXCEPT
|
||||||
{
|
{
|
||||||
@ -82,7 +82,7 @@ async_msg(async_msg&& other) SPDLOG_NOEXCEPT:
|
|||||||
|
|
||||||
// never copy or assign. should only be moved..
|
// never copy or assign. should only be moved..
|
||||||
async_msg(const async_msg&) = delete;
|
async_msg(const async_msg&) = delete;
|
||||||
async_msg& operator=(async_msg& other) = delete;
|
async_msg& operator=(const async_msg& other) = delete;
|
||||||
|
|
||||||
// construct from log_msg
|
// construct from log_msg
|
||||||
async_msg(const details::log_msg& m) :
|
async_msg(const details::log_msg& m) :
|
||||||
@ -229,8 +229,6 @@ inline spdlog::details::async_log_helper::~async_log_helper()
|
|||||||
inline void spdlog::details::async_log_helper::log(const details::log_msg& msg)
|
inline void spdlog::details::async_log_helper::log(const details::log_msg& msg)
|
||||||
{
|
{
|
||||||
push_msg(async_msg(msg));
|
push_msg(async_msg(msg));
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
inline void spdlog::details::async_log_helper::push_msg(details::async_log_helper::async_msg&& new_msg)
|
inline void spdlog::details::async_log_helper::push_msg(details::async_log_helper::async_msg&& new_msg)
|
||||||
@ -246,7 +244,6 @@ inline void spdlog::details::async_log_helper::push_msg(details::async_log_helpe
|
|||||||
}
|
}
|
||||||
while (!_q.enqueue(std::move(new_msg)));
|
while (!_q.enqueue(std::move(new_msg)));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// optionally wait for the queue be empty and request flush from the sinks
|
// optionally wait for the queue be empty and request flush from the sinks
|
||||||
@ -281,10 +278,8 @@ inline void spdlog::details::async_log_helper::worker_loop()
|
|||||||
// return true if this thread should still be active (while no terminate msg was received)
|
// 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)
|
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;
|
async_msg incoming_async_msg;
|
||||||
|
|
||||||
|
|
||||||
if (_q.dequeue(incoming_async_msg))
|
if (_q.dequeue(incoming_async_msg))
|
||||||
{
|
{
|
||||||
last_pop = details::os::now();
|
last_pop = details::os::now();
|
||||||
@ -359,8 +354,7 @@ inline void spdlog::details::async_log_helper::sleep_or_yield(const spdlog::log_
|
|||||||
|
|
||||||
// yield upto 150 micros
|
// yield upto 150 micros
|
||||||
if (time_since_op <= microseconds(100))
|
if (time_since_op <= microseconds(100))
|
||||||
return yield();
|
return std::this_thread::yield();
|
||||||
|
|
||||||
|
|
||||||
// sleep for 20 ms upto 200 ms
|
// sleep for 20 ms upto 200 ms
|
||||||
if (time_since_op <= milliseconds(200))
|
if (time_since_op <= milliseconds(200))
|
||||||
@ -378,13 +372,7 @@ inline void spdlog::details::async_log_helper::wait_empty_q()
|
|||||||
{
|
{
|
||||||
sleep_or_yield(details::os::now(), last_op);
|
sleep_or_yield(details::os::now(), last_op);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -31,13 +31,13 @@ inline spdlog::async_logger::async_logger(const std::string& logger_name,
|
|||||||
}
|
}
|
||||||
|
|
||||||
inline spdlog::async_logger::async_logger(const std::string& logger_name,
|
inline spdlog::async_logger::async_logger(const std::string& logger_name,
|
||||||
sinks_init_list sinks,
|
sinks_init_list sinks_list,
|
||||||
size_t queue_size,
|
size_t queue_size,
|
||||||
const async_overflow_policy overflow_policy,
|
const async_overflow_policy overflow_policy,
|
||||||
const std::function<void()>& worker_warmup_cb,
|
const std::function<void()>& worker_warmup_cb,
|
||||||
const std::chrono::milliseconds& flush_interval_ms,
|
const std::chrono::milliseconds& flush_interval_ms,
|
||||||
const std::function<void()>& worker_teardown_cb) :
|
const std::function<void()>& worker_teardown_cb) :
|
||||||
async_logger(logger_name, sinks.begin(), sinks.end(), queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms, 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,
|
inline spdlog::async_logger::async_logger(const std::string& logger_name,
|
||||||
sink_ptr single_sink,
|
sink_ptr single_sink,
|
||||||
|
|||||||
5
vendor/spdlog/spdlog/details/logger_impl.h
vendored
5
vendor/spdlog/spdlog/details/logger_impl.h
vendored
@ -291,3 +291,8 @@ inline bool spdlog::logger::_should_flush_on(const details::log_msg &msg)
|
|||||||
const auto flush_level = _flush_level.load(std::memory_order_relaxed);
|
const auto flush_level = _flush_level.load(std::memory_order_relaxed);
|
||||||
return (msg.level >= flush_level) && (msg.level != level::off);
|
return (msg.level >= flush_level) && (msg.level != level::off);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inline const std::vector<spdlog::sink_ptr>& spdlog::logger::sinks() const
|
||||||
|
{
|
||||||
|
return _sinks;
|
||||||
|
}
|
||||||
|
|||||||
92
vendor/spdlog/spdlog/details/os.h
vendored
92
vendor/spdlog/spdlog/details/os.h
vendored
@ -10,10 +10,12 @@
|
|||||||
#include <ctime>
|
#include <ctime>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <chrono>
|
||||||
|
#include <thread>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
|
||||||
@ -25,27 +27,32 @@
|
|||||||
#define WIN32_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
#endif
|
#endif
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
#include <process.h> // _get_pid support
|
||||||
|
#include <io.h> // _get_osfhandle support
|
||||||
|
|
||||||
#ifdef __MINGW32__
|
#ifdef __MINGW32__
|
||||||
#include <share.h>
|
#include <share.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <sys/types.h>
|
#else // unix
|
||||||
|
|
||||||
#elif __linux__
|
|
||||||
|
|
||||||
#include <sys/syscall.h> //Use gettid() syscall under linux to get thread id
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <chrono>
|
#include <fcntl.h>
|
||||||
|
|
||||||
|
#ifdef __linux__
|
||||||
|
#include <sys/syscall.h> //Use gettid() syscall under linux to get thread id
|
||||||
|
|
||||||
#elif __FreeBSD__
|
#elif __FreeBSD__
|
||||||
#include <sys/thr.h> //Use thr_self() syscall under FreeBSD to get thread id
|
#include <sys/thr.h> //Use thr_self() syscall under FreeBSD to get thread id
|
||||||
|
|
||||||
#else
|
|
||||||
#include <thread>
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif //unix
|
||||||
|
|
||||||
|
#ifndef __has_feature // Clang - feature checking macros.
|
||||||
|
#define __has_feature(x) 0 // Compatibility with non-clang compilers.
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
namespace spdlog
|
namespace spdlog
|
||||||
{
|
{
|
||||||
namespace details
|
namespace details
|
||||||
@ -135,6 +142,18 @@ inline bool operator!=(const std::tm& tm1, const std::tm& tm2)
|
|||||||
SPDLOG_CONSTEXPR static const char* eol = SPDLOG_EOL;
|
SPDLOG_CONSTEXPR static const char* eol = SPDLOG_EOL;
|
||||||
SPDLOG_CONSTEXPR static int eol_size = sizeof(SPDLOG_EOL) - 1;
|
SPDLOG_CONSTEXPR static int eol_size = sizeof(SPDLOG_EOL) - 1;
|
||||||
|
|
||||||
|
inline void prevent_child_fd(FILE *f)
|
||||||
|
{
|
||||||
|
#ifdef _WIN32
|
||||||
|
auto file_handle = (HANDLE)_get_osfhandle(_fileno(f));
|
||||||
|
if (!::SetHandleInformation(file_handle, HANDLE_FLAG_INHERIT, 0))
|
||||||
|
throw spdlog_ex("SetHandleInformation failed", errno);
|
||||||
|
#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
|
//fopen_s on non windows for writing
|
||||||
@ -146,13 +165,18 @@ inline int fopen_s(FILE** fp, const filename_t& filename, const filename_t& mode
|
|||||||
#else
|
#else
|
||||||
*fp = _fsopen((filename.c_str()), mode.c_str(), _SH_DENYWR);
|
*fp = _fsopen((filename.c_str()), mode.c_str(), _SH_DENYWR);
|
||||||
#endif
|
#endif
|
||||||
return *fp == nullptr;
|
#else //unix
|
||||||
#else
|
|
||||||
*fp = fopen((filename.c_str()), mode.c_str());
|
*fp = fopen((filename.c_str()), mode.c_str());
|
||||||
return *fp == nullptr;
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef SPDLOG_PREVENT_CHILD_FD
|
||||||
|
if(*fp != nullptr)
|
||||||
|
prevent_child_fd(*fp);
|
||||||
|
#endif
|
||||||
|
return *fp == nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
inline int remove(const filename_t &filename)
|
inline int remove(const filename_t &filename)
|
||||||
{
|
{
|
||||||
#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
|
#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
|
||||||
@ -204,9 +228,9 @@ inline size_t filesize(FILE *f)
|
|||||||
return st.st_size;
|
return st.st_size;
|
||||||
|
|
||||||
#else //windows 32 bits
|
#else //windows 32 bits
|
||||||
struct _stat st;
|
long ret = _filelength(fd);
|
||||||
if (_fstat(fd, &st) == 0)
|
if (ret >= 0)
|
||||||
return st.st_size;
|
return static_cast<size_t>(ret);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#else // unix
|
#else // unix
|
||||||
@ -215,11 +239,11 @@ inline size_t filesize(FILE *f)
|
|||||||
#if !defined(__FreeBSD__) && !defined(__APPLE__) && (defined(__x86_64__) || defined(__ppc64__))
|
#if !defined(__FreeBSD__) && !defined(__APPLE__) && (defined(__x86_64__) || defined(__ppc64__))
|
||||||
struct stat64 st;
|
struct stat64 st;
|
||||||
if (fstat64(fd, &st) == 0)
|
if (fstat64(fd, &st) == 0)
|
||||||
return st.st_size;
|
return static_cast<size_t>(st.st_size);
|
||||||
#else // unix 32 bits or osx
|
#else // unix 32 bits or osx
|
||||||
struct stat st;
|
struct stat st;
|
||||||
if (fstat(fd, &st) == 0)
|
if (fstat(fd, &st) == 0)
|
||||||
return st.st_size;
|
return static_cast<size_t>(st.st_size);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
throw spdlog_ex("Failed getting file size from fd", errno);
|
throw spdlog_ex("Failed getting file size from fd", errno);
|
||||||
@ -292,7 +316,7 @@ inline int utc_minutes_offset(const std::tm& tm = details::os::localtime())
|
|||||||
|
|
||||||
//Return current thread id as size_t
|
//Return current thread id as size_t
|
||||||
//It exists because the std::this_thread::get_id() is much slower(espcially under VS 2013)
|
//It exists because the std::this_thread::get_id() is much slower(espcially under VS 2013)
|
||||||
inline size_t thread_id()
|
inline size_t _thread_id()
|
||||||
{
|
{
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
return static_cast<size_t>(::GetCurrentThreadId());
|
return static_cast<size_t>(::GetCurrentThreadId());
|
||||||
@ -308,10 +332,21 @@ inline size_t thread_id()
|
|||||||
#else //Default to standard C++11 (OSX and other Unix)
|
#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()));
|
return static_cast<size_t>(std::hash<std::thread::id>()(std::this_thread::get_id()));
|
||||||
#endif
|
#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)
|
// wchar support for windows file names (SPDLOG_WCHAR_FILENAMES must be defined)
|
||||||
#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
|
#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
|
||||||
@ -342,8 +377,8 @@ inline std::string errno_str(int err_num)
|
|||||||
else
|
else
|
||||||
return "Unkown error";
|
return "Unkown error";
|
||||||
|
|
||||||
#elif defined(__FreeBSD__) || defined(__APPLE__) || defined(ANDROID) || \
|
#elif defined(__FreeBSD__) || defined(__APPLE__) || defined(ANDROID) || defined(__SUNPRO_CC) || \
|
||||||
((_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE) // posix version
|
((_POSIX_C_SOURCE >= 200112L) && ! defined(_GNU_SOURCE)) // posix version
|
||||||
|
|
||||||
if (strerror_r(err_num, buf, buf_size) == 0)
|
if (strerror_r(err_num, buf, buf_size) == 0)
|
||||||
return std::string(buf);
|
return std::string(buf);
|
||||||
@ -355,6 +390,17 @@ inline std::string errno_str(int err_num)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inline int pid()
|
||||||
|
{
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
return ::_getpid();
|
||||||
|
#else
|
||||||
|
return static_cast<int>(::getpid());
|
||||||
|
#endif
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
} //os
|
} //os
|
||||||
} //details
|
} //details
|
||||||
} //spdlog
|
} //spdlog
|
||||||
|
|||||||
@ -18,6 +18,7 @@
|
|||||||
#include <thread>
|
#include <thread>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include <array>
|
||||||
|
|
||||||
namespace spdlog
|
namespace spdlog
|
||||||
{
|
{
|
||||||
@ -78,42 +79,60 @@ static int to12h(const tm& t)
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Abbreviated weekday name
|
//Abbreviated weekday name
|
||||||
static const std::string days[] { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
|
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
|
class a_formatter:public flag_formatter
|
||||||
{
|
{
|
||||||
void format(details::log_msg& msg, const std::tm& tm_time) override
|
void format(details::log_msg& msg, const std::tm& tm_time) override
|
||||||
{
|
{
|
||||||
msg.formatted << days[tm_time.tm_wday];
|
msg.formatted << days()[tm_time.tm_wday];
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
//Full weekday name
|
//Full weekday name
|
||||||
static const std::string full_days[] { "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" };
|
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
|
class A_formatter:public flag_formatter
|
||||||
{
|
{
|
||||||
void format(details::log_msg& msg, const std::tm& tm_time) override
|
void format(details::log_msg& msg, const std::tm& tm_time) override
|
||||||
{
|
{
|
||||||
msg.formatted << full_days[tm_time.tm_wday];
|
msg.formatted << full_days()[tm_time.tm_wday];
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
//Abbreviated month
|
//Abbreviated month
|
||||||
static const std::string months[] { "Jan", "Feb", "Mar", "Apr", "May", "June", "July", "Aug", "Sept", "Oct", "Nov", "Dec" };
|
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
|
class b_formatter:public flag_formatter
|
||||||
{
|
{
|
||||||
void format(details::log_msg& msg, const std::tm& tm_time) override
|
void format(details::log_msg& msg, const std::tm& tm_time) override
|
||||||
{
|
{
|
||||||
msg.formatted << months[tm_time.tm_mon];
|
msg.formatted << months()[tm_time.tm_mon];
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
//Full month name
|
//Full month name
|
||||||
static const std::string full_months[] { "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" };
|
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
|
class B_formatter:public flag_formatter
|
||||||
{
|
{
|
||||||
void format(details::log_msg& msg, const std::tm& tm_time) override
|
void format(details::log_msg& msg, const std::tm& tm_time) override
|
||||||
{
|
{
|
||||||
msg.formatted << full_months[tm_time.tm_mon];
|
msg.formatted << full_months()[tm_time.tm_mon];
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -138,7 +157,7 @@ class c_formatter:public flag_formatter
|
|||||||
{
|
{
|
||||||
void format(details::log_msg& msg, const std::tm& tm_time) override
|
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 << ' ';
|
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;
|
pad_n_join(msg.formatted, tm_time.tm_hour, tm_time.tm_min, tm_time.tm_sec, ':') << ' ' << tm_time.tm_year + 1900;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -356,7 +375,7 @@ private:
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
//Thread id
|
// Thread id
|
||||||
class t_formatter:public flag_formatter
|
class t_formatter:public flag_formatter
|
||||||
{
|
{
|
||||||
void format(details::log_msg& msg, const std::tm&) override
|
void format(details::log_msg& msg, const std::tm&) override
|
||||||
@ -365,6 +384,15 @@ class t_formatter:public flag_formatter
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// 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
|
class v_formatter:public flag_formatter
|
||||||
{
|
{
|
||||||
@ -453,6 +481,8 @@ class full_formatter:public flag_formatter
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
@ -611,6 +641,10 @@ inline void spdlog::pattern_formatter::handle_flag(char flag)
|
|||||||
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::full_formatter()));
|
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::full_formatter()));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case ('P'):
|
||||||
|
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::pid_formatter()));
|
||||||
|
break;
|
||||||
|
|
||||||
default: //Unkown flag appears as is
|
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('%')));
|
||||||
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::ch_formatter(flag)));
|
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::ch_formatter(flag)));
|
||||||
|
|||||||
89
vendor/spdlog/spdlog/details/spdlog_impl.h
vendored
89
vendor/spdlog/spdlog/details/spdlog_impl.h
vendored
@ -12,9 +12,20 @@
|
|||||||
#include <spdlog/details/registry.h>
|
#include <spdlog/details/registry.h>
|
||||||
#include <spdlog/sinks/file_sinks.h>
|
#include <spdlog/sinks/file_sinks.h>
|
||||||
#include <spdlog/sinks/stdout_sinks.h>
|
#include <spdlog/sinks/stdout_sinks.h>
|
||||||
|
#ifdef SPDLOG_ENABLE_SYSLOG
|
||||||
#include <spdlog/sinks/syslog_sink.h>
|
#include <spdlog/sinks/syslog_sink.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
#include <spdlog/sinks/wincolor_sink.h>
|
||||||
|
#else
|
||||||
#include <spdlog/sinks/ansicolor_sink.h>
|
#include <spdlog/sinks/ansicolor_sink.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef __ANDROID__
|
||||||
#include <spdlog/sinks/android_sink.h>
|
#include <spdlog/sinks/android_sink.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
@ -69,34 +80,86 @@ inline std::shared_ptr<spdlog::logger> spdlog::daily_logger_st(const std::string
|
|||||||
return create<spdlog::sinks::daily_file_sink_st>(logger_name, filename, SPDLOG_FILENAME_T("txt"), hour, minute);
|
return create<spdlog::sinks::daily_file_sink_st>(logger_name, filename, SPDLOG_FILENAME_T("txt"), hour, minute);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create stdout/stderr loggers (with optinal color support)
|
|
||||||
inline std::shared_ptr<spdlog::logger> create_console_logger(const std::string& logger_name, spdlog::sink_ptr sink, bool color)
|
//
|
||||||
|
// stdout/stderr loggers
|
||||||
|
//
|
||||||
|
inline std::shared_ptr<spdlog::logger> spdlog::stdout_logger_mt(const std::string& logger_name)
|
||||||
{
|
{
|
||||||
if (color) //use color wrapper sink
|
return spdlog::details::registry::instance().create(logger_name, spdlog::sinks::stdout_sink_mt::instance());
|
||||||
sink = std::make_shared<spdlog::sinks::ansicolor_sink>(sink);
|
}
|
||||||
|
|
||||||
|
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);
|
return spdlog::details::registry::instance().create(logger_name, sink);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline std::shared_ptr<spdlog::logger> spdlog::stdout_logger_mt(const std::string& logger_name, bool color)
|
inline std::shared_ptr<spdlog::logger> spdlog::stdout_color_st(const std::string& logger_name)
|
||||||
{
|
{
|
||||||
return create_console_logger(logger_name, sinks::stdout_sink_mt::instance(), color);
|
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::stdout_logger_st(const std::string& logger_name, bool color)
|
inline std::shared_ptr<spdlog::logger> spdlog::stderr_color_mt(const std::string& logger_name)
|
||||||
{
|
{
|
||||||
return create_console_logger(logger_name, sinks::stdout_sink_st::instance(), color);
|
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_logger_mt(const std::string& logger_name, bool color)
|
|
||||||
|
inline std::shared_ptr<spdlog::logger> spdlog::stderr_color_st(const std::string& logger_name)
|
||||||
{
|
{
|
||||||
return create_console_logger(logger_name, sinks::stderr_sink_mt::instance(), color);
|
auto sink = std::make_shared<spdlog::sinks::wincolor_stderr_sink_st>();
|
||||||
|
return spdlog::details::registry::instance().create(logger_name, sink);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline std::shared_ptr<spdlog::logger> spdlog::stderr_logger_st(const std::string& logger_name, bool color)
|
#else //ansi terminal colors
|
||||||
|
|
||||||
|
inline std::shared_ptr<spdlog::logger> spdlog::stdout_color_mt(const std::string& logger_name)
|
||||||
{
|
{
|
||||||
return create_console_logger(logger_name, sinks::stderr_sink_st::instance(), color);
|
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
|
#ifdef SPDLOG_ENABLE_SYSLOG
|
||||||
// Create syslog logger
|
// 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)
|
inline std::shared_ptr<spdlog::logger> spdlog::syslog_logger(const std::string& logger_name, const std::string& syslog_ident, int syslog_option)
|
||||||
@ -105,7 +168,7 @@ inline std::shared_ptr<spdlog::logger> spdlog::syslog_logger(const std::string&
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__ANDROID__)
|
#ifdef __ANDROID__
|
||||||
inline std::shared_ptr<spdlog::logger> spdlog::android_logger(const std::string& logger_name, const std::string& tag)
|
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);
|
return create<spdlog::sinks::android_sink>(logger_name, tag);
|
||||||
|
|||||||
852
vendor/spdlog/spdlog/fmt/bundled/format.cc
vendored
852
vendor/spdlog/spdlog/fmt/bundled/format.cc
vendored
@ -1,33 +1,31 @@
|
|||||||
/*
|
/*
|
||||||
Formatting library for C++
|
Formatting library for C++
|
||||||
|
|
||||||
Copyright (c) 2012 - 2016, Victor Zverovich
|
Copyright (c) 2012 - 2016, Victor Zverovich
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are met:
|
modification, are permitted provided that the following conditions are met:
|
||||||
|
|
||||||
1. Redistributions of source code must retain the above copyright notice, this
|
1. Redistributions of source code must retain the above copyright notice, this
|
||||||
list of conditions and the following disclaimer.
|
list of conditions and the following disclaimer.
|
||||||
2. Redistributions in binary form must reproduce the above copyright notice,
|
2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
this list of conditions and the following disclaimer in the documentation
|
this list of conditions and the following disclaimer in the documentation
|
||||||
and/or other materials provided with the distribution.
|
and/or other materials provided with the distribution.
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
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
|
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||||
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
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
|
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// Commented out by spdlog to use header only
|
#include "format.h"
|
||||||
// #include "fmt/format.h"
|
|
||||||
// #include "fmt/printf.h"
|
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
@ -73,31 +71,37 @@ using fmt::internal::Arg;
|
|||||||
|
|
||||||
// Dummy implementations of strerror_r and strerror_s called if corresponding
|
// Dummy implementations of strerror_r and strerror_s called if corresponding
|
||||||
// system functions are not available.
|
// system functions are not available.
|
||||||
static inline fmt::internal::Null<> strerror_r(int, char *, ...) {
|
static inline fmt::internal::Null<> strerror_r(int, char *, ...)
|
||||||
return fmt::internal::Null<>();
|
{
|
||||||
|
return fmt::internal::Null<>();
|
||||||
}
|
}
|
||||||
static inline fmt::internal::Null<> strerror_s(char *, std::size_t, ...) {
|
static inline fmt::internal::Null<> strerror_s(char *, std::size_t, ...)
|
||||||
return fmt::internal::Null<>();
|
{
|
||||||
|
return fmt::internal::Null<>();
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace fmt {
|
namespace fmt {
|
||||||
|
|
||||||
FMT_FUNC internal::RuntimeError::~RuntimeError() throw() {}
|
FMT_FUNC internal::RuntimeError::~RuntimeError() FMT_DTOR_NOEXCEPT
|
||||||
FMT_FUNC FormatError::~FormatError() throw() {}
|
{}
|
||||||
FMT_FUNC SystemError::~SystemError() throw() {}
|
FMT_FUNC FormatError::~FormatError() FMT_DTOR_NOEXCEPT
|
||||||
|
{}
|
||||||
|
FMT_FUNC SystemError::~SystemError() FMT_DTOR_NOEXCEPT
|
||||||
|
{}
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
#ifndef _MSC_VER
|
#ifndef _MSC_VER
|
||||||
# define FMT_SNPRINTF snprintf
|
# define FMT_SNPRINTF snprintf
|
||||||
#else // _MSC_VER
|
#else // _MSC_VER
|
||||||
inline int fmt_snprintf(char *buffer, size_t size, const char *format, ...) {
|
inline int fmt_snprintf(char *buffer, size_t size, const char *format, ...)
|
||||||
va_list args;
|
{
|
||||||
va_start(args, format);
|
va_list args;
|
||||||
int result = vsnprintf_s(buffer, size, _TRUNCATE, format, args);
|
va_start(args, format);
|
||||||
va_end(args);
|
int result = vsnprintf_s(buffer, size, _TRUNCATE, format, args);
|
||||||
return result;
|
va_end(args);
|
||||||
}
|
return result;
|
||||||
|
}
|
||||||
# define FMT_SNPRINTF fmt_snprintf
|
# define FMT_SNPRINTF fmt_snprintf
|
||||||
#endif // _MSC_VER
|
#endif // _MSC_VER
|
||||||
|
|
||||||
@ -107,166 +111,183 @@ inline int fmt_snprintf(char *buffer, size_t size, const char *format, ...) {
|
|||||||
# define FMT_SWPRINTF swprintf
|
# define FMT_SWPRINTF swprintf
|
||||||
#endif // defined(_WIN32) && defined(__MINGW32__) && !defined(__NO_ISOCEXT)
|
#endif // defined(_WIN32) && defined(__MINGW32__) && !defined(__NO_ISOCEXT)
|
||||||
|
|
||||||
const char RESET_COLOR[] = "\x1b[0m";
|
const char RESET_COLOR[] = "\x1b[0m";
|
||||||
|
|
||||||
typedef void (*FormatFunc)(Writer &, int, StringRef);
|
typedef void(*FormatFunc)(Writer &, int, StringRef);
|
||||||
|
|
||||||
// Portable thread-safe version of strerror.
|
// Portable thread-safe version of strerror.
|
||||||
// Sets buffer to point to a string describing the error code.
|
// Sets buffer to point to a string describing the error code.
|
||||||
// This can be either a pointer to a string stored in buffer,
|
// This can be either a pointer to a string stored in buffer,
|
||||||
// or a pointer to some static immutable string.
|
// or a pointer to some static immutable string.
|
||||||
// Returns one of the following values:
|
// Returns one of the following values:
|
||||||
// 0 - success
|
// 0 - success
|
||||||
// ERANGE - buffer is not large enough to store the error message
|
// ERANGE - buffer is not large enough to store the error message
|
||||||
// other - failure
|
// other - failure
|
||||||
// Buffer should be at least of size 1.
|
// Buffer should be at least of size 1.
|
||||||
int safe_strerror(
|
int safe_strerror(
|
||||||
int error_code, char *&buffer, std::size_t buffer_size) FMT_NOEXCEPT {
|
int error_code, char *&buffer, std::size_t buffer_size) FMT_NOEXCEPT
|
||||||
FMT_ASSERT(buffer != 0 && buffer_size != 0, "invalid buffer");
|
{
|
||||||
|
FMT_ASSERT(buffer != 0 && buffer_size != 0, "invalid buffer");
|
||||||
|
|
||||||
class StrError {
|
class StrError
|
||||||
private:
|
{
|
||||||
int error_code_;
|
private:
|
||||||
char *&buffer_;
|
int error_code_;
|
||||||
std::size_t buffer_size_;
|
char *&buffer_;
|
||||||
|
std::size_t buffer_size_;
|
||||||
|
|
||||||
// A noop assignment operator to avoid bogus warnings.
|
// A noop assignment operator to avoid bogus warnings.
|
||||||
void operator=(const StrError &) {}
|
void operator=(const StrError &)
|
||||||
|
{}
|
||||||
|
|
||||||
// Handle the result of XSI-compliant version of strerror_r.
|
// Handle the result of XSI-compliant version of strerror_r.
|
||||||
int handle(int result) {
|
int handle(int result)
|
||||||
// glibc versions before 2.13 return result in errno.
|
{
|
||||||
return result == -1 ? errno : 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.
|
// Handle the result of GNU-specific version of strerror_r.
|
||||||
int handle(char *message) {
|
int handle(char *message)
|
||||||
// If the buffer is full then the message is probably truncated.
|
{
|
||||||
if (message == buffer_ && strlen(buffer_) == buffer_size_ - 1)
|
// If the buffer is full then the message is probably truncated.
|
||||||
return ERANGE;
|
if (message == buffer_ && strlen(buffer_) == buffer_size_ - 1)
|
||||||
buffer_ = message;
|
return ERANGE;
|
||||||
return 0;
|
buffer_ = message;
|
||||||
}
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
// Handle the case when strerror_r is not available.
|
// Handle the case when strerror_r is not available.
|
||||||
int handle(internal::Null<>) {
|
int handle(internal::Null<>)
|
||||||
return fallback(strerror_s(buffer_, buffer_size_, error_code_));
|
{
|
||||||
}
|
return fallback(strerror_s(buffer_, buffer_size_, error_code_));
|
||||||
|
}
|
||||||
|
|
||||||
// Fallback to strerror_s when strerror_r is not available.
|
// Fallback to strerror_s when strerror_r is not available.
|
||||||
int fallback(int result) {
|
int fallback(int result)
|
||||||
// If the buffer is full then the message is probably truncated.
|
{
|
||||||
return result == 0 && strlen(buffer_) == buffer_size_ - 1 ?
|
// If the buffer is full then the message is probably truncated.
|
||||||
ERANGE : result;
|
return result == 0 && strlen(buffer_) == buffer_size_ - 1 ?
|
||||||
}
|
ERANGE : result;
|
||||||
|
}
|
||||||
|
|
||||||
// Fallback to strerror if strerror_r and strerror_s are not available.
|
// Fallback to strerror if strerror_r and strerror_s are not available.
|
||||||
int fallback(internal::Null<>) {
|
int fallback(internal::Null<>)
|
||||||
errno = 0;
|
{
|
||||||
buffer_ = strerror(error_code_);
|
errno = 0;
|
||||||
return errno;
|
buffer_ = strerror(error_code_);
|
||||||
}
|
return errno;
|
||||||
|
}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
StrError(int err_code, char *&buf, std::size_t buf_size)
|
StrError(int err_code, char *&buf, std::size_t buf_size)
|
||||||
: error_code_(err_code), buffer_(buf), buffer_size_(buf_size) {}
|
: error_code_(err_code), buffer_(buf), buffer_size_(buf_size)
|
||||||
|
{}
|
||||||
|
|
||||||
int run() {
|
int run()
|
||||||
strerror_r(0, 0, ""); // Suppress a warning about unused strerror_r.
|
{
|
||||||
return handle(strerror_r(error_code_, buffer_, buffer_size_));
|
// 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();
|
}
|
||||||
}
|
};
|
||||||
|
return StrError(error_code, buffer, buffer_size).run();
|
||||||
|
}
|
||||||
|
|
||||||
void format_error_code(Writer &out, int error_code,
|
void format_error_code(Writer &out, int error_code,
|
||||||
StringRef message) FMT_NOEXCEPT {
|
StringRef message) FMT_NOEXCEPT
|
||||||
// Report error code making sure that the output fits into
|
{
|
||||||
// INLINE_BUFFER_SIZE to avoid dynamic memory allocation and potential
|
// Report error code making sure that the output fits into
|
||||||
// bad_alloc.
|
// INLINE_BUFFER_SIZE to avoid dynamic memory allocation and potential
|
||||||
out.clear();
|
// bad_alloc.
|
||||||
static const char SEP[] = ": ";
|
out.clear();
|
||||||
static const char ERROR_STR[] = "error ";
|
static const char SEP[] = ": ";
|
||||||
// Subtract 2 to account for terminating null characters in SEP and ERROR_STR.
|
static const char ERROR_STR[] = "error ";
|
||||||
std::size_t error_code_size = sizeof(SEP) + sizeof(ERROR_STR) - 2;
|
// Subtract 2 to account for terminating null characters in SEP and ERROR_STR.
|
||||||
typedef internal::IntTraits<int>::MainType MainType;
|
std::size_t error_code_size = sizeof(SEP) + sizeof(ERROR_STR) - 2;
|
||||||
MainType abs_value = static_cast<MainType>(error_code);
|
typedef internal::IntTraits<int>::MainType MainType;
|
||||||
if (internal::is_negative(error_code)) {
|
MainType abs_value = static_cast<MainType>(error_code);
|
||||||
abs_value = 0 - abs_value;
|
if (internal::is_negative(error_code)) {
|
||||||
++error_code_size;
|
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)
|
error_code_size += internal::count_digits(abs_value);
|
||||||
out << message << SEP;
|
if (message.size() <= internal::INLINE_BUFFER_SIZE - error_code_size)
|
||||||
out << ERROR_STR << error_code;
|
out << message << SEP;
|
||||||
assert(out.size() <= internal::INLINE_BUFFER_SIZE);
|
out << ERROR_STR << error_code;
|
||||||
}
|
assert(out.size() <= internal::INLINE_BUFFER_SIZE);
|
||||||
|
}
|
||||||
|
|
||||||
void report_error(FormatFunc func, int error_code,
|
void report_error(FormatFunc func, int error_code,
|
||||||
StringRef message) FMT_NOEXCEPT {
|
StringRef message) FMT_NOEXCEPT
|
||||||
MemoryWriter full_message;
|
{
|
||||||
func(full_message, error_code, message);
|
MemoryWriter full_message;
|
||||||
// Use Writer::data instead of Writer::c_str to avoid potential memory
|
func(full_message, error_code, message);
|
||||||
// allocation.
|
// Use Writer::data instead of Writer::c_str to avoid potential memory
|
||||||
std::fwrite(full_message.data(), full_message.size(), 1, stderr);
|
// allocation.
|
||||||
std::fputc('\n', stderr);
|
std::fwrite(full_message.data(), full_message.size(), 1, stderr);
|
||||||
}
|
std::fputc('\n', stderr);
|
||||||
} // namespace
|
}
|
||||||
|
} // namespace
|
||||||
|
|
||||||
namespace internal {
|
namespace internal {
|
||||||
|
|
||||||
// This method is used to preserve binary compatibility with fmt 3.0.
|
// This method is used to preserve binary compatibility with fmt 3.0.
|
||||||
// It can be removed in 4.0.
|
// It can be removed in 4.0.
|
||||||
FMT_FUNC void format_system_error(
|
FMT_FUNC void format_system_error(
|
||||||
Writer &out, int error_code, StringRef message) FMT_NOEXCEPT {
|
Writer &out, int error_code, StringRef message) FMT_NOEXCEPT
|
||||||
fmt::format_system_error(out, error_code, message);
|
{
|
||||||
}
|
fmt::format_system_error(out, error_code, message);
|
||||||
} // namespace internal
|
}
|
||||||
|
} // namespace internal
|
||||||
|
|
||||||
FMT_FUNC void SystemError::init(
|
FMT_FUNC void SystemError::init(
|
||||||
int err_code, CStringRef format_str, ArgList args) {
|
int err_code, CStringRef format_str, ArgList args)
|
||||||
error_code_ = err_code;
|
{
|
||||||
MemoryWriter w;
|
error_code_ = err_code;
|
||||||
format_system_error(w, err_code, format(format_str, args));
|
MemoryWriter w;
|
||||||
std::runtime_error &base = *this;
|
format_system_error(w, err_code, format(format_str, args));
|
||||||
base = std::runtime_error(w.str());
|
std::runtime_error &base = *this;
|
||||||
}
|
base = std::runtime_error(w.str());
|
||||||
|
}
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
int internal::CharTraits<char>::format_float(
|
int internal::CharTraits<char>::format_float(
|
||||||
char *buffer, std::size_t size, const char *format,
|
char *buffer, std::size_t size, const char *format,
|
||||||
unsigned width, int precision, T value) {
|
unsigned width, int precision, T value)
|
||||||
if (width == 0) {
|
{
|
||||||
return precision < 0 ?
|
if (width == 0) {
|
||||||
FMT_SNPRINTF(buffer, size, format, value) :
|
return precision < 0 ?
|
||||||
FMT_SNPRINTF(buffer, size, format, precision, value);
|
FMT_SNPRINTF(buffer, size, format, value) :
|
||||||
}
|
FMT_SNPRINTF(buffer, size, format, precision, value);
|
||||||
return precision < 0 ?
|
}
|
||||||
FMT_SNPRINTF(buffer, size, format, width, value) :
|
return precision < 0 ?
|
||||||
FMT_SNPRINTF(buffer, size, format, width, precision, value);
|
FMT_SNPRINTF(buffer, size, format, width, value) :
|
||||||
}
|
FMT_SNPRINTF(buffer, size, format, width, precision, value);
|
||||||
|
}
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
int internal::CharTraits<wchar_t>::format_float(
|
int internal::CharTraits<wchar_t>::format_float(
|
||||||
wchar_t *buffer, std::size_t size, const wchar_t *format,
|
wchar_t *buffer, std::size_t size, const wchar_t *format,
|
||||||
unsigned width, int precision, T value) {
|
unsigned width, int precision, T value)
|
||||||
if (width == 0) {
|
{
|
||||||
return precision < 0 ?
|
if (width == 0) {
|
||||||
FMT_SWPRINTF(buffer, size, format, value) :
|
return precision < 0 ?
|
||||||
FMT_SWPRINTF(buffer, size, format, precision, value);
|
FMT_SWPRINTF(buffer, size, format, value) :
|
||||||
}
|
FMT_SWPRINTF(buffer, size, format, precision, value);
|
||||||
return precision < 0 ?
|
}
|
||||||
FMT_SWPRINTF(buffer, size, format, width, value) :
|
return precision < 0 ?
|
||||||
FMT_SWPRINTF(buffer, size, format, width, precision, value);
|
FMT_SWPRINTF(buffer, size, format, width, value) :
|
||||||
}
|
FMT_SWPRINTF(buffer, size, format, width, precision, value);
|
||||||
|
}
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
const char internal::BasicData<T>::DIGITS[] =
|
const char internal::BasicData<T>::DIGITS[] =
|
||||||
"0001020304050607080910111213141516171819"
|
"0001020304050607080910111213141516171819"
|
||||||
"2021222324252627282930313233343536373839"
|
"2021222324252627282930313233343536373839"
|
||||||
"4041424344454647484950515253545556575859"
|
"4041424344454647484950515253545556575859"
|
||||||
"6061626364656667686970717273747576777879"
|
"6061626364656667686970717273747576777879"
|
||||||
"8081828384858687888990919293949596979899";
|
"8081828384858687888990919293949596979899";
|
||||||
|
|
||||||
#define FMT_POWERS_OF_10(factor) \
|
#define FMT_POWERS_OF_10(factor) \
|
||||||
factor * 10, \
|
factor * 10, \
|
||||||
@ -279,274 +300,279 @@ const char internal::BasicData<T>::DIGITS[] =
|
|||||||
factor * 100000000, \
|
factor * 100000000, \
|
||||||
factor * 1000000000
|
factor * 1000000000
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
const uint32_t internal::BasicData<T>::POWERS_OF_10_32[] = {
|
const uint32_t internal::BasicData<T>::POWERS_OF_10_32[] = {
|
||||||
0, FMT_POWERS_OF_10(1)
|
0, FMT_POWERS_OF_10(1)
|
||||||
};
|
};
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
const uint64_t internal::BasicData<T>::POWERS_OF_10_64[] = {
|
const uint64_t internal::BasicData<T>::POWERS_OF_10_64[] = {
|
||||||
0,
|
0,
|
||||||
FMT_POWERS_OF_10(1),
|
FMT_POWERS_OF_10(1),
|
||||||
FMT_POWERS_OF_10(ULongLong(1000000000)),
|
FMT_POWERS_OF_10(ULongLong(1000000000)),
|
||||||
// Multiply several constants instead of using a single long long constant
|
// Multiply several constants instead of using a single long long constant
|
||||||
// to avoid warnings about C++98 not supporting long long.
|
// to avoid warnings about C++98 not supporting long long.
|
||||||
ULongLong(1000000000) * ULongLong(1000000000) * 10
|
ULongLong(1000000000) * ULongLong(1000000000) * 10
|
||||||
};
|
};
|
||||||
|
|
||||||
FMT_FUNC void internal::report_unknown_type(char code, const char *type) {
|
FMT_FUNC void internal::report_unknown_type(char code, const char *type)
|
||||||
(void)type;
|
{
|
||||||
if (std::isprint(static_cast<unsigned char>(code))) {
|
(void)type;
|
||||||
FMT_THROW(FormatError(
|
if (std::isprint(static_cast<unsigned char>(code))) {
|
||||||
format("unknown format code '{}' for {}", code, type)));
|
FMT_THROW(FormatError(
|
||||||
}
|
format("unknown format code '{}' for {}", code, type)));
|
||||||
FMT_THROW(FormatError(
|
}
|
||||||
format("unknown format code '\\x{:02x}' for {}",
|
FMT_THROW(FormatError(
|
||||||
static_cast<unsigned>(code), type)));
|
format("unknown format code '\\x{:02x}' for {}",
|
||||||
}
|
static_cast<unsigned>(code), type)));
|
||||||
|
}
|
||||||
|
|
||||||
#if FMT_USE_WINDOWS_H
|
#if FMT_USE_WINDOWS_H
|
||||||
|
|
||||||
FMT_FUNC internal::UTF8ToUTF16::UTF8ToUTF16(StringRef s) {
|
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)
|
static const char ERROR_MSG[] = "cannot convert string from UTF-8 to UTF-16";
|
||||||
FMT_THROW(WindowsError(ERROR_INVALID_PARAMETER, ERROR_MSG));
|
if (s.size() > INT_MAX)
|
||||||
int s_size = static_cast<int>(s.size());
|
FMT_THROW(WindowsError(ERROR_INVALID_PARAMETER, ERROR_MSG));
|
||||||
int length = MultiByteToWideChar(
|
int s_size = static_cast<int>(s.size());
|
||||||
CP_UTF8, MB_ERR_INVALID_CHARS, s.data(), s_size, 0, 0);
|
int length = MultiByteToWideChar(
|
||||||
if (length == 0)
|
CP_UTF8, MB_ERR_INVALID_CHARS, s.data(), s_size, FMT_NULL, 0);
|
||||||
FMT_THROW(WindowsError(GetLastError(), ERROR_MSG));
|
if (length == 0)
|
||||||
buffer_.resize(length + 1);
|
FMT_THROW(WindowsError(GetLastError(), ERROR_MSG));
|
||||||
length = MultiByteToWideChar(
|
buffer_.resize(length + 1);
|
||||||
CP_UTF8, MB_ERR_INVALID_CHARS, s.data(), s_size, &buffer_[0], length);
|
length = MultiByteToWideChar(
|
||||||
if (length == 0)
|
CP_UTF8, MB_ERR_INVALID_CHARS, s.data(), s_size, &buffer_[0], length);
|
||||||
FMT_THROW(WindowsError(GetLastError(), ERROR_MSG));
|
if (length == 0)
|
||||||
buffer_[length] = 0;
|
FMT_THROW(WindowsError(GetLastError(), ERROR_MSG));
|
||||||
}
|
buffer_[length] = 0;
|
||||||
|
}
|
||||||
|
|
||||||
FMT_FUNC internal::UTF16ToUTF8::UTF16ToUTF8(WStringRef s) {
|
FMT_FUNC internal::UTF16ToUTF8::UTF16ToUTF8(WStringRef s)
|
||||||
if (int error_code = convert(s)) {
|
{
|
||||||
FMT_THROW(WindowsError(error_code,
|
if (int error_code = convert(s)) {
|
||||||
"cannot convert string from UTF-16 to UTF-8"));
|
FMT_THROW(WindowsError(error_code,
|
||||||
}
|
"cannot convert string from UTF-16 to UTF-8"));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
FMT_FUNC int internal::UTF16ToUTF8::convert(WStringRef s) {
|
FMT_FUNC int internal::UTF16ToUTF8::convert(WStringRef s)
|
||||||
if (s.size() > INT_MAX)
|
{
|
||||||
return ERROR_INVALID_PARAMETER;
|
if (s.size() > INT_MAX)
|
||||||
int s_size = static_cast<int>(s.size());
|
return ERROR_INVALID_PARAMETER;
|
||||||
int length = WideCharToMultiByte(CP_UTF8, 0, s.data(), s_size, 0, 0, 0, 0);
|
int s_size = static_cast<int>(s.size());
|
||||||
if (length == 0)
|
int length = WideCharToMultiByte(
|
||||||
return GetLastError();
|
CP_UTF8, 0, s.data(), s_size, FMT_NULL, 0, FMT_NULL, FMT_NULL);
|
||||||
buffer_.resize(length + 1);
|
if (length == 0)
|
||||||
length = WideCharToMultiByte(
|
return GetLastError();
|
||||||
CP_UTF8, 0, s.data(), s_size, &buffer_[0], length, 0, 0);
|
buffer_.resize(length + 1);
|
||||||
if (length == 0)
|
length = WideCharToMultiByte(
|
||||||
return GetLastError();
|
CP_UTF8, 0, s.data(), s_size, &buffer_[0], length, FMT_NULL, FMT_NULL);
|
||||||
buffer_[length] = 0;
|
if (length == 0)
|
||||||
return 0;
|
return GetLastError();
|
||||||
}
|
buffer_[length] = 0;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
FMT_FUNC void WindowsError::init(
|
FMT_FUNC void WindowsError::init(
|
||||||
int err_code, CStringRef format_str, ArgList args) {
|
int err_code, CStringRef format_str, ArgList args)
|
||||||
error_code_ = err_code;
|
{
|
||||||
MemoryWriter w;
|
error_code_ = err_code;
|
||||||
internal::format_windows_error(w, err_code, format(format_str, args));
|
MemoryWriter w;
|
||||||
std::runtime_error &base = *this;
|
internal::format_windows_error(w, err_code, format(format_str, args));
|
||||||
base = std::runtime_error(w.str());
|
std::runtime_error &base = *this;
|
||||||
}
|
base = std::runtime_error(w.str());
|
||||||
|
}
|
||||||
|
|
||||||
FMT_FUNC void internal::format_windows_error(
|
FMT_FUNC void internal::format_windows_error(
|
||||||
Writer &out, int error_code, StringRef message) FMT_NOEXCEPT {
|
Writer &out, int error_code, StringRef message) FMT_NOEXCEPT
|
||||||
FMT_TRY {
|
{
|
||||||
MemoryBuffer<wchar_t, INLINE_BUFFER_SIZE> buffer;
|
FMT_TRY{
|
||||||
buffer.resize(INLINE_BUFFER_SIZE);
|
MemoryBuffer<wchar_t, INLINE_BUFFER_SIZE> buffer;
|
||||||
for (;;) {
|
buffer.resize(INLINE_BUFFER_SIZE);
|
||||||
wchar_t *system_message = &buffer[0];
|
for (;;) {
|
||||||
int result = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
|
wchar_t *system_message = &buffer[0];
|
||||||
0, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
|
int result = FormatMessageW(
|
||||||
system_message, static_cast<uint32_t>(buffer.size()), 0);
|
FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
|
||||||
if (result != 0) {
|
FMT_NULL, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
|
||||||
UTF16ToUTF8 utf8_message;
|
system_message, static_cast<uint32_t>(buffer.size()), FMT_NULL);
|
||||||
if (utf8_message.convert(system_message) == ERROR_SUCCESS) {
|
if (result != 0) {
|
||||||
out << message << ": " << utf8_message;
|
UTF16ToUTF8 utf8_message;
|
||||||
return;
|
if (utf8_message.convert(system_message) == ERROR_SUCCESS) {
|
||||||
}
|
out << message << ": " << utf8_message;
|
||||||
break;
|
return;
|
||||||
}
|
}
|
||||||
if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
|
break;
|
||||||
break; // Can't get error message, report error code instead.
|
}
|
||||||
buffer.resize(buffer.size() * 2);
|
if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
|
||||||
}
|
break; // Can't get error message, report error code instead.
|
||||||
} FMT_CATCH(...) {}
|
buffer.resize(buffer.size() * 2);
|
||||||
fmt::format_error_code(out, error_code, message); // 'fmt::' is for bcc32.
|
}
|
||||||
}
|
} FMT_CATCH(...)
|
||||||
|
{}
|
||||||
|
fmt::format_error_code(out, error_code, message); // 'fmt::' is for bcc32.
|
||||||
|
}
|
||||||
|
|
||||||
#endif // FMT_USE_WINDOWS_H
|
#endif // FMT_USE_WINDOWS_H
|
||||||
|
|
||||||
FMT_FUNC void format_system_error(
|
FMT_FUNC void format_system_error(
|
||||||
Writer &out, int error_code, StringRef message) FMT_NOEXCEPT {
|
Writer &out, int error_code, StringRef message) FMT_NOEXCEPT
|
||||||
FMT_TRY {
|
{
|
||||||
internal::MemoryBuffer<char, internal::INLINE_BUFFER_SIZE> buffer;
|
FMT_TRY{
|
||||||
buffer.resize(internal::INLINE_BUFFER_SIZE);
|
internal::MemoryBuffer<char, internal::INLINE_BUFFER_SIZE> buffer;
|
||||||
for (;;) {
|
buffer.resize(internal::INLINE_BUFFER_SIZE);
|
||||||
char *system_message = &buffer[0];
|
for (;;) {
|
||||||
int result = safe_strerror(error_code, system_message, buffer.size());
|
char *system_message = &buffer[0];
|
||||||
if (result == 0) {
|
int result = safe_strerror(error_code, system_message, buffer.size());
|
||||||
out << message << ": " << system_message;
|
if (result == 0) {
|
||||||
return;
|
out << message << ": " << system_message;
|
||||||
}
|
return;
|
||||||
if (result != ERANGE)
|
}
|
||||||
break; // Can't get error message, report error code instead.
|
if (result != ERANGE)
|
||||||
buffer.resize(buffer.size() * 2);
|
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.
|
} FMT_CATCH(...)
|
||||||
}
|
{}
|
||||||
|
fmt::format_error_code(out, error_code, message); // 'fmt::' is for bcc32.
|
||||||
|
}
|
||||||
|
|
||||||
template <typename Char>
|
template <typename Char>
|
||||||
void internal::ArgMap<Char>::init(const ArgList &args) {
|
void internal::ArgMap<Char>::init(const ArgList &args)
|
||||||
if (!map_.empty())
|
{
|
||||||
return;
|
if (!map_.empty())
|
||||||
typedef internal::NamedArg<Char> NamedArg;
|
return;
|
||||||
const NamedArg *named_arg = 0;
|
typedef internal::NamedArg<Char> NamedArg;
|
||||||
bool use_values =
|
const NamedArg *named_arg = FMT_NULL;
|
||||||
args.type(ArgList::MAX_PACKED_ARGS - 1) == internal::Arg::NONE;
|
bool use_values =
|
||||||
if (use_values) {
|
args.type(ArgList::MAX_PACKED_ARGS - 1) == internal::Arg::NONE;
|
||||||
for (unsigned i = 0;/*nothing*/; ++i) {
|
if (use_values) {
|
||||||
internal::Arg::Type arg_type = args.type(i);
|
for (unsigned i = 0;/*nothing*/; ++i) {
|
||||||
switch (arg_type) {
|
internal::Arg::Type arg_type = args.type(i);
|
||||||
case internal::Arg::NONE:
|
switch (arg_type) {
|
||||||
return;
|
case internal::Arg::NONE:
|
||||||
case internal::Arg::NAMED_ARG:
|
return;
|
||||||
named_arg = static_cast<const NamedArg*>(args.values_[i].pointer);
|
case internal::Arg::NAMED_ARG:
|
||||||
map_.push_back(Pair(named_arg->name, *named_arg));
|
named_arg = static_cast<const NamedArg*>(args.values_[i].pointer);
|
||||||
break;
|
map_.push_back(Pair(named_arg->name, *named_arg));
|
||||||
default:
|
break;
|
||||||
/*nothing*/;
|
default:
|
||||||
}
|
/*nothing*/;
|
||||||
}
|
}
|
||||||
return;
|
}
|
||||||
}
|
return;
|
||||||
for (unsigned i = 0; i != ArgList::MAX_PACKED_ARGS; ++i) {
|
}
|
||||||
internal::Arg::Type arg_type = args.type(i);
|
for (unsigned i = 0; i != ArgList::MAX_PACKED_ARGS; ++i) {
|
||||||
if (arg_type == internal::Arg::NAMED_ARG) {
|
internal::Arg::Type arg_type = args.type(i);
|
||||||
named_arg = static_cast<const NamedArg*>(args.args_[i].pointer);
|
if (arg_type == internal::Arg::NAMED_ARG) {
|
||||||
map_.push_back(Pair(named_arg->name, *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) {
|
for (unsigned i = ArgList::MAX_PACKED_ARGS;/*nothing*/; ++i) {
|
||||||
case internal::Arg::NONE:
|
switch (args.args_[i].type) {
|
||||||
return;
|
case internal::Arg::NONE:
|
||||||
case internal::Arg::NAMED_ARG:
|
return;
|
||||||
named_arg = static_cast<const NamedArg*>(args.args_[i].pointer);
|
case internal::Arg::NAMED_ARG:
|
||||||
map_.push_back(Pair(named_arg->name, *named_arg));
|
named_arg = static_cast<const NamedArg*>(args.args_[i].pointer);
|
||||||
break;
|
map_.push_back(Pair(named_arg->name, *named_arg));
|
||||||
default:
|
break;
|
||||||
/*nothing*/;
|
default:
|
||||||
}
|
/*nothing*/;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
template <typename Char>
|
template <typename Char>
|
||||||
void internal::FixedBuffer<Char>::grow(std::size_t) {
|
void internal::FixedBuffer<Char>::grow(std::size_t)
|
||||||
FMT_THROW(std::runtime_error("buffer overflow"));
|
{
|
||||||
}
|
FMT_THROW(std::runtime_error("buffer overflow"));
|
||||||
|
}
|
||||||
|
|
||||||
FMT_FUNC Arg internal::FormatterBase::do_get_arg(
|
FMT_FUNC Arg internal::FormatterBase::do_get_arg(
|
||||||
unsigned arg_index, const char *&error) {
|
unsigned arg_index, const char *&error)
|
||||||
Arg arg = args_[arg_index];
|
{
|
||||||
switch (arg.type) {
|
Arg arg = args_[arg_index];
|
||||||
case Arg::NONE:
|
switch (arg.type) {
|
||||||
error = "argument index out of range";
|
case Arg::NONE:
|
||||||
break;
|
error = "argument index out of range";
|
||||||
case Arg::NAMED_ARG:
|
break;
|
||||||
arg = *static_cast<const internal::Arg*>(arg.pointer);
|
case Arg::NAMED_ARG:
|
||||||
break;
|
arg = *static_cast<const internal::Arg*>(arg.pointer);
|
||||||
default:
|
break;
|
||||||
/*nothing*/;
|
default:
|
||||||
}
|
/*nothing*/;
|
||||||
return arg;
|
}
|
||||||
}
|
return arg;
|
||||||
|
}
|
||||||
|
|
||||||
FMT_FUNC void report_system_error(
|
FMT_FUNC void report_system_error(
|
||||||
int error_code, fmt::StringRef message) FMT_NOEXCEPT {
|
int error_code, fmt::StringRef message) FMT_NOEXCEPT
|
||||||
// 'fmt::' is for bcc32.
|
{
|
||||||
report_error(format_system_error, error_code, message);
|
// 'fmt::' is for bcc32.
|
||||||
}
|
report_error(format_system_error, error_code, message);
|
||||||
|
}
|
||||||
|
|
||||||
#if FMT_USE_WINDOWS_H
|
#if FMT_USE_WINDOWS_H
|
||||||
FMT_FUNC void report_windows_error(
|
FMT_FUNC void report_windows_error(
|
||||||
int error_code, fmt::StringRef message) FMT_NOEXCEPT {
|
int error_code, fmt::StringRef message) FMT_NOEXCEPT
|
||||||
// 'fmt::' is for bcc32.
|
{
|
||||||
report_error(internal::format_windows_error, error_code, message);
|
// 'fmt::' is for bcc32.
|
||||||
}
|
report_error(internal::format_windows_error, error_code, message);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
FMT_FUNC void print(std::FILE *f, CStringRef format_str, ArgList args) {
|
FMT_FUNC void print(std::FILE *f, CStringRef format_str, ArgList args)
|
||||||
MemoryWriter w;
|
{
|
||||||
w.write(format_str, args);
|
MemoryWriter w;
|
||||||
std::fwrite(w.data(), 1, w.size(), f);
|
w.write(format_str, args);
|
||||||
}
|
std::fwrite(w.data(), 1, w.size(), f);
|
||||||
|
}
|
||||||
|
|
||||||
FMT_FUNC void print(CStringRef format_str, ArgList args) {
|
FMT_FUNC void print(CStringRef format_str, ArgList args)
|
||||||
print(stdout, format_str, args);
|
{
|
||||||
}
|
print(stdout, format_str, args);
|
||||||
|
}
|
||||||
|
|
||||||
FMT_FUNC void print_colored(Color c, CStringRef format, ArgList args) {
|
FMT_FUNC void print_colored(Color c, CStringRef format, ArgList args)
|
||||||
char escape[] = "\x1b[30m";
|
{
|
||||||
escape[3] = static_cast<char>('0' + c);
|
char escape[] = "\x1b[30m";
|
||||||
std::fputs(escape, stdout);
|
escape[3] = static_cast<char>('0' + c);
|
||||||
print(format, args);
|
std::fputs(escape, stdout);
|
||||||
std::fputs(RESET_COLOR, stdout);
|
print(format, args);
|
||||||
}
|
std::fputs(RESET_COLOR, stdout);
|
||||||
|
}
|
||||||
template <typename Char>
|
|
||||||
void printf(BasicWriter<Char> &w, BasicCStringRef<Char> format, ArgList args);
|
|
||||||
|
|
||||||
FMT_FUNC int fprintf(std::FILE *f, CStringRef format, ArgList args) {
|
|
||||||
MemoryWriter w;
|
|
||||||
printf(w, format, args);
|
|
||||||
std::size_t size = w.size();
|
|
||||||
return std::fwrite(w.data(), 1, size, f) < size ? -1 : static_cast<int>(size);
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifndef FMT_HEADER_ONLY
|
#ifndef FMT_HEADER_ONLY
|
||||||
|
|
||||||
template struct internal::BasicData<void>;
|
template struct internal::BasicData<void>;
|
||||||
|
|
||||||
// Explicit instantiations for char.
|
// Explicit instantiations for char.
|
||||||
|
|
||||||
template void internal::FixedBuffer<char>::grow(std::size_t);
|
template void internal::FixedBuffer<char>::grow(std::size_t);
|
||||||
|
|
||||||
template void internal::ArgMap<char>::init(const ArgList &args);
|
template void internal::ArgMap<char>::init(const ArgList &args);
|
||||||
|
|
||||||
template void PrintfFormatter<char>::format(CStringRef format);
|
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(
|
template int internal::CharTraits<char>::format_float(
|
||||||
char *buffer, std::size_t size, const char *format,
|
char *buffer, std::size_t size, const char *format,
|
||||||
unsigned width, int precision, double value);
|
unsigned width, int precision, long double value);
|
||||||
|
|
||||||
template int internal::CharTraits<char>::format_float(
|
// Explicit instantiations for wchar_t.
|
||||||
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::FixedBuffer<wchar_t>::grow(std::size_t);
|
template void internal::ArgMap<wchar_t>::init(const ArgList &args);
|
||||||
|
|
||||||
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 void PrintfFormatter<wchar_t>::format(WCStringRef format);
|
template int internal::CharTraits<wchar_t>::format_float(
|
||||||
|
wchar_t *buffer, std::size_t size, const wchar_t *format,
|
||||||
template int internal::CharTraits<wchar_t>::format_float(
|
unsigned width, int precision, long double value);
|
||||||
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
|
#endif // FMT_HEADER_ONLY
|
||||||
|
|
||||||
|
|||||||
1346
vendor/spdlog/spdlog/fmt/bundled/format.h
vendored
1346
vendor/spdlog/spdlog/fmt/bundled/format.h
vendored
File diff suppressed because it is too large
Load Diff
55
vendor/spdlog/spdlog/fmt/bundled/ostream.cc
vendored
55
vendor/spdlog/spdlog/fmt/bundled/ostream.cc
vendored
@ -1,36 +1,37 @@
|
|||||||
/*
|
/*
|
||||||
Formatting library for C++ - std::ostream support
|
Formatting library for C++ - std::ostream support
|
||||||
|
|
||||||
Copyright (c) 2012 - 2016, Victor Zverovich
|
Copyright (c) 2012 - 2016, Victor Zverovich
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
For the license information refer to format.h.
|
For the license information refer to format.h.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// Commented out by spdlog to use header only
|
#include "ostream.h"
|
||||||
// #include "fmt/ostream.h"
|
|
||||||
|
|
||||||
namespace fmt {
|
namespace fmt {
|
||||||
|
|
||||||
namespace internal {
|
namespace internal {
|
||||||
FMT_FUNC void write(std::ostream &os, Writer &w) {
|
FMT_FUNC void write(std::ostream &os, Writer &w)
|
||||||
const char *data = w.data();
|
{
|
||||||
typedef internal::MakeUnsigned<std::streamsize>::Type UnsignedStreamSize;
|
const char *data = w.data();
|
||||||
UnsignedStreamSize size = w.size();
|
typedef internal::MakeUnsigned<std::streamsize>::Type UnsignedStreamSize;
|
||||||
UnsignedStreamSize max_size =
|
UnsignedStreamSize size = w.size();
|
||||||
internal::to_unsigned((std::numeric_limits<std::streamsize>::max)());
|
UnsignedStreamSize max_size =
|
||||||
do {
|
internal::to_unsigned((std::numeric_limits<std::streamsize>::max)());
|
||||||
UnsignedStreamSize n = size <= max_size ? size : max_size;
|
do {
|
||||||
os.write(data, static_cast<std::streamsize>(n));
|
UnsignedStreamSize n = size <= max_size ? size : max_size;
|
||||||
data += n;
|
os.write(data, static_cast<std::streamsize>(n));
|
||||||
size -= n;
|
data += n;
|
||||||
} while (size != 0);
|
size -= n;
|
||||||
}
|
} while (size != 0);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
FMT_FUNC void print(std::ostream &os, CStringRef format_str, ArgList args) {
|
FMT_FUNC void print(std::ostream &os, CStringRef format_str, ArgList args)
|
||||||
MemoryWriter w;
|
{
|
||||||
w.write(format_str, args);
|
MemoryWriter w;
|
||||||
internal::write(os, w);
|
w.write(format_str, args);
|
||||||
}
|
internal::write(os, w);
|
||||||
|
}
|
||||||
} // namespace fmt
|
} // namespace fmt
|
||||||
|
|||||||
34
vendor/spdlog/spdlog/fmt/bundled/ostream.h
vendored
34
vendor/spdlog/spdlog/fmt/bundled/ostream.h
vendored
@ -1,17 +1,17 @@
|
|||||||
/*
|
/*
|
||||||
Formatting library for C++ - std::ostream support
|
Formatting library for C++ - std::ostream support
|
||||||
|
|
||||||
Copyright (c) 2012 - 2016, Victor Zverovich
|
Copyright (c) 2012 - 2016, Victor Zverovich
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
For the license information refer to format.h.
|
For the license information refer to format.h.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef FMT_OSTREAM_H_
|
#ifndef FMT_OSTREAM_H_
|
||||||
#define FMT_OSTREAM_H_
|
#define FMT_OSTREAM_H_
|
||||||
|
|
||||||
// Commented out by spdlog to use header only
|
// commented out by spdlog
|
||||||
// #include "fmt/format.h"
|
// #include "format.h"
|
||||||
#include <ostream>
|
#include <ostream>
|
||||||
|
|
||||||
namespace fmt
|
namespace fmt
|
||||||
@ -21,7 +21,7 @@ namespace internal
|
|||||||
{
|
{
|
||||||
|
|
||||||
template <class Char>
|
template <class Char>
|
||||||
class FormatBuf : public std::basic_streambuf<Char>
|
class FormatBuf: public std::basic_streambuf<Char>
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
typedef typename std::basic_streambuf<Char>::int_type int_type;
|
typedef typename std::basic_streambuf<Char>::int_type int_type;
|
||||||
@ -31,7 +31,7 @@ private:
|
|||||||
Char *start_;
|
Char *start_;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
FormatBuf(Buffer<Char> &buffer) : buffer_(buffer), start_(&buffer[0])
|
FormatBuf(Buffer<Char> &buffer): buffer_(buffer), start_(&buffer[0])
|
||||||
{
|
{
|
||||||
this->setp(start_, start_ + buffer_.capacity());
|
this->setp(start_, start_ + buffer_.capacity());
|
||||||
}
|
}
|
||||||
@ -46,7 +46,7 @@ public:
|
|||||||
|
|
||||||
start_ = &buffer_[0];
|
start_ = &buffer_[0];
|
||||||
start_[buf_size] = traits_type::to_char_type(ch);
|
start_[buf_size] = traits_type::to_char_type(ch);
|
||||||
this->setp(start_+ buf_size + 1, start_ + buf_size * 2);
|
this->setp(start_ + buf_size + 1, start_ + buf_size * 2);
|
||||||
}
|
}
|
||||||
return ch;
|
return ch;
|
||||||
}
|
}
|
||||||
@ -59,7 +59,7 @@ public:
|
|||||||
|
|
||||||
Yes &convert(std::ostream &);
|
Yes &convert(std::ostream &);
|
||||||
|
|
||||||
struct DummyStream : std::ostream
|
struct DummyStream: std::ostream
|
||||||
{
|
{
|
||||||
DummyStream(); // Suppress a bogus warning in MSVC.
|
DummyStream(); // Suppress a bogus warning in MSVC.
|
||||||
// Hide all operator<< overloads from std::ostream.
|
// Hide all operator<< overloads from std::ostream.
|
||||||
@ -99,14 +99,14 @@ void format_arg(BasicFormatter<Char, ArgFormatter> &f,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\rst
|
\rst
|
||||||
Prints formatted data to the stream *os*.
|
Prints formatted data to the stream *os*.
|
||||||
|
|
||||||
**Example**::
|
**Example**::
|
||||||
|
|
||||||
print(cerr, "Don't {}!", "panic");
|
print(cerr, "Don't {}!", "panic");
|
||||||
\endrst
|
\endrst
|
||||||
*/
|
*/
|
||||||
FMT_API void print(std::ostream &os, CStringRef format_str, ArgList args);
|
FMT_API void print(std::ostream &os, CStringRef format_str, ArgList args);
|
||||||
FMT_VARIADIC(void, print, std::ostream &, CStringRef)
|
FMT_VARIADIC(void, print, std::ostream &, CStringRef)
|
||||||
} // namespace fmt
|
} // namespace fmt
|
||||||
|
|||||||
166
vendor/spdlog/spdlog/fmt/bundled/printf.h
vendored
166
vendor/spdlog/spdlog/fmt/bundled/printf.h
vendored
@ -1,11 +1,11 @@
|
|||||||
/*
|
/*
|
||||||
Formatting library for C++
|
Formatting library for C++
|
||||||
|
|
||||||
Copyright (c) 2012 - 2016, Victor Zverovich
|
Copyright (c) 2012 - 2016, Victor Zverovich
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
For the license information refer to format.h.
|
For the license information refer to format.h.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef FMT_PRINTF_H_
|
#ifndef FMT_PRINTF_H_
|
||||||
#define FMT_PRINTF_H_
|
#define FMT_PRINTF_H_
|
||||||
@ -13,7 +13,7 @@
|
|||||||
#include <algorithm> // std::fill_n
|
#include <algorithm> // std::fill_n
|
||||||
#include <limits> // std::numeric_limits
|
#include <limits> // std::numeric_limits
|
||||||
|
|
||||||
#include "fmt/ostream.h"
|
#include "ostream.h"
|
||||||
|
|
||||||
namespace fmt
|
namespace fmt
|
||||||
{
|
{
|
||||||
@ -52,7 +52,7 @@ struct IntChecker<true>
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
class PrecisionHandler : public ArgVisitor<PrecisionHandler, int>
|
class PrecisionHandler: public ArgVisitor<PrecisionHandler, int>
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
void report_unhandled_arg()
|
void report_unhandled_arg()
|
||||||
@ -70,7 +70,7 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
// IsZeroInt::visit(arg) returns true iff arg is a zero integer.
|
// IsZeroInt::visit(arg) returns true iff arg is a zero integer.
|
||||||
class IsZeroInt : public ArgVisitor<IsZeroInt, bool>
|
class IsZeroInt: public ArgVisitor<IsZeroInt, bool>
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
template <typename T>
|
template <typename T>
|
||||||
@ -83,13 +83,19 @@ public:
|
|||||||
template <typename T, typename U>
|
template <typename T, typename U>
|
||||||
struct is_same
|
struct is_same
|
||||||
{
|
{
|
||||||
enum { value = 0 };
|
enum
|
||||||
|
{
|
||||||
|
value = 0
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
struct is_same<T, T>
|
struct is_same<T, T>
|
||||||
{
|
{
|
||||||
enum { value = 1 };
|
enum
|
||||||
|
{
|
||||||
|
value = 1
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
// An argument visitor that converts an integer argument to T for printf,
|
// An argument visitor that converts an integer argument to T for printf,
|
||||||
@ -97,7 +103,7 @@ struct is_same<T, T>
|
|||||||
// corresponding signed or unsigned type depending on the type specifier:
|
// corresponding signed or unsigned type depending on the type specifier:
|
||||||
// 'd' and 'i' - signed, other - unsigned)
|
// 'd' and 'i' - signed, other - unsigned)
|
||||||
template <typename T = void>
|
template <typename T = void>
|
||||||
class ArgConverter : public ArgVisitor<ArgConverter<T>, void>
|
class ArgConverter: public ArgVisitor<ArgConverter<T>, void>
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
internal::Arg &arg_;
|
internal::Arg &arg_;
|
||||||
@ -107,7 +113,8 @@ private:
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
ArgConverter(internal::Arg &arg, wchar_t type)
|
ArgConverter(internal::Arg &arg, wchar_t type)
|
||||||
: arg_(arg), type_(type) {}
|
: arg_(arg), type_(type)
|
||||||
|
{}
|
||||||
|
|
||||||
void visit_bool(bool value)
|
void visit_bool(bool value)
|
||||||
{
|
{
|
||||||
@ -158,7 +165,7 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
// Converts an integer argument to char for printf.
|
// Converts an integer argument to char for printf.
|
||||||
class CharConverter : public ArgVisitor<CharConverter, void>
|
class CharConverter: public ArgVisitor<CharConverter, void>
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
internal::Arg &arg_;
|
internal::Arg &arg_;
|
||||||
@ -166,7 +173,8 @@ private:
|
|||||||
FMT_DISALLOW_COPY_AND_ASSIGN(CharConverter);
|
FMT_DISALLOW_COPY_AND_ASSIGN(CharConverter);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit CharConverter(internal::Arg &arg) : arg_(arg) {}
|
explicit CharConverter(internal::Arg &arg): arg_(arg)
|
||||||
|
{}
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
void visit_any_int(T value)
|
void visit_any_int(T value)
|
||||||
@ -178,7 +186,7 @@ public:
|
|||||||
|
|
||||||
// Checks if an argument is a valid printf width specifier and sets
|
// Checks if an argument is a valid printf width specifier and sets
|
||||||
// left alignment if it is negative.
|
// left alignment if it is negative.
|
||||||
class WidthHandler : public ArgVisitor<WidthHandler, unsigned>
|
class WidthHandler: public ArgVisitor<WidthHandler, unsigned>
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
FormatSpec &spec_;
|
FormatSpec &spec_;
|
||||||
@ -186,7 +194,8 @@ private:
|
|||||||
FMT_DISALLOW_COPY_AND_ASSIGN(WidthHandler);
|
FMT_DISALLOW_COPY_AND_ASSIGN(WidthHandler);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit WidthHandler(FormatSpec &spec) : spec_(spec) {}
|
explicit WidthHandler(FormatSpec &spec): spec_(spec)
|
||||||
|
{}
|
||||||
|
|
||||||
void report_unhandled_arg()
|
void report_unhandled_arg()
|
||||||
{
|
{
|
||||||
@ -212,24 +221,24 @@ public:
|
|||||||
} // namespace internal
|
} // namespace internal
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\rst
|
\rst
|
||||||
A ``printf`` argument formatter based on the `curiously recurring template
|
A ``printf`` argument formatter based on the `curiously recurring template
|
||||||
pattern <http://en.wikipedia.org/wiki/Curiously_recurring_template_pattern>`_.
|
pattern <http://en.wikipedia.org/wiki/Curiously_recurring_template_pattern>`_.
|
||||||
|
|
||||||
To use `~fmt::BasicPrintfArgFormatter` define a subclass that implements some
|
To use `~fmt::BasicPrintfArgFormatter` define a subclass that implements some
|
||||||
or all of the visit methods with the same signatures as the methods in
|
or all of the visit methods with the same signatures as the methods in
|
||||||
`~fmt::ArgVisitor`, for example, `~fmt::ArgVisitor::visit_int()`.
|
`~fmt::ArgVisitor`, for example, `~fmt::ArgVisitor::visit_int()`.
|
||||||
Pass the subclass as the *Impl* template parameter. When a formatting
|
Pass the subclass as the *Impl* template parameter. When a formatting
|
||||||
function processes an argument, it will dispatch to a visit method
|
function processes an argument, it will dispatch to a visit method
|
||||||
specific to the argument type. For example, if the argument type is
|
specific to the argument type. For example, if the argument type is
|
||||||
``double`` then the `~fmt::ArgVisitor::visit_double()` method of a subclass
|
``double`` then the `~fmt::ArgVisitor::visit_double()` method of a subclass
|
||||||
will be called. If the subclass doesn't contain a method with this signature,
|
will be called. If the subclass doesn't contain a method with this signature,
|
||||||
then a corresponding method of `~fmt::BasicPrintfArgFormatter` or its
|
then a corresponding method of `~fmt::BasicPrintfArgFormatter` or its
|
||||||
superclass will be called.
|
superclass will be called.
|
||||||
\endrst
|
\endrst
|
||||||
*/
|
*/
|
||||||
template <typename Impl, typename Char>
|
template <typename Impl, typename Char>
|
||||||
class BasicPrintfArgFormatter : public internal::ArgFormatterBase<Impl, Char>
|
class BasicPrintfArgFormatter: public internal::ArgFormatterBase<Impl, Char>
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
void write_null_pointer()
|
void write_null_pointer()
|
||||||
@ -242,14 +251,15 @@ private:
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
\rst
|
\rst
|
||||||
Constructs an argument formatter object.
|
Constructs an argument formatter object.
|
||||||
*writer* is a reference to the output writer and *spec* contains format
|
*writer* is a reference to the output writer and *spec* contains format
|
||||||
specifier information for standard argument types.
|
specifier information for standard argument types.
|
||||||
\endrst
|
\endrst
|
||||||
*/
|
*/
|
||||||
BasicPrintfArgFormatter(BasicWriter<Char> &writer, FormatSpec &spec)
|
BasicPrintfArgFormatter(BasicWriter<Char> &w, FormatSpec &s)
|
||||||
: internal::ArgFormatterBase<Impl, Char>(writer, spec) {}
|
: internal::ArgFormatterBase<Impl, Char>(w, s)
|
||||||
|
{}
|
||||||
|
|
||||||
/** Formats an argument of type ``bool``. */
|
/** Formats an argument of type ``bool``. */
|
||||||
void visit_bool(bool value)
|
void visit_bool(bool value)
|
||||||
@ -315,7 +325,7 @@ public:
|
|||||||
void visit_custom(internal::Arg::CustomValue c)
|
void visit_custom(internal::Arg::CustomValue c)
|
||||||
{
|
{
|
||||||
BasicFormatter<Char> formatter(ArgList(), this->writer());
|
BasicFormatter<Char> formatter(ArgList(), this->writer());
|
||||||
const Char format_str[] = {'}', 0};
|
const Char format_str[] = { '}', 0 };
|
||||||
const Char *format = format_str;
|
const Char *format = format_str;
|
||||||
c.format(&formatter, c.value, &format);
|
c.format(&formatter, c.value, &format);
|
||||||
}
|
}
|
||||||
@ -329,12 +339,13 @@ class PrintfArgFormatter
|
|||||||
public:
|
public:
|
||||||
/** Constructs an argument formatter object. */
|
/** Constructs an argument formatter object. */
|
||||||
PrintfArgFormatter(BasicWriter<Char> &w, FormatSpec &s)
|
PrintfArgFormatter(BasicWriter<Char> &w, FormatSpec &s)
|
||||||
: BasicPrintfArgFormatter<PrintfArgFormatter<Char>, Char>(w, s) {}
|
: BasicPrintfArgFormatter<PrintfArgFormatter<Char>, Char>(w, s)
|
||||||
|
{}
|
||||||
};
|
};
|
||||||
|
|
||||||
/** This template formats data and writes the output to a writer. */
|
/** This template formats data and writes the output to a writer. */
|
||||||
template <typename Char, typename ArgFormatter = PrintfArgFormatter<Char> >
|
template <typename Char, typename ArgFormatter = PrintfArgFormatter<Char> >
|
||||||
class PrintfFormatter : private internal::FormatterBase
|
class PrintfFormatter: private internal::FormatterBase
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
BasicWriter<Char> &writer_;
|
BasicWriter<Char> &writer_;
|
||||||
@ -352,14 +363,15 @@ private:
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
\rst
|
\rst
|
||||||
Constructs a ``PrintfFormatter`` object. References to the arguments and
|
Constructs a ``PrintfFormatter`` object. References to the arguments and
|
||||||
the writer are stored in the formatter object so make sure they have
|
the writer are stored in the formatter object so make sure they have
|
||||||
appropriate lifetimes.
|
appropriate lifetimes.
|
||||||
\endrst
|
\endrst
|
||||||
*/
|
*/
|
||||||
explicit PrintfFormatter(const ArgList &args, BasicWriter<Char> &w)
|
explicit PrintfFormatter(const ArgList &al, BasicWriter<Char> &w)
|
||||||
: FormatterBase(args), writer_(w) {}
|
: FormatterBase(al), writer_(w)
|
||||||
|
{}
|
||||||
|
|
||||||
/** Formats stored arguments and writes the output to the writer. */
|
/** Formats stored arguments and writes the output to the writer. */
|
||||||
FMT_API void format(BasicCStringRef<Char> format_str);
|
FMT_API void format(BasicCStringRef<Char> format_str);
|
||||||
@ -399,7 +411,7 @@ internal::Arg PrintfFormatter<Char, AF>::get_arg(const Char *s,
|
|||||||
unsigned arg_index)
|
unsigned arg_index)
|
||||||
{
|
{
|
||||||
(void)s;
|
(void)s;
|
||||||
const char *error = 0;
|
const char *error = FMT_NULL;
|
||||||
internal::Arg arg = arg_index == std::numeric_limits<unsigned>::max() ?
|
internal::Arg arg = arg_index == std::numeric_limits<unsigned>::max() ?
|
||||||
next_arg(error) : FormatterBase::get_arg(arg_index - 1, error);
|
next_arg(error) : FormatterBase::get_arg(arg_index - 1, error);
|
||||||
if (error)
|
if (error)
|
||||||
@ -569,13 +581,13 @@ void printf(BasicWriter<Char> &w, BasicCStringRef<Char> format, ArgList args)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\rst
|
\rst
|
||||||
Formats arguments and returns the result as a string.
|
Formats arguments and returns the result as a string.
|
||||||
|
|
||||||
**Example**::
|
**Example**::
|
||||||
|
|
||||||
std::string message = fmt::sprintf("The answer is %d", 42);
|
std::string message = fmt::sprintf("The answer is %d", 42);
|
||||||
\endrst
|
\endrst
|
||||||
*/
|
*/
|
||||||
inline std::string sprintf(CStringRef format, ArgList args)
|
inline std::string sprintf(CStringRef format, ArgList args)
|
||||||
{
|
{
|
||||||
@ -594,26 +606,26 @@ inline std::wstring sprintf(WCStringRef format, ArgList args)
|
|||||||
FMT_VARIADIC_W(std::wstring, sprintf, WCStringRef)
|
FMT_VARIADIC_W(std::wstring, sprintf, WCStringRef)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\rst
|
\rst
|
||||||
Prints formatted data to the file *f*.
|
Prints formatted data to the file *f*.
|
||||||
|
|
||||||
**Example**::
|
**Example**::
|
||||||
|
|
||||||
fmt::fprintf(stderr, "Don't %s!", "panic");
|
fmt::fprintf(stderr, "Don't %s!", "panic");
|
||||||
\endrst
|
\endrst
|
||||||
*/
|
*/
|
||||||
FMT_API int fprintf(std::FILE *f, CStringRef format, ArgList args);
|
FMT_API int fprintf(std::FILE *f, CStringRef format, ArgList args);
|
||||||
FMT_VARIADIC(int, fprintf, std::FILE *, CStringRef)
|
FMT_VARIADIC(int, fprintf, std::FILE *, CStringRef)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\rst
|
\rst
|
||||||
Prints formatted data to ``stdout``.
|
Prints formatted data to ``stdout``.
|
||||||
|
|
||||||
**Example**::
|
**Example**::
|
||||||
|
|
||||||
fmt::printf("Elapsed time: %.2f seconds", 1.23);
|
fmt::printf("Elapsed time: %.2f seconds", 1.23);
|
||||||
\endrst
|
\endrst
|
||||||
*/
|
*/
|
||||||
inline int printf(CStringRef format, ArgList args)
|
inline int printf(CStringRef format, ArgList args)
|
||||||
{
|
{
|
||||||
return fprintf(stdout, format, args);
|
return fprintf(stdout, format, args);
|
||||||
@ -621,14 +633,14 @@ inline int printf(CStringRef format, ArgList args)
|
|||||||
FMT_VARIADIC(int, printf, CStringRef)
|
FMT_VARIADIC(int, printf, CStringRef)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\rst
|
\rst
|
||||||
Prints formatted data to the stream *os*.
|
Prints formatted data to the stream *os*.
|
||||||
|
|
||||||
**Example**::
|
**Example**::
|
||||||
|
|
||||||
fprintf(cerr, "Don't %s!", "panic");
|
fprintf(cerr, "Don't %s!", "panic");
|
||||||
\endrst
|
\endrst
|
||||||
*/
|
*/
|
||||||
inline int fprintf(std::ostream &os, CStringRef format_str, ArgList args)
|
inline int fprintf(std::ostream &os, CStringRef format_str, ArgList args)
|
||||||
{
|
{
|
||||||
MemoryWriter w;
|
MemoryWriter w;
|
||||||
@ -639,4 +651,8 @@ inline int fprintf(std::ostream &os, CStringRef format_str, ArgList args)
|
|||||||
FMT_VARIADIC(int, fprintf, std::ostream &, CStringRef)
|
FMT_VARIADIC(int, fprintf, std::ostream &, CStringRef)
|
||||||
} // namespace fmt
|
} // namespace fmt
|
||||||
|
|
||||||
|
#ifdef FMT_HEADER_ONLY
|
||||||
|
# include "printf.cc"
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif // FMT_PRINTF_H_
|
#endif // FMT_PRINTF_H_
|
||||||
|
|||||||
6
vendor/spdlog/spdlog/logger.h
vendored
6
vendor/spdlog/spdlog/logger.h
vendored
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
// Thread safe logger
|
// Thread safe logger (except for set_pattern(..), set_formatter(..) and set_error_handler())
|
||||||
// Has name, log level, vector of std::shared sink pointers and formatter
|
// Has name, log level, vector of std::shared sink pointers and formatter
|
||||||
// Upon each log write the logger:
|
// Upon each log write the logger:
|
||||||
// 1. Checks if its log level is enough to log the message
|
// 1. Checks if its log level is enough to log the message
|
||||||
@ -68,6 +68,8 @@ public:
|
|||||||
|
|
||||||
virtual void flush();
|
virtual void flush();
|
||||||
|
|
||||||
|
const std::vector<sink_ptr>& sinks() const;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void _sink_it(details::log_msg&);
|
virtual void _sink_it(details::log_msg&);
|
||||||
virtual void _set_pattern(const std::string&);
|
virtual void _set_pattern(const std::string&);
|
||||||
@ -90,5 +92,3 @@ protected:
|
|||||||
}
|
}
|
||||||
|
|
||||||
#include <spdlog/details/logger_impl.h>
|
#include <spdlog/details/logger_impl.h>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
6
vendor/spdlog/spdlog/sinks/ansicolor_sink.h
vendored
6
vendor/spdlog/spdlog/sinks/ansicolor_sink.h
vendored
@ -33,7 +33,7 @@ public:
|
|||||||
virtual void log(const details::log_msg& msg) override;
|
virtual void log(const details::log_msg& msg) override;
|
||||||
virtual void flush() override;
|
virtual void flush() override;
|
||||||
|
|
||||||
void set_color(level::level_enum level, const std::string& color);
|
void set_color(level::level_enum color_level, const std::string& color);
|
||||||
|
|
||||||
/// Formatting codes
|
/// Formatting codes
|
||||||
const std::string reset = "\033[00m";
|
const std::string reset = "\033[00m";
|
||||||
@ -101,9 +101,9 @@ inline void ansicolor_sink::flush()
|
|||||||
sink_->flush();
|
sink_->flush();
|
||||||
}
|
}
|
||||||
|
|
||||||
inline void ansicolor_sink::set_color(level::level_enum level, const std::string& color)
|
inline void ansicolor_sink::set_color(level::level_enum color_level, const std::string& color)
|
||||||
{
|
{
|
||||||
colors_[level] = color;
|
colors_[color_level] = color;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline ansicolor_sink::~ansicolor_sink()
|
inline ansicolor_sink::~ansicolor_sink()
|
||||||
|
|||||||
9
vendor/spdlog/spdlog/sinks/file_sinks.h
vendored
9
vendor/spdlog/spdlog/sinks/file_sinks.h
vendored
@ -29,7 +29,7 @@ template<class Mutex>
|
|||||||
class simple_file_sink : public base_sink < Mutex >
|
class simple_file_sink : public base_sink < Mutex >
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit simple_file_sink(const filename_t &filename, bool truncate = false)
|
explicit simple_file_sink(const filename_t &filename, bool truncate = false):_force_flush(false)
|
||||||
{
|
{
|
||||||
_file_helper.open(filename, truncate);
|
_file_helper.open(filename, truncate);
|
||||||
}
|
}
|
||||||
@ -37,14 +37,21 @@ public:
|
|||||||
{
|
{
|
||||||
_file_helper.flush();
|
_file_helper.flush();
|
||||||
}
|
}
|
||||||
|
void set_force_flush(bool force_flush)
|
||||||
|
{
|
||||||
|
_force_flush = force_flush;
|
||||||
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void _sink_it(const details::log_msg& msg) override
|
void _sink_it(const details::log_msg& msg) override
|
||||||
{
|
{
|
||||||
_file_helper.write(msg);
|
_file_helper.write(msg);
|
||||||
|
if(_force_flush)
|
||||||
|
_file_helper.flush();
|
||||||
}
|
}
|
||||||
private:
|
private:
|
||||||
details::file_helper _file_helper;
|
details::file_helper _file_helper;
|
||||||
|
bool _force_flush;
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef simple_file_sink<std::mutex> simple_file_sink_mt;
|
typedef simple_file_sink<std::mutex> simple_file_sink_mt;
|
||||||
|
|||||||
2
vendor/spdlog/spdlog/sinks/null_sink.h
vendored
2
vendor/spdlog/spdlog/sinks/null_sink.h
vendored
@ -27,7 +27,7 @@ protected:
|
|||||||
|
|
||||||
};
|
};
|
||||||
typedef null_sink<details::null_mutex> null_sink_st;
|
typedef null_sink<details::null_mutex> null_sink_st;
|
||||||
typedef null_sink<std::mutex> null_sink_mt;
|
typedef null_sink<details::null_mutex> null_sink_mt;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
5
vendor/spdlog/spdlog/sinks/sink.h
vendored
5
vendor/spdlog/spdlog/sinks/sink.h
vendored
@ -15,7 +15,10 @@ namespace sinks
|
|||||||
class sink
|
class sink
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
sink(): _level( level::trace ) {}
|
sink()
|
||||||
|
{
|
||||||
|
_level = level::trace;
|
||||||
|
}
|
||||||
|
|
||||||
virtual ~sink() {}
|
virtual ~sink() {}
|
||||||
virtual void log(const details::log_msg& msg) = 0;
|
virtual void log(const details::log_msg& msg) = 0;
|
||||||
|
|||||||
10
vendor/spdlog/spdlog/sinks/stdout_sinks.h
vendored
10
vendor/spdlog/spdlog/sinks/stdout_sinks.h
vendored
@ -18,11 +18,12 @@ namespace sinks
|
|||||||
{
|
{
|
||||||
|
|
||||||
template <class Mutex>
|
template <class Mutex>
|
||||||
class stdout_sink : public base_sink<Mutex>
|
class stdout_sink: public base_sink<Mutex>
|
||||||
{
|
{
|
||||||
using MyType = stdout_sink<Mutex>;
|
using MyType = stdout_sink<Mutex>;
|
||||||
public:
|
public:
|
||||||
stdout_sink() {}
|
stdout_sink()
|
||||||
|
{}
|
||||||
static std::shared_ptr<MyType> instance()
|
static std::shared_ptr<MyType> instance()
|
||||||
{
|
{
|
||||||
static std::shared_ptr<MyType> instance = std::make_shared<MyType>();
|
static std::shared_ptr<MyType> instance = std::make_shared<MyType>();
|
||||||
@ -46,11 +47,12 @@ typedef stdout_sink<std::mutex> stdout_sink_mt;
|
|||||||
|
|
||||||
|
|
||||||
template <class Mutex>
|
template <class Mutex>
|
||||||
class stderr_sink : public base_sink<Mutex>
|
class stderr_sink: public base_sink<Mutex>
|
||||||
{
|
{
|
||||||
using MyType = stderr_sink<Mutex>;
|
using MyType = stderr_sink<Mutex>;
|
||||||
public:
|
public:
|
||||||
stderr_sink() {}
|
stderr_sink()
|
||||||
|
{}
|
||||||
static std::shared_ptr<MyType> instance()
|
static std::shared_ptr<MyType> instance()
|
||||||
{
|
{
|
||||||
static std::shared_ptr<MyType> instance = std::make_shared<MyType>();
|
static std::shared_ptr<MyType> instance = std::make_shared<MyType>();
|
||||||
|
|||||||
116
vendor/spdlog/spdlog/sinks/wincolor_sink.h
vendored
Normal file
116
vendor/spdlog/spdlog/sinks/wincolor_sink.h
vendored
Normal file
@ -0,0 +1,116 @@
|
|||||||
|
//
|
||||||
|
// Copyright(c) 2016 spdlog
|
||||||
|
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
|
||||||
|
//
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <spdlog/sinks/base_sink.h>
|
||||||
|
#include <spdlog/details/null_mutex.h>
|
||||||
|
#include <spdlog/common.h>
|
||||||
|
|
||||||
|
#include <mutex>
|
||||||
|
#include <string>
|
||||||
|
#include <map>
|
||||||
|
#include <wincon.h>
|
||||||
|
|
||||||
|
namespace spdlog
|
||||||
|
{
|
||||||
|
namespace sinks
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Windows color console sink. Uses WriteConsoleA to write to the console with colors
|
||||||
|
*/
|
||||||
|
template<class Mutex>
|
||||||
|
class wincolor_sink: public base_sink<Mutex>
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
const WORD BOLD = FOREGROUND_INTENSITY;
|
||||||
|
const WORD RED = FOREGROUND_RED;
|
||||||
|
const WORD CYAN = FOREGROUND_GREEN | FOREGROUND_BLUE;
|
||||||
|
const WORD WHITE = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE;
|
||||||
|
const WORD YELLOW = FOREGROUND_RED | FOREGROUND_GREEN;
|
||||||
|
|
||||||
|
wincolor_sink(HANDLE std_handle): out_handle_(std_handle)
|
||||||
|
{
|
||||||
|
colors_[level::trace] = CYAN;
|
||||||
|
colors_[level::debug] = CYAN;
|
||||||
|
colors_[level::info] = WHITE | BOLD;
|
||||||
|
colors_[level::warn] = YELLOW | BOLD;
|
||||||
|
colors_[level::err] = RED | BOLD; // red bold
|
||||||
|
colors_[level::critical] = BACKGROUND_RED | WHITE | BOLD; // white bold on red background
|
||||||
|
colors_[level::off] = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual ~wincolor_sink()
|
||||||
|
{
|
||||||
|
flush();
|
||||||
|
}
|
||||||
|
|
||||||
|
wincolor_sink(const wincolor_sink& other) = delete;
|
||||||
|
wincolor_sink& operator=(const wincolor_sink& other) = delete;
|
||||||
|
|
||||||
|
virtual void _sink_it(const details::log_msg& msg) override
|
||||||
|
{
|
||||||
|
auto color = colors_[msg.level];
|
||||||
|
auto orig_attribs = set_console_attribs(color);
|
||||||
|
WriteConsoleA(out_handle_, msg.formatted.data(), static_cast<DWORD>(msg.formatted.size()), nullptr, nullptr);
|
||||||
|
SetConsoleTextAttribute(out_handle_, orig_attribs); //reset to orig colors
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void flush() override
|
||||||
|
{
|
||||||
|
// windows console always flushed?
|
||||||
|
}
|
||||||
|
|
||||||
|
// change the color for the given level
|
||||||
|
void set_color(level::level_enum level, WORD color)
|
||||||
|
{
|
||||||
|
std::lock_guard<Mutex> lock(base_sink<Mutex>::_mutex);
|
||||||
|
colors_[level] = color;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
HANDLE out_handle_;
|
||||||
|
std::map<level::level_enum, WORD> colors_;
|
||||||
|
|
||||||
|
// set color and return the orig console attributes (for resetting later)
|
||||||
|
WORD set_console_attribs(WORD attribs)
|
||||||
|
{
|
||||||
|
CONSOLE_SCREEN_BUFFER_INFO orig_buffer_info;
|
||||||
|
GetConsoleScreenBufferInfo(out_handle_, &orig_buffer_info);
|
||||||
|
SetConsoleTextAttribute(out_handle_, attribs);
|
||||||
|
return orig_buffer_info.wAttributes; //return orig attribs
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
//
|
||||||
|
// windows color console to stdout
|
||||||
|
//
|
||||||
|
template<class Mutex>
|
||||||
|
class wincolor_stdout_sink: public wincolor_sink<Mutex>
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
wincolor_stdout_sink() : wincolor_sink<Mutex>(GetStdHandle(STD_OUTPUT_HANDLE))
|
||||||
|
{}
|
||||||
|
};
|
||||||
|
|
||||||
|
typedef wincolor_stdout_sink<std::mutex> wincolor_stdout_sink_mt;
|
||||||
|
typedef wincolor_stdout_sink<details::null_mutex> wincolor_stdout_sink_st;
|
||||||
|
|
||||||
|
//
|
||||||
|
// windows color console to stderr
|
||||||
|
//
|
||||||
|
template<class Mutex>
|
||||||
|
class wincolor_stderr_sink: public wincolor_sink<Mutex>
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
wincolor_stderr_sink() : wincolor_sink<Mutex>(GetStdHandle(STD_ERROR_HANDLE))
|
||||||
|
{}
|
||||||
|
};
|
||||||
|
|
||||||
|
typedef wincolor_stderr_sink<std::mutex> wincolor_stderr_sink_mt;
|
||||||
|
typedef wincolor_stderr_sink<details::null_mutex> wincolor_stderr_sink_st;
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
18
vendor/spdlog/spdlog/spdlog.h
vendored
18
vendor/spdlog/spdlog/spdlog.h
vendored
@ -2,12 +2,13 @@
|
|||||||
// Copyright(c) 2015 Gabi Melman.
|
// Copyright(c) 2015 Gabi Melman.
|
||||||
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
|
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
|
||||||
//
|
//
|
||||||
|
|
||||||
// spdlog main header file.
|
// spdlog main header file.
|
||||||
// see example.cpp for usage example
|
// see example.cpp for usage example
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#define SPDLOG_VERSION "0.12.0"
|
||||||
|
|
||||||
#include <spdlog/tweakme.h>
|
#include <spdlog/tweakme.h>
|
||||||
#include <spdlog/common.h>
|
#include <spdlog/common.h>
|
||||||
#include <spdlog/logger.h>
|
#include <spdlog/logger.h>
|
||||||
@ -88,10 +89,17 @@ std::shared_ptr<logger> daily_logger_st(const std::string& logger_name, const fi
|
|||||||
//
|
//
|
||||||
// Create and register stdout/stderr loggers
|
// Create and register stdout/stderr loggers
|
||||||
//
|
//
|
||||||
std::shared_ptr<logger> stdout_logger_mt(const std::string& logger_name, bool color = false);
|
std::shared_ptr<logger> stdout_logger_mt(const std::string& logger_name);
|
||||||
std::shared_ptr<logger> stdout_logger_st(const std::string& logger_name, bool color = false);
|
std::shared_ptr<logger> stdout_logger_st(const std::string& logger_name);
|
||||||
std::shared_ptr<logger> stderr_logger_mt(const std::string& logger_name, bool color = false);
|
std::shared_ptr<logger> stderr_logger_mt(const std::string& logger_name);
|
||||||
std::shared_ptr<logger> stderr_logger_st(const std::string& logger_name, bool color = false);
|
std::shared_ptr<logger> stderr_logger_st(const std::string& logger_name);
|
||||||
|
//
|
||||||
|
// Create and register colored stdout/stderr loggers
|
||||||
|
//
|
||||||
|
std::shared_ptr<logger> stdout_color_mt(const std::string& logger_name);
|
||||||
|
std::shared_ptr<logger> stdout_color_st(const std::string& logger_name);
|
||||||
|
std::shared_ptr<logger> stderr_color_mt(const std::string& logger_name);
|
||||||
|
std::shared_ptr<logger> stderr_color_st(const std::string& logger_name);
|
||||||
|
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|||||||
5
vendor/spdlog/spdlog/tweakme.h
vendored
5
vendor/spdlog/spdlog/tweakme.h
vendored
@ -101,3 +101,8 @@
|
|||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
// Uncomment to prevent child processes from inheriting log file descriptors
|
||||||
|
//
|
||||||
|
// #define SPDLOG_PREVENT_CHILD_FD
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user