diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2005-08-13 20:53:35 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2005-08-13 20:53:35 (GMT) |
commit | 6b45f5172ccb4311e0be9ae15da3758abb6b0e67 (patch) | |
tree | 5a7a112fe7a8a98c6fecb45b513789d15962eb3d /perform/iopipe.c | |
parent | 6562465a2c2a58cfbc2f47bf60bb538f7a783933 (diff) | |
download | hdf5-6b45f5172ccb4311e0be9ae15da3758abb6b0e67.zip hdf5-6b45f5172ccb4311e0be9ae15da3758abb6b0e67.tar.gz hdf5-6b45f5172ccb4311e0be9ae15da3758abb6b0e67.tar.bz2 |
[svn-r11245] Purpose:
Code cleanup
Description:
Trim trailing whitespace, which is making 'diff'ing the two branches
difficult.
Solution:
Ran this script in each directory:
foreach f (*.[ch] *.cpp)
sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f
end
Platforms tested:
FreeBSD 4.11 (sleipnir)
Too minor to require h5committest
Diffstat (limited to 'perform/iopipe.c')
-rw-r--r-- | perform/iopipe.c | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/perform/iopipe.c b/perform/iopipe.c index 200ee7e..84a0a69 100644 --- a/perform/iopipe.c +++ b/perform/iopipe.c @@ -22,23 +22,23 @@ #ifdef H5_HAVE_WINSOCK_H #include <Winsock.h> -#endif +#endif /*Winsock.h includes windows.h, due to the different value of WINVER, windows.h should be put before H5private.h. Kent yang 6/21/2001*/ #if defined (__MWERKS__) -#ifdef H5_HAVE_SYS_TIMEB +#ifdef H5_HAVE_SYS_TIMEB #undef H5_HAVE_SYS_TIMEB #endif -#ifdef H5_HAVE_SYSTEM +#ifdef H5_HAVE_SYSTEM #undef H5_HAVE_SYSTEM #endif #endif /* __MWERKS__*/ #include "H5private.h" -#ifdef H5_HAVE_SYS_TIMEB +#ifdef H5_HAVE_SYS_TIMEB #include <sys/timeb.h> #endif @@ -117,12 +117,12 @@ print_stats (const char *prefix, (double)(t_start->tv_usec)/1000.0); #endif bw = (double)nbytes / e_time; - + #ifdef H5_HAVE_GETRUSAGE - printf (HEADING "%1.2fuser %1.2fsystem %1.2felapsed %1.2fMB/s\n", + 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", + printf (HEADING "%1.2felapsed %1.2fMB/s\n", prefix, e_time, bw/(1024*1024)); #endif @@ -132,7 +132,7 @@ print_stats (const char *prefix, /*------------------------------------------------------------------------- * Function: synchronize * - * Purpose: + * Purpose: * * Return: void * @@ -168,11 +168,11 @@ synchronize (void) /*------------------------------------------------------------------------- * Function: main * - * Purpose: + * Purpose: * - * Return: Success: + * Return: Success: * - * Failure: + * Failure: * * Programmer: Robb Matzke * Thursday, March 12, 1998 @@ -192,9 +192,9 @@ main (void) herr_t status; #ifdef H5_HAVE_GETRUSAGE struct rusage r_start, r_stop; -#else +#else struct timeval r_start, r_stop; -#endif +#endif struct timeval t_start, t_stop; int i, fd; hssize_t n; @@ -214,13 +214,13 @@ main (void) */ 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 = HDopen (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); @@ -238,11 +238,11 @@ printf("Before getrusage() call\n"); #endif #ifdef H5_HAVE_GETTIMEOFDAY gettimeofday (&t_start, NULL); -#else +#else #ifdef H5_HAVE_SYS_TIMEB _ftime(tbstart); #endif -#endif +#endif fprintf (stderr, HEADING, "fill raw"); for (i=0; i<nwrite; i++) { putc (PROGRESS, stderr); @@ -261,13 +261,13 @@ printf("Before getrusage() call\n"); t_start.tv_usec = tbstart->millitm; t_stop.tv_sec = tbstop->time; t_stop.tv_usec = tbstop->millitm; -#endif -#endif +#endif +#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 (); @@ -280,7 +280,7 @@ printf("Before getrusage() call\n"); #ifdef H5_HAVE_SYS_TIMEB _ftime(tbstart); #endif -#endif +#endif fprintf (stderr, HEADING, "fill hdf5"); for (i=0; i<nread; i++) { putc (PROGRESS, stderr); @@ -301,13 +301,13 @@ printf("Before getrusage() call\n"); t_start.tv_usec = tbstart->millitm; t_stop.tv_sec = tbstop->time; t_stop.tv_usec = tbstop->millitm; -#endif -#endif +#endif +#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 H5_HAVE_GETRUSAGE @@ -319,7 +319,7 @@ printf("Before getrusage() call\n"); #ifdef H5_HAVE_SYS_TIMEB _ftime(tbstart); #endif -#endif +#endif fprintf (stderr, HEADING, "out raw"); for (i=0; i<nwrite; i++) { putc (PROGRESS, stderr); @@ -341,8 +341,8 @@ printf("Before getrusage() call\n"); t_start.tv_usec = tbstart->millitm; t_stop.tv_sec = tbstop->time; t_stop.tv_usec = tbstop->millitm; -#endif -#endif +#endif +#endif putc ('\n', stderr); print_stats ("out raw", &r_start, &r_stop, &t_start, &t_stop, @@ -359,7 +359,7 @@ printf("Before getrusage() call\n"); #ifdef H5_HAVE_SYS_TIMEB _ftime(tbstart); #endif -#endif +#endif fprintf (stderr, HEADING, "out hdf5"); for (i=0; i<nwrite; i++) { putc (PROGRESS, stderr); @@ -380,8 +380,8 @@ printf("Before getrusage() call\n"); t_start.tv_usec = tbstart->millitm; t_stop.tv_sec = tbstop->time; t_stop.tv_usec = tbstop->millitm; -#endif -#endif +#endif +#endif putc ('\n', stderr); print_stats ("out hdf5", &r_start, &r_stop, &t_start, &t_stop, @@ -398,7 +398,7 @@ printf("Before getrusage() call\n"); #ifdef H5_HAVE_SYS_TIMEB _ftime(tbstart); #endif -#endif +#endif fprintf (stderr, HEADING, "in raw"); for (i=0; i<nread; i++) { putc (PROGRESS, stderr); @@ -420,13 +420,13 @@ printf("Before getrusage() call\n"); t_start.tv_usec = tbstart->millitm; t_stop.tv_sec = tbstop->time; t_stop.tv_usec = tbstop->millitm; -#endif -#endif +#endif +#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 (); @@ -438,8 +438,8 @@ printf("Before getrusage() call\n"); #else #ifdef H5_HAVE_SYS_TIMEB _ftime(tbstart); -#endif -#endif +#endif +#endif fprintf (stderr, HEADING, "in hdf5"); for (i=0; i<nread; i++) { putc (PROGRESS, stderr); @@ -461,7 +461,7 @@ printf("Before getrusage() call\n"); t_stop.tv_sec = tbstop->time; t_stop.tv_usec = tbstop->millitm; #endif -#endif +#endif putc ('\n', stderr); print_stats ("in hdf5", &r_start, &r_stop, &t_start, &t_stop, @@ -482,8 +482,8 @@ printf("Before getrusage() call\n"); #else #ifdef H5_HAVE_SYS_TIMEB _ftime(tbstart); -#endif -#endif +#endif +#endif fprintf (stderr, HEADING, "in hdf5 partial"); for (i=0; i<nread; i++) { putc (PROGRESS, stderr); @@ -504,20 +504,20 @@ printf("Before getrusage() call\n"); t_start.tv_usec = tbstart->millitm; t_stop.tv_sec = tbstop->time; t_stop.tv_usec = tbstop->millitm; -#endif -#endif +#endif +#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 */ HDclose (fd); H5Dclose (dset); H5Sclose (file_space); H5Fclose (file); - + return 0; } |