Don't print thread ID when the library isn't multithreaded.

Corresponding changes to make error output for regression tests agnostic to thread setting. Signed-off-by: Quincey Koziol <[email protected]>
qkoziol · Apr 20, 2024 · af05f74 · af05f74
1 parent 84e75e2
commit af05f74
Show file tree

Hide file tree

Showing 32 changed files with 124 additions and 110 deletions.
diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in
diff --git a/src/H5CS.c b/src/H5CS.c
@@ -134,9 +134,11 @@ H5CS_print_stack(const H5CS_t *fstack, FILE *stream)
     if (!stream)
         stream = stderr;
 
-    fprintf(stream, "HDF5-DIAG: Function stack from %s ", H5_lib_vers_info_g);
+    fprintf(stream, "HDF5-DIAG: Function stack from %s", H5_lib_vers_info_g);
     /* try show the process or thread id in multiple processes cases*/
-    fprintf(stream, "thread %" PRIu64 ".", H5TS_thread_id());
+#ifdef H5_HAVE_THREADSAFE
+    fprintf(stream, " thread %" PRIu64 ".", H5TS_thread_id());
+#endif
     if (fstack && fstack->nused > 0)
         fprintf(stream, "  Back trace follows.");
     fputc('\n', stream);

diff --git a/src/H5Eint.c b/src/H5Eint.c
@@ -218,7 +218,7 @@ H5E__walk1_cb(int n, H5E_error1_t *err_desc, void *client_data)
         if (cls_ptr->lib_vers)
             eprint->cls.lib_vers = cls_ptr->lib_vers;
 
-        fprintf(stream, "%s-DIAG: Error detected in %s (%s) ",
+        fprintf(stream, "%s-DIAG: Error detected in %s (%s)",
                 (cls_ptr->cls_name ? cls_ptr->cls_name : "(null)"),
                 (cls_ptr->lib_name ? cls_ptr->lib_name : "(null)"),
                 (cls_ptr->lib_vers ? cls_ptr->lib_vers : "(null)"));
@@ -233,13 +233,17 @@ H5E__walk1_cb(int n, H5E_error1_t *err_desc, void *client_data)
 
             if (mpi_initialized && !mpi_finalized) {
                 MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
-                fprintf(stream, "MPI-process %d", mpi_rank);
+                fprintf(stream, " MPI-process %d", mpi_rank);
             } /* end if */
+#ifdef H5_HAVE_THREADSAFE
             else
-                fprintf(stream, "thread 0");
+                fprintf(stream, " thread %" PRIu64, H5TS_thread_id());
+#endif
         } /* end block */
 #else
-        fprintf(stream, "thread %" PRIu64, H5TS_thread_id());
+#ifdef H5_HAVE_THREADSAFE
+        fprintf(stream, " thread %" PRIu64, H5TS_thread_id());
+#endif
 #endif
         fprintf(stream, ":\n");
     } /* end if */
@@ -342,7 +346,7 @@ H5E__walk2_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data)
         if (cls_ptr->lib_vers)
             eprint->cls.lib_vers = cls_ptr->lib_vers;
 
-        fprintf(stream, "%s-DIAG: Error detected in %s (%s) ",
+        fprintf(stream, "%s-DIAG: Error detected in %s (%s)",
                 (cls_ptr->cls_name ? cls_ptr->cls_name : "(null)"),
                 (cls_ptr->lib_name ? cls_ptr->lib_name : "(null)"),
                 (cls_ptr->lib_vers ? cls_ptr->lib_vers : "(null)"));
@@ -357,13 +361,17 @@ H5E__walk2_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data)
 
             if (mpi_initialized && !mpi_finalized) {
                 MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
-                fprintf(stream, "MPI-process %d", mpi_rank);
+                fprintf(stream, " MPI-process %d", mpi_rank);
             } /* end if */
+#ifdef H5_HAVE_THREADSAFE
             else
-                fprintf(stream, "thread 0");
+                fprintf(stream, " thread %" PRIu64, H5TS_thread_id());
+#endif
         } /* end block */
 #else
-        fprintf(stream, "thread %" PRIu64, H5TS_thread_id());
+#ifdef H5_HAVE_THREADSAFE
+        fprintf(stream, " thread %" PRIu64, H5TS_thread_id());
+#endif
 #endif
         fprintf(stream, ":\n");
     } /* end if */

diff --git a/test/h5test.c b/test/h5test.c
@@ -1117,11 +1117,15 @@ h5_show_hostname(void)
         MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
         printf("MPI-process %d.", mpi_rank);
     }
+#ifdef H5_HAVE_THREADSAFE
     else
-        printf("thread 0.");
+        printf("thread %" PRIu64 ".", H5TS_thread_id());
+#endif
 #else
+#ifdef H5_HAVE_THREADSAFE
     printf("thread %" PRIu64 ".", H5TS_thread_id());
 #endif
+#endif
 #ifdef H5_HAVE_WIN32_API
 
     err = WSAStartup(MAKEWORD(2, 2), &wsaData);

diff --git a/test/test_error.sh.in b/test/test_error.sh.in
@@ -70,7 +70,7 @@ TEST() {
    fi
 
    # Extract file name, line number, version and thread IDs because they may be different
-   sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
+   sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
 	-e 's/line [0-9]*/line (number)/' \
         -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
 	-e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \

diff --git a/test/testfiles/err_compat_1 b/test/testfiles/err_compat_1
@@ -3,7 +3,7 @@ Testing error API based on data I/O
 All error API tests passed.
    This program tests the Error API compatible with HDF5 version (number).  There are supposed to be some error messages
 ********* Print error stack in HDF5 default way *********
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in main(): fake error message 1
     major: Error API
     minor: Bad value
@@ -12,7 +12,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
     error #000: (file name) in main(): line (number)
         major: Error API
         minor: Bad value
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5Dcreate2(): unable to synchronously create dataset
     major: Dataset
     minor: Unable to create file
@@ -70,7 +70,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
     error #003: (file name) in H5Dcreate2(): line (number)
         major: Dataset
         minor: Unable to create file
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5Dcreate2(): unable to synchronously create dataset
     major: Dataset
     minor: Unable to create file
@@ -83,7 +83,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #003: (file name) line (number) in H5VL_vol_object(): invalid identifier type to function
     major: Invalid arguments to routine
     minor: Inappropriate type
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in main(): fake error message 2
     major: Error API
     minor: Unrecognized message

diff --git a/test/testfiles/error_test_1 b/test/testfiles/error_test_1
@@ -1,10 +1,10 @@
    This program tests the Error API.  There're supposed to be some error messages
 ********* Print error stack in HDF5 default way *********
-Second Test-DIAG: Error detected in Second Program (1.0) thread (IDs):
+Second Test-DIAG: Error detected in Second Program (1.0):
   #000: (file name) line (number) in main(): Error stack test failed
     major: Error in test
     minor: Error in error stack
-Error Test-DIAG: Error detected in Error Program (1.0) thread (IDs):
+Error Test-DIAG: Error detected in Error Program (1.0):
   #001: (file name) line (number) in error_stack(): Get number test failed, returned 0
     major: Error in API
     minor: Error in H5Eget_num
@@ -20,21 +20,21 @@ Error Test-DIAG: Error detected in Error Program (1.0) thread (IDs):
         minor: Error in error stack
 
 Testing error API based on data I/O
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5Dwrite(): can't synchronously write data
     major: Dataset
     minor: Write failed
   #001: (file name) line (number) in H5D__write_api_common(): dset_id is not a dataset ID
     major: Invalid arguments to routine
     minor: Inappropriate type
-Error Test-DIAG: Error detected in Error Program (1.0) thread (IDs):
+Error Test-DIAG: Error detected in Error Program (1.0):
   #000: (file name) line (number) in main(): Error test failed, it's wrong
     major: Error in test
     minor: Error in subroutine
   #001: (file name) line (number) in test_error(): H5Dwrite failed as supposed to
     major: Error in IO
     minor: Error in H5Dwrite
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #002: (file name) line (number) in H5Dwrite(): can't synchronously write data
     major: Dataset
     minor: Write failed
@@ -43,7 +43,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
     minor: Inappropriate type
 
 Testing error message during data reading when filter isn't registered
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5Dread(): can't synchronously read data
     major: Dataset
     minor: Read failed

diff --git a/tools/test/h5dump/errfiles/tall-1.err b/tools/test/h5dump/errfiles/tall-1.err
@@ -1,4 +1,4 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5Oopen(): unable to synchronously open object
     major: Object header
     minor: Can't open object

diff --git a/tools/test/h5dump/errfiles/tall-2A.err b/tools/test/h5dump/errfiles/tall-2A.err
@@ -1,4 +1,4 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5Oopen(): unable to synchronously open object
     major: Object header
     minor: Can't open object

diff --git a/tools/test/h5dump/errfiles/tall-2A0.err b/tools/test/h5dump/errfiles/tall-2A0.err
@@ -1,4 +1,4 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5Oopen(): unable to synchronously open object
     major: Object header
     minor: Can't open object

diff --git a/tools/test/h5dump/errfiles/tall-2B.err b/tools/test/h5dump/errfiles/tall-2B.err
@@ -1,4 +1,4 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5Oopen(): unable to synchronously open object
     major: Object header
     minor: Can't open object

diff --git a/tools/test/h5dump/errfiles/tarray1_big.err b/tools/test/h5dump/errfiles/tarray1_big.err
@@ -1,25 +1,25 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
     minor: Can't get value
   #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
     minor: Unable to copy object
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
     minor: Can't get value
   #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
     minor: Unable to copy object
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
     minor: Can't get value
   #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
     minor: Unable to copy object
-H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
+H5tools-DIAG: Error detected in HDF5:tools (version (number)):
   #000: (file name) line (number) in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
     major: Failure in tools library
     minor: error in function

diff --git a/tools/test/h5dump/errfiles/tattr-3.err b/tools/test/h5dump/errfiles/tattr-3.err
@@ -1,4 +1,4 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5Aopen(): unable to synchronously open attribute
     major: Attribute
     minor: Unable to create file

diff --git a/tools/test/h5dump/errfiles/tattrregR.err b/tools/test/h5dump/errfiles/tattrregR.err
@@ -1,18 +1,18 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
     minor: Can't get value
   #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
     minor: Unable to copy object
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
     minor: Can't get value
   #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
     minor: Unable to copy object
-H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
+H5tools-DIAG: Error detected in HDF5:tools (version (number)):
   #000: (file name) line (number) in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
     major: Failure in tools library
     minor: error in function

diff --git a/tools/test/h5dump/errfiles/tcomp-3.err b/tools/test/h5dump/errfiles/tcomp-3.err
@@ -1,4 +1,4 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5Topen2(): unable to open named datatype synchronously
     major: Datatype
     minor: Can't open object

diff --git a/tools/test/h5dump/errfiles/tdataregR.err b/tools/test/h5dump/errfiles/tdataregR.err
@@ -1,18 +1,18 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
     minor: Can't get value
   #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
     minor: Unable to copy object
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
     minor: Can't get value
   #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
     minor: Unable to copy object
-H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
+H5tools-DIAG: Error detected in HDF5:tools (version (number)):
   #000: (file name) line (number) in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
     major: Failure in tools library
     minor: error in function

diff --git a/tools/test/h5dump/errfiles/tdset-2.err b/tools/test/h5dump/errfiles/tdset-2.err
@@ -1,4 +1,4 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5Dopen2(): unable to synchronously open dataset
     major: Dataset
     minor: Can't open object
@@ -29,7 +29,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #009: (file name) line (number) in H5G__loc_find_cb(): object 'dset3' doesn't exist
     major: Symbol table
     minor: Object not found
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5Lget_info2(): unable to get link info
     major: Links
     minor: Can't get value

diff --git a/tools/test/h5dump/errfiles/textlink.err b/tools/test/h5dump/errfiles/textlink.err
@@ -1,4 +1,4 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5Oopen(): unable to synchronously open object
     major: Object header
     minor: Can't open object
@@ -35,7 +35,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #011: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'filename'
     major: Links
     minor: Unable to open file
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5Oopen(): unable to synchronously open object
     major: Object header
     minor: Can't open object

diff --git a/tools/test/h5dump/errfiles/textlinkfar.err b/tools/test/h5dump/errfiles/textlinkfar.err
@@ -1,4 +1,4 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5Oopen(): unable to synchronously open object
     major: Object header
     minor: Can't open object
@@ -59,7 +59,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #019: (file name) line (number) in H5G__traverse_slink_cb(): component not found
     major: Symbol table
     minor: Object not found
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
@@ -156,7 +156,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #031: (file name) line (number) in H5G__traverse_special(): too many links
     major: Links
     minor: Too many soft links in path
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found

diff --git a/tools/test/h5dump/errfiles/textlinksrc.err b/tools/test/h5dump/errfiles/textlinksrc.err
@@ -1,4 +1,4 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5Oopen(): unable to synchronously open object
     major: Object header
     minor: Can't open object
@@ -59,7 +59,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #019: (file name) line (number) in H5G__traverse_slink_cb(): component not found
     major: Symbol table
     minor: Object not found
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
@@ -156,7 +156,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #031: (file name) line (number) in H5G__traverse_special(): too many links
     major: Links
     minor: Too many soft links in path
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found

diff --git a/tools/test/h5dump/errfiles/tgroup-2.err b/tools/test/h5dump/errfiles/tgroup-2.err
@@ -1,4 +1,4 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5Gopen2(): unable to synchronously open group
     major: Symbol table
     minor: Unable to create file

diff --git a/tools/test/h5dump/errfiles/torderlinks1.err b/tools/test/h5dump/errfiles/torderlinks1.err
@@ -1,4 +1,4 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5Oopen(): unable to synchronously open object
     major: Object header
     minor: Can't open object

diff --git a/tools/test/h5dump/errfiles/torderlinks2.err b/tools/test/h5dump/errfiles/torderlinks2.err
@@ -1,4 +1,4 @@
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+HDF5-DIAG: Error detected in HDF5 (version (number)):
   #000: (file name) line (number) in H5Oopen(): unable to synchronously open object
     major: Object header
     minor: Can't open object