From 0bb02f32dee193e0e9f5c03d21f72cb763873226 Mon Sep 17 00:00:00 2001
From: rkebichi <54912798+rkebichi@users.noreply.github.com>
Date: Thu, 5 Sep 2019 10:35:28 -0400
Subject: [PATCH] Update roctx.cpp

[ROCm/roctracer commit: 6e1fbda1c772dc4086973786efbf78fa74976ec0]
---
 projects/roctracer/src/roctx/roctx.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/projects/roctracer/src/roctx/roctx.cpp b/projects/roctracer/src/roctx/roctx.cpp
index b7faab91e3..78af443ffe 100644
--- a/projects/roctracer/src/roctx/roctx.cpp
+++ b/projects/roctracer/src/roctx/roctx.cpp
@@ -62,7 +62,7 @@ THE SOFTWARE.
   (void)err;                                                                                       \
   return X;
 
-std::stack<std::string> message_stack;
+static thread_local std::stack<std::string> message_stack;
 
 static inline uint32_t GetPid() { return syscall(__NR_getpid); }
 static inline uint32_t GetTid() { return syscall(__NR_gettid); }
@@ -117,7 +117,6 @@ PUBLIC_API void roctxMarkA(const char* message) {
 
 PUBLIC_API int roctxRangePushA(const char* message) {
   API_METHOD_PREFIX
-  //EXC_ABORT(ROCTX_STATUS_ERROR, "method is not implemented");
   roctx_api_data_t api_data{};
   api_data.args.roctxRangePushA.message = strdup(message);
   activity_rtapi_callback_t api_callback_fun = NULL;
@@ -125,12 +124,12 @@ PUBLIC_API int roctxRangePushA(const char* message) {
   roctx::cb_table.get(ROCTX_API_ID_roctxRangePushA, &api_callback_fun, &api_callback_arg);
   if (api_callback_fun) api_callback_fun(ACTIVITY_DOMAIN_ROCTX, ROCTX_API_ID_roctxRangePushA, &api_data, api_callback_arg);
   message_stack.push(strdup(message));
-  API_METHOD_SUFFIX
+  API_METHOD_CATCH(-1);
+  return 0;
 }
 
 PUBLIC_API int roctxRangePop() {
   API_METHOD_PREFIX
-  //EXC_ABORT(ROCTX_STATUS_ERROR, "method is not implemented");
   roctx_api_data_t api_data{};
   activity_rtapi_callback_t api_callback_fun = NULL;
   void* api_callback_arg = NULL;
@@ -141,7 +140,8 @@ PUBLIC_API int roctxRangePop() {
   } else {
       message_stack.pop();
   }
-  API_METHOD_SUFFIX
+  API_METHOD_CATCH(-1)
+  return 0;
 }
 
 }  // extern "C"