diff options
author | Robb Matzke <matzke@llnl.gov> | 1998-11-02 17:58:28 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1998-11-02 17:58:28 (GMT) |
commit | 254ae8d43d796c02aedfb7393726a80be14b95d5 (patch) | |
tree | a8be7fe29a273fb0ae4c21e41625755ae6ae88f9 /test/iopipe.c | |
parent | a125ee351ba738a61d35755fbb2880b011ac6649 (diff) | |
download | hdf5-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/iopipe.c')
-rw-r--r-- | test/iopipe.c | 80 |
1 files changed, 47 insertions, 33 deletions
diff --git a/test/iopipe.c b/test/iopipe.c index bac63e1..6cdbd2b 100644 --- a/test/iopipe.c +++ b/test/iopipe.c @@ -5,25 +5,43 @@ * Programmer: Robb Matzke <matzke@llnl.gov> * Thursday, March 12, 1998 */ + +/* See H5private.h for how to include headers */ #undef NDEBUG -#include <assert.h> -#include <fcntl.h> -#include <hdf5.h> -#include <stdio.h> -#include <string.h> -#include <stdlib.h> -#include <sys/types.h> +#include <H5config.h> +#ifdef STDC_HEADERS +# include <assert.h> +# include <fcntl.h> +# include <stdio.h> +# include <string.h> +# include <stdlib.h> +#endif -#if defined(WIN32) -#include <time.h> -#include <Winsock.h> +#ifdef HAVE_UNISTD_H +# include <sys/types.h> +# include <unistd.h> +#endif + +#if defined(TIME_WITH_SYS_TIME) +# include <sys/time.h> +# include <time.h> +#elif defined(HAVE_SYS_TIME_H) +# include <sys/time.h> #else -#include <sys/time.h> -#include <sys/resource.h> -#include <unistd.h> +# include <time.h> +#endif + +#ifdef HAVE_SYS_RESOURCE_H +# include <sys/resource.h> #endif +#ifdef HAVE_WINSOCK_H +#include <Winsock.h> +#endif + +#include <hdf5.h> + #define RAW_FILE_NAME "iopipe.raw" #define HDF5_FILE_NAME "iopipe.h5" #define HEADING "%-16s" @@ -148,20 +166,16 @@ synchronize (void) int main (void) { -#if defined(WIN32) - static hssize_t size[2] = {REQUEST_SIZE_X, REQUEST_SIZE_Y}; -#else static hsize_t size[2] = {REQUEST_SIZE_X, REQUEST_SIZE_Y}; -#endif static int nread=NREAD_REQUESTS, nwrite=NWRITE_REQUESTS; unsigned char *the_data = NULL; hid_t file, dset, file_space=-1; herr_t status; -#if !defined(WIN32) +#ifdef HAVE_GETRUSAGE struct rusage r_start, r_stop; #else - struct timeval r_start, r_stop; + struct timeval r_start, r_stop; #endif struct timeval t_start, t_stop; int i, fd; @@ -194,7 +208,7 @@ main (void) #ifdef HAVE_GETRUSAGE getrusage (RUSAGE_SELF, &r_start); #endif -#if !defined(WIN32) +#ifdef HAVE_GETTIMEOFDAY gettimeofday (&t_start, NULL); #endif fprintf (stderr, HEADING, "fill raw"); @@ -206,7 +220,7 @@ main (void) #ifdef HAVE_GETRUSAGE getrusage (RUSAGE_SELF, &r_stop); #endif -#if !defined(WIN32) +#ifdef HAVE_GETTIMEOFDAY gettimeofday (&t_stop, NULL); #endif putc ('\n', stderr); @@ -220,7 +234,7 @@ main (void) #ifdef HAVE_GETRUSAGE getrusage (RUSAGE_SELF, &r_start); #endif -#if !defined(WIN32) +#ifdef HAVE_GETTIMEOFDAY gettimeofday (&t_start, NULL); #endif fprintf (stderr, HEADING, "fill hdf5"); @@ -234,7 +248,7 @@ main (void) #ifdef HAVE_GETRUSAGE getrusage (RUSAGE_SELF, &r_stop); #endif -#if !defined(WIN32) +#ifdef HAVE_GETTIMEOFDAY gettimeofday (&t_stop, NULL); #endif putc ('\n', stderr); @@ -247,7 +261,7 @@ main (void) #ifdef HAVE_GETRUSAGE getrusage (RUSAGE_SELF, &r_start); #endif -#if !defined(WIN32) +#ifdef HAVE_GETTIMEOFDAY gettimeofday (&t_start, NULL); #endif fprintf (stderr, HEADING, "out raw"); @@ -262,7 +276,7 @@ main (void) #ifdef HAVE_GETRUSAGE getrusage (RUSAGE_SELF, &r_stop); #endif -#if !defined(WIN32) +#ifdef HAVE_GETTIMEOFDAY gettimeofday (&t_stop, NULL); #endif putc ('\n', stderr); @@ -275,7 +289,7 @@ main (void) #ifdef HAVE_GETRUSAGE getrusage (RUSAGE_SELF, &r_start); #endif -#if !defined(WIN32) +#ifdef HAVE_GETTIMEOFDAY gettimeofday (&t_start, NULL); #endif fprintf (stderr, HEADING, "out hdf5"); @@ -289,7 +303,7 @@ main (void) #ifdef HAVE_GETRUSAGE getrusage (RUSAGE_SELF, &r_stop); #endif -#if !defined(WIN32) +#ifdef HAVE_GETTIMEOFDAY gettimeofday (&t_stop, NULL); #endif putc ('\n', stderr); @@ -302,7 +316,7 @@ main (void) #ifdef HAVE_GETRUSAGE getrusage (RUSAGE_SELF, &r_start); #endif -#if !defined(WIN32) +#ifdef HAVE_GETTIMEOFDAY gettimeofday (&t_start, NULL); #endif fprintf (stderr, HEADING, "in raw"); @@ -317,7 +331,7 @@ main (void) #ifdef HAVE_GETRUSAGE getrusage (RUSAGE_SELF, &r_stop); #endif -#if !defined(WIN32) +#ifdef HAVE_GETTIMEOFDAY gettimeofday (&t_stop, NULL); #endif putc ('\n', stderr); @@ -331,7 +345,7 @@ main (void) #ifdef HAVE_GETRUSAGE getrusage (RUSAGE_SELF, &r_start); #endif -#if !defined(WIN32) +#ifdef HAVE_GETTIMEOFDAY gettimeofday (&t_start, NULL); #endif fprintf (stderr, HEADING, "in hdf5"); @@ -345,7 +359,7 @@ main (void) #ifdef HAVE_GETRUSAGE getrusage (RUSAGE_SELF, &r_stop); #endif -#if !defined(WIN32) +#ifdef HAVE_GETTIMEOFDAY gettimeofday (&t_stop, NULL); #endif putc ('\n', stderr); @@ -363,7 +377,7 @@ main (void) #ifdef HAVE_GETRUSAGE getrusage (RUSAGE_SELF, &r_start); #endif -#if !defined(WIN32) +#ifdef HAVE_GETTIMEOFDAY gettimeofday (&t_start, NULL); #endif fprintf (stderr, HEADING, "in hdf5 partial"); @@ -377,7 +391,7 @@ main (void) #ifdef HAVE_GETRUSAGE getrusage (RUSAGE_SELF, &r_stop); #endif -#if !defined(WIN32) +#ifdef HAVE_GETTIMEOFDAY gettimeofday (&t_stop, NULL); #endif putc ('\n', stderr); |