summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/H5F.c1
-rw-r--r--src/H5FD.c4
-rw-r--r--src/H5FDsrb.c843
-rw-r--r--src/H5FDsrb.h57
-rw-r--r--src/H5config.h.in15
-rw-r--r--src/H5public.h3
-rwxr-xr-xsrc/Makefile.am9
-rw-r--r--src/Makefile.in53
-rw-r--r--src/hdf5.h3
-rwxr-xr-xsrc/hdf5.lnt1
10 files changed, 8 insertions, 981 deletions
diff --git a/src/H5F.c b/src/H5F.c
index d683084..9a80f04 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -41,7 +41,6 @@
#include "H5FDmpi.h" /* MPI-based file drivers */
#include "H5FDmulti.h" /*multiple files partitioned by mem usage */
#include "H5FDsec2.h" /*Posix unbuffered I/O */
-#include "H5FDsrb.h" /*SRB I/O */
#include "H5FDstdio.h" /* Standard C buffered I/O */
#include "H5FDstream.h" /*in-memory files streamed via sockets */
diff --git a/src/H5FD.c b/src/H5FD.c
index bbb30c9..d2f95d6 100644
--- a/src/H5FD.c
+++ b/src/H5FD.c
@@ -41,7 +41,6 @@
#include "H5FDmpi.h" /* MPI-based file drivers */
#include "H5FDmulti.h" /* Usage-partitioned file family */
#include "H5FDsec2.h" /* POSIX unbuffered file I/O */
-#include "H5FDsrb.h" /* Remote access using SRB */
#include "H5FDstdio.h" /* Standard C buffered I/O */
#include "H5FDstream.h" /* In-memory files streamed via sockets */
#include "H5FLprivate.h" /* Free lists */
@@ -165,9 +164,6 @@ H5FD_term_interface(void)
H5FD_log_term();
H5FD_stdio_term();
H5FD_family_term();
-#ifdef H5_HAVE_SRB
- H5FD_srb_term();
-#endif
H5FD_core_term();
H5FD_multi_term();
#ifdef H5_HAVE_PARALLEL
diff --git a/src/H5FDsrb.c b/src/H5FDsrb.c
deleted file mode 100644
index 15faa15..0000000
--- a/src/H5FDsrb.c
+++ /dev/null
@@ -1,843 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by the Board of Trustees of the University of Illinois. *
- * All rights reserved. *
- * *
- * This file is part of HDF5. The full HDF5 copyright notice, including *
- * terms governing use, modification, and redistribution, is contained in *
- * the files COPYING and Copyright.html. COPYING can be found at the root *
- * of the source code distribution tree; Copyright.html can be found at the *
- * root level of an installed copy of the electronic HDF5 document set and *
- * is linked from the top-level documents page. It can also be found at *
- * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have *
- * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*
- * Programmer: Raymond Lu <slu@ncsa.uiuc.edu>
- * Wednesday, April 12, 2000
- *
- * Purpose: SRB I/O driver.
- */
-
-/* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC H5FD_srb_init_interface
-
-
-#include "H5private.h" /* Generic Functions */
-#include "H5Eprivate.h" /* Error handling */
-#include "H5Fprivate.h" /* File access */
-#include "H5FDprivate.h" /* File drivers */
-#include "H5FDsrb.h" /* SRB file driver */
-#include "H5Iprivate.h" /* IDs */
-#include "H5MMprivate.h" /* Memory management */
-#include "H5Pprivate.h" /* Property lists */
-
-
-#ifdef H5_HAVE_SRB
-
-/* The driver identification number, initialized at runtime */
-static hid_t H5FD_SRB_g = 0;
-
-/*
- * This driver supports systems that have the lseek64() function by defining
- * some macros here so we don't have to have conditional compilations later
- * throughout the code.
- *
- * file_offset_t: The datatype for file offsets, the second argument of
- * the lseek() or lseek64() call.
- *
- * file_seek: The function which adjusts the current file position,
- * either lseek() or lseek64().
- */
-/* adding for windows NT file system support. */
-
-#ifdef H5_HAVE_LSEEK64
-# define file_offset_t off64_t
-# define file_seek lseek64
-#elif defined (WIN32)
-# ifdef __MWERKS__
-# define file_offset_t off_t
-# define file_seek lseek
-# else /*MSVC*/
-# define file_offset_t __int64
-# define file_seek _lseeki64
-# endif
-#else
-# define file_offset_t off_t
-# define file_seek lseek
-#endif
-
-
-/*
- * These macros check for overflow of various quantities. These macros
- * assume that file_offset_t is signed and haddr_t and size_t are unsigned.
- *
- * ADDR_OVERFLOW: Checks whether a file address of type `haddr_t'
- * is too large to be represented by the second argument
- * of the file seek function.
- *
- * SIZE_OVERFLOW: Checks whether a buffer size of type `hsize_t' is too
- * large to be represented by the `size_t' type.
- *
- * REGION_OVERFLOW: Checks whether an address and size pair describe data
- * which can be addressed entirely by the second
- * argument of the file seek function.
- */
-#define MAXADDR (((haddr_t)1<<(8*sizeof(file_offset_t)-1))-1)
-#define ADDR_OVERFLOW(A) (HADDR_UNDEF==(A) || \
- ((A) & ~(haddr_t)MAXADDR))
-#define SIZE_OVERFLOW(Z) ((Z) & ~(hsize_t)MAXADDR)
-#define REGION_OVERFLOW(A,Z) (ADDR_OVERFLOW(A) || SIZE_OVERFLOW(Z) || \
- sizeof(file_offset_t)<sizeof(size_t) || \
- HADDR_UNDEF==(A)+(Z) || \
- (file_offset_t)((A)+(Z))<(file_offset_t)(A))
-
-
-static H5FD_t *H5FD_srb_open(const char *name, unsigned flags, hid_t fapl_id,
- haddr_t maxaddr);
-static herr_t H5FD_srb_close(H5FD_t *_file);
-static herr_t H5FD_srb_query(const H5FD_t *_f1, unsigned long *flags);
-static haddr_t H5FD_srb_get_eoa(H5FD_t *_file);
-static herr_t H5FD_srb_set_eoa(H5FD_t *_file, haddr_t addr);
-static haddr_t H5FD_srb_get_eof(H5FD_t *_file);
-static herr_t H5FD_srb_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle);
-static herr_t H5FD_srb_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
- size_t size, void *buf);
-static herr_t H5FD_srb_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
- size_t size, const void *buf);
-static herr_t H5FD_srb_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing);
-
-/* The description of a file belonging to this driver. */
-typedef struct H5FD_srb_t {
- H5FD_t pub; /*public stuff, must be first */
- int fd; /*file descriptor */
- srbConn *srb_conn; /*SRB connection handler */
- SRB_Info info; /*file information */
- haddr_t eoa; /*end of allocated region */
- haddr_t eof; /*end of file; current file size*/
- haddr_t pos; /*current file I/O position */
-} H5FD_srb_t;
-
-/* SRB-specific file access properties */
-typedef struct H5FD_srb_fapl_t {
- srbConn *srb_conn; /*SRB connection handler */
- SRB_Info info; /*file information */
-} H5FD_srb_fapl_t;
-
-/* SRB file driver information */
-static const H5FD_class_t H5FD_srb_g = {
- "srb", /*name */
- MAXADDR, /*maxaddr */
- H5F_CLOSE_WEAK, /* fc_degree */
- NULL, /*sb_size */
- NULL, /*sb_encode */
- NULL, /*sb_decode */
- sizeof(H5FD_srb_fapl_t), /*fapl_size */
- NULL, /*fapl_get */
- NULL, /*fapl_copy */
- NULL, /*fapl_free */
- 0, /*dxpl_size */
- NULL, /*dxpl_copy */
- NULL, /*dxpl_free */
- H5FD_srb_open, /*open */
- H5FD_srb_close, /*close */
- NULL, /*cmp */
- H5FD_srb_query, /*query */
- NULL, /*alloc */
- NULL, /*free */
- H5FD_srb_get_eoa, /*get_eoa */
- H5FD_srb_set_eoa, /*set_eoa */
- H5FD_srb_get_eof, /*get_eof */
- H5FD_srb_get_handle, /*get_handle */
- H5FD_srb_read, /*read */
- H5FD_srb_write, /*write */
- H5FD_srb_flush, /*flush */
- NULL, /*lock */
- NULL, /*unlock */
- H5FD_FLMAP_SINGLE /*fl_map */
-};
-
-
-/*--------------------------------------------------------------------------
-NAME
- H5FD_srb_init_interface -- Initialize interface-specific information
-USAGE
- herr_t H5FD_srb_init_interface()
-
-RETURNS
- Non-negative on success/Negative on failure
-DESCRIPTION
- Initializes any interface-specific data or routines. (Just calls
- H5FD_srb_init currently).
-
---------------------------------------------------------------------------*/
-static herr_t
-H5FD_srb_init_interface(void)
-{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_srb_init_interface)
-
- FUNC_LEAVE_NOAPI(H5FD_srb_init())
-} /* H5FD_srb_init_interface() */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5FD_srb_init
- *
- * Purpose: Initialize this driver by registering the driver with the
- * library.
- *
- * Return: Success: The driver ID for the srb driver.
- *
- * Failure: Negative.
- *
- * Programmer: Raymond Lu
- * Wednesday, April 12, 2000
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-hid_t
-H5FD_srb_init(void)
-{
- hid_t ret_value=H5FD_SRB_g; /* Return value */
-
- FUNC_ENTER_NOAPI(H5FD_srb_init, FAIL)
-
- if(H5I_VFL != H5Iget_type(H5FD_SRB_g))
- H5FD_SRB_g = H5FD_register(&H5FD_srb_g,sizeof(H5FD_class_t));
-
- /* Set return value */
- ret_value=H5FD_SRB_g;
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
-}
-
-
-/*---------------------------------------------------------------------------
- * Function: H5FD_srb_term
- *
- * Purpose: Shut down the VFD
- *
- * Return: <none>
- *
- * Programmer: Quincey Koziol
- * Friday, Jan 30, 2004
- *
- * Modification:
- *
- *---------------------------------------------------------------------------
- */
-void
-H5FD_srb_term(void)
-{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_srb_term)
-
- /* Reset VFL ID */
- H5FD_SRB_g=0;
-
- FUNC_LEAVE_NOAPI_VOID
-} /* end H5FD_srb_term() */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5Pset_fapl_srb
- *
- * Purpose: Store srb connection(client to server) handler SRB_CONN
- * after connected and user supplied INFO in the file access
- * property list FAPL_ID, which can be used to create or open
- * file.
- *
- * Return: Success: Non-negative
- *
- * Failure: Negative
- *
- * Programmer: Raymond Lu
- * April 12, 2000
- *
- * Modifications:
- *
- * Raymond Lu, 2001-10-25
- * Use the new generic property list for argument checking.
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pset_fapl_srb(hid_t fapl_id, SRB_Info info)
-{
- H5FD_srb_fapl_t fa;
- int srb_status;
- H5P_genplist_t *plist; /* Property list pointer */
- herr_t ret_value;
-
- FUNC_ENTER_API(H5Pset_fapl_srb, FAIL)
- /*NO TRACE*/
-
- if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
- HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
-
- /*connect to SRB server */
- fa.srb_conn = clConnect(info.srbHost, info.srbPort, info.srbAuth);
- if((srb_status = clStatus(fa.srb_conn)) != CLI_CONNECTION_OK) {
- fprintf(stderr,"%s",clErrorMessage(fa.srb_conn));
- clFinish(fa.srb_conn);
-
- /*not sure about first 2 parameters. */
- HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "Connection to srbMaster failed.")
- }
-
- fa.info = info;
- ret_value = H5P_set_driver(plist, H5FD_SRB, &fa);
-
-done:
- FUNC_LEAVE_API(ret_value)
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5Pget_fapl_srb
- *
- * Purpose: If the file access property list is set to the H5FD_SRB
- * driver then this function returns the srb file INFO.
- *
- * Return: Success: File INFO is returned.
- * Failure: Negative
- *
- * Programmer: Raymond Lu
- * April 12, 2000
- *
- * Modifications:
- *
- * Raymond Lu, 2001-10-25
- * Use the new generic property list for checking property list
- * ID.
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pget_fapl_srb(hid_t fapl_id, SRB_Info *info/*out*/)
-{
- H5P_genplist_t *plist; /* Property list pointer */
- H5FD_srb_fapl_t *fa;
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_API(H5Pget_fapl_srb, FAIL)
- H5TRACE2("e","ix",fapl_id,info);
-
- if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
- HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
- if(H5FD_SRB != H5P_get_driver(plist))
- HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "incorrect VFL driver")
- if(NULL==(fa=H5P_get_driver_info(plist)))
- HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "bad VFL driver info")
-
- if(info)
- *info = fa->info;
-
-done:
- FUNC_LEAVE_API(ret_value)
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5FD_srb_open
- *
- * Purpose: Opens a file with name NAME. The FLAGS are a bit field with
- * purpose similar to the second argument of open(2) and which
- * are defined in H5Fpublic.h. The file access property list
- * FAPL_ID contains the properties driver properties and MAXADDR
- * is the largest address which this file will be expected to
- * access.
- *
- * Return: Success: A new file pointer.
- *
- * Failure: NULL
- *
- * Programmer: Raymond Lu
- * April 12, 2000
- * Modifications:
- *-------------------------------------------------------------------------
- */
-static H5FD_t *
-H5FD_srb_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
-{
- struct srbStat srb_stat;
- H5FD_srb_fapl_t *fa=NULL;
- H5FD_srb_fapl_t _fa;
- H5FD_srb_t *file;
- int srb_fid;
- H5P_genplist_t *plist; /* Property list pointer */
- H5FD_t *ret_value;
-
- FUNC_ENTER_NOAPI(H5FD_srb_open, FAIL)
-
- /* Check arguments */
- if (!name || !*name)
- HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "invalid file name")
- if (0==maxaddr || HADDR_UNDEF==maxaddr)
- HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "bogus maxaddr")
- if (ADDR_OVERFLOW(maxaddr))
- HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "bogus maxaddr")
-
- if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
- HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list")
- if(H5P_FILE_ACCESS_DEFAULT==fapl_id || H5FD_SRB!=H5P_get_driver(plist)) {
- HDmemset((void*)&_fa, 0, sizeof(H5FD_srb_fapl_t));
- fa = &_fa;
- }
- else {
- fa = H5P_get_driver_info(plist);
- assert(fa);
- }
-
- /* When I come down here, the possible flag values and the correct
- * responses are given here :-
- *
- * 1. H5F_ACC_CREAT | H5F_ACC_RDWR | H5F_ACC_EXCL : The file is
- * a new one. Go ahead and open it with srbObjCreate.
- * 2. H5F_ACC_CREAT | H5F_ACC_RDWR | H5F_ACC_TRUNC : how do I handle this?
- * srbObjCreate doesn't support truncate while srbObjOpen doesn't
- * support create. Try to call both srbFileCreate and srbFileOpen!
- * 3. H5F_ACC_RDWR | H5F_ACC_TRUNC : Use O_RDWR | O_TRUNC with srbObjOpen.
- * 4. H5F_ACC_RDWR : Use O_RDWR with srbObjOpen.
- * 5. Flag is not set : Use O_RDONLY with srbObjOpen.
- *
- * (In srbObjOpen, O_CREATE is not supported. For file creation, use
- * srbObjCreate.)
- */
-
- if((flags & H5F_ACC_CREAT) && (flags & H5F_ACC_RDWR) &&
- (flags & H5F_ACC_EXCL))
- srb_fid = srbFileCreate(fa->srb_conn, fa->info.storSysType,
- fa->info.srbHost, name, fa->info.mode, fa->info.size);
- else if((flags & H5F_ACC_CREAT) && (flags & H5F_ACC_RDWR) &&
- (flags & H5F_ACC_TRUNC)) {
- if( (srb_fid = srbFileCreate(fa->srb_conn, fa->info.storSysType,
- fa->info.srbHost, name, fa->info.mode, fa->info.size)) < 0 ) {
- srb_fid = srbFileOpen(fa->srb_conn, fa->info.storSysType,
- fa->info.srbHost, name, O_RDWR|O_TRUNC, fa->info.mode);
- }
- }
- else if((flags & H5F_ACC_RDWR) && (flags & H5F_ACC_TRUNC))
- srb_fid = srbFileOpen(fa->srb_conn, fa->info.storSysType,
- fa->info.srbHost, name, O_RDWR|O_TRUNC, fa->info.mode);
- else if(flags & H5F_ACC_RDWR)
- srb_fid = srbFileOpen(fa->srb_conn, fa->info.storSysType,
- fa->info.srbHost, name, O_RDWR, fa->info.mode);
- else
- srb_fid = srbFileOpen(fa->srb_conn, fa->info.storSysType,
- fa->info.srbHost, name, O_RDONLY, fa->info.mode);
-
-
- if(srb_fid < 0) {
-#ifdef OLD_WAY
- fprintf(stderr, "cannot open file %s\n", name);
- fprintf(stderr,"%s",clErrorMessage(fa->srb_conn));
- clFinish(fa->srb_conn);
- HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, NULL, "cannot open file")
-#else /* OLD_WAY */
- HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, NULL, clErrorMessage(fa->srb_conn))
-#endif /* OLD_WAY */
- }
-
- if(srbFileStat(fa->srb_conn, fa->info.storSysType, fa->info.srbHost, name,
- &srb_stat)!=0) {
-#ifdef OLD_WAY
- srbFileClose(fa->srb_conn, srb_fid);
- clFinish(fa->srb_conn);
- HGOTO_ERROR(H5E_IO, H5E_BADFILE, NULL, "SRB file stat failed")
-#else /* OLD_WAY */
- HGOTO_ERROR(H5E_IO, H5E_BADFILE, NULL, "SRB file stat failed")
-#endif /* OLD_WAY */
- }
-
- if (NULL==(file=H5MM_calloc(sizeof(H5FD_srb_t))))
- HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate file struct")
-
- file->fd = srb_fid;
- file->eof = srb_stat.st_size;
- file->pos = HADDR_UNDEF;
- file->srb_conn = fa->srb_conn;
- file->info = fa->info;
-
- /* Set return value */
- ret_value=(H5FD_t*)file;
-
-done:
- if(ret_value==NULL) {
- if(fa!=NULL)
- clFinish(fa->srb_conn);
- if(srb_fid>=0)
- srbFileClose(fa->srb_conn, srb_fid);
- } /* end if */
- FUNC_LEAVE_NOAPI(ret_value)
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5FD_srb_close
- *
- * Purpose: Closes a file and srb connection.
- *
- * Return: Success: Non-negative
- *
- * Failure: Negative
- *
- * Programmer: Raymond Lu
- * Modification:
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FD_srb_close(H5FD_t *_file)
-{
- H5FD_srb_t *file = (H5FD_srb_t *)_file;
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5FD_srb_close, FAIL)
-
- srbFileClose(file->srb_conn, file->fd);
- clFinish(file->srb_conn);
-
- H5MM_xfree(file);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5FD_srb_query
- *
- * Purpose: Set the flags that this VFL driver is capable of supporting.
- * (listed in H5FDpublic.h)
- *
- * Return: Success: non-negative
- *
- * Failure: negative
- *
- * Programmer: Quincey Koziol
- * Tuesday, September 26, 2000
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FD_srb_query(const UNUSED H5FD_t *_f, unsigned long *flags /* out */)
-{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5FD_srb_query, FAIL)
-
- /* Set the VFL feature flags that this driver supports */
- if(flags) {
- *flags = 0;
- *flags|=H5FD_FEAT_DATA_SIEVE; /* OK to perform data sieving for faster raw data reads & writes */
- *flags|=H5FD_FEAT_AGGREGATE_SMALLDATA; /* OK to aggregate "small" raw data allocations */
- }
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5FD_srb_get_eoa
- *
- * Purpose: Gets the end-of-address marker for the file. The EOA marker
- * is the first address past the last byte allocated in the
- * format address space.
- *
- * Return: Success: The end-of-address marker.
- *
- * Failure: HADDR_UNDEF
- *
- * Programmer: Raymond Lu
- * April 12, 2000
- *
- * Modifications:
- *-------------------------------------------------------------------------
- */
-static haddr_t
-H5FD_srb_get_eoa(H5FD_t *_file)
-{
- H5FD_srb_t *file = (H5FD_srb_t *)_file;
- haddr_t ret_value; /* Return value */
-
- FUNC_ENTER_NOAPI(H5FD_srb_get_eoa, HADDR_UNDEF)
-
- /* Set return value */
- ret_value=file->eoa;
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5FD_srb_set_eoa
- *
- * Purpose: Set the end-of-address marker for the file. This function is
- * called shortly after an existing HDF5 file is opened in order
- * to tell the driver where the end of the HDF5 data is located.
- *
- * Return: Success: 0
- *
- * Failure: -1
- *
- * Programmer: Robb Matzke
- * Friday, August 6, 1999
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FD_srb_set_eoa(H5FD_t *_file, haddr_t addr)
-{
- H5FD_srb_t *file = (H5FD_srb_t *)_file;
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5FD_srb_set_eoa, FAIL)
-
- file->eoa = addr;
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5FD_srb_get_eof
- *
- * Purpose: Gets the end-of-file marker for the file. The EOF marker
- * is the real size of the file.
- *
- * Return: Success: The end-of-address marker.
- *
- * Failure: HADDR_UNDEF
- *
- * Programmer: Raymond Lu
- * April 12, 2000
- *
- * Modifications:
- *-------------------------------------------------------------------------
- */
-static haddr_t
-H5FD_srb_get_eof(H5FD_t *_file)
-{
- H5FD_srb_t *file = (H5FD_srb_t *)_file;
- haddr_t ret_value; /* Return value */
-
- FUNC_ENTER_NOAPI(H5FD_srb_get_eof, HADDR_UNDEF)
-
- /* Set return value */
- ret_value=file->eof;
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5FD_srb_get_handle
- *
- * Purpose: Returns the file handle of SRB file driver.
- *
- * Returns: Non-negative if succeed or negative if fails.
- *
- * Programmer: Raymond Lu
- * Sept. 16, 2002
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FD_srb_get_handle(H5FD_t *_file, hid_t UNUSED fapl, void** file_handle)
-{
- H5FD_srb_t *file = (H5FD_srb_t *)_file;
- herr_t ret_value = SUCCEED;
-
- FUNC_ENTER_NOAPI(H5FD_srb_get_eof, FAIL)
-
- if(!file_handle)
- HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file handle not valid")
-
- *file_handle = &(file->fd);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5FD_srb_read
- *
- * Purpose: Reads SIZE bytes of data from FILE beginning at address ADDR
- * into buffer BUF.
- *
- * Return: Success: Zero. Result is stored in caller-supplied
- * buffer BUF.
- *
- * Failure: -1, Contents of buffer BUF are undefined.
- *
- * Programmer: Raymond Lu
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FD_srb_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, haddr_t addr,
- size_t size, void *buf)
-{
- H5FD_srb_t *file = (H5FD_srb_t*)_file;
- ssize_t nbytes;
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5FD_srb_read, FAIL)
-
- /* Check for overflow conditions */
- if (HADDR_UNDEF==addr)
- HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "addr undefined")
- if (REGION_OVERFLOW(addr, size))
- HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr too large")
- if (addr+size>file->eoa)
- HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr too large")
-
- if( addr!=file->pos &&
- srbFileSeek(file->srb_conn, (int)file->fd, (int)addr, SEEK_SET)<0 )
- HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "srb file seek failed")
-
- /*
- * Read data, being careful of interrupted system calls, partial results,
- * and the end of the file.
- */
- while(size>0) {
- if((nbytes=srbFileRead(file->srb_conn, (int)file->fd, (char*)buf, size))<0)
- HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "srb file write failed")
-
- if (0==nbytes) {
- /*end of file but not end of format address space*/
- HDmemset(buf, 0, size);
- size = 0;
- }
- size -= nbytes;
- addr += (haddr_t)nbytes;
- buf = (char*)buf + nbytes;
- }
-
- /* Update current position */
- file->pos = addr;
-
-done:
- if(ret_value<0) {
- /* Reset file position */
- file->pos = HADDR_UNDEF;
-
- /* Close connection, etc. */
- srbFileClose(file->srb_conn, file->fd);
- clFinish(file->srb_conn);
- } /* end if */
-
- FUNC_LEAVE_NOAPI(ret_value)
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5FD_srb_write
- *
- * Purpose: Writes SIZE bytes of data to FILE beginning at address ADDR
- * from buffer BUF.
- *
- * Return: Success: Zero.
- *
- * Failure: -1
- *
- * Programmer: Raymond Lu
- * April 12, 2000
- * Modifications:
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FD_srb_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, haddr_t addr,
- size_t size, const void *buf)
-{
- H5FD_srb_t *file = (H5FD_srb_t*)_file;
- ssize_t nbytes;
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5FD_srb_write, FAIL)
-
- /* Check for overflow conditions */
- if (HADDR_UNDEF==addr)
- HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "addr undefined")
- if (REGION_OVERFLOW(addr, size))
- HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr too large")
- if (addr+size>file->eoa)
- HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr too large")
-
- if( addr!=file->pos &&
- srbFileSeek(file->srb_conn, (int)file->fd, (int)addr, SEEK_SET)<0 )
- HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "srb file seek failed")
-
- while(size>0) {
- if( (nbytes=srbFileWrite(file->srb_conn, (int)file->fd, (char*)buf, size)) < 0 )
- HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "srb file write failed")
-
- size -= nbytes;
- addr += (haddr_t)nbytes;
- buf = (const char*)buf + nbytes;
- }
-
- /* Update current position and eof */
- file->pos = addr;
- if(file->pos > file->eof)
- file->eof = file->pos;
-
-done:
- if(ret_value<0) {
- /* Reset file position */
- file->pos = HADDR_UNDEF;
-
- /* Close connection, etc. */
- srbFileClose(file->srb_conn, file->fd);
- clFinish(file->srb_conn);
- } /* end if */
-
- FUNC_LEAVE_NOAPI(ret_value)
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5FD_srb_flush
- *
- * Purpose: Makes sure that all data is on disk.
- *
- * Return: Success: Non-negative
- *
- * Failure: Negative
- *
- * Programmer: Raymond Lu
- * April 12, 2000
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FD_srb_flush(H5FD_t *_file, hid_t dxpl_id, unsigned UNUSED closing)
-{
- H5FD_srb_t *file = (H5FD_srb_t*)_file;
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5FD_srb_flush, FAIL)
-
- if(srbFileSync(file->srb_conn, file->fd) != 0)
- HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "srb file sync failed")
-
-done:
- if(ret_value<0) {
- srbFileClose(file->srb_conn, file->fd);
- clFinish(file->srb_conn);
- } /* end if */
-
- FUNC_LEAVE_NOAPI(ret_value)
-}
-
-#endif /* H5_HAVE_SRB */
diff --git a/src/H5FDsrb.h b/src/H5FDsrb.h
deleted file mode 100644
index 053ca51..0000000
--- a/src/H5FDsrb.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by the Board of Trustees of the University of Illinois. *
- * All rights reserved. *
- * *
- * This file is part of HDF5. The full HDF5 copyright notice, including *
- * terms governing use, modification, and redistribution, is contained in *
- * the files COPYING and Copyright.html. COPYING can be found at the root *
- * of the source code distribution tree; Copyright.html can be found at the *
- * root level of an installed copy of the electronic HDF5 document set and *
- * is linked from the top-level documents page. It can also be found at *
- * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have *
- * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*
- * Programmer: Raymond Lu <slu@ncsa.uiuc.edu>
- * Wednesday, April 12, 2000
- * Purpose: The public header file for the SRB driver.
- */
-#ifndef H5FDsrb_H
-#define H5FDsrb_H
-
-#include "H5FDpublic.h"
-#include "H5Ipublic.h"
-
-#ifdef H5_HAVE_SRB
-
-#define H5FD_SRB (H5FD_srb_init())
-
-typedef struct SRB_Info { /* Define the SRB info object. */
- char *srbHost; /* SRB host address of server */
- char *srbPort; /* SRB host port number */
- char *srbAuth; /* SRB Authentication-password */
- int storSysType; /* Storage Type: 0=Unix, 1=UniTree, 2=HPSS,
- * 3=FTP, 4=HTTP */
- int mode; /* File mode-Unix access mode */
- int size; /* File Size-Only valid for HPSS, -1 is default */
-} SRB_Info;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-H5_DLL hid_t H5FD_srb_init(void);
-H5_DLL void H5FD_srb_term(void);
-H5_DLL herr_t H5Pset_fapl_srb(hid_t fapl_id, SRB_Info info);
-H5_DLL herr_t H5Pget_fapl_srb(hid_t fapl_id, SRB_Info *info);
-
-#ifdef __cplusplus
-}
-#endif
-
-#else
-#define H5FD_SRB (-1)
-#endif /* H5_HAVE_SRB */
-
-#endif /* H5FDsrb_H */
diff --git a/src/H5config.h.in b/src/H5config.h.in
index 5cfb439..d639e50 100644
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@@ -139,9 +139,6 @@
/* Define to 1 if you have the `dmalloc' library (-ldmalloc). */
#undef HAVE_LIBDMALLOC
-/* Define to 1 if you have the `elf' library (-lelf). */
-#undef HAVE_LIBELF
-
/* Define to 1 if you have the `lmpe' library (-llmpe). */
#undef HAVE_LIBLMPE
@@ -169,12 +166,6 @@
/* Define to 1 if you have the `silo' library (-lsilo). */
#undef HAVE_LIBSILO
-/* Define to 1 if you have the `socket' library (-lsocket). */
-#undef HAVE_LIBSOCKET
-
-/* Define to 1 if you have the `SrbClient' library (-lSrbClient). */
-#undef HAVE_LIBSRBCLIENT
-
/* Define to 1 if you have the `sz' library (-lsz). */
#undef HAVE_LIBSZ
@@ -232,12 +223,6 @@
/* Define if `socklen_t' is defined */
#undef HAVE_SOCKLEN_T
-/* Define if the SRB is defined */
-#undef HAVE_SRB
-
-/* Define to 1 if you have the <srbClient.h> header file. */
-#undef HAVE_SRBCLIENT_H
-
/* Define if `struct stat' has the `st_blocks' field */
#undef HAVE_STAT_ST_BLOCKS
diff --git a/src/H5public.h b/src/H5public.h
index 02a7f17..8ca7075 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -56,9 +56,6 @@
#endif
#endif
-#ifdef H5_HAVE_SRB /*for SRB I/O */
-#include <srbClient.h>
-#endif
#include "H5api_adpt.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index 1dbdaed..64f39ed 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,11 +34,6 @@ MOSTLYCLEANFILES=H5detect.o H5detect.lo H5detect H5Tinit.o H5Tinit.lo H5Tinit.c
# libhdf5.settings is generated during configure. Remove it when distclean.
DISTCLEAN=libhdf5.settings
-# Compile SRB file driver only if SRB is enabled.
-if BUILD_SRB_CONDITIONAL
- SRB_SOURCE=H5FDsrb.c
- SRB_HEADER=H5FDsrb.h
-endif
# library sources
libhdf5_la_SOURCES= H5.c H5A.c H5AC.c H5B.c H5B2.c H5B2cache.c H5B2dbg.c \
@@ -49,7 +44,7 @@ libhdf5_la_SOURCES= H5.c H5A.c H5AC.c H5B.c H5B2.c H5B2cache.c H5B2dbg.c \
H5Defl.c H5Dio.c H5Distore.c H5Dmpio.c H5Dselect.c H5Dtest.c H5E.c H5F.c \
H5Fdbg.c H5FD.c H5FDcore.c \
H5FDfamily.c H5FDfphdf5.c H5FDlog.c H5FDmpi.c H5FDmpio.c \
- H5FDmpiposix.c H5FDmulti.c H5FDsec2.c $(SRB_SOURCE) H5FDstdio.c \
+ H5FDmpiposix.c H5FDmulti.c H5FDsec2.c H5FDstdio.c \
H5FDstream.c H5FL.c H5FO.c H5FP.c H5FPclient.c H5FPserver.c H5FS.c \
H5G.c H5Gent.c H5Gnode.c H5Gstab.c \
H5HG.c H5HGdbg.c H5HL.c H5HLdbg.c H5HP.c H5I.c H5MF.c H5MM.c H5O.c \
@@ -72,7 +67,7 @@ include_HEADERS =H5public.h H5Apublic.h H5ACpublic.h H5Bpublic.h H5B2public.h \
H5BTpublic.h H5Cpublic.h H5Dpublic.h \
H5Epubgen.h H5Epublic.h H5Fpublic.h H5FDpublic.h H5FDcore.h H5FDfamily.h \
H5FDfphdf5.h H5FDlog.h H5FDmpi.h H5FDmpio.h H5FDmpiposix.h \
- H5FDmulti.h H5FDsec2.h $(SRB_HEADER) H5FDstdio.h H5FDstream.h H5FPpublic.h \
+ H5FDmulti.h H5FDsec2.h H5FDstdio.h H5FDstream.h H5FPpublic.h \
H5Gpublic.h H5HGpublic.h H5HLpublic.h H5Ipublic.h \
H5MMpublic.h H5Opublic.h H5Ppublic.h H5Rpublic.h H5Spublic.h \
H5SHpublic.h \
diff --git a/src/Makefile.in b/src/Makefile.in
index 80687f6..19547da 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -57,7 +57,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-DIST_COMMON = $(am__include_HEADERS_DIST) $(srcdir)/H5config.h.in \
+DIST_COMMON = $(include_HEADERS) $(srcdir)/H5config.h.in \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/libhdf5.settings.in $(top_srcdir)/config/commence.am \
$(top_srcdir)/config/conclude.am
@@ -81,29 +81,6 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(settingsdir)" \
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libhdf5_la_LIBADD =
-am__libhdf5_la_SOURCES_DIST = H5.c H5A.c H5AC.c H5B.c H5B2.c \
- H5B2cache.c H5B2dbg.c H5B2test.c H5BT.c H5BTbtree2.c \
- H5BTcache.c H5BTdbg.c H5BTtest.c H5C.c H5D.c H5Dcontig.c \
- H5Dcompact.c H5Defl.c H5Dio.c H5Distore.c H5Dmpio.c \
- H5Dselect.c H5Dtest.c H5E.c H5F.c H5Fdbg.c H5FD.c H5FDcore.c \
- H5FDfamily.c H5FDfphdf5.c H5FDlog.c H5FDmpi.c H5FDmpio.c \
- H5FDmpiposix.c H5FDmulti.c H5FDsec2.c H5FDsrb.c H5FDstdio.c \
- H5FDstream.c H5FL.c H5FO.c H5FP.c H5FPclient.c H5FPserver.c \
- H5FS.c H5G.c H5Gent.c H5Gnode.c H5Gstab.c H5HG.c H5HGdbg.c \
- H5HL.c H5HLdbg.c H5HP.c H5I.c H5MF.c H5MM.c H5O.c H5Oattr.c \
- H5Obogus.c H5Ocont.c H5Odtype.c H5Oefl.c H5Ofill.c H5Olayout.c \
- H5Omtime.c H5Oname.c H5Onull.c H5Opline.c H5Osdspace.c \
- H5Oshared.c H5Ostab.c H5P.c H5Pdcpl.c H5Pdxpl.c H5Pfapl.c \
- H5Pfcpl.c H5Ptest.c H5R.c H5RC.c H5RS.c H5S.c H5Sall.c \
- H5Shyper.c H5Smpio.c H5Snone.c H5Spoint.c H5Sselect.c \
- H5Stest.c H5SH.c H5SHcache.c H5SHdbg.c H5SL.c H5ST.c H5T.c \
- H5Tarray.c H5Tbit.c H5Tcommit.c H5Tcompound.c H5Tconv.c \
- H5Tcset.c H5Tenum.c H5Tfields.c H5Tfixed.c H5Tfloat.c \
- H5Tinit.c H5Tnative.c H5Toffset.c H5Topaque.c H5Torder.c \
- H5Tpad.c H5Tprecis.c H5Tstrpad.c H5Tvlen.c H5TS.c H5V.c H5Z.c \
- H5Zdeflate.c H5Zfletcher32.c H5Znbit.c H5Zshuffle.c H5Zszip.c \
- H5Zscaleoffset.c H5Ztrans.c
-@BUILD_SRB_CONDITIONAL_TRUE@am__objects_1 = H5FDsrb.lo
am_libhdf5_la_OBJECTS = H5.lo H5A.lo H5AC.lo H5B.lo H5B2.lo \
H5B2cache.lo H5B2dbg.lo H5B2test.lo H5BT.lo H5BTbtree2.lo \
H5BTcache.lo H5BTdbg.lo H5BTtest.lo H5C.lo H5D.lo H5Dcontig.lo \
@@ -111,8 +88,8 @@ am_libhdf5_la_OBJECTS = H5.lo H5A.lo H5AC.lo H5B.lo H5B2.lo \
H5Dselect.lo H5Dtest.lo H5E.lo H5F.lo H5Fdbg.lo H5FD.lo \
H5FDcore.lo H5FDfamily.lo H5FDfphdf5.lo H5FDlog.lo H5FDmpi.lo \
H5FDmpio.lo H5FDmpiposix.lo H5FDmulti.lo H5FDsec2.lo \
- $(am__objects_1) H5FDstdio.lo H5FDstream.lo H5FL.lo H5FO.lo \
- H5FP.lo H5FPclient.lo H5FPserver.lo H5FS.lo H5G.lo H5Gent.lo \
+ H5FDstdio.lo H5FDstream.lo H5FL.lo H5FO.lo H5FP.lo \
+ H5FPclient.lo H5FPserver.lo H5FS.lo H5G.lo H5Gent.lo \
H5Gnode.lo H5Gstab.lo H5HG.lo H5HGdbg.lo H5HL.lo H5HLdbg.lo \
H5HP.lo H5I.lo H5MF.lo H5MM.lo H5O.lo H5Oattr.lo H5Obogus.lo \
H5Ocont.lo H5Odtype.lo H5Oefl.lo H5Ofill.lo H5Olayout.lo \
@@ -145,18 +122,9 @@ CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libhdf5_la_SOURCES) H5detect.c
-DIST_SOURCES = $(am__libhdf5_la_SOURCES_DIST) H5detect.c
+DIST_SOURCES = $(libhdf5_la_SOURCES) H5detect.c
settingsDATA_INSTALL = $(INSTALL_DATA)
DATA = $(settings_DATA)
-am__include_HEADERS_DIST = H5public.h H5Apublic.h H5ACpublic.h \
- H5Bpublic.h H5B2public.h H5BTpublic.h H5Cpublic.h H5Dpublic.h \
- H5Epubgen.h H5Epublic.h H5Fpublic.h H5FDpublic.h H5FDcore.h \
- H5FDfamily.h H5FDfphdf5.h H5FDlog.h H5FDmpi.h H5FDmpio.h \
- H5FDmpiposix.h H5FDmulti.h H5FDsec2.h H5FDsrb.h H5FDstdio.h \
- H5FDstream.h H5FPpublic.h H5Gpublic.h H5HGpublic.h \
- H5HLpublic.h H5Ipublic.h H5MMpublic.h H5Opublic.h H5Ppublic.h \
- H5Rpublic.h H5Spublic.h H5SHpublic.h H5Tpublic.h H5Zpublic.h \
- H5pubconf.h hdf5.h H5api_adpt.h
includeHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(include_HEADERS)
ETAGS = etags
@@ -189,8 +157,6 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
BUILD_PDB2HDF = @BUILD_PDB2HDF@
BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
-BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
-BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
BYTESEX = @BYTESEX@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -282,11 +248,9 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
-SRB = @SRB@
STATIC_SHARED = @STATIC_SHARED@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
-TESTSRB = @TESTSRB@
TRACE_API = @TRACE_API@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
@@ -382,10 +346,6 @@ MOSTLYCLEANFILES = H5detect.o H5detect.lo H5detect H5Tinit.o H5Tinit.lo H5Tinit.
# libhdf5.settings is generated during configure. Remove it when distclean.
DISTCLEAN = libhdf5.settings
-# Compile SRB file driver only if SRB is enabled.
-@BUILD_SRB_CONDITIONAL_TRUE@SRB_SOURCE = H5FDsrb.c
-@BUILD_SRB_CONDITIONAL_TRUE@SRB_HEADER = H5FDsrb.h
-
# library sources
libhdf5_la_SOURCES = H5.c H5A.c H5AC.c H5B.c H5B2.c H5B2cache.c H5B2dbg.c \
H5B2test.c H5BT.c H5BTbtree2.c H5BTcache.c H5BTdbg.c H5BTtest.c H5C.c \
@@ -395,7 +355,7 @@ libhdf5_la_SOURCES = H5.c H5A.c H5AC.c H5B.c H5B2.c H5B2cache.c H5B2dbg.c \
H5Defl.c H5Dio.c H5Distore.c H5Dmpio.c H5Dselect.c H5Dtest.c H5E.c H5F.c \
H5Fdbg.c H5FD.c H5FDcore.c \
H5FDfamily.c H5FDfphdf5.c H5FDlog.c H5FDmpi.c H5FDmpio.c \
- H5FDmpiposix.c H5FDmulti.c H5FDsec2.c $(SRB_SOURCE) H5FDstdio.c \
+ H5FDmpiposix.c H5FDmulti.c H5FDsec2.c H5FDstdio.c \
H5FDstream.c H5FL.c H5FO.c H5FP.c H5FPclient.c H5FPserver.c H5FS.c \
H5G.c H5Gent.c H5Gnode.c H5Gstab.c \
H5HG.c H5HGdbg.c H5HL.c H5HLdbg.c H5HP.c H5I.c H5MF.c H5MM.c H5O.c \
@@ -418,7 +378,7 @@ include_HEADERS = H5public.h H5Apublic.h H5ACpublic.h H5Bpublic.h H5B2public.h \
H5BTpublic.h H5Cpublic.h H5Dpublic.h \
H5Epubgen.h H5Epublic.h H5Fpublic.h H5FDpublic.h H5FDcore.h H5FDfamily.h \
H5FDfphdf5.h H5FDlog.h H5FDmpi.h H5FDmpio.h H5FDmpiposix.h \
- H5FDmulti.h H5FDsec2.h $(SRB_HEADER) H5FDstdio.h H5FDstream.h H5FPpublic.h \
+ H5FDmulti.h H5FDsec2.h H5FDstdio.h H5FDstream.h H5FPpublic.h \
H5Gpublic.h H5HGpublic.h H5HLpublic.h H5Ipublic.h \
H5MMpublic.h H5Opublic.h H5Ppublic.h H5Rpublic.h H5Spublic.h \
H5SHpublic.h \
@@ -588,7 +548,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDmpiposix.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDmulti.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDsec2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDsrb.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDstdio.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDstream.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FL.Plo@am__quote@
diff --git a/src/hdf5.h b/src/hdf5.h
index 3b6da96..bce01c5 100644
--- a/src/hdf5.h
+++ b/src/hdf5.h
@@ -48,9 +48,6 @@
#include "H5FDmpi.h" /* MPI-based file drivers */
#include "H5FDmulti.h" /* Usage-partitioned file family */
#include "H5FDsec2.h" /* POSIX unbuffered file I/O */
-#ifdef H5_HAVE_LIBSRBCLIENT
-#include "H5FDsrb.h" /* Remote access using SRB */
-#endif
#include "H5FDstdio.h" /* Standard C buffered I/O */
#include "H5FDstream.h" /* In-memory files streamed via sockets */
diff --git a/src/hdf5.lnt b/src/hdf5.lnt
index ecb9964..ed623b4 100755
--- a/src/hdf5.lnt
+++ b/src/hdf5.lnt
@@ -94,6 +94,5 @@
H5FDfphdf5.c
H5FDmpio.c
H5FDmpiposix.c
- H5FDsrb.c
H5FDstream.c
*/