crimson/os/seastore: clean up logging

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>

diff --git a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h
index 59d032e76e1efa656e5284af695b9ccd9a71929a..a036b337b819a01138471cacdb2427ced5e3113b 100644 (file)
--- a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h
+++ b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h
@@ -15,7 +15,6 @@
 #include "common/interval_map.h"
 #include "crimson/osd/exceptions.h"
 
-#include "crimson/os/seastore/logging.h"
 #include "crimson/os/seastore/seastore_types.h"
 #include "crimson/os/seastore/lba_manager.h"
 #include "crimson/os/seastore/cache.h"

diff --git a/src/crimson/os/seastore/logging.h b/src/crimson/os/seastore/logging.h
index 6c996d326dd61a284e4250c8cd18dc41587f2c33..a0c8b8e45ce01ac1ee833dfd255a89e1ca31ef68 100644 (file)
--- a/src/crimson/os/seastore/logging.h
+++ b/src/crimson/os/seastore/logging.h
@@ -12,8 +12,26 @@
 
 #ifdef NDEBUG
 
-#define LOG(level_, MSG, ...) LOGGER.log(level_, "{}: " MSG, FNAME , ##__VA_ARGS__)
-#define LOGT(level_, MSG, t, ...) LOGGER.log(level_, "{}({}): " MSG, FNAME, (void*)&t , ##__VA_ARGS__)
+#define LOG(level_, MSG, ...) \
+  LOGGER.log(level_, "{}: " MSG, FNAME , ##__VA_ARGS__)
+#define LOGT(level_, MSG, t, ...) \
+  LOGGER.log(level_, "{}({}): " MSG, FNAME, (void*)&t , ##__VA_ARGS__)
+
+#else
+
+// do compile-time format string validation
+using namespace fmt::literals;
+template<seastar::log_level lv>
+void _LOG(seastar::logger& logger, std::string_view info) {
+  logger.log(lv, info.data());
+}
+
+#define LOG(level_, MSG, ...) \
+  _LOG<level_>(LOGGER, "{}: " MSG ## _format(FNAME , ##__VA_ARGS__))
+#define LOGT(level_, MSG, t_, ...) \
+  _LOG<level_>(LOGGER, "{}({}): " 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__)
@@ -29,26 +47,3 @@
 
 #define ERROR(...) LOG(seastar::log_level::error, __VA_ARGS__)
 #define ERRORT(...) LOGT(seastar::log_level::error, __VA_ARGS__)
-
-#else
-// do compile-time format string validation
-using namespace fmt::literals;
-template<seastar::log_level lv>
-void LOG(std::string_view info) {
-  crimson::get_logger(ceph_subsys_seastore).log(lv, info.data());
-}
-#define TRACE(MSG_, ...) LOG<seastar::log_level::trace>("{}: " MSG_ ## _format(FNAME , ##__VA_ARGS__))
-#define TRACET(MSG_, t_, ...) LOG<seastar::log_level::trace>("{}({}): " MSG_ ## _format(FNAME, (void*)&t_ , ##__VA_ARGS__))
-
-#define DEBUG(MSG_, ...) LOG<seastar::log_level::debug>("{}: " MSG_ ## _format(FNAME , ##__VA_ARGS__))
-#define DEBUGT(MSG_, t_, ...) LOG<seastar::log_level::debug>("{}({}): " MSG_ ## _format(FNAME, (void*)&t_ , ##__VA_ARGS__))
-
-#define INFO(MSG_, ...) LOG<seastar::log_level::info>("{}: " MSG_ ## _format(FNAME , ##__VA_ARGS__))
-#define INFOT(MSG_, t_, ...) LOG<seastar::log_level::info>("{}({}): " MSG_ ## _format(FNAME, (void*)&t_ , ##__VA_ARGS__))
-
-#define WARN(MSG_, ...) LOG<seastar::log_level::warn>("{}: " MSG_ ## _format(FNAME , ##__VA_ARGS__))
-#define WARNT(MSG_, t_, ...) LOG<seastar::log_level::warn>("{}({}): " MSG_ ## _format(FNAME, (void*)&t_ , ##__VA_ARGS__))
-
-#define ERROR(MSG_, ...) LOG<seastar::log_level::error>("{}: " MSG_ ## _format(FNAME , ##__VA_ARGS__))
-#define ERRORT(MSG_, t_, ...) LOG<seastar::log_level::error>("{}({}): " MSG_ ## _format(FNAME, (void*)&t_ , ##__VA_ARGS__))
-#endif