From a9d551c161d0ef14655e82c0027109ab8e46678d Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 18 Feb 2022 22:44:51 +0800 Subject: [PATCH] crimson/os/seastore: drop compile-time fmt validation _format() was deprecated in fmtlib v8, see also https://github.com/fmtlib/fmt/pull/2646 Signed-off-by: Kefu Chai (cherry picked from commit 3fd91d7e6d9315244aeff02070721ef4a021b0b3) --- src/crimson/os/seastore/logging.h | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/src/crimson/os/seastore/logging.h b/src/crimson/os/seastore/logging.h index 7153850eca3548..5094a6e4a5a6bc 100644 --- a/src/crimson/os/seastore/logging.h +++ b/src/crimson/os/seastore/logging.h @@ -12,8 +12,6 @@ #define LOGGER(subname_) crimson::get_logger(ceph_subsys_##subname_) #define LOG_PREFIX(x) constexpr auto FNAME = #x -#ifdef NDEBUG - #define LOG(level_, MSG, ...) \ LOCAL_LOGGER.log(level_, "{}: " MSG, FNAME , ##__VA_ARGS__) #define LOGT(level_, MSG, t, ...) \ @@ -23,26 +21,6 @@ #define SUBLOGT(subname_, level_, MSG, t, ...) \ LOGGER(subname_).log(level_, "{}({}): " MSG, FNAME, (void*)&t , ##__VA_ARGS__) -#else - -// do compile-time format string validation -using namespace fmt::literals; -template -void _LOG(seastar::logger& logger, std::string_view info) { - logger.log(lv, info.data()); -} - -#define LOG(level_, MSG, ...) \ - _LOG(LOCAL_LOGGER, "{}: " MSG ## _format(FNAME , ##__VA_ARGS__)) -#define LOGT(level_, MSG, t_, ...) \ - _LOG(LOCAL_LOGGER, "{}({}): " MSG ## _format(FNAME, (void*)&t_ , ##__VA_ARGS__)) -#define SUBLOG(subname_, level_, MSG, ...) \ - _LOG(LOGGER(subname_), "{}: " MSG ## _format(FNAME , ##__VA_ARGS__)) -#define SUBLOGT(subname_, level_, MSG, t_, ...) \ - _LOG(LOGGER(subname_), "{}({}): " MSG ## _format(FNAME, (void*)&t_ , ##__VA_ARGS__)) - -#endif - #define TRACE(...) LOG(seastar::log_level::trace, __VA_ARGS__) #define TRACET(...) LOGT(seastar::log_level::trace, __VA_ARGS__) #define SUBTRACE(subname_, ...) SUBLOG(subname_, seastar::log_level::trace, __VA_ARGS__)