mirror of
https://github.com/HDFGroup/hdf5.git
synced 2024-12-09 07:32:32 +08:00
7488c6366e
---------------------- ./src/H5.c ./src/H5A.c ./src/H5AC.c ./src/H5B.c ./src/H5D.c ./src/H5E.c ./src/H5F.c ./src/H5Farray.c ./src/H5Fcore.c ./src/H5Ffamily.c ./src/H5Fistore.c ./src/H5Flow.c ./src/H5Fmpio.c ./src/H5Fsec2.c ./src/H5Fsplit.c ./src/H5Fstdio.c ./src/H5G.c ./src/H5Gent.c ./src/H5Gnode.c ./src/H5Gstab.c ./src/H5HG.c ./src/H5HL.c ./src/H5I.c ./src/H5Iprivate.h ./src/H5MF.c ./src/H5MM.c ./src/H5O.c ./src/H5Oattr.c ./src/H5Ocomp.c ./src/H5Ocont.c ./src/H5Odtype.c ./src/H5Oefl.c ./src/H5Ofill.c ./src/H5Olayout.c ./src/H5Omtime.c ./src/H5Oname.c ./src/H5Osdspace.c ./src/H5Oshared.c ./src/H5Ostab.c ./src/H5P.c ./src/H5R.c ./src/H5RA.c ./src/H5S.c ./src/H5Sall.c ./src/H5Shyper.c ./src/H5Smpio.c ./src/H5Snone.c ./src/H5Spoint.c ./src/H5Sselect.c ./src/H5T.c ./src/H5TB.c ./src/H5Tbit.c ./src/H5Tconv.c ./src/H5V.c ./src/H5Z.c ./src/H5detect.c ./src/H5private.h Most of these changes are because the `interface_initialize_g' variable change from hbool_t to int. It's a one line change. Changed the way the library is closed so we have more control over the order the interfaces are shut down. Instead of registering an atexit() function for every interface in some haphazard order we just register one: H5_term_library() which then calls the H5*_term_interface() functions in a well-defined order. If the library is closed and then reopened repeatedly by calling H5close() and H5open() in a loop we only add one copy of the library termination functions with atexit(). Termination is a two-step process in order to help detect programming errors that would cause an infinite loop caused by the termination of one interface waking up some other previously terminated interface. The first step terminates the interface and *marks it as unusable*. After all interfaces are terminated then we mark them all as usable again. The FUNC_ENTER() macro has been modified to return failure or to dump core (depending on whether NDEBUG is defined) if we try to call an interface while it's shutting down. ./src/H5.c The H5dont_atexit() function returns failure if it's called more than once or if it's called too late. However, the error stack is not automatically printed on failure because the library might not be initialized yet ./test/chunk.c ./test/flush1.c ./test/flush2.c ./test/iopipe.c ./test/overhead.c ./test/ragged.c Changed the extra cast for Win32 so we do floating point division again -- it was just confusion about precedence and associativity of casting and the C coercion rules. Removed extra carriage returns inserted by broken operating system. ./src/H5Ffamily.c Fixed an bug where H5F_fam_write() lowered the EOF marker for one of the family members causing H5F_fam_read() to read zeros. ./test/h5test.h [NEW] ./test/h5test.c [NEW] ./test/Makefile.in ./test/bittests.c ./test/cmpd_dset.c ./test/dsets.c ./test/dtypes.c ./test/extend.c ./test/external.c Support library for test files. This isn't done yet but Katie's contractions are ~10 minutes apart so I figured I better back this stuff up just in case I'm not here next week... Eventually all test files will understand HDF5_DRIVER to name the low level file driver and parameters so we can easily test various drivers. They will also understand HDF5_PREFIX to prepend to the beginning of file names which is necessary for testing ROMIO with various drivers. Also, the cleanup function will know how to use the file name prefix and will understand different file driver naming schemes like file families. I'm not sure they'll understand the `gsf:' type prefixes yet. Note, the external test is completely commented out because I'm in the middle of modifying it. It will still compile and run but it doesn't test anything at the moment.
414 lines
9.9 KiB
C
414 lines
9.9 KiB
C
/*
|
||
* Copyright (C) 1998 NCSA
|
||
* All rights reserved.
|
||
*
|
||
* Programmer: Robb Matzke <matzke@llnl.gov>
|
||
* Thursday, March 12, 1998
|
||
*/
|
||
|
||
/* See H5private.h for how to include headers */
|
||
#undef NDEBUG
|
||
#include <hdf5.h>
|
||
|
||
#ifdef STDC_HEADERS
|
||
# include <assert.h>
|
||
# include <fcntl.h>
|
||
# include <stdio.h>
|
||
# include <string.h>
|
||
# include <stdlib.h>
|
||
#endif
|
||
|
||
#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 <time.h>
|
||
#endif
|
||
|
||
#ifdef HAVE_SYS_RESOURCE_H
|
||
# include <sys/resource.h>
|
||
#endif
|
||
|
||
#ifdef HAVE_WINSOCK_H
|
||
#include <Winsock.h>
|
||
#endif
|
||
|
||
#define RAW_FILE_NAME "iopipe.raw"
|
||
#define HDF5_FILE_NAME "iopipe.h5"
|
||
#define HEADING "%-16s"
|
||
#define PROGRESS '='
|
||
|
||
#if 0
|
||
/* Normal testing */
|
||
#define REQUEST_SIZE_X 4579
|
||
#define REQUEST_SIZE_Y 4579
|
||
#define NREAD_REQUESTS 45
|
||
#define NWRITE_REQUESTS 45
|
||
#else
|
||
/* Speedy testing */
|
||
#define REQUEST_SIZE_X 1000
|
||
#define REQUEST_SIZE_Y 1000
|
||
#define NREAD_REQUESTS 45
|
||
#define NWRITE_REQUESTS 45
|
||
#endif
|
||
|
||
|
||
/*-------------------------------------------------------------------------
|
||
* Function: print_stats
|
||
*
|
||
* Purpose: Prints statistics
|
||
*
|
||
* Return: void
|
||
*
|
||
* Programmer: Robb Matzke
|
||
* Thursday, March 12, 1998
|
||
*
|
||
* Modifications:
|
||
*
|
||
*-------------------------------------------------------------------------
|
||
*/
|
||
static void
|
||
print_stats (const char *prefix,
|
||
struct rusage *r_start, struct rusage *r_stop,
|
||
struct timeval *t_start, struct timeval *t_stop,
|
||
size_t nbytes)
|
||
{
|
||
double e_time, bw;
|
||
#ifdef HAVE_GETRUSAGE
|
||
double u_time, s_time;
|
||
|
||
u_time = ((double)(r_stop->ru_utime.tv_sec)+
|
||
(double)(r_stop->ru_utime.tv_usec)/1000000.0) -
|
||
((double)(r_start->ru_utime.tv_sec)+
|
||
(double)(r_start->ru_utime.tv_usec)/1000000.0);
|
||
|
||
s_time = ((double)(r_stop->ru_stime.tv_sec)+
|
||
(double)(r_stop->ru_stime.tv_usec)/1000000.0) -
|
||
((double)(r_start->ru_stime.tv_sec)+
|
||
(double)(r_start->ru_stime.tv_usec)/1000000.0);
|
||
#endif
|
||
|
||
e_time = ((double)(t_stop->tv_sec)+
|
||
(double)(t_stop->tv_usec)/1000000.0) -
|
||
((double)(t_start->tv_sec)+
|
||
(double)(t_start->tv_usec)/1000000.0);
|
||
|
||
bw = (double)nbytes / e_time;
|
||
|
||
#ifdef HAVE_GETRUSAGE
|
||
printf (HEADING "%1.2fuser %1.2fsystem %1.2felapsed %1.2fMB/s\n",
|
||
prefix, u_time, s_time, e_time, bw/(1024*1024));
|
||
#else
|
||
printf (HEADING "%1.2felapsed %1.2fMB/s\n",
|
||
prefix, e_time, bw/(1024*1024));
|
||
#endif
|
||
|
||
}
|
||
|
||
|
||
/*-------------------------------------------------------------------------
|
||
* Function: synchronize
|
||
*
|
||
* Purpose:
|
||
*
|
||
* Return: void
|
||
*
|
||
* Programmer: Robb Matzke
|
||
* Thursday, March 12, 1998
|
||
*
|
||
* Modifications:
|
||
*
|
||
*-------------------------------------------------------------------------
|
||
*/
|
||
static void
|
||
synchronize (void)
|
||
{
|
||
#ifdef HAVE_SYSTEM
|
||
system ("sync");
|
||
system ("df >/dev/null");
|
||
#if 0
|
||
/*
|
||
* This works well on Linux to get rid of all cached disk buffers. The
|
||
* number should be approximately the amount of RAM in MB. Do not
|
||
* include swap space in that amount or the command will fail.
|
||
*/
|
||
system ("/sbin/swapout 128");
|
||
#endif
|
||
#endif
|
||
}
|
||
|
||
|
||
/*-------------------------------------------------------------------------
|
||
* Function: main
|
||
*
|
||
* Purpose:
|
||
*
|
||
* Return: Success:
|
||
*
|
||
* Failure:
|
||
*
|
||
* Programmer: Robb Matzke
|
||
* Thursday, March 12, 1998
|
||
*
|
||
* Modifications:
|
||
*
|
||
*-------------------------------------------------------------------------
|
||
*/
|
||
int
|
||
main (void)
|
||
{
|
||
static hsize_t size[2] = {REQUEST_SIZE_X, REQUEST_SIZE_Y};
|
||
static int nread=NREAD_REQUESTS, nwrite=NWRITE_REQUESTS;
|
||
|
||
unsigned char *the_data = NULL;
|
||
hid_t file, dset, file_space=-1;
|
||
herr_t status;
|
||
#ifdef HAVE_GETRUSAGE
|
||
struct rusage r_start, r_stop;
|
||
#else
|
||
struct timeval r_start, r_stop;
|
||
#endif
|
||
struct timeval t_start, t_stop;
|
||
int i, fd;
|
||
hssize_t n;
|
||
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 5.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);
|
||
|
||
/* Open the files */
|
||
file = H5Fcreate (HDF5_FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
|
||
assert (file>=0);
|
||
fd = open (RAW_FILE_NAME, O_RDWR|O_CREAT|O_TRUNC, 0666);
|
||
assert (fd>=0);
|
||
|
||
/* Create the dataset */
|
||
file_space = H5Screate_simple (2, size, size);
|
||
assert (file_space>=0);
|
||
dset = H5Dcreate (file, "dset", H5T_NATIVE_UCHAR, file_space, H5P_DEFAULT);
|
||
assert (dset>=0);
|
||
the_data = malloc ((size_t)(size[0]*size[1]));
|
||
/*initial fill for lazy malloc*/
|
||
memset (the_data, 0xAA, (size_t)(size[0]*size[1]));
|
||
|
||
/* Fill raw */
|
||
synchronize ();
|
||
#ifdef HAVE_GETRUSAGE
|
||
getrusage (RUSAGE_SELF, &r_start);
|
||
#endif
|
||
#ifdef HAVE_GETTIMEOFDAY
|
||
gettimeofday (&t_start, NULL);
|
||
#endif
|
||
fprintf (stderr, HEADING, "fill raw");
|
||
for (i=0; i<nwrite; i++) {
|
||
putc (PROGRESS, stderr);
|
||
fflush (stderr);
|
||
memset (the_data, 0xAA, (size_t)(size[0]*size[1]));
|
||
}
|
||
#ifdef HAVE_GETRUSAGE
|
||
getrusage (RUSAGE_SELF, &r_stop);
|
||
#endif
|
||
#ifdef HAVE_GETTIMEOFDAY
|
||
gettimeofday (&t_stop, NULL);
|
||
#endif
|
||
putc ('\n', stderr);
|
||
print_stats ("fill raw",
|
||
&r_start, &r_stop, &t_start, &t_stop,
|
||
(size_t)(nread*size[0]*size[1]));
|
||
|
||
|
||
/* Fill hdf5 */
|
||
synchronize ();
|
||
#ifdef HAVE_GETRUSAGE
|
||
getrusage (RUSAGE_SELF, &r_start);
|
||
#endif
|
||
#ifdef HAVE_GETTIMEOFDAY
|
||
gettimeofday (&t_start, NULL);
|
||
#endif
|
||
fprintf (stderr, HEADING, "fill hdf5");
|
||
for (i=0; i<nread; i++) {
|
||
putc (PROGRESS, stderr);
|
||
fflush (stderr);
|
||
status = H5Dread (dset, H5T_NATIVE_UCHAR, file_space, file_space,
|
||
H5P_DEFAULT, the_data);
|
||
assert (status>=0);
|
||
}
|
||
#ifdef HAVE_GETRUSAGE
|
||
getrusage (RUSAGE_SELF, &r_stop);
|
||
#endif
|
||
#ifdef HAVE_GETTIMEOFDAY
|
||
gettimeofday (&t_stop, NULL);
|
||
#endif
|
||
putc ('\n', stderr);
|
||
print_stats ("fill hdf5",
|
||
&r_start, &r_stop, &t_start, &t_stop,
|
||
(size_t)(nread*size[0]*size[1]));
|
||
|
||
/* Write the raw dataset */
|
||
synchronize ();
|
||
#ifdef HAVE_GETRUSAGE
|
||
getrusage (RUSAGE_SELF, &r_start);
|
||
#endif
|
||
#ifdef HAVE_GETTIMEOFDAY
|
||
gettimeofday (&t_start, NULL);
|
||
#endif
|
||
fprintf (stderr, HEADING, "out raw");
|
||
for (i=0; i<nwrite; i++) {
|
||
putc (PROGRESS, stderr);
|
||
fflush (stderr);
|
||
offset = lseek (fd, 0, SEEK_SET);
|
||
assert (0==offset);
|
||
n = write (fd, the_data, (size_t)(size[0]*size[1]));
|
||
assert (n>=0 && (size_t)n==size[0]*size[1]);
|
||
}
|
||
#ifdef HAVE_GETRUSAGE
|
||
getrusage (RUSAGE_SELF, &r_stop);
|
||
#endif
|
||
#ifdef HAVE_GETTIMEOFDAY
|
||
gettimeofday (&t_stop, NULL);
|
||
#endif
|
||
putc ('\n', stderr);
|
||
print_stats ("out raw",
|
||
&r_start, &r_stop, &t_start, &t_stop,
|
||
(size_t)(nread*size[0]*size[1]));
|
||
|
||
/* Write the hdf5 dataset */
|
||
synchronize ();
|
||
#ifdef HAVE_GETRUSAGE
|
||
getrusage (RUSAGE_SELF, &r_start);
|
||
#endif
|
||
#ifdef HAVE_GETTIMEOFDAY
|
||
gettimeofday (&t_start, NULL);
|
||
#endif
|
||
fprintf (stderr, HEADING, "out hdf5");
|
||
for (i=0; i<nwrite; i++) {
|
||
putc (PROGRESS, stderr);
|
||
fflush (stderr);
|
||
status = H5Dwrite (dset, H5T_NATIVE_UCHAR, H5S_ALL, H5S_ALL,
|
||
H5P_DEFAULT, the_data);
|
||
assert (status>=0);
|
||
}
|
||
#ifdef HAVE_GETRUSAGE
|
||
getrusage (RUSAGE_SELF, &r_stop);
|
||
#endif
|
||
#ifdef HAVE_GETTIMEOFDAY
|
||
gettimeofday (&t_stop, NULL);
|
||
#endif
|
||
putc ('\n', stderr);
|
||
print_stats ("out hdf5",
|
||
&r_start, &r_stop, &t_start, &t_stop,
|
||
(size_t)(nread*size[0]*size[1]));
|
||
|
||
/* Read the raw dataset */
|
||
synchronize ();
|
||
#ifdef HAVE_GETRUSAGE
|
||
getrusage (RUSAGE_SELF, &r_start);
|
||
#endif
|
||
#ifdef HAVE_GETTIMEOFDAY
|
||
gettimeofday (&t_start, NULL);
|
||
#endif
|
||
fprintf (stderr, HEADING, "in raw");
|
||
for (i=0; i<nread; i++) {
|
||
putc (PROGRESS, stderr);
|
||
fflush (stderr);
|
||
offset = lseek (fd, 0, SEEK_SET);
|
||
assert (0==offset);
|
||
n = read (fd, the_data, (size_t)(size[0]*size[1]));
|
||
assert (n>=0 && (size_t)n==size[0]*size[1]);
|
||
}
|
||
#ifdef HAVE_GETRUSAGE
|
||
getrusage (RUSAGE_SELF, &r_stop);
|
||
#endif
|
||
#ifdef HAVE_GETTIMEOFDAY
|
||
gettimeofday (&t_stop, NULL);
|
||
#endif
|
||
putc ('\n', stderr);
|
||
print_stats ("in raw",
|
||
&r_start, &r_stop, &t_start, &t_stop,
|
||
(size_t)(nread*size[0]*size[1]));
|
||
|
||
|
||
/* Read the hdf5 dataset */
|
||
synchronize ();
|
||
#ifdef HAVE_GETRUSAGE
|
||
getrusage (RUSAGE_SELF, &r_start);
|
||
#endif
|
||
#ifdef HAVE_GETTIMEOFDAY
|
||
gettimeofday (&t_start, NULL);
|
||
#endif
|
||
fprintf (stderr, HEADING, "in hdf5");
|
||
for (i=0; i<nread; i++) {
|
||
putc (PROGRESS, stderr);
|
||
fflush (stderr);
|
||
status = H5Dread (dset, H5T_NATIVE_UCHAR, file_space, file_space,
|
||
H5P_DEFAULT, the_data);
|
||
assert (status>=0);
|
||
}
|
||
#ifdef HAVE_GETRUSAGE
|
||
getrusage (RUSAGE_SELF, &r_stop);
|
||
#endif
|
||
#ifdef HAVE_GETTIMEOFDAY
|
||
gettimeofday (&t_stop, NULL);
|
||
#endif
|
||
putc ('\n', stderr);
|
||
print_stats ("in hdf5",
|
||
&r_start, &r_stop, &t_start, &t_stop,
|
||
(size_t)(nread*size[0]*size[1]));
|
||
|
||
/* Read hyperslab */
|
||
assert (size[0]>20 && size[1]>20);
|
||
start[0] = start[1] = 10;
|
||
count[0] = count[1] = size[0]-20;
|
||
status = H5Sselect_hyperslab (file_space, H5S_SELECT_SET, start, NULL, count, NULL);
|
||
assert (status>=0);
|
||
synchronize ();
|
||
#ifdef HAVE_GETRUSAGE
|
||
getrusage (RUSAGE_SELF, &r_start);
|
||
#endif
|
||
#ifdef HAVE_GETTIMEOFDAY
|
||
gettimeofday (&t_start, NULL);
|
||
#endif
|
||
fprintf (stderr, HEADING, "in hdf5 partial");
|
||
for (i=0; i<nread; i++) {
|
||
putc (PROGRESS, stderr);
|
||
fflush (stderr);
|
||
status = H5Dread (dset, H5T_NATIVE_UCHAR, file_space, file_space,
|
||
H5P_DEFAULT, the_data);
|
||
assert (status>=0);
|
||
}
|
||
#ifdef HAVE_GETRUSAGE
|
||
getrusage (RUSAGE_SELF, &r_stop);
|
||
#endif
|
||
#ifdef HAVE_GETTIMEOFDAY
|
||
gettimeofday (&t_stop, NULL);
|
||
#endif
|
||
putc ('\n', stderr);
|
||
print_stats ("in hdf5 partial",
|
||
&r_start, &r_stop, &t_start, &t_stop,
|
||
(size_t)(nread*count[0]*count[1]));
|
||
|
||
|
||
|
||
/* Close everything */
|
||
close (fd);
|
||
H5Dclose (dset);
|
||
H5Sclose (file_space);
|
||
H5Fclose (file);
|
||
|
||
return 0;
|
||
}
|