Update for TRACE script changes

Signed-off-by: Quincey Koziol <[email protected]>
qkoziol · Apr 13, 2024 · c7738a2 · c7738a2
1 parent d8cf853
commit c7738a2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 26 deletions.
diff --git a/src/H5FDtest.c b/src/H5FDtest.c
@@ -81,7 +81,6 @@ H5FDopen_test(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
     H5FD_t *ret_value;
 
     FUNC_ENTER_API(NULL)
-    H5TRACE4("*#", "*sIuia", name, flags, fapl_id, maxaddr);
 
     /* Call developer routine */
     ret_value = H5FDopen(name, flags, fapl_id, maxaddr);
@@ -109,7 +108,6 @@ H5FDclose_test(H5FD_t *file)
     herr_t ret_value;
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE1("e", "*#", file);
 
     /* Call developer routine */
     ret_value = H5FDclose(file);
@@ -137,7 +135,6 @@ H5FDalloc_test(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
     haddr_t ret_value;
 
     FUNC_ENTER_API(HADDR_UNDEF)
-    H5TRACE4("a", "*#Mtih", file, type, dxpl_id, size);
 
     /* Call developer routine */
     ret_value = H5FDalloc(file, type, dxpl_id, size);
@@ -165,7 +162,6 @@ H5FDget_eoa_test(H5FD_t *file, H5FD_mem_t type)
     haddr_t ret_value;
 
     FUNC_ENTER_API(HADDR_UNDEF)
-    H5TRACE2("a", "*#Mt", file, type);
 
     /* Call developer routine */
     ret_value = H5FDget_eoa(file, type);
@@ -193,7 +189,6 @@ H5FDset_eoa_test(H5FD_t *file, H5FD_mem_t type, haddr_t eoa)
     herr_t ret_value;
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE3("e", "*#Mta", file, type, eoa);
 
     /* Call developer routine */
     ret_value = H5FDset_eoa(file, type, eoa);
@@ -221,7 +216,6 @@ H5FDget_eof_test(H5FD_t *file, H5FD_mem_t type)
     haddr_t ret_value;
 
     FUNC_ENTER_API(HADDR_UNDEF)
-    H5TRACE2("a", "*#Mt", file, type);
 
     /* Call developer routine */
     ret_value = H5FDget_eof(file, type);
@@ -249,7 +243,6 @@ H5FDread_test(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t
     herr_t ret_value;
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE6("e", "*#Mtiaz*x", file, type, dxpl_id, addr, size, buf);
 
     /* Call developer routine */
     ret_value = H5FDread(file, type, dxpl_id, addr, size, buf);
@@ -277,7 +270,6 @@ H5FDwrite_test(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_
     herr_t ret_value;
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE6("e", "*#Mtiaz*x", file, type, dxpl_id, addr, size, buf);
 
     /* Call developer routine */
     ret_value = H5FDwrite(file, type, dxpl_id, addr, size, buf);
@@ -306,7 +298,6 @@ H5FDread_vector_test(H5FD_t *file, hid_t dxpl_id, uint32_t count, H5FD_mem_t typ
     herr_t ret_value;
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE7("e", "*#iIu*Mt*a*z**x", file, dxpl_id, count, types, addrs, sizes, bufs);
 
     /* Call developer routine */
     ret_value = H5FDread_vector(file, dxpl_id, count, types, addrs, sizes, bufs);
@@ -335,7 +326,6 @@ H5FDwrite_vector_test(H5FD_t *file, hid_t dxpl_id, uint32_t count, H5FD_mem_t ty
     herr_t ret_value;
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE7("e", "*#iIu*Mt*a*z**x", file, dxpl_id, count, types, addrs, sizes, bufs);
 
     /* Call developer routine */
     ret_value = H5FDwrite_vector(file, dxpl_id, count, types, addrs, sizes, bufs);
@@ -364,8 +354,6 @@ H5FDread_selection_test(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, uint32_t c
     herr_t ret_value;
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE9("e", "*#MtiIu*i*i*a*z**x", file, type, dxpl_id, count, mem_spaces, file_spaces, offsets,
-             element_sizes, bufs);
 
     /* Call developer routine */
     ret_value =
@@ -395,8 +383,6 @@ H5FDwrite_selection_test(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, uint32_t
     herr_t ret_value;
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE9("e", "*#MtiIu*i*i*a*z**x", file, type, dxpl_id, count, mem_spaces, file_spaces, offsets,
-             element_sizes, bufs);
 
     /* Call developer routine */
     ret_value = H5FDwrite_selection(file, type, dxpl_id, count, mem_spaces, file_spaces, offsets,
@@ -425,7 +411,6 @@ H5FDtruncate_test(H5FD_t *file, hid_t dxpl_id, hbool_t closing)
     herr_t ret_value;
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE3("e", "*#ib", file, dxpl_id, closing);
 
     /* Call developer routine */
     ret_value = H5FDtruncate(file, dxpl_id, closing);
@@ -453,7 +438,6 @@ H5FDctl_test(H5FD_t *file, uint64_t op_code, uint64_t flags, const void *input,
     herr_t ret_value;
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE5("e", "*#ULUL*x**x", file, op_code, flags, input, output);
 
     /* Call developer routine */
     ret_value = H5FDctl(file, op_code, flags, input, output);

diff --git a/src/H5TSmutex.c b/src/H5TSmutex.c
@@ -94,7 +94,7 @@ H5TS_mutex_init(H5TS_mutex_t *mutex, int type)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5TS_mutex_lock(H5TS_mutex_t *mutex) H5TS_NO_THREAD_SAFETY_ANALYSIS
+H5TS_mutex_lock(H5TS_mutex_t *mutex)
 {
     herr_t ret_value = SUCCEED;
 
@@ -117,7 +117,7 @@ H5TS_mutex_lock(H5TS_mutex_t *mutex) H5TS_NO_THREAD_SAFETY_ANALYSIS
  *-------------------------------------------------------------------------
  */
 herr_t
-H5TS_mutex_trylock(H5TS_mutex_t *mutex, bool *acquired) H5TS_NO_THREAD_SAFETY_ANALYSIS
+H5TS_mutex_trylock(H5TS_mutex_t *mutex, bool *acquired)
 {
     int    rc;
     herr_t ret_value = SUCCEED;
@@ -146,7 +146,7 @@ H5TS_mutex_trylock(H5TS_mutex_t *mutex, bool *acquired) H5TS_NO_THREAD_SAFETY_AN
  *-------------------------------------------------------------------------
  */
 herr_t
-H5TS_mutex_unlock(H5TS_mutex_t *mutex) H5TS_NO_THREAD_SAFETY_ANALYSIS
+H5TS_mutex_unlock(H5TS_mutex_t *mutex)
 {
     herr_t ret_value = SUCCEED;
 
@@ -211,7 +211,7 @@ H5TS_mutex_init(H5TS_mutex_t *mutex, int H5_ATTR_UNUSED type)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5TS_mutex_lock(H5TS_mutex_t *mutex) H5TS_NO_THREAD_SAFETY_ANALYSIS
+H5TS_mutex_lock(H5TS_mutex_t *mutex)
 {
     FUNC_ENTER_NOAPI_NAMECHECK_ONLY
 
@@ -230,7 +230,7 @@ H5TS_mutex_lock(H5TS_mutex_t *mutex) H5TS_NO_THREAD_SAFETY_ANALYSIS
  *-------------------------------------------------------------------------
  */
 herr_t
-H5TS_mutex_trylock(H5TS_mutex_t *mutex, bool *acquired) H5TS_NO_THREAD_SAFETY_ANALYSIS
+H5TS_mutex_trylock(H5TS_mutex_t *mutex, bool *acquired)
 {
     FUNC_ENTER_NOAPI_NAMECHECK_ONLY
 
@@ -249,7 +249,7 @@ H5TS_mutex_trylock(H5TS_mutex_t *mutex, bool *acquired) H5TS_NO_THREAD_SAFETY_AN
  *-------------------------------------------------------------------------
  */
 herr_t
-H5TS_mutex_unlock(H5TS_mutex_t *mutex) H5TS_NO_THREAD_SAFETY_ANALYSIS
+H5TS_mutex_unlock(H5TS_mutex_t *mutex)
 {
     FUNC_ENTER_NOAPI_NAMECHECK_ONLY
 
@@ -327,7 +327,7 @@ H5TS_mutex_init(H5TS_mutex_t *mutex, int type)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5TS_mutex_lock(H5TS_mutex_t *mutex) H5TS_NO_THREAD_SAFETY_ANALYSIS
+H5TS_mutex_lock(H5TS_mutex_t *mutex)
 {
     herr_t ret_value = SUCCEED;
 
@@ -350,7 +350,7 @@ H5TS_mutex_lock(H5TS_mutex_t *mutex) H5TS_NO_THREAD_SAFETY_ANALYSIS
  *-------------------------------------------------------------------------
  */
 herr_t
-H5TS_mutex_trylock(H5TS_mutex_t *mutex, bool *acquired) H5TS_NO_THREAD_SAFETY_ANALYSIS
+H5TS_mutex_trylock(H5TS_mutex_t *mutex, bool *acquired)
 {
     int    rc;
     herr_t ret_value = SUCCEED;
@@ -379,7 +379,7 @@ H5TS_mutex_trylock(H5TS_mutex_t *mutex, bool *acquired) H5TS_NO_THREAD_SAFETY_AN
  *-------------------------------------------------------------------------
  */
 herr_t
-H5TS_mutex_unlock(H5TS_mutex_t *mutex) H5TS_NO_THREAD_SAFETY_ANALYSIS
+H5TS_mutex_unlock(H5TS_mutex_t *mutex)
 {
     herr_t ret_value = SUCCEED;
 

diff --git a/src/H5private.h b/src/H5private.h
@@ -1539,7 +1539,6 @@ H5_DLL herr_t H5CX_pop(bool update_dxpl_props);
 #define FUNC_LEAVE_API_REENTER(ret_value)                                                                    \
     ;                                                                                                        \
     } /*end scope from end of FUNC_ENTER*/                                                                   \
-    FUNC_LEAVE_API_COMMON(ret_value);                                                                        \
     H5_POP_FUNC                                                                                              \
     if (H5_UNLIKELY(err_occurred))                                                                           \
         (void)H5E_dump_api_stack();                                                                          \