summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1998-11-11 16:33:33 (GMT)
committerRobb Matzke <matzke@llnl.gov>1998-11-11 16:33:33 (GMT)
commitbb36032d5a67da619efb8d6139f4f6bae1fe4706 (patch)
tree819eb2f9d631d5e3accf9042d4fce60861f25c5c /test
parentc82e6a41229a20086e0d6903da0f831b60ff62d9 (diff)
downloadhdf5-bb36032d5a67da619efb8d6139f4f6bae1fe4706.zip
hdf5-bb36032d5a67da619efb8d6139f4f6bae1fe4706.tar.gz
hdf5-bb36032d5a67da619efb8d6139f4f6bae1fe4706.tar.bz2
[svn-r900] Changes since 19981106
---------------------- ./tools/h5ls.c The chunk dimensions and total size is printed for chunked datasets. ./examples/h5_attribute.c ./examples/h5_select.c ./test/chunk.c ./test/iopipe.c ./test/ragged.c ./src/H5.c ./src/H5private.h ./src/H5public.h Removed extra carriage-return characters inserted by a broken OS :-) Reformatted strange-looking comments. Removed C++ comments. Wrapped long lines. ./examples/h5_attribute.c ./examples/h5_select.c Removed inclusion of private headers. Changed `uint32' (originally `uint') to `unsigned' because `int32' is not exported as part of the API. ./src/H5Fmpio.h Removed includes for <sys/types.h> and <sys/stat.h> since they're already included by H5private.h. All system include files should be included in H5private.h so we can wrap them with appropriate feature macros. ./tools/h5import.c ./tools/h5repart.c Included header files like all other programs in that directory. ./tools/h5tools.c Better type checking for `hsize_t' and `hssize_t'.
Diffstat (limited to 'test')
-rw-r--r--test/chunk.c10
-rw-r--r--test/iopipe.c15
-rw-r--r--test/ragged.c92
3 files changed, 60 insertions, 57 deletions
diff --git a/test/chunk.c b/test/chunk.c
index c2533e7..767dc48 100644
--- a/test/chunk.c
+++ b/test/chunk.c
@@ -285,11 +285,11 @@ test_diag (int op, hsize_t cache_size, hsize_t io_size, hsize_t offset)
H5Dclose (dset);
H5Fclose (file);
- /*
- * The extra cast in the following statement is a bug
- * workaround for the Win32 version 0.0 compiler.
- * 1998-11-06 ptl
- */
+ /*
+ * The extra cast in the following statement is a bug workaround for the
+ * Win32 version 0.0 compiler.
+ * 1998-11-06 ptl
+ */
return (double)((hssize_t)(nio/nio_g));
}
diff --git a/test/iopipe.c b/test/iopipe.c
index f7e3349..49231f3 100644
--- a/test/iopipe.c
+++ b/test/iopipe.c
@@ -183,17 +183,14 @@ main (void)
off_t offset;
hssize_t start[2];
hsize_t count[2];
-
- /*
- * The extra cast in the following statement is a bug
- * workaround for the Win32 version 0.0 compiler.
- * 1998-11-06 ptl
- */
+ /*
+ * The extra cast in the following statement is a bug workaround for the
+ * Win32 version 0.0 compiler.
+ * 1998-11-06 ptl
+ */
printf ("I/O request size is %1.1fMB\n",
- ((double)((hssize_t)(size[0]*size[1])))/(1024.0*1024));
- // ((double)(size[0])*(double)(size[1]))/(1024.0*1024));
-
+ ((double)((hssize_t)(size[0]*size[1])))/(1024.0*1024));
/* Open the files */
file = H5Fcreate (HDF5_FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
diff --git a/test/ragged.c b/test/ragged.c
index 9926a0a..ce73bf3 100644
--- a/test/ragged.c
+++ b/test/ragged.c
@@ -247,12 +247,13 @@ ragged_write_all(hid_t ra, hsize_t rows_at_once)
if (0==row || alarm_g || 0==timeout_g) {
alarm_g = 0;
H5_timer_end(&timer_total, &timer);
- /*
- * The extra cast in the following statement is a bug
- * workaround for the Win32 version 0.0 compiler.
- * 1998-11-06 ptl
- */
- H5_bandwidth(s, (double)((hssize_t)interval_nelmts)*sizeof(C_MTYPE),
+ /*
+ * The extra cast in the following statement is a bug workaround
+ * for the Win32 version 0.0 compiler.
+ * 1998-11-06 ptl
+ */
+ H5_bandwidth(s,
+ (double)((hssize_t)interval_nelmts)*sizeof(C_MTYPE),
timer.etime);
printf(" %8lu %8lu %7.3f%% %10s%s\n",
(unsigned long)(row+i), (unsigned long)total_nelmts,
@@ -266,13 +267,13 @@ ragged_write_all(hid_t ra, hsize_t rows_at_once)
/* Conclusions */
if (timeout_g) { /*a minor race condition, but who really cares?*/
H5_timer_end(&timer_total, &timer);
-
- /*
- * The extra cast in the following statement is a bug
- * workaround for the Win32 version 0.0 compiler.
- * 1998-11-06 ptl
- */
- H5_bandwidth(s, (double)((hssize_t)interval_nelmts)*sizeof(C_MTYPE), timer.etime);
+ /*
+ * The extra cast in the following statement is a bug workaround for
+ * the Win32 version 0.0 compiler.
+ * 1998-11-06 ptl
+ */
+ H5_bandwidth(s, (double)((hssize_t)interval_nelmts)*sizeof(C_MTYPE),
+ timer.etime);
printf(" %8lu %8lu %7.3f%% %10s\n",
(unsigned long)row, (unsigned long)total_nelmts,
100.0*total_nelmts/MAX_NELMTS, s);
@@ -380,12 +381,13 @@ ragged_read_all(hid_t ra, hsize_t rows_at_once)
if (0==row || alarm_g || 0==timeout_g) {
alarm_g = 0;
H5_timer_end(&timer_total, &timer);
- /*
- * The extra cast in the following statement is a bug
- * workaround for the Win32 version 0.0 compiler.
- * 1998-11-06 ptl
- */
- H5_bandwidth(s, (double)((hssize_t)interval_nelmts)*sizeof(C_MTYPE),
+ /*
+ * The extra cast in the following statement is a bug workaround
+ * for the Win32 version 0.0 compiler.
+ * 1998-11-06 ptl
+ */
+ H5_bandwidth(s,
+ (double)((hssize_t)interval_nelmts)*sizeof(C_MTYPE),
timer.etime);
printf(" %8lu %8lu %7.3f%% %10s%s\n",
(unsigned long)(row+i), (unsigned long)total_nelmts,
@@ -407,12 +409,13 @@ ragged_read_all(hid_t ra, hsize_t rows_at_once)
/* Conclusions */
if (timeout_g) { /*a minor race condition, but who really cares?*/
H5_timer_end(&timer_total, &timer);
- /*
- * The extra cast in the following statement is a bug
- * workaround for the Win32 version 0.0 compiler.
- * 1998-11-06 ptl
- */
- H5_bandwidth(s, (double)((hssize_t)interval_nelmts)*sizeof(C_MTYPE), timer.etime);
+ /*
+ * The extra cast in the following statement is a bug workaround for
+ * the Win32 version 0.0 compiler.
+ * 1998-11-06 ptl
+ */
+ H5_bandwidth(s, (double)((hssize_t)interval_nelmts)*sizeof(C_MTYPE),
+ timer.etime);
printf(" %8lu %8lu %7.3f%% %10s\n",
(unsigned long)row, (unsigned long)total_nelmts,
100.0*total_nelmts/MAX_NELMTS, s);
@@ -542,12 +545,13 @@ ragged_read_short(hid_t ra, hsize_t rows_at_once, hsize_t width)
if (0==row || alarm_g || 0==timeout_g) {
alarm_g = 0;
H5_timer_end(&timer_total, &timer);
- /*
- * The extra cast in the following statement is a bug
- * workaround for the Win32 version 0.0 compiler.
- * 1998-11-06 ptl
- */
- H5_bandwidth(s, (double)((hssize_t)interval_nelmts)*sizeof(C_MTYPE),
+ /*
+ * The extra cast in the following statement is a bug workaround
+ * for the Win32 version 0.0 compiler.
+ * 1998-11-06 ptl
+ */
+ H5_bandwidth(s,
+ (double)((hssize_t)interval_nelmts)*sizeof(C_MTYPE),
timer.etime);
printf(" %8lu %8lu %7.3f%% %10s%s\n",
(unsigned long)(row+i), (unsigned long)read_nelmts,
@@ -569,23 +573,25 @@ ragged_read_short(hid_t ra, hsize_t rows_at_once, hsize_t width)
/* Conclusions */
if (timeout_g) { /*a minor race condition, but who really cares?*/
H5_timer_end(&timer_total, &timer);
- /*
- * The extra cast in the following statement is a bug
- * workaround for the Win32 version 0.0 compiler.
- * 1998-11-06 ptl
- */
- H5_bandwidth(s, (double)((hssize_t)interval_nelmts)*sizeof(C_MTYPE), timer.etime);
+ /*
+ * The extra cast in the following statement is a bug workaround for
+ * the Win32 version 0.0 compiler.
+ * 1998-11-06 ptl
+ */
+ H5_bandwidth(s, (double)((hssize_t)interval_nelmts)*sizeof(C_MTYPE),
+ timer.etime);
printf(" %8lu %8lu %7.3f%% %10s\n",
(unsigned long)row, (unsigned long)read_nelmts,
100.0*total_nelmts/MAX_NELMTS, s);
}
printf(" -------- -------- -------- ----------\n");
- /*
- * The extra cast in the following statement is a bug
- * workaround for the Win32 version 0.0 compiler.
- * 1998-11-06 ptl
- */
- H5_bandwidth(s, (double)((hssize_t)read_nelmts)*sizeof(C_MTYPE), timer_total.etime);
+ /*
+ * The extra cast in the following statement is a bug workaround for the
+ * Win32 version 0.0 compiler.
+ * 1998-11-06 ptl
+ */
+ H5_bandwidth(s, (double)((hssize_t)read_nelmts)*sizeof(C_MTYPE),
+ timer_total.etime);
printf(" %27s%10s\n", "", s);
/* Cleanup */