summaryrefslogtreecommitdiffstats
path: root/test/ragged.c
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1998-11-02 17:58:28 (GMT)
committerRobb Matzke <matzke@llnl.gov>1998-11-02 17:58:28 (GMT)
commit254ae8d43d796c02aedfb7393726a80be14b95d5 (patch)
treea8be7fe29a273fb0ae4c21e41625755ae6ae88f9 /test/ragged.c
parenta125ee351ba738a61d35755fbb2880b011ac6649 (diff)
downloadhdf5-254ae8d43d796c02aedfb7393726a80be14b95d5.zip
hdf5-254ae8d43d796c02aedfb7393726a80be14b95d5.tar.gz
hdf5-254ae8d43d796c02aedfb7393726a80be14b95d5.tar.bz2
[svn-r859] Changes since 19981030
---------------------- ./MANIFEST Added new Pablo files HDF5record_RT.h and ProcIDs.h ./acconfig.h ./configure [REGENERATED] ./configure.in ./src/H5.c ./src/H5Vprivate.h ./src/H5config.h.in [REGENERATED] ./src/H5private.h ./src/H5public.h ./test/big.c Added more configuration stuff for the Win32 environment. Removed all the #ifdef WIN32 from the source and replaced them with OS-independent stuff. Specifics follow: Check for non-Posix.1 `st_blocks' field in `struct stat' which is used by the big file test to decide if the file system supports holes. If the st_blocks field isn't present then we just skip the test. Configure checks for <io.h> <sys/resource.h> <sys/time.h> and <winsock.h> and defines HAVE_IO_H, HAVE_SYS_RESOURCE_H, HAVE_SYS_TIME_H and HAVE_WINSOCK_H when they're found. Configure checks whether both <sys/time.h> and <time.h> can be included and defines SYS_TIME_WITH_TIME if so. Otherwise include only <sys/time.h> or <time.h> even if both exist. Configure checks sizeof(__int64) and defines SIZEOF___INT64 to the result or to zero if __int64 isn't defined. The source uses `long long' in preference to `__int64'. Removed null WIN32 definition for `inline' since such a definition already exists in H5config.h Protected gettimeofday() calls in debugging code with HAVE_GETTIMEOFDAY instead of WIN32. ./src/H5F.c ./src/H5Flow.c ./src/H5Fmpio.c ./src/H5Fsec2.c ./src/H5Fstdio.h ./src/H5P.c ./src/H5Tconv.c ./src/H5private.h Removed #include of system files from library source files and consolodated them into H5private.h where they're protected by various configuration macros (most of them were duplicated there already anyway). ./test/big.c ./test/chunk.c ./test/cmpd_dset.c ./test/dsets.c ./test/dtypes.c ./test/extend.c ./test/external.c ./test/fillval.c ./test/flush1.c ./test/flush2.c ./test/iopipe.c ./test/links.c ./test/mount.c ./test/mtime.c ./test/overhead.c ./test/ragged.c ./test/shtype.c ./test/unlink.c Protected system #include's with #ifdef's from H5config.h. Undefined NDEBUG since some of the tests rely on assert() to check return values. Removed WIN32 definitions for __unused__ since this can be controlled by the definition of HAVE_ATTRIBUTE in H5config.h ./test/testhdf5.h Removed the CLEAN_CMD definition because we no longer use it. Albert's cleanup() functions replaced it. ./test/fillval.c Initialized auto hid_t variables to fix warnings in error recovery code when data flow analysis is turned on in compilers. ./test/h5tools.c Initialized an auto variable to fix a compiler warning. ./test/chunk.c ./test/ragged.c The WIN32 had some unsigned variables changed to signed because the compiler generates warnings when coercing unsigned to double(?). I changed them back to unsigned because they really are unsigned quantities. If this the change was just to shut up extraneous warnings then perhaps a compiler flag can do the same; otherwise if the compiler generates bad code then we should supply a patch file instead messing up source code with bug work-arounds. ./src/H5detect.c Protected system #include's with #ifdef's from H5config.h thereby removing a WIN32. If getpwuid() doesn't exist (HAVE_GETPWUID) then we assume that `struct passwd' doesn't exist either (we don't really need it in that case). The H5T_NATIVE_LLONG and H5T_NATIVE_ULLONG are defined in terms of `long long' or else `__int64' or else `long' depending on what's available. ./src/H5Flow.c ./src/H5Ofill.c Added __unused__ to some function arguments that aren't used when assertions are turned off. ./src/H5V.c Changed an auto variable name in some hand-inlined code to get rid of a warning about the variable shadowing a previous auto.
Diffstat (limited to 'test/ragged.c')
-rw-r--r--test/ragged.c30
1 files changed, 12 insertions, 18 deletions
diff --git a/test/ragged.c b/test/ragged.c
index 903a32e..fa1f8b0 100644
--- a/test/ragged.c
+++ b/test/ragged.c
@@ -5,10 +5,18 @@
* Programmer: Robb Matzke <robb@arborea.spizella.com>
* Tuesday, August 25, 1998
*/
-#include <assert.h>
+
+/* See H5private.h for how to include headers */
+#undef NDEBUG
+#include <H5config.h>
+
+#ifdef STDC_HEADERS
+# include <assert.h>
+# include <signal.h>
+# include <stdlib.h>
+#endif
+
#include <hdf5.h>
-#include <signal.h>
-#include <stdlib.h>
#include <H5private.h> /*for performance monitoring*/
@@ -196,11 +204,7 @@ ragged_write_all(hid_t ra, hsize_t rows_at_once)
hssize_t row; /*current row number */
hsize_t i; /*counter */
hsize_t max_width = quant_g[NELMTS(quant_g)-1].hi;
-#if !defined(WIN32)
hsize_t interval_nelmts; /*elmts/interval timer */
-#else
- hssize_t interval_nelmts; /*elmts/interval timer */
-#endif
hsize_t *size=NULL; /*size of each row */
void **buf=NULL; /*buffer for each row */
H5_timer_t timer, timer_total; /*performance timers */
@@ -302,11 +306,7 @@ ragged_read_all(hid_t ra, hsize_t rows_at_once)
int total_nelmts=0;
hsize_t i, j; /*counters */
hssize_t row; /*current row number */
-#if !defined(WIN32)
hsize_t interval_nelmts; /*elmts/interval timer */
-#else
- hssize_t interval_nelmts; /*elmts/interval timer */
-#endif
hsize_t *size=NULL; /*size of each row */
C_MTYPE **buf=NULL; /*buffer for each row */
H5_timer_t timer, timer_total; /*performance timers */
@@ -437,14 +437,8 @@ ragged_read_short(hid_t ra, hsize_t rows_at_once, hsize_t width)
int total_nelmts=0;
hsize_t i, j;
hssize_t row; /*current row number */
-#if !defined(WIN32)
hsize_t interval_nelmts; /*elmts/interval timer */
- hsize_t read_nelmts=0; /*total elements read */
-#else
- hssize_t read_nelmts=0; /*total elements read */
- hssize_t interval_nelmts; /*elmts/interval timer */
-#endif
-
+ hsize_t read_nelmts=0; /*total elements read */
hsize_t *size=NULL; /*size of each row */
C_MTYPE **buf=NULL; /*buffer for each row */
H5_timer_t timer, timer_total; /*performance timers */