summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElena Pourmal <epourmal@hdfgroup.org>2006-07-31 20:57:44 (GMT)
committerElena Pourmal <epourmal@hdfgroup.org>2006-07-31 20:57:44 (GMT)
commit400676eea079ad55b77b01e507185cd66c2e9bae (patch)
treee02aa7290640bec119db1f89c6cffbeb0932d2f3
parent26303bfdb55cf158a24a58ad64e81c9bbd65b7f9 (diff)
downloadhdf5-400676eea079ad55b77b01e507185cd66c2e9bae.zip
hdf5-400676eea079ad55b77b01e507185cd66c2e9bae.tar.gz
hdf5-400676eea079ad55b77b01e507185cd66c2e9bae.tar.bz2
[svn-r12521] Description:
ttsafe test failed on the tts_error call. The error was due to the outdated expected error stack; fixed. Test was also moved to use new error APIs. Platforms tested: Linux 2.4 (heping) and Solaris 2.9 (shanti)
-rw-r--r--test/ttsafe_error.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/test/ttsafe_error.c b/test/ttsafe_error.c
index 1f07429..9630116 100644
--- a/test/ttsafe_error.c
+++ b/test/ttsafe_error.c
@@ -46,7 +46,7 @@
#ifdef H5_HAVE_THREADSAFE
-#define NUM_THREAD 16
+#define NUM_THREAD 16
#define FILENAME "ttsafe_error.h5"
/* Having a common dataset name is an error */
@@ -54,8 +54,8 @@
#define EXPECTED_ERROR_DEPTH 8
#define WRITE_NUMBER 37
-static herr_t error_callback(void *);
-static herr_t walk_error_callback(unsigned, const H5E_error_t *, void *);
+static herr_t error_callback(hid_t , void *);
+static herr_t walk_error_callback(unsigned, const H5E_error_stack_t *, void *);
static void *tts_error_thread(void *);
/* Global variables */
@@ -81,14 +81,14 @@ void tts_error(void)
int ret;
/* Must initialize these at runtime */
- expected[0].maj_num = H5E_DATASET;
- expected[0].min_num = H5E_CANTINIT;
+ expected[0].maj_num = H5E_ATOM;
+ expected[0].min_num = H5E_CANTREGISTER;
- expected[1].maj_num = H5E_DATASET;
+ expected[1].maj_num = H5E_SYM;
expected[1].min_num = H5E_CANTINIT;
expected[2].maj_num = H5E_SYM;
- expected[2].min_num = H5E_EXISTS;
+ expected[2].min_num = H5E_CANTINSERT;
expected[3].maj_num = H5E_SYM;
expected[3].min_num = H5E_NOTFOUND;
@@ -168,7 +168,7 @@ void *tts_error_thread(void UNUSED *arg)
H5Eget_auto_stack(H5E_DEFAULT, &old_error_cb, &old_error_client_data);
/* set each thread's error stack handler */
- H5Eset_auto(error_callback, NULL);
+ H5Eset_auto_stack(H5E_DEFAULT, error_callback, NULL);
/* define dataspace for dataset */
dimsf[0] = 1;
@@ -200,7 +200,7 @@ void *tts_error_thread(void UNUSED *arg)
}
static
-herr_t error_callback(void *client_data)
+herr_t error_callback(hid_t estack_id, void *client_data)
{
int ret;
@@ -209,11 +209,11 @@ herr_t error_callback(void *client_data)
error_count++;
ret=pthread_mutex_unlock(&error_mutex);
assert(ret==0);
- return H5Ewalk(H5E_WALK_DOWNWARD, walk_error_callback, client_data);
+ return H5Ewalk_stack(H5E_DEFAULT, H5E_WALK_DOWNWARD, walk_error_callback, client_data);
}
static
-herr_t walk_error_callback(unsigned n, const H5E_error_t *err_desc, void UNUSED *client_data)
+herr_t walk_error_callback(unsigned n, const H5E_error_stack_t *err_desc, void UNUSED *client_data)
{
hid_t maj_num, min_num;