summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.in1
-rw-r--r--acconfig.h4
-rwxr-xr-xconfigure58
-rw-r--r--configure.in58
-rw-r--r--src/H5F.c6
-rw-r--r--src/H5FDdpss.c10
-rw-r--r--src/H5FDdpss.h4
-rw-r--r--src/H5config.h.in4
-rw-r--r--test/dpss_read.c2
-rw-r--r--test/dpss_write.c2
10 files changed, 74 insertions, 75 deletions
diff --git a/Makefile.in b/Makefile.in
index 651bbbb..b132e71 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -96,7 +96,6 @@ distclean:
-$(RM) config.cache config.log config.status
-$(RM) src/H5config.h src/H5pubconf.h
-$(RM) libtool Makefile
- -$(CP) Makefile.dist Makefile
maintainer-clean:
@echo "This target is intended for maintainers to use;"
diff --git a/acconfig.h b/acconfig.h
index 46ffeda..5bd6286 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -46,5 +46,5 @@
/* 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
diff --git a/configure b/configure
index c2c9325..9c4f730 100755
--- a/configure
+++ b/configure
@@ -94,7 +94,7 @@ ac_help="$ac_help
ac_help="$ac_help
--with-globus=INC,LIB Use the GLOBUS Library [default=no]"
ac_help="$ac_help
- --with-dpss=INC,LIB Use the Globus DPSS driver [default=no]"
+ --with-gridstorage=INC,LIB Use the Globus Grid Storage driver [default=no]"
ac_help="$ac_help
--with-pthread=INC,LIB Use the Pthreads library"
ac_help="$ac_help
@@ -4670,8 +4670,8 @@ if test "${with_ssl+set}" = set; then
:
fi
-if test "X-" != "X-$with_ssl_libpath"; then
- LDFLAGS="$LDFLAGS -L$with_ssl_libpath"
+if test "X-" != "X-$with_ssl"; then
+ LDFLAGS="$LDFLAGS -L$with_ssl"
fi
echo $ac_n "checking for main in -lcrypto""... $ac_c" 1>&6
@@ -7134,13 +7134,13 @@ EOF
fi
-DPSS=yes
+GRIDSTORAGE=yes
-TESTDPSS='$(srcdir)/testdpss'
+TESTGRIDSTORAGE='$(srcdir)/testgridstorage'
-# Check whether --with-dpss or --without-dpss was given.
-if test "${with_dpss+set}" = set; then
- withval="$with_dpss"
+# Check whether --with-gridstorage or --without-gridstorage was given.
+if test "${with_gridstorage+set}" = set; then
+ withval="$with_gridstorage"
:
else
withval=no
@@ -7185,7 +7185,7 @@ EOF
else
echo "$ac_t""no" 1>&6
-unset DPSS TESTDPSS
+unset GRIDSTORAGE TESTGRIDSTORAGE
fi
done
@@ -7230,7 +7230,7 @@ EOF
else
echo "$ac_t""no" 1>&6
-unset DPSS TESTDPSS
+unset GRIDSTORAGE TESTGRIDSTORAGE
fi
echo $ac_n "checking for grid_storage_open in -lgrid_storage_file""... $ac_c" 1>&6
@@ -7278,21 +7278,21 @@ EOF
else
echo "$ac_t""no" 1>&6
-unset DPSS TESTDPSS
+unset GRIDSTORAGE TESTGRIDSTORAGE
fi
;;
no)
- echo $ac_n "checking for DPSS""... $ac_c" 1>&6
-echo "configure:7288: checking for DPSS" >&5
+ echo $ac_n "checking for GRIDSTORAGE""... $ac_c" 1>&6
+echo "configure:7288: checking for GRIDSTORAGE" >&5
echo "$ac_t""suppressed" 1>&6
- unset DPSS TESTDPSS
+ unset GRIDSTORAGE TESTGRIDSTORAGE
;;
*)
- dpss_inc="`echo $withval |cut -f1 -d,`"
- if test "X" != "$dpss_inc"; then
+ gridstorage_inc="`echo $withval |cut -f1 -d,`"
+ if test "X" != "$gridstorage_inc"; then
saved_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS -I$dpss_inc"
+ CPPFLAGS="$CPPFLAGS -I$gridstorage_inc"
for ac_hdr in grid_storage_file.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
@@ -7331,7 +7331,7 @@ EOF
else
echo "$ac_t""no" 1>&6
CPPFLAGS="$saved_CPPFLAGS"
- unset DPSS TESTDPSS
+ unset GRIDSTORAGE TESTGRIDSTORAGE
fi
done
@@ -7379,10 +7379,10 @@ done
fi
- dpss_lib="`echo $withval |cut -f2 -d, -s`"
- if test "X" != "$dpss_lib"; then
+ gridstorage_lib="`echo $withval |cut -f2 -d, -s`"
+ if test "X" != "$gridstorage_lib"; then
saved_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -L$dpss_lib"
+ LDFLAGS="$LDFLAGS -L$gridstorage_lib"
echo $ac_n "checking for main in -lgrid_storage_client""... $ac_c" 1>&6
echo "configure:7388: checking for main in -lgrid_storage_client" >&5
ac_lib_var=`echo grid_storage_client'_'main | sed 'y%./+-%__p_%'`
@@ -7424,7 +7424,7 @@ EOF
else
echo "$ac_t""no" 1>&6
-unset DPSS TESTDPSS
+unset GRIDSTORAGE TESTGRIDSTORAGE
fi
echo $ac_n "checking for grid_storage_open in -lgrid_storage_file""... $ac_c" 1>&6
@@ -7472,7 +7472,7 @@ EOF
else
echo "$ac_t""no" 1>&6
-unset DPSS TESTDPSS
+unset GRIDSTORAGE TESTGRIDSTORAGE
fi
else
@@ -7517,7 +7517,7 @@ EOF
else
echo "$ac_t""no" 1>&6
-unset DPSS TESTDPSS
+unset GRIDSTORAGE TESTGRIDSTORAGE
fi
echo $ac_n "checking for grid_storage_open in -lgrid_storage_file""... $ac_c" 1>&6
@@ -7565,15 +7565,15 @@ EOF
else
echo "$ac_t""no" 1>&6
-unset DPSS TESTDPSS
+unset GRIDSTORAGE TESTGRIDSTORAGE
fi
fi
;;
esac
-if test "X-" != "X-$DPSS"; then
+if test "X-" != "X-$GRIDSTORAGE"; then
cat >> confdefs.h <<\EOF
-#define HAVE_DPSS 1
+#define HAVE_GRIDSTORAGE 1
EOF
fi
@@ -9548,8 +9548,8 @@ s%@GASS@%$GASS%g
s%@TESTGASS@%$TESTGASS%g
s%@GLOBUS@%$GLOBUS%g
s%@TESTGLOBUS@%$TESTGLOBUS%g
-s%@DPSS@%$DPSS%g
-s%@TESTDPSS@%$TESTDPSS%g
+s%@GRIDSTORAGE@%$GRIDSTORAGE%g
+s%@TESTGRIDSTORAGE@%$TESTGRIDSTORAGE%g
s%@PDB2HDF@%$PDB2HDF%g
s%@DEBUG_PKG@%$DEBUG_PKG%g
s%@TRACE_API@%$TRACE_API%g
diff --git a/configure.in b/configure.in
index 33d1659..3e213d1 100644
--- a/configure.in
+++ b/configure.in
@@ -496,14 +496,14 @@ case $withval in
esac
dnl ----------------------------------------------------------------------
-dnl Is SSL library present? It is needed by the DPSS driver.
+dnl Is SSL library present? It is needed by the Grid Storage driver.
dnl
AC_SUBST(SSL)
SSL=yes
AC_ARG_WITH(ssl,[ --with-ssl=LIB Use SSL libs from LIB ],,)
-if test "X-" != "X-$with_ssl_libpath"; then
- LDFLAGS="$LDFLAGS -L$with_ssl_libpath"
+if test "X-" != "X-$with_ssl"; then
+ LDFLAGS="$LDFLAGS -L$with_ssl"
fi
AC_CHECK_LIB(crypto,main,,unset SSL)
@@ -574,7 +574,7 @@ if test "X-" != "X-$GASS"; then
fi
dnl ----------------------------------------------------------------------
-dnl Is GLOBUS Library present? It is needed by the DPSS driver.
+dnl Is GLOBUS Library present? It is needed by the Grid Storage driver.
dnl
AC_SUBST(GLOBUS)
GLOBUS=yes
@@ -645,54 +645,54 @@ if test "X-" != "X-$GLOBUS"; then
fi
dnl ----------------------------------------------------------------------
-dnl Is DPSS present? If so then we can compile in the DPSS driver.
+dnl Is Grid Storage present? If so then we can compile in the Grid Storage driver.
dnl
-AC_SUBST(DPSS)
-DPSS=yes
-AC_SUBST(TESTDPSS)
-TESTDPSS='$(srcdir)/testdpss'
+AC_SUBST(GRIDSTORAGE)
+GRIDSTORAGE=yes
+AC_SUBST(TESTGRIDSTORAGE)
+TESTGRIDSTORAGE='$(srcdir)/testgridstorage'
-AC_ARG_WITH(dpss,
- [ --with-dpss=INC,LIB Use the Globus DPSS driver [default=no]],
+AC_ARG_WITH(gridstorage,
+ [ --with-gridstorage=INC,LIB Use the Globus Grid Storage driver [default=no]],
,withval=no)
case $withval in
yes)
- AC_CHECK_HEADERS(grid_storage_file.h,,unset DPSS TESTDPSS)
- AC_CHECK_LIB(grid_storage_client,main,,unset DPSS TESTDPSS)
- AC_CHECK_LIB(grid_storage_file,grid_storage_open,,unset DPSS TESTDPSS)
+ AC_CHECK_HEADERS(grid_storage_file.h,,unset GRIDSTORAGE TESTGRIDSTORAGE)
+ AC_CHECK_LIB(grid_storage_client,main,,unset GRIDSTORAGE TESTGRIDSTORAGE)
+ AC_CHECK_LIB(grid_storage_file,grid_storage_open,,unset GRIDSTORAGE TESTGRIDSTORAGE)
;;
no)
- AC_MSG_CHECKING(for DPSS)
+ AC_MSG_CHECKING(for GRIDSTORAGE)
AC_MSG_RESULT(suppressed)
- unset DPSS TESTDPSS
+ unset GRIDSTORAGE TESTGRIDSTORAGE
;;
*)
- dpss_inc="`echo $withval |cut -f1 -d,`"
- if test "X" != "$dpss_inc"; then
+ gridstorage_inc="`echo $withval |cut -f1 -d,`"
+ if test "X" != "$gridstorage_inc"; then
saved_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS -I$dpss_inc"
+ CPPFLAGS="$CPPFLAGS -I$gridstorage_inc"
AC_CHECK_HEADERS(grid_storage_file.h,,
CPPFLAGS="$saved_CPPFLAGS"
- unset DPSS TESTDPSS
+ unset GRIDSTORAGE TESTGRIDSTORAGE
)
else
AC_CHECK_HEADERS(grid_storage_file.h)
fi
- dpss_lib="`echo $withval |cut -f2 -d, -s`"
- if test "X" != "$dpss_lib"; then
+ gridstorage_lib="`echo $withval |cut -f2 -d, -s`"
+ if test "X" != "$gridstorage_lib"; then
saved_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -L$dpss_lib"
- AC_CHECK_LIB(grid_storage_client,main,,unset DPSS TESTDPSS)
- AC_CHECK_LIB(grid_storage_file,grid_storage_open,,unset DPSS TESTDPSS)
+ LDFLAGS="$LDFLAGS -L$gridstorage_lib"
+ AC_CHECK_LIB(grid_storage_client,main,,unset GRIDSTORAGE TESTGRIDSTORAGE)
+ AC_CHECK_LIB(grid_storage_file,grid_storage_open,,unset GRIDSTORAGE TESTGRIDSTORAGE)
else
- AC_CHECK_LIB(grid_storage_client,main,,unset DPSS TESTDPSS)
- AC_CHECK_LIB(grid_storage_file,grid_storage_open,,unset DPSS TESTDPSS)
+ AC_CHECK_LIB(grid_storage_client,main,,unset GRIDSTORAGE TESTGRIDSTORAGE)
+ AC_CHECK_LIB(grid_storage_file,grid_storage_open,,unset GRIDSTORAGE TESTGRIDSTORAGE)
fi
;;
esac
-if test "X-" != "X-$DPSS"; then
- AC_DEFINE(HAVE_DPSS)
+if test "X-" != "X-$GRIDSTORAGE"; then
+ AC_DEFINE(HAVE_GRIDSTORAGE)
fi
dnl ----------------------------------------------------------------------
diff --git a/src/H5F.c b/src/H5F.c
index 10df2cd..0cbf889 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -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
diff --git a/test/dpss_read.c b/test/dpss_read.c
index c8bafe9..e2cd1c0 100644
--- a/test/dpss_read.c
+++ b/test/dpss_read.c
@@ -18,7 +18,7 @@
#include <h5test.h>
#include <strings.h>
-#ifndef H5_HAVE_DPSS
+#ifndef H5_HAVE_GRIDSTORAGE
int main(void)
{
printf("Test skipped because DPSS driver not available\n");
diff --git a/test/dpss_write.c b/test/dpss_write.c
index 4287d3e..0fdb7e0 100644
--- a/test/dpss_write.c
+++ b/test/dpss_write.c
@@ -17,7 +17,7 @@
*/
#include <h5test.h>
-#ifndef H5_HAVE_DPSS
+#ifndef H5_HAVE_GRIDSTORAGE
int main(void)
{
printf("Test skipped because DPSS driver not available\n");
generated by cgit v0.12 at 2024-11-07 11:26:12 (GMT)