From 47fd5ee13d0db276a54efc5d48446959200dd536 Mon Sep 17 00:00:00 2001 From: nnshah1 Date: Tue, 14 May 2024 16:03:30 -0700 Subject: [PATCH 1/2] adding json logging macros --- include/triton/backend/backend_common.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/triton/backend/backend_common.h b/include/triton/backend/backend_common.h index 84c889e..8ea1a43 100644 --- a/include/triton/backend/backend_common.h +++ b/include/triton/backend/backend_common.h @@ -78,6 +78,29 @@ namespace triton { namespace backend { ("failed to log message: ")); \ } while (false) +#define LOG_JSON_MESSAGE(LEVEL, PREAMBLE, MSG) \ + do { \ + LOG_IF_ERROR( \ + TRITONSERVER_LogJsonMessage(LEVEL, __FILE__, __LINE__, PREAMBLE, MSG), \ + ("failed to log JSON message: ")); \ + } while (false) + +#define LOG_JSON_VALUE(LEVEL, PREAMBLE, VALUE) \ + do { \ + const char* error_message = "failed to log JSON message: "; \ + triton::common::TritonJson::WriteBuffer buffer; \ + TRITONSERVER_Message* message; \ + LOG_IF_ERROR(VALUE.PrettyWrite(&buffer), (error_message)); \ + LOG_IF_ERROR( \ + TRITONSERVER_MessageNewFromSerializedJson( \ + &message, buffer.Contents().c_str(), buffer.Contents().length()), \ + error_message); \ + LOG_IF_ERROR( \ + TRITONSERVER_LogJsonMessage( \ + TRITONSERVER_LOG_INFO, __FILE__, __LINE__, PREAMBLE, message), \ + (error_message)); \ + LOG_IF_ERROR(TRITONSERVER_MessageDelete(message), (error_message)); \ + } while (false) #define RETURN_ERROR_IF_FALSE(P, C, MSG) \ do { \ From 2ca8f28a30bae97f74d64ebdb510a16627289546 Mon Sep 17 00:00:00 2001 From: nnshah1 Date: Wed, 15 May 2024 14:07:17 -0700 Subject: [PATCH 2/2] updated based on review comments --- include/triton/backend/backend_common.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/include/triton/backend/backend_common.h b/include/triton/backend/backend_common.h index 8ea1a43..4d27771 100644 --- a/include/triton/backend/backend_common.h +++ b/include/triton/backend/backend_common.h @@ -78,14 +78,15 @@ namespace triton { namespace backend { ("failed to log message: ")); \ } while (false) -#define LOG_JSON_MESSAGE(LEVEL, PREAMBLE, MSG) \ - do { \ - LOG_IF_ERROR( \ - TRITONSERVER_LogJsonMessage(LEVEL, __FILE__, __LINE__, PREAMBLE, MSG), \ - ("failed to log JSON message: ")); \ +#define LOG_SERVER_MESSAGE(LEVEL, HEADING, MSG) \ + do { \ + LOG_IF_ERROR( \ + TRITONSERVER_LogServerMessage( \ + LEVEL, __FILE__, __LINE__, HEADING, MSG), \ + ("failed to log message: ")); \ } while (false) -#define LOG_JSON_VALUE(LEVEL, PREAMBLE, VALUE) \ +#define LOG_JSON_VALUE(LEVEL, HEADING, VALUE) \ do { \ const char* error_message = "failed to log JSON message: "; \ triton::common::TritonJson::WriteBuffer buffer; \ @@ -96,8 +97,8 @@ namespace triton { namespace backend { &message, buffer.Contents().c_str(), buffer.Contents().length()), \ error_message); \ LOG_IF_ERROR( \ - TRITONSERVER_LogJsonMessage( \ - TRITONSERVER_LOG_INFO, __FILE__, __LINE__, PREAMBLE, message), \ + TRITONSERVER_LogServerMessage( \ + TRITONSERVER_LOG_INFO, __FILE__, __LINE__, HEADING, message), \ (error_message)); \ LOG_IF_ERROR(TRITONSERVER_MessageDelete(message), (error_message)); \ } while (false)