diff options
| -rw-r--r-- | src/H5AC.c | 12 | ||||
| -rw-r--r-- | src/H5D.c | 14 | ||||
| -rw-r--r-- | src/H5F.c | 5 | ||||
| -rw-r--r-- | src/H5O.c | 30 |
4 files changed, 2 insertions, 59 deletions
@@ -1258,15 +1258,14 @@ H5AC_protect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, idx = H5AC_HASH(f, addr); cache = f->shared->cache; info = cache->slot + idx; -#ifdef H5_HAVE_FPHDF5 - lf = f->shared->lf; -#endif /* H5_HAVE_FPHDF5 */ #ifdef H5AC_DEBUG prot = cache->prot + idx; #endif /* H5AC_DEBUG */ #ifdef H5_HAVE_PARALLEL #ifdef H5_HAVE_FPHDF5 + lf = f->shared->lf; + if (H5FD_is_fphdf5_driver(lf)) { /* * This is the FPHDF5 driver. Grab a lock for this piece of @@ -1505,13 +1504,6 @@ H5AC_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, FUNC_ENTER_NOAPI(H5AC_unprotect, FAIL) -#ifdef H5_HAVE_FPHDF5 - /* - * XXX: Send a request to the SAP asking to release the lock on this - * particular address. -BW - */ -#endif /* H5_HAVE_FPHDF5 */ - /* check args */ assert(f); assert(f->shared->cache); @@ -30,12 +30,6 @@ #include "H5Sprivate.h" /* Dataspaces */ #include "H5Vprivate.h" /* Vectors and arrays */ -#ifdef H5_HAVE_FPHDF5 -#define H5F_PACKAGE /*suppress error about including H5Fpkg */ - -#include "H5Fpkg.h" /* File access */ -#endif /* H5_HAVE_FPHDF5 */ - /*#define H5D_DEBUG*/ /* Interface initialization */ @@ -1833,14 +1827,6 @@ H5D_create(H5G_entry_t *loc, const char *name, hid_t type_id, const H5S_t *space if (H5D_update_entry_info(file, dxpl_id, new_dset, dc_plist) != SUCCEED) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL, "can't update the metadata cache") -#ifdef H5_HAVE_FPHDF5 - /* FPHDF5 is all about independent writes */ - if (H5FD_is_fphdf5_driver(file->shared->lf)) - if (H5Pset_dxpl_fphdf5(dxpl_id, H5FD_MPIO_INDEPENDENT) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, NULL, - "unable to set xfer property list to independent write") -#endif /* H5_HAVE_FPHDF5 */ - /* * Give the dataset a name. That is, create and add a new * "H5G_entry_t" object to the group this dataset is being initially @@ -3361,11 +3361,6 @@ H5F_close(H5F_t *f) H5F_FLUSH_INVALIDATE | H5F_FLUSH_CLOSING | H5F_FLUSH_CLEAR_ONLY) < 0) HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush cache") } - - /* Let's all meet up now... */ - if (H5F_flush(f, H5AC_dxpl_id, H5F_SCOPE_LOCAL, - H5F_FLUSH_INVALIDATE | H5F_FLUSH_CLOSING | H5F_FLUSH_CLEAR_ONLY) < 0) - HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush cache") #endif /* H5_HAVE_FPHDF5 */ } /* end if */ @@ -39,10 +39,6 @@ #include "H5Opkg.h" /* Object headers */ #include "H5Pprivate.h" /* Property lists */ -#ifdef H5_HAVE_FPHDF5 -#include "H5FDfphdf5.h" /* FPHDF5 File Descriptor */ -#endif /* H5_HAVE_FPHDF5 */ - #ifdef H5_HAVE_GETTIMEOFDAY #include <sys/time.h> #endif /* H5_HAVE_GETTIMEOFDAY */ @@ -265,9 +261,6 @@ H5O_init(H5F_t *f, hid_t dxpl_id, size_t size_hint, H5G_entry_t *ent/*out*/, had H5O_t *oh = NULL; haddr_t tmp_addr; herr_t ret_value = SUCCEED; /* return value */ -#ifdef H5_HAVE_FPHDF5 - unsigned capt_only = 0; -#endif /* H5_HAVE_FPHDF5 */ FUNC_ENTER_NOINIT(H5O_init); @@ -316,29 +309,6 @@ H5O_init(H5F_t *f, hid_t dxpl_id, size_t size_hint, H5G_entry_t *ent/*out*/, had oh->mesg[0].raw_size = size_hint - H5O_SIZEOF_MSGHDR(f); oh->mesg[0].chunkno = 0; -#ifdef H5_HAVE_FPHDF5 - if (H5FD_is_fphdf5_driver(f->shared->lf)) { - H5P_genplist_t *plist; - - /* Get the data xfer property list */ - if ((plist = H5I_object(dxpl_id)) == NULL) - HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dataset transfer list"); - - /* Check if the "Captain Only" flag's been set */ - if (H5P_exist_plist(plist, H5FD_FPHDF5_CAPTN_ALLOC_ONLY) > 0) - if (H5P_get(plist, H5FD_FPHDF5_CAPTN_ALLOC_ONLY, &capt_only) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTDELETE, FAIL, "can't retrieve FPHDF5 property"); - } - - /* - * We only want to initialize the object header if this isn't an - * FPHDF5 driver or it is, but the captain only flag is set or if the - * captain only flag just isn't set. - */ - if (!H5FD_is_fphdf5_driver(f->shared->lf) || !capt_only || (H5FD_fphdf5_is_captain(f->shared->lf) && capt_only)) - ; -#endif /* H5_HAVE_FPHDF5 */ - /* cache it */ if (H5AC_set(f, dxpl_id, H5AC_OHDR, ent->header, oh) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to cache object header"); |