Commit 0185d58a authored by Max Kellermann's avatar Max Kellermann

Log: add libfmt support

parent d7df5e1c
...@@ -241,10 +241,12 @@ log = static_library( ...@@ -241,10 +241,12 @@ log = static_library(
'src/Log.cxx', 'src/Log.cxx',
'src/LogBackend.cxx', 'src/LogBackend.cxx',
include_directories: inc, include_directories: inc,
dependencies: fmt_dep,
) )
log_dep = declare_dependency( log_dep = declare_dependency(
link_with: log, link_with: log,
dependencies: fmt_dep,
) )
sources = [ sources = [
......
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "util/Exception.hxx" #include "util/Exception.hxx"
#include <fmt/format.h>
#include <cerrno> #include <cerrno>
#include <stdio.h> #include <stdio.h>
...@@ -29,6 +31,15 @@ ...@@ -29,6 +31,15 @@
static constexpr Domain exception_domain("exception"); static constexpr Domain exception_domain("exception");
void void
LogVFmt(LogLevel level, const Domain &domain,
fmt::string_view format_str, fmt::format_args args) noexcept
{
fmt::memory_buffer buffer;
fmt::vformat_to(buffer, format_str, args);
Log(level, domain, {buffer.data(), buffer.size()});
}
void
LogFormatV(LogLevel level, const Domain &domain, LogFormatV(LogLevel level, const Domain &domain,
const char *fmt, std::va_list ap) noexcept const char *fmt, std::va_list ap) noexcept
{ {
......
...@@ -23,6 +23,11 @@ ...@@ -23,6 +23,11 @@
#include "LogLevel.hxx" #include "LogLevel.hxx"
#include "util/Compiler.h" #include "util/Compiler.h"
#include <fmt/core.h>
#if FMT_VERSION < 70000
#include <fmt/format.h>
#endif
#include <exception> #include <exception>
#include <string_view> #include <string_view>
...@@ -31,6 +36,66 @@ class Domain; ...@@ -31,6 +36,66 @@ class Domain;
void void
Log(LogLevel level, const Domain &domain, std::string_view msg) noexcept; Log(LogLevel level, const Domain &domain, std::string_view msg) noexcept;
void
LogVFmt(LogLevel level, const Domain &domain,
fmt::string_view format_str, fmt::format_args args) noexcept;
template<typename S, typename... Args>
void
LogFmt(LogLevel level, const Domain &domain,
const S &format_str, Args&&... args) noexcept
{
#if FMT_VERSION >= 70000
return LogVFmt(level, domain, fmt::to_string_view(format_str),
fmt::make_args_checked<Args...>(format_str,
args...));
#else
/* expensive fallback for older libfmt versions */
const auto result = fmt::format(format_str, args...);
return Log(level, domain, result);
#endif
}
template<typename S, typename... Args>
void
FmtDebug(const Domain &domain,
const S &format_str, Args&&... args) noexcept
{
LogFmt(LogLevel::DEBUG, domain, format_str, args...);
}
template<typename S, typename... Args>
void
FmtInfo(const Domain &domain,
const S &format_str, Args&&... args) noexcept
{
LogFmt(LogLevel::INFO, domain, format_str, args...);
}
template<typename S, typename... Args>
void
FmtNotice(const Domain &domain,
const S &format_str, Args&&... args) noexcept
{
LogFmt(LogLevel::NOTICE, domain, format_str, args...);
}
template<typename S, typename... Args>
void
FmtWarning(const Domain &domain,
const S &format_str, Args&&... args) noexcept
{
LogFmt(LogLevel::WARNING, domain, format_str, args...);
}
template<typename S, typename... Args>
void
FmtError(const Domain &domain,
const S &format_str, Args&&... args) noexcept
{
LogFmt(LogLevel::ERROR, domain, format_str, args...);
}
gcc_printf(3,4) gcc_printf(3,4)
void void
LogFormat(LogLevel level, const Domain &domain, const char *fmt, ...) noexcept; LogFormat(LogLevel level, const Domain &domain, const char *fmt, ...) noexcept;
...@@ -67,6 +132,9 @@ gcc_printf(2,3) ...@@ -67,6 +132,9 @@ gcc_printf(2,3)
void void
FormatDebug(const Domain &domain, const char *fmt, ...) noexcept; FormatDebug(const Domain &domain, const char *fmt, ...) noexcept;
void
FormatDebug(const Domain &domain, const char *fmt, ...) noexcept;
static inline void static inline void
LogInfo(const Domain &domain, const char *msg) noexcept LogInfo(const Domain &domain, const char *msg) noexcept
{ {
......
...@@ -36,6 +36,7 @@ db_plugins = static_library( ...@@ -36,6 +36,7 @@ db_plugins = static_library(
dependencies: [ dependencies: [
upnp_dep, upnp_dep,
libmpdclient_dep, libmpdclient_dep,
log_dep,
], ],
) )
......
...@@ -28,6 +28,9 @@ decoder_glue = static_library( ...@@ -28,6 +28,9 @@ decoder_glue = static_library(
'decoder_glue', 'decoder_glue',
'DecoderList.cxx', 'DecoderList.cxx',
include_directories: inc, include_directories: inc,
dependencies: [
log_dep,
],
) )
decoder_glue_dep = declare_dependency( decoder_glue_dep = declare_dependency(
......
...@@ -208,6 +208,7 @@ decoder_plugins = static_library( ...@@ -208,6 +208,7 @@ decoder_plugins = static_library(
ogg_dep, ogg_dep,
wavpack_dep, wavpack_dep,
wildmidi_dep, wildmidi_dep,
log_dep,
], ],
) )
......
filter_plugins_sources = [] filter_plugins_sources = []
filter_plugins_deps = [] filter_plugins_deps = [fmt_dep]
if libavfilter_dep.found() if libavfilter_dep.found()
filter_plugins_sources += [ filter_plugins_sources += [
......
...@@ -45,6 +45,7 @@ input_glue = static_library( ...@@ -45,6 +45,7 @@ input_glue = static_library(
include_directories: inc, include_directories: inc,
dependencies: [ dependencies: [
boost_dep, boost_dep,
log_dep,
], ],
) )
......
...@@ -41,6 +41,7 @@ ffmpeg = static_library( ...@@ -41,6 +41,7 @@ ffmpeg = static_library(
libavcodec_dep, libavcodec_dep,
libavfilter_dep, libavfilter_dep,
libavutil_dep, libavutil_dep,
log_dep,
], ],
) )
......
/*
* Copyright 2021 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef AUDIO_FORMAT_FORMATTER_HXX
#define AUDIO_FORMAT_FORMATTER_HXX
#include "pcm/AudioFormat.hxx"
#include "util/StringBuffer.hxx"
#include <fmt/format.h>
template<>
struct fmt::formatter<AudioFormat> : formatter<string_view>
{
template<typename FormatContext>
auto format(const AudioFormat &af, FormatContext &ctx) {
return formatter<string_view>::format(ToString(af).c_str(),
ctx);
}
};
#endif
/*
* Copyright 2021 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef EXCEPTION_FORMATTER_HXX
#define EXCEPTION_FORMATTER_HXX
#include "util/Exception.hxx"
#include <fmt/format.h>
template<>
struct fmt::formatter<std::exception_ptr> : formatter<string_view>
{
template<typename FormatContext>
auto format(std::exception_ptr e, FormatContext &ctx) {
return formatter<string_view>::format(GetFullMessage(e), ctx);
}
};
#endif
/*
* Copyright 2003-2021 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef PATH_FORMATTER_HXX
#define PATH_FORMATTER_HXX
#include "fs/Path.hxx"
#include "fs/AllocatedPath.hxx"
#include <fmt/format.h>
template<>
struct fmt::formatter<Path> : formatter<string_view>
{
template<typename FormatContext>
auto format(Path path, FormatContext &ctx) {
return formatter<string_view>::format(path.ToUTF8(), ctx);
}
};
template<>
struct fmt::formatter<AllocatedPath> : formatter<Path> {};
#endif
...@@ -16,6 +16,7 @@ nfs = static_library( ...@@ -16,6 +16,7 @@ nfs = static_library(
include_directories: inc, include_directories: inc,
dependencies: [ dependencies: [
nfs_dep, nfs_dep,
log_dep,
], ],
) )
......
...@@ -124,6 +124,7 @@ if libflac_dep.found() ...@@ -124,6 +124,7 @@ if libflac_dep.found()
include_directories: inc, include_directories: inc,
dependencies: [ dependencies: [
libflac_dep, libflac_dep,
log_dep,
], ],
) )
......
...@@ -8,6 +8,9 @@ mixer_glue = static_library( ...@@ -8,6 +8,9 @@ mixer_glue = static_library(
'MixerType.cxx', 'MixerType.cxx',
'MixerAll.cxx', 'MixerAll.cxx',
include_directories: inc, include_directories: inc,
dependencies: [
log_dep,
],
) )
mixer_glue_dep = declare_dependency( mixer_glue_dep = declare_dependency(
......
...@@ -183,6 +183,7 @@ output_plugins = static_library( ...@@ -183,6 +183,7 @@ output_plugins = static_library(
winmm_dep, winmm_dep,
wasapi_dep, wasapi_dep,
boost_dep, boost_dep,
output_plugins_deps,
], ],
) )
......
...@@ -20,6 +20,7 @@ storage_glue = static_library( ...@@ -20,6 +20,7 @@ storage_glue = static_library(
include_directories: inc, include_directories: inc,
dependencies: [ dependencies: [
boost_dep, boost_dep,
log_dep,
], ],
) )
......
...@@ -17,6 +17,9 @@ system = static_library( ...@@ -17,6 +17,9 @@ system = static_library(
'system', 'system',
system_sources, system_sources,
include_directories: inc, include_directories: inc,
dependencies: [
log_dep,
],
) )
if is_windows if is_windows
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment