mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-01-06 14:56:51 +08:00
cbf68fc824
---------------------- This extensive change is the virtual file layer implementation. I've ported and tested the sec2, family, and core drivers and only ported the mpio driver (Albert will test it). So if you need MPIO I would recommend sticking with the previous version for a while. You will get a few compile warnings about split and stdio drivers not being implemented and possibly tracing information not inserted in some of the drivers. You can safely ignore them but I plan to fix them. I'm still working on the split driver because I just realized that it needs a part of the VFL that isn't written yet. Documentation is being updated also because there were some minor changes (mostly just name changes). It should be available on my web site later this week. ./MANIFEST ./src/Makefile.in ./src/hdf5.h ./src/H5Flow.c [REMOVED] ./src/H5Fstdio.c [REMOVED] ./src/H5Fsec2.c [REMOVED] ./src/H5Fsplit.c [REMOVED] ./src/H5Fmpio.c [REMOVED] ./src/H5Ffamily.c [REMOVED] ./src/H5Fcore.c [REMOVED] ./src/H5MFpublic.h [REMOVED] ./src/H5FD.c [NEW] ./src/H5FDcore.c [NEW] ./src/H5FDcore.h [NEW] ./src/H5FDfamily.c [NEW] ./src/H5FDfamily.h [NEW] ./src/H5FDmpio.c [NEW] ./src/H5FDmpio.h [NEW] ./src/H5FDprivate.h [NEW] ./src/H5FDpublic.h [NEW] ./src/H5FDsec2.c [NEW] ./src/H5FDsec2.h [NEW] Removed/added files for virtual file layer. ./bin/trace ./src/H5.c Removed unused public datatypes and added new VFL public datatypes. Changed an error message. ./config/BlankForm ./config/dec-flags ./config/gnu-flags ./config/hpux10.20 ./config/hpux9.03 ./config/irix5.x ./config/irix6.x ./config/solaris2.x ./config/unicosmk Removed the H5F_OPT_SEEK and H5F_LOW_DFLT constants from the configuration since they're no longer applicable. The default file driver is always the sec2 driver and it always optimizes calls to lseek() or lseek64(). ./config/depend.in C preprocessor errors generated during automatic dependency building are sent to /dev/null to prevent them from appearing twice in the make output. ./src/H5AC.c ./src/H5B.c ./src/H5D.c ./src/H5F.c ./src/H5G.c ./src/H5Gent.c ./src/H5Gnode.c ./src/H5HG.c ./src/H5HL.c ./src/H5O.c ./src/H5Oattr.c ./src/H5Odtype.c ./src/H5Oefl.c ./src/H5Oshared.c ./src/H5T.c ./src/H5detect.c ./test/ohdr.c Changed H5F_ADDR_UNDEF to HADDR_UNDEF to be more consistent with the `haddr_t' datatype which is now a public type. ./src/H5D.c ./src/H5P.c ./src/H5Ppublic.h ./src/H5Tconv.c ./test/cmpd_dset.c ./test/dsets.c ./test/overhead.c ./test/tselect.c ./test/tvltypes.c The H5P_DATASET_XFER constant was changed to H5P_DATA_XFER because the properties apply to all types of I/O operations, not just datasets. ./src/H5B.c ./src/H5Bprivate.h ./src/H5D.c ./src/H5Dpublic.h ./src/H5F.c ./src/H5Farray.c ./src/H5Fistore.c ./src/H5Fprivate.h ./src/H5Fpublic.h ./src/H5Gnode.c ./src/H5Gpkg.h ./src/H5HG.c ./src/H5HL.c ./src/H5O.c ./src/H5R.c ./src/H5Sall.c ./src/H5Shyper.c ./src/H5Smpio.c ./src/H5Spoint.c ./src/H5Sprivate.h ./test/big.c ./test/h5test.c ./test/istore.c ./testpar/t_dset.c ./testpar/t_file.c ./tools/h5debug.c ./tools/h5ls.c Modified to work with the virtual file layer by calling H5FD_* functions instead of H5F_low_* functions and by passing file access and data transfer properties by object ID instead of pointer. Changed H5D_transfer_t to H5FD_mpio_xfer_t since the COLLECTIVE vs. INDEPENDENT transfer mode is specific to the MPIO file driver. Moved MPIO-specific stuff into the MPIO driver. ./src/H5B.c ./src/H5D.c ./src/H5Fprivate.h The H5F_mpio_* private functions were renamed and placed in the H5FDmpio driver except those which appeared in H5Smpio.c. ./src/H5E.c ./src/H5Epublic.h Added major error number H5E_VFL for virtual file layer related errors. ./src/H5F.c ./src/H5Fprivate.h Changed the logic that controls whether the boot block is written. Instead of assuming that the first call to write the boot block is only to allocate space, I've added a function argument which makes this explicit. Changed the way files are compared so that a driver-defined comparison function can be called. Files which belong to different drivers are always considered different. Removed H5F_driver_t since file drivers are now identified by object ID instead of a special non-user-extendible datatype. Removed all the hard-coded low-level file properties which have been replaced by the various file drivers. ./src/H5I.c ./src/H5Iprivate.h Added the H5I_inc_ref() which was removed a few months ago since we finally have a use for it. ./src/H5Ipublic.h Added the H5I_VFL object ID type to identify file drivers in the virtual file layer. ./src/H5MF.c ./src/H5MFprivate.h Moved all the allocation/deallocation code into the virtual file layer which allows file drivers to override much of it. ./src/H5P.c ./src/H5Ppublic.h Moved file driver-specific code into the various file driver files. The H5Pcopy() and H5Pclose() functions make calls into the virtual file driver to manage the memory for driver-specific file access and data transfer properties. ./src/H5private.h ./src/H5public.h The `haddr_t' type is now public. ./test/tfile.c Added a few more comments.
385 lines
10 KiB
C
385 lines
10 KiB
C
/*
|
||
* Copyright (C) 1998 NCSA
|
||
* All rights reserved.
|
||
*
|
||
* Programmer: Robb Matzke <matzke@llnl.gov>
|
||
* Monday, September 28, 1998
|
||
*
|
||
* Purpose: Creates a chunked dataset and measures the storage overhead.
|
||
*/
|
||
|
||
/* See H5private.h for how to include headers */
|
||
#undef NDEBUG
|
||
#include <hdf5.h>
|
||
|
||
#ifdef STDC_HEADERS
|
||
# include <ctype.h>
|
||
# include <fcntl.h>
|
||
# include <stdlib.h>
|
||
# include <sys/stat.h>
|
||
# include <string.h>
|
||
#endif
|
||
|
||
#ifdef HAVE_IO_H
|
||
# include <io.h>
|
||
#endif
|
||
|
||
#ifdef HAVE_UNISTD_H
|
||
# include <sys/types.h>
|
||
# include <unistd.h>
|
||
#endif
|
||
|
||
#ifdef HAVE_IO_H
|
||
# include <io.h>
|
||
#endif
|
||
|
||
#ifndef HAVE_ATTRIBUTE
|
||
# undef __attribute__
|
||
# define __attribute__(X) /*void*/
|
||
# define UNUSED /*void*/
|
||
#else
|
||
# define UNUSED __attribute__((unused))
|
||
#endif
|
||
|
||
#define FILE_NAME_1 "overhead.h5"
|
||
#define FALSE 0
|
||
#define TRUE 1
|
||
|
||
typedef enum fill_t {
|
||
FILL_ALL,
|
||
FILL_FORWARD,
|
||
FILL_REVERSE,
|
||
FILL_INWARD,
|
||
FILL_OUTWARD,
|
||
FILL_RANDOM
|
||
} fill_t;
|
||
|
||
|
||
/*-------------------------------------------------------------------------
|
||
* Function: usage
|
||
*
|
||
* Purpose: Prints a usage message and exits.
|
||
*
|
||
* Return: never returns
|
||
*
|
||
* Programmer: Robb Matzke
|
||
* Wednesday, September 30, 1998
|
||
*
|
||
* Modifications:
|
||
*
|
||
*-------------------------------------------------------------------------
|
||
*/
|
||
static void
|
||
usage(const char *prog)
|
||
{
|
||
fprintf(stderr, "usage: %s [STYLE|cache] [LEFT [MIDDLE [RIGHT]]]\n",
|
||
prog);
|
||
fprintf(stderr, "\
|
||
STYLE is the order that the dataset is filled and should be one of:\n\
|
||
forward -- Fill the dataset from lowest address to highest\n\
|
||
address. This style tests the right split ratio.\n\
|
||
reverse -- Fill the dataset from highest address to lowest\n\
|
||
address. This is the reverse order of `forward' and\n\
|
||
tests the left split ratio.\n\
|
||
inward -- Fill beginning at both the lowest and highest\n\
|
||
addresses and work in toward the center of the\n\
|
||
dataset. This tests the middle split ratio.\n\
|
||
outward -- Start at the center of the dataset and work outward\n\
|
||
toward the lowest and highest addresses. This tests\n\
|
||
both left and right split ratios.\n\
|
||
random -- Write the chunks of the dataset in random order. This\n\
|
||
tests all split ratios.\n\
|
||
If no fill style is specified then all fill styles are tried and a\n\
|
||
single value is printed for each one.\n\
|
||
\n\
|
||
If the word `cache' is used instead of a fill style then the raw data\n\
|
||
cache is enabled. It is not possible to enable the raw data cache when\n\
|
||
a specific fill style is used because H5Fflush() is called after each\n\
|
||
chunk is written in order to calculate overhead during the test. If\n\
|
||
the cache is enabled then chunks are written to disk in different orders\n\
|
||
than the actual H5Dwrite() calls in the test due to collisions and the\n\
|
||
resulting B-tree will be split differently.\n\
|
||
\n\
|
||
LEFT, MIDDLE, and RIGHT are the ratios to use for splitting and should\n\
|
||
be values between zero and one, inclusive.\n");
|
||
exit(1);
|
||
}
|
||
|
||
|
||
/*-------------------------------------------------------------------------
|
||
* Function: cleanup
|
||
*
|
||
* Purpose: Removes test files
|
||
*
|
||
* Return: void
|
||
*
|
||
* Programmer: Robb Matzke
|
||
* Thursday, June 4, 1998
|
||
*
|
||
* Modifications:
|
||
*
|
||
*-------------------------------------------------------------------------
|
||
*/
|
||
static void
|
||
cleanup (void)
|
||
{
|
||
if (!getenv ("HDF5_NOCLEANUP")) {
|
||
remove (FILE_NAME_1);
|
||
}
|
||
}
|
||
|
||
|
||
/*-------------------------------------------------------------------------
|
||
* Function: display_error_cb
|
||
*
|
||
* Purpose: Displays the error stack after printing "*FAILED*".
|
||
*
|
||
* Return: Success: 0
|
||
*
|
||
* Failure: -1
|
||
*
|
||
* Programmer: Robb Matzke
|
||
* Wednesday, March 4, 1998
|
||
*
|
||
* Modifications:
|
||
*
|
||
*-------------------------------------------------------------------------
|
||
*/
|
||
static herr_t
|
||
display_error_cb (void UNUSED *client_data)
|
||
{
|
||
puts ("*FAILED*");
|
||
H5Eprint (stdout);
|
||
return 0;
|
||
}
|
||
|
||
|
||
/*-------------------------------------------------------------------------
|
||
* Function: test
|
||
*
|
||
* Purpose: The guts of the test
|
||
*
|
||
* Return: Success: 0
|
||
*
|
||
* Failure: number of errors
|
||
*
|
||
* Programmer: Robb Matzke
|
||
* Wednesday, September 30, 1998
|
||
*
|
||
* Modifications:
|
||
*
|
||
*-------------------------------------------------------------------------
|
||
*/
|
||
static int
|
||
test(fill_t fill_style, const double splits[],
|
||
hbool_t verbose, hbool_t use_rdcc)
|
||
{
|
||
hid_t file, fapl, dcpl, xfer, mspace, fspace, dset;
|
||
hsize_t ch_size[1] = {1}; /*chunk size */
|
||
hsize_t cur_size[1] = {1000}; /*current dataset size */
|
||
hsize_t max_size[1] = {H5S_UNLIMITED}; /*maximum dataset size */
|
||
hssize_t hs_start[1]; /*hyperslab start offset*/
|
||
hsize_t hs_count[1] = {1}; /*hyperslab nelmts */
|
||
int fd; /*h5 file direct */
|
||
static int *had = NULL; /*for random filling */
|
||
const char *sname; /*fill style nam */
|
||
int mdc_nelmts; /*num meta objs to cache*/
|
||
hsize_t i;
|
||
int j;
|
||
struct stat sb;
|
||
|
||
if (!had) had = calloc(cur_size[0], sizeof(int));
|
||
if ((fapl=H5Pcreate(H5P_FILE_ACCESS))<0) goto error;
|
||
if (!use_rdcc) {
|
||
if (H5Pget_cache(fapl, &mdc_nelmts, NULL, NULL, NULL)<0) goto error;
|
||
if (H5Pset_cache(fapl, mdc_nelmts, 0, 0, 0.0)<0) goto error;
|
||
}
|
||
if ((file=H5Fcreate(FILE_NAME_1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) {
|
||
goto error;
|
||
}
|
||
if ((dcpl=H5Pcreate(H5P_DATA_CREATE))<0) goto error;
|
||
if (H5Pset_chunk(dcpl, 1, ch_size)<0) goto error;
|
||
if ((xfer=H5Pcreate(H5P_DATASET_XFER))<0) goto error;
|
||
if (H5Pset_btree_ratios(xfer, splits[0], splits[1], splits[2])<0) {
|
||
goto error;
|
||
}
|
||
if ((fspace=H5Screate_simple(1, cur_size, max_size))<0) goto error;
|
||
if ((mspace=H5Screate_simple(1, ch_size, ch_size))<0) goto error;
|
||
if ((dset=H5Dcreate(file, "chunked", H5T_NATIVE_INT,
|
||
fspace, dcpl))<0) goto error;
|
||
if ((fd=open(FILE_NAME_1, O_RDONLY))<0) goto error;
|
||
|
||
for (i=1; i<=cur_size[0]; i++) {
|
||
|
||
/* Decide which chunk to write to */
|
||
switch (fill_style) {
|
||
case FILL_FORWARD:
|
||
hs_start[0] = i-1;
|
||
break;
|
||
case FILL_REVERSE:
|
||
hs_start[0] = cur_size[0]-i;
|
||
break;
|
||
case FILL_INWARD:
|
||
hs_start[0] = i%2 ? i/2 : cur_size[0]-i/2;
|
||
break;
|
||
case FILL_OUTWARD:
|
||
j = (cur_size[0]-i)+1;
|
||
hs_start[0] = j%2 ? j/2 : cur_size[0]-j/2;
|
||
break;
|
||
case FILL_RANDOM:
|
||
for (j=rand()%cur_size[0]; had[j]; j=(j+1)%cur_size[0]) /*void*/;
|
||
hs_start[0] = j;
|
||
had[j] = 1;
|
||
break;
|
||
case FILL_ALL:
|
||
abort();
|
||
}
|
||
|
||
/* Write the chunk */
|
||
if (H5Sselect_hyperslab(fspace, H5S_SELECT_SET, hs_start, NULL,
|
||
hs_count, NULL)<0) goto error;
|
||
if (H5Dwrite(dset, H5T_NATIVE_INT, mspace, fspace, xfer, &i)<0) {
|
||
goto error;
|
||
}
|
||
|
||
/* Determine overhead */
|
||
if (verbose) {
|
||
if (H5Fflush(file, H5F_SCOPE_LOCAL)<0) goto error;
|
||
if (fstat(fd, &sb)<0) goto error;
|
||
/*
|
||
* The extra cast in the following statement is a bug workaround
|
||
* for the Win32 version 5.0 compiler.
|
||
* 1998-11-06 ptl
|
||
*/
|
||
printf("%4lu %8.3f ***\n",
|
||
(unsigned long)i,
|
||
(double)(hssize_t)(sb.st_size-i*sizeof(int))/(hssize_t)i);
|
||
}
|
||
}
|
||
|
||
H5Dclose(dset);
|
||
H5Sclose(mspace);
|
||
H5Sclose(fspace);
|
||
H5Pclose(dcpl);
|
||
H5Fclose(file);
|
||
|
||
if (!verbose) {
|
||
switch (fill_style) {
|
||
case FILL_FORWARD:
|
||
sname = "forward";
|
||
break;
|
||
case FILL_REVERSE:
|
||
sname = "reverse";
|
||
break;
|
||
case FILL_INWARD:
|
||
sname = "inward";
|
||
break;
|
||
case FILL_OUTWARD:
|
||
sname = "outward";
|
||
break;
|
||
case FILL_RANDOM:
|
||
sname = "random";
|
||
break;
|
||
case FILL_ALL:
|
||
abort();
|
||
}
|
||
if (fstat(fd, &sb)<0) goto error;
|
||
/*
|
||
* The extra cast in the following statement is a bug workaround
|
||
* for the Win32 version 5.0 compiler.
|
||
* 1998-11-06 ptl
|
||
*/
|
||
printf("%-7s %8.3f\n", sname,
|
||
(double)(hssize_t)(sb.st_size-cur_size[0]*sizeof(int))/
|
||
(hssize_t)cur_size[0]);
|
||
}
|
||
close(fd);
|
||
return 0;
|
||
|
||
error:
|
||
H5Dclose(dset);
|
||
H5Sclose(mspace);
|
||
H5Sclose(fspace);
|
||
H5Pclose(dcpl);
|
||
H5Fclose(file);
|
||
free(had);
|
||
close(fd);
|
||
return 1;
|
||
}
|
||
|
||
|
||
/*-------------------------------------------------------------------------
|
||
* Function: main
|
||
*
|
||
* Purpose:
|
||
*
|
||
* Return: Success: zero
|
||
*
|
||
* Failure: non-zero
|
||
*
|
||
* Programmer: Robb Matzke
|
||
* Monday, September 28, 1998
|
||
*
|
||
* Modifications:
|
||
*
|
||
*-------------------------------------------------------------------------
|
||
*/
|
||
int
|
||
main(int argc, char *argv[])
|
||
{
|
||
hid_t xfer;
|
||
fill_t fill_style = FILL_ALL;
|
||
hbool_t use_cache = FALSE;
|
||
double splits[3];
|
||
int i, j, nerrors=0;
|
||
|
||
/* Default split ratios */
|
||
H5Eset_auto(display_error_cb, NULL);
|
||
if ((xfer=H5Pcreate(H5P_DATA_XFER))<0) goto error;
|
||
if (H5Pget_btree_ratios(xfer, splits+0, splits+1, splits+2)<0) {
|
||
goto error;
|
||
}
|
||
if (H5Pclose(xfer)<0) goto error;
|
||
|
||
/* Parse command-line options */
|
||
for (i=1, j=0; i<argc; i++) {
|
||
if (!strcmp(argv[i], "forward")) {
|
||
fill_style = FILL_FORWARD;
|
||
} else if (!strcmp(argv[i], "reverse")) {
|
||
fill_style = FILL_REVERSE;
|
||
} else if (!strcmp(argv[i], "inward")) {
|
||
fill_style = FILL_INWARD;
|
||
} else if (!strcmp(argv[i], "outward")) {
|
||
fill_style = FILL_OUTWARD;
|
||
} else if (!strcmp(argv[i], "random")) {
|
||
fill_style = FILL_RANDOM;
|
||
} else if (!strcmp(argv[i], "cache")) {
|
||
use_cache = TRUE;
|
||
} else if (j<3 && (isdigit(argv[i][0]) || '.'==argv[i][0])) {
|
||
splits[j++] = strtod(argv[i], NULL);
|
||
} else {
|
||
usage(argv[0]);
|
||
}
|
||
}
|
||
|
||
if (FILL_ALL==fill_style) {
|
||
printf("%-7s %8s\n", "Style", "Bytes/Chunk");
|
||
printf("%-7s %8s\n", "-----", "-----------");
|
||
nerrors += test(FILL_FORWARD, splits, FALSE, use_cache);
|
||
nerrors += test(FILL_REVERSE, splits, FALSE, use_cache);
|
||
nerrors += test(FILL_INWARD, splits, FALSE, use_cache);
|
||
nerrors += test(FILL_OUTWARD, splits, FALSE, use_cache);
|
||
nerrors += test(FILL_RANDOM, splits, FALSE, use_cache);
|
||
} else {
|
||
if (use_cache) usage(argv[0]);
|
||
nerrors += test(fill_style, splits, TRUE, FALSE);
|
||
}
|
||
if (nerrors>0) goto error;
|
||
cleanup();
|
||
return 0;
|
||
|
||
error:
|
||
fprintf(stderr, "*** ERRORS DETECTED ***\n");
|
||
return 1;
|
||
}
|