From db0e3a0ed1de3f9ab823595a4f679880e5bb92d2 Mon Sep 17 00:00:00 2001
From: Nicholas Sielicki <nslick@amazon.com>
Date: Wed, 11 Sep 2024 17:41:21 -0700
Subject: [PATCH] fix(tracing/nvtx): silence -Wmissing-field-initializer
 warnings

stack-info: PR: https://github.com/aws/aws-ofi-nccl/pull/593, branch: aws-nslick/stack/34
---
 include/tracing_impl/nvtx.h | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/include/tracing_impl/nvtx.h b/include/tracing_impl/nvtx.h
index 1fbfe8b55..415d6e77c 100644
--- a/include/tracing_impl/nvtx.h
+++ b/include/tracing_impl/nvtx.h
@@ -7,31 +7,36 @@
 
 #if HAVE_NVTX_TRACING
 #include "nvToolsExt.h"
+#include <string.h>
 
 #define NCCL_OFI_N_NVTX_DOMAIN_PER_COMM 8
 
 static inline void nvtx_mark_domain(nvtxDomainHandle_t domain, const char* name, uint32_t color)
 {
-	const nvtxEventAttributes_t eventAttrib = {
-		.version = NVTX_VERSION,
-		.size = NVTX_EVENT_ATTRIB_STRUCT_SIZE,
-		.colorType = NVTX_COLOR_ARGB,
-		.color = color,
-		.messageType = NVTX_MESSAGE_TYPE_ASCII,
-		.message = { .ascii = name },
-	};
+	nvtxEventAttributes_t eventAttrib;
+	memset(&eventAttrib, 0, sizeof(nvtxEventAttributes_t));
+
+	eventAttrib.version = NVTX_VERSION;
+	eventAttrib.size = NVTX_EVENT_ATTRIB_STRUCT_SIZE;
+	eventAttrib.colorType = NVTX_COLOR_ARGB;
+	eventAttrib.color = color;
+	eventAttrib.messageType = NVTX_MESSAGE_TYPE_ASCII;
+	eventAttrib.message.ascii = name;
+
 	nvtxDomainMarkEx(domain, &eventAttrib);
 }
 
 static inline nvtxRangeId_t nvtx_start_domain(bool have_domain, nvtxDomainHandle_t domain, const char* name, uint32_t color) {
-	const nvtxEventAttributes_t eventAttrib = {
-		.version = NVTX_VERSION,
-		.size = NVTX_EVENT_ATTRIB_STRUCT_SIZE,
-		.colorType = NVTX_COLOR_ARGB,
-		.color = color,
-		.messageType = NVTX_MESSAGE_TYPE_ASCII,
-		.message = { .ascii = name },
-	};
+	nvtxEventAttributes_t eventAttrib;
+	memset(&eventAttrib, 0, sizeof(nvtxEventAttributes_t));
+
+	eventAttrib.version = NVTX_VERSION;
+	eventAttrib.size = NVTX_EVENT_ATTRIB_STRUCT_SIZE;
+	eventAttrib.colorType = NVTX_COLOR_ARGB;
+	eventAttrib.color = color;
+	eventAttrib.messageType = NVTX_MESSAGE_TYPE_ASCII;
+	eventAttrib.message.ascii = name;
+
 	if (have_domain)
 		return nvtxDomainRangeStartEx(domain, &eventAttrib);
 	else