From 04ff56ebba52fc664bb1a7afcdb3cfeb731c9209 Mon Sep 17 00:00:00 2001 From: Yingxin Cheng Date: Wed, 19 Jan 2022 10:30:40 +0800 Subject: [PATCH] crimson/os/seastore: move transaction-id forward in log Signed-off-by: Yingxin Cheng --- src/crimson/os/seastore/logging.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/crimson/os/seastore/logging.h b/src/crimson/os/seastore/logging.h index 7153850eca3..3f1f93439ef 100644 --- a/src/crimson/os/seastore/logging.h +++ b/src/crimson/os/seastore/logging.h @@ -17,11 +17,11 @@ #define LOG(level_, MSG, ...) \ LOCAL_LOGGER.log(level_, "{}: " MSG, FNAME , ##__VA_ARGS__) #define LOGT(level_, MSG, t, ...) \ - LOCAL_LOGGER.log(level_, "{}({}): " MSG, FNAME, (void*)&t , ##__VA_ARGS__) + LOCAL_LOGGER.log(level_, "{} {}: " MSG, (void*)&t, FNAME , ##__VA_ARGS__) #define SUBLOG(subname_, level_, MSG, ...) \ LOGGER(subname_).log(level_, "{}: " MSG, FNAME , ##__VA_ARGS__) #define SUBLOGT(subname_, level_, MSG, t, ...) \ - LOGGER(subname_).log(level_, "{}({}): " MSG, FNAME, (void*)&t , ##__VA_ARGS__) + LOGGER(subname_).log(level_, "{} {}: " MSG, (void*)&t, FNAME , ##__VA_ARGS__) #else @@ -35,11 +35,11 @@ void _LOG(seastar::logger& logger, std::string_view info) { #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__)) + _LOG(LOCAL_LOGGER, "{} {}: " MSG ## _format((void*)&t_, FNAME , ##__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__)) + _LOG(LOGGER(subname_), "{} {}: " MSG ## _format((void*)&t_, FNAME , ##__VA_ARGS__)) #endif