diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2000-03-01 23:56:22 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2000-03-01 23:56:22 (GMT) |
| commit | b70c49d253ac81ee4b53e3f37900061744edd04a (patch) | |
| tree | 3606d61bde3b38414855a377924cafd7a9c4f84f /src | |
| parent | 2be532445cd15ce80afd49127e8ddbc3175d7ac8 (diff) | |
| download | hdf5-b70c49d253ac81ee4b53e3f37900061744edd04a.zip hdf5-b70c49d253ac81ee4b53e3f37900061744edd04a.tar.gz hdf5-b70c49d253ac81ee4b53e3f37900061744edd04a.tar.bz2 | |
[svn-r1995] configure.in:
Makefile.in:
acconfig.h:
src/H5F.c:
src/H5FDdpss.c:
src/H5FDdpss.h:
src/H5config.h.in:
test/dpss_read.c:
test/dpss_write.c:
Changed the name DPSS to GRIDSTORAGE since that is the real name
of the API from ANL. DPSS is just one of the protocols it can use.
Changed a bug in the --with-ssl option.
Makefile.in:
Removed the copying of Makefile.dist since it caused problems
when doing a make distclean in a --srcdir configured directory.
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5F.c | 6 | ||||
| -rw-r--r-- | src/H5FDdpss.c | 10 | ||||
| -rw-r--r-- | src/H5FDdpss.h | 4 | ||||
| -rw-r--r-- | src/H5config.h.in | 4 |
4 files changed, 12 insertions, 12 deletions
@@ -24,8 +24,8 @@ static char RcsId[] = "@(#)$Revision$"; #include <H5FDcore.h> /*temporary in-memory files */ #include <H5FDfamily.h> /*family of files */ #include <H5FDmpio.h> /*MPI-2 I/O */ -#include <H5FDgass.h> /*GASS I/O */ -#include <H5FDdpss.h> /*DPSS I/O */ +#include <H5FDgass.h> /*GASS I/O */ +#include <H5FDdpss.h> /*Grid Storage I/O */ #include <H5FDmulti.h> /*multiple files partitioned by mem usage */ #include <H5FDsec2.h> /*Posix unbuffered I/O */ #include <H5FDstdio.h> /* Standard C buffered I/O */ @@ -214,7 +214,7 @@ H5F_init_interface(void) #ifdef H5_HAVE_GASS if ((status=H5FD_GASS)<0) goto end_registration; #endif -#ifdef HAVE_DPSS +#ifdef H5_HAVE_GRIDSTORAGE if ((status=H5FD_DPSS)<0) goto end_registration; #endif if ((status=H5FD_CORE)<0) goto end_registration; diff --git a/src/H5FDdpss.c b/src/H5FDdpss.c index acef361..67e43e3 100644 --- a/src/H5FDdpss.c +++ b/src/H5FDdpss.c @@ -32,10 +32,10 @@ static hid_t H5FD_DPSS_g = 0; -/* compile this only if HDF5 was configured to use the DPSS I/O driver */ -#ifdef H5_HAVE_DPSS +/* compile this only if HDF5 was configured to use the Grid Storage I/O driver */ +#ifdef H5_HAVE_GRIDSTORAGE -/* include the DPSS Storage Client header */ +/* include the Storage Client header */ #include <grid_storage_file.h> /* @@ -110,7 +110,7 @@ typedef struct H5FD_dpss_t { } \ } -/* DPSS driver function prototypes */ +/* Grid Storage driver function prototypes */ static H5FD_t *H5FD_dpss_open (const char *name, unsigned flags, hid_t UNUSED fapl_id, haddr_t maxaddr); static herr_t H5FD_dpss_close (H5FD_t *_file); @@ -122,7 +122,7 @@ static herr_t H5FD_dpss_read (H5FD_t *_file, hid_t fapl_id, haddr_t addr, static herr_t H5FD_dpss_write (H5FD_t *_file, hid_t UNUSED fapl_id,haddr_t addr, hsize_t size, const void *buf); -/* The DPSS I/O driver information */ +/* The Grid Storage I/O driver information */ static const H5FD_class_t H5FD_dpss_g = { "dpss", /* name */ MAXADDR, /* maxaddr */ diff --git a/src/H5FDdpss.h b/src/H5FDdpss.h index 7ba8ca2..82d0313 100644 --- a/src/H5FDdpss.h +++ b/src/H5FDdpss.h @@ -13,14 +13,14 @@ #include <H5public.h> /* typedef for herr_t */ #include <H5Ipublic.h> /* typedef for hid_t */ -#ifdef H5_HAVE_DPSS +#ifdef H5_HAVE_GRIDSTORAGE #define H5FD_DPSS (H5FD_dpss_init()) #else #define H5FD_DPSS (-1) #endif /* Function prototypes */ -#ifdef H5_HAVE_DPSS +#ifdef H5_HAVE_GRIDSTORAGE hid_t H5FD_dpss_init(void); herr_t H5Pset_fapl_dpss (hid_t fapl_id); diff --git a/src/H5config.h.in b/src/H5config.h.in index af035f9..161c034 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -80,8 +80,8 @@ /* Define if we have Globus support */ #undef HAVE_GLOBUS -/* Define if we have DPSS support */ -#undef HAVE_DPSS +/* Define if we have Globus Grid Storage support */ +#undef HAVE_GRIDSTORAGE /* The number of bytes in a __int64. */ #undef SIZEOF___INT64 |