diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5D.c | 14 | ||||
| -rw-r--r-- | src/H5Dprivate.h | 14 | ||||
| -rw-r--r-- | src/H5FDlog.c | 49 | ||||
| -rw-r--r-- | src/H5FDlog.h | 4 | ||||
| -rw-r--r-- | src/H5FDmpiposix.c | 119 | ||||
| -rw-r--r-- | src/H5FDmpiposix.h | 5 | ||||
| -rw-r--r-- | src/H5G.c | 30 | ||||
| -rw-r--r-- | src/H5Gpublic.h | 20 | ||||
| -rw-r--r-- | src/H5Pdxpl.c | 199 | ||||
| -rw-r--r-- | src/H5Pfapl.c | 228 | ||||
| -rw-r--r-- | src/H5Pfcpl.c | 112 | ||||
| -rw-r--r-- | src/H5Ppublic.h | 44 | ||||
| -rw-r--r-- | src/H5R.c | 114 | ||||
| -rw-r--r-- | src/H5Rpublic.h | 5 | ||||
| -rw-r--r-- | src/H5Spublic.h | 4 | ||||
| -rw-r--r-- | src/H5Sselect.c | 34 | ||||
| -rw-r--r-- | src/H5Z.c | 51 | ||||
| -rw-r--r-- | src/H5Zpublic.h | 5 | ||||
| -rw-r--r-- | src/H5config.h.in | 10 |
19 files changed, 8 insertions, 1053 deletions
@@ -156,10 +156,6 @@ H5D_init_interface(void) void *def_bkgr_buf = H5D_XFER_BKGR_BUF_DEF; H5T_bkg_t def_bkgr_buf_type = H5D_XFER_BKGR_BUF_TYPE_DEF; double def_btree_split_ratio[3] = H5D_XFER_BTREE_SPLIT_RATIO_DEF; -#ifdef H5_WANT_H5_V1_4_COMPAT - unsigned def_hyper_cache = H5D_XFER_HYPER_CACHE_DEF; - unsigned def_hyper_cache_lim = H5D_XFER_HYPER_CACHE_LIM_DEF; -#endif /* H5_WANT_H5_V1_4_COMPAT */ H5MM_allocate_t def_vlen_alloc = H5D_XFER_VLEN_ALLOC_DEF; void *def_vlen_alloc_info = H5D_XFER_VLEN_ALLOC_INFO_DEF; H5MM_free_t def_vlen_free = H5D_XFER_VLEN_FREE_DEF; @@ -234,16 +230,6 @@ H5D_init_interface(void) if(H5P_register(xfer_pclass,H5D_XFER_BTREE_SPLIT_RATIO_NAME,H5D_XFER_BTREE_SPLIT_RATIO_SIZE,&def_btree_split_ratio,NULL,NULL,NULL,NULL,NULL,NULL)<0) HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class"); -#ifdef H5_WANT_H5_V1_4_COMPAT - /* Register the hyperslab caching property */ - if(H5P_register(xfer_pclass,H5D_XFER_HYPER_CACHE_NAME,H5D_XFER_HYPER_CACHE_SIZE,&def_hyper_cache,NULL,NULL,NULL,NULL,NULL,NULL)<0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class"); - - /* Register the hyperslab cache limit property */ - if(H5P_register(xfer_pclass,H5D_XFER_HYPER_CACHE_LIM_NAME,H5D_XFER_HYPER_CACHE_LIM_SIZE,&def_hyper_cache_lim,NULL,NULL,NULL,NULL,NULL,NULL)<0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class"); -#endif /* H5_WANT_H5_V1_4_COMPAT */ - /* Register the vlen allocation function property */ if(H5P_register(xfer_pclass,H5D_XFER_VLEN_ALLOC_NAME,H5D_XFER_VLEN_ALLOC_SIZE,&def_vlen_alloc,NULL,NULL,NULL,NULL,NULL,NULL)<0) HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class"); diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h index b1615b0..9b0191c 100644 --- a/src/H5Dprivate.h +++ b/src/H5Dprivate.h @@ -90,20 +90,6 @@ #define H5D_XFER_BTREE_SPLIT_RATIO_NAME "btree_split_ratio" #define H5D_XFER_BTREE_SPLIT_RATIO_SIZE sizeof(double[3]) #define H5D_XFER_BTREE_SPLIT_RATIO_DEF {0.1, 0.5, 0.9} -#ifdef H5_WANT_H5_V1_4_COMPAT -/* Definitions for hyperslab caching property */ -#define H5D_XFER_HYPER_CACHE_NAME "hyper_cache" -#define H5D_XFER_HYPER_CACHE_SIZE sizeof(unsigned) -#ifndef H5_HAVE_PARALLEL -#define H5D_XFER_HYPER_CACHE_DEF 1 -#else -#define H5D_XFER_HYPER_CACHE_DEF 0 -#endif -/* Definitions for hyperslab cache limit property */ -#define H5D_XFER_HYPER_CACHE_LIM_NAME "hyper_cache_limit" -#define H5D_XFER_HYPER_CACHE_LIM_SIZE sizeof(unsigned) -#define H5D_XFER_HYPER_CACHE_LIM_DEF 0 -#endif /* H5_WANT_H5_V1_4_COMPAT */ /* Definitions for vlen allocation function property */ #define H5D_XFER_VLEN_ALLOC_NAME "vlen_alloc" #define H5D_XFER_VLEN_ALLOC_SIZE sizeof(H5MM_allocate_t) diff --git a/src/H5FDlog.c b/src/H5FDlog.c index 1073ab6..6ba47cf 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -273,54 +273,6 @@ done: FUNC_LEAVE_NOAPI(ret_value); } -#ifdef H5_WANT_H5_V1_4_COMPAT - -/*------------------------------------------------------------------------- - * Function: H5Pset_fapl_log - * - * Purpose: Modify the file access property list to use the H5FD_LOG - * driver defined in this source file. There are no driver - * specific properties. - * - * Return: Non-negative on success/Negative on failure - * - * Programmer: Robb Matzke - * Thursday, February 19, 1998 - * - * Modifications: - * We copy the LOGFILE value into our own access properties. - * - * Raymond Lu, 2001-10-25 - * Changed the file access list to the new generic property list. - * - *------------------------------------------------------------------------- - */ -herr_t -H5Pset_fapl_log(hid_t fapl_id, const char *logfile, int verbosity) -{ - H5FD_log_fapl_t fa; /* File access property list information */ - H5P_genplist_t *plist; /* Property list pointer */ - herr_t ret_value; - - FUNC_ENTER_API(H5Pset_fapl_log, FAIL); - H5TRACE3("e","isIs",fapl_id,logfile,verbosity); - - if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list"); - - fa.logfile=logfile; - if(verbosity>0) { - fa.flags=H5FD_LOG_LOC_IO|H5FD_LOG_FLAVOR; - if(verbosity>1) - fa.flags|=H5FD_LOG_FILE_IO; - } /* end if */ - fa.buf_size=32*(1024*1024); - ret_value= H5P_set_driver(plist, H5FD_LOG, &fa); - -done: - FUNC_LEAVE_API(ret_value); -} -#else /* H5_WANT_H5_V1_4_COMPAT */ /*------------------------------------------------------------------------- * Function: H5Pset_fapl_log @@ -363,7 +315,6 @@ H5Pset_fapl_log(hid_t fapl_id, const char *logfile, unsigned flags, size_t buf_s done: FUNC_LEAVE_API(ret_value); } -#endif /* H5_WANT_H5_V1_4_COMPAT */ /*------------------------------------------------------------------------- diff --git a/src/H5FDlog.h b/src/H5FDlog.h index 569220a..4685742 100644 --- a/src/H5FDlog.h +++ b/src/H5FDlog.h @@ -58,11 +58,7 @@ extern "C" { #endif H5_DLL hid_t H5FD_log_init(void); -#ifdef H5_WANT_H5_V1_4_COMPAT -H5_DLL herr_t H5Pset_fapl_log(hid_t fapl_id, const char *logfile, int verbosity); -#else /* H5_WANT_H5_V1_4_COMPAT */ H5_DLL herr_t H5Pset_fapl_log(hid_t fapl_id, const char *logfile, unsigned flags, size_t buf_size); -#endif /* H5_WANT_H5_V1_4_COMPAT */ #ifdef __cplusplus } diff --git a/src/H5FDmpiposix.c b/src/H5FDmpiposix.c index a56a18d..7a17016 100644 --- a/src/H5FDmpiposix.c +++ b/src/H5FDmpiposix.c @@ -273,124 +273,6 @@ done: FUNC_LEAVE_NOAPI(ret_value); } /* end H5FD_mpiposix_init() */ -#ifdef H5_WANT_H5_V1_4_COMPAT - -/*------------------------------------------------------------------------- - * Function: H5Pset_fapl_mpiposix - * - * Purpose: Store the user supplied MPI communicator COMM in - * the file access property list FAPL_ID which can then be used - * to create and/or open the file. This function is available - * only in the parallel HDF5 library and is not collective. - * - * comm is the MPI communicator to be used for file open as - * defined in MPI_FILE_OPEN of MPI-2. This function makes a - * duplicate of comm. Any modification to comm after this function - * call returns has no effect on the access property list. - * - * If fapl_id has previously set comm value, it will be replaced - * and the old communicator is freed. - * - * Return: Success: Non-negative - * Failure: Negative - * - * Programmer: Quincey Koziol - * Thursday, July 11, 2002 - * - * Modifications: - * Albert Cheng, 2003-04-24 - * Modified the description of the function that it now stores - * a duplicate of the communicator. Free the old duplicate if - * previously set. (Work is actually done by H5P_set_driver.) - * - *------------------------------------------------------------------------- - */ -herr_t -H5Pset_fapl_mpiposix(hid_t fapl_id, MPI_Comm comm) -{ - H5FD_mpiposix_fapl_t fa; - H5P_genplist_t *plist; /* Property list pointer */ - herr_t ret_value; - - FUNC_ENTER_API(H5Pset_fapl_mpiposix, FAIL); - H5TRACE2("e","iMc",fapl_id,comm); - - /* Check arguments */ - if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS))) - HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a file access list"); - if (MPI_COMM_NULL == comm) - HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a valid communicator"); - - /* Initialize driver specific properties */ - fa.comm = comm; - fa.use_gpfs = FALSE; - - /* duplication is done during driver setting. */ - ret_value= H5P_set_driver(plist, H5FD_MPIPOSIX, &fa); - -done: - FUNC_LEAVE_API(ret_value); -} /* end H5Pset_fapl_mpiposix() */ - - -/*------------------------------------------------------------------------- - * Function: H5Pget_fapl_mpiposix - * - * Purpose: If the file access property list is set to the H5FD_MPIPOSIX - * driver then this function returns a duplicate of the MPI - * communicator through the comm pointer. It is the responsibility - * of the application to free the returned communicator. - * - * Return: Success: Non-negative with the communicator and - * information returned through the COMM - * argument if non-null. Since it is a duplicate - * of the stored object, future modifications to - * the access property list do not affect it and - * it is the responsibility of the application to - * free it. - * - * Failure: Negative - * - * Programmer: Quincey Koziol - * Thursday, July 11, 2002 - * - * Modifications: - * Albert Cheng, 2003-04-24 - * Return duplicate of the stored communicator. - * - * Bill Wendling, 2003-05-01 - * Return the USE_GPFS flag. - * - *------------------------------------------------------------------------- - */ -herr_t -H5Pget_fapl_mpiposix(hid_t fapl_id, MPI_Comm *comm/*out*/) -{ - H5FD_mpiposix_fapl_t *fa; - H5P_genplist_t *plist; /* Property list pointer */ - int mpi_code; /* mpi return code */ - herr_t ret_value=SUCCEED; /* Return value */ - - FUNC_ENTER_API(H5Pget_fapl_mpiposix, FAIL); - H5TRACE2("e","ix",fapl_id,comm); - - if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS))) - HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a file access list"); - if (H5FD_MPIPOSIX!=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"); - - /* Get MPI Communicator */ - if (comm){ - if (MPI_SUCCESS != (mpi_code=MPI_Comm_dup(fa->comm, comm))) - HMPI_GOTO_ERROR(FAIL, "MPI_Comm_dup failed", mpi_code); - } - -done: - FUNC_LEAVE_API(ret_value); -} /* end H5Pget_fapl_mpiposix() */ -#else /* H5_WANT_H5_V1_4_COMPAT */ /*------------------------------------------------------------------------- * Function: H5Pset_fapl_mpiposix @@ -514,7 +396,6 @@ H5Pget_fapl_mpiposix(hid_t fapl_id, MPI_Comm *comm/*out*/, hbool_t *use_gpfs/*ou done: FUNC_LEAVE_API(ret_value); } /* end H5Pget_fapl_mpiposix() */ -#endif /* H5_WANT_H5_V1_4_COMPAT */ /*------------------------------------------------------------------------- diff --git a/src/H5FDmpiposix.h b/src/H5FDmpiposix.h index b4614c7..cae9370 100644 --- a/src/H5FDmpiposix.h +++ b/src/H5FDmpiposix.h @@ -44,13 +44,8 @@ extern "C" { #endif H5_DLL hid_t H5FD_mpiposix_init(void); -#ifdef H5_WANT_H5_V1_4_COMPAT -H5_DLL herr_t H5Pset_fapl_mpiposix(hid_t fapl_id, MPI_Comm comm); -H5_DLL herr_t H5Pget_fapl_mpiposix(hid_t fapl_id, MPI_Comm *comm/*out*/); -#else /* H5_WANT_H5_V1_4_COMPAT */ H5_DLL herr_t H5Pset_fapl_mpiposix(hid_t fapl_id, MPI_Comm comm, hbool_t use_gpfs); H5_DLL herr_t H5Pget_fapl_mpiposix(hid_t fapl_id, MPI_Comm *comm/*out*/, hbool_t *use_gpfs/*out*/); -#endif /* H5_WANT_H5_V1_4_COMPAT */ H5_DLL MPI_Comm H5FD_mpiposix_communicator(H5FD_t *_file); H5_DLL herr_t H5FD_mpiposix_closing(H5FD_t *file); H5_DLL int H5FD_mpiposix_mpi_rank(H5FD_t *_file); @@ -547,35 +547,6 @@ done: * *------------------------------------------------------------------------- */ -#ifdef H5_WANT_H5_V1_4_COMPAT -int -H5Gget_objtype_by_idx(hid_t group_id, hsize_t idx) -{ - H5G_t *group = NULL; - hsize_t num_objs; - int ret_value = H5G_UNKNOWN; - - FUNC_ENTER_API(H5Gget_objtype_by_idx, FAIL); - H5TRACE2("Is","ih",group_id,idx); - - /* Check args */ - if (NULL==(group = H5I_object_verify(group_id,H5I_GROUP))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group"); - - if (H5G_get_num_objs(group, &num_objs, H5AC_ind_dxpl_id)<0) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "unable to retrieve number of members"); - if(idx >= num_objs) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "index out of bound"); - - /*call private function*/ - ret_value = H5G_get_objtype_by_idx(group, idx, H5AC_ind_dxpl_id); - -done: - FUNC_LEAVE_API(ret_value); - -} - -#else /*H5_WANT_H5_V1_4_COMPAT*/ H5G_obj_t H5Gget_objtype_by_idx(hid_t group_id, hsize_t idx) { @@ -602,7 +573,6 @@ done: FUNC_LEAVE_API(ret_value); } -#endif /*H5_WANT_H5_V1_4_COMPAT*/ /*------------------------------------------------------------------------- diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h index 5a48e30..88b6c45 100644 --- a/src/H5Gpublic.h +++ b/src/H5Gpublic.h @@ -52,17 +52,6 @@ typedef enum H5G_link_t { * application is running. An object may satisfy the `isa' function for more * than one type. */ -#ifdef H5_WANT_H5_V1_4_COMPAT -#define H5G_UNKNOWN -1 /* Unknown object type */ -#define H5G_LINK 0 /* Object is a symbolic link */ -#define H5G_GROUP 1 /* Object is a group */ -#define H5G_DATASET 2 /* Object is a dataset */ -#define H5G_TYPE 3 /* Object is a named data type */ -#define H5G_RESERVED_4 4 /* Reserved for future use */ -#define H5G_RESERVED_5 5 /* Reserved for future use */ -#define H5G_RESERVED_6 6 /* Reserved for future use */ -#define H5G_RESERVED_7 7 /* Reserved for future use */ -#else /*H5_WANT_H5_V1_4_COMPAT*/ typedef enum H5G_obj_t { H5G_UNKNOWN = -1, /* Unknown object type */ H5G_LINK, /* Object is a symbolic link */ @@ -74,7 +63,6 @@ typedef enum H5G_obj_t { H5G_RESERVED_6, /* Reserved for future use */ H5G_RESERVED_7 /* Reserved for future use */ } H5G_obj_t; -#endif /*H5_WANT_H5_V1_4_COMPAT*/ #define H5G_NTYPES 256 /* Max possible number of types */ #define H5G_NLIBTYPES 8 /* Number of internal types */ @@ -86,11 +74,7 @@ typedef struct H5G_stat_t { unsigned long fileno[2]; /*file number */ unsigned long objno[2]; /*object number */ unsigned nlink; /*number of hard links to object*/ -#ifdef H5_WANT_H5_V1_4_COMPAT - int type; /*basic object type */ -#else /*H5_WANT_H5_V1_4_COMPAT*/ H5G_obj_t type; /*basic object type */ -#endif /*H5_WANT_H5_V1_4_COMPAT*/ time_t mtime; /*modification time */ size_t linklen; /*symbolic link value length */ } H5G_stat_t; @@ -111,11 +95,7 @@ H5_DLL herr_t H5Giterate(hid_t loc_id, const char *name, int *idx, H5G_iterate_t op, void *op_data); H5_DLL herr_t H5Gget_num_objs(hid_t loc_id, hsize_t *num_objs); H5_DLL ssize_t H5Gget_objname_by_idx(hid_t group_id, hsize_t idx, char* name, size_t size); -#ifdef H5_WANT_H5_V1_4_COMPAT -H5_DLL int H5Gget_objtype_by_idx(hid_t group_id, hsize_t idx); -#else /*H5_WANT_H5_V1_4_COMPAT*/ H5_DLL H5G_obj_t H5Gget_objtype_by_idx(hid_t group_id, hsize_t idx); -#endif /*H5_WANT_H5_V1_4_COMPAT*/ H5_DLL herr_t H5Gmove2(hid_t src_loc, const char *src, hid_t dst_loc, const char *dst); H5_DLL herr_t H5Glink2(hid_t src_loc, const char *cur_name, H5G_link_t type, diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c index 6c042c8..3805c68 100644 --- a/src/H5Pdxpl.c +++ b/src/H5Pdxpl.c @@ -31,112 +31,6 @@ static int interface_initialize_g = 0; /* Static function prototypes */ -#ifdef H5_WANT_H5_V1_4_COMPAT - -/*------------------------------------------------------------------------- - * Function: H5Pset_buffer - * - * Purpose: Given a dataset transfer property list, set the maximum size - * for the type conversion buffer and background buffer and - * optionally supply pointers to application-allocated buffers. - * If the buffer size is smaller than the entire amount of data - * being transfered between application and file, and a type - * conversion buffer or background buffer is required then - * strip mining will be used. - * - * If TCONV and/or BKG are null pointers then buffers will be - * allocated and freed during the data transfer. - * - * Return: Non-negative on success/Negative on failure - * - * Programmer: Robb Matzke - * Monday, March 16, 1998 - * - * Modifications: - * - *------------------------------------------------------------------------- - */ -herr_t -H5Pset_buffer(hid_t plist_id, hsize_t _size, void *tconv, void *bkg) -{ - H5P_genplist_t *plist; /* Property list pointer */ - size_t size=(size_t)_size; /* Work around size difference */ - herr_t ret_value=SUCCEED; /* return value */ - - FUNC_ENTER_API(H5Pset_buffer, FAIL); - H5TRACE4("e","ihxx",plist_id,_size,tconv,bkg); - - /* Check arguments */ - if (size<=0) - HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "buffer size must not be zero"); - - /* Get the plist structure */ - if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER))) - HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID"); - - /* Update property list */ - if(H5P_set(plist, H5D_XFER_MAX_TEMP_BUF_NAME, &size)<0) - HGOTO_ERROR (H5E_PLIST, H5E_CANTSET, FAIL, "Can't set transfer buffer size"); - if(H5P_set(plist, H5D_XFER_TCONV_BUF_NAME, &tconv)<0) - HGOTO_ERROR (H5E_PLIST, H5E_CANTSET, FAIL, "Can't set transfer type conversion buffer"); - if(H5P_set(plist, H5D_XFER_BKGR_BUF_NAME, &bkg)<0) - HGOTO_ERROR (H5E_PLIST, H5E_CANTSET, FAIL, "Can't set background type conversion buffer"); - -done: - FUNC_LEAVE_API(ret_value); -} - - -/*------------------------------------------------------------------------- - * Function: H5Pget_buffer - * - * Purpose: Reads values previously set with H5Pset_buffer(). - * - * Return: Success: Buffer size. - * - * Failure: 0 - * - * Programmer: Robb Matzke - * Monday, March 16, 1998 - * - * Modifications: - * - *------------------------------------------------------------------------- - */ -hsize_t -H5Pget_buffer(hid_t plist_id, void **tconv/*out*/, void **bkg/*out*/) -{ - H5P_genplist_t *plist; /* Property list pointer */ - size_t size; /* Type conversion buffer size */ - hsize_t ret_value; /* Return value */ - - FUNC_ENTER_API(H5Pget_buffer, 0); - H5TRACE3("h","ixx",plist_id,tconv,bkg); - - /* Get the plist structure */ - if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER))) - HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, 0, "can't find object for ID"); - - /* Return values */ - if (tconv) - if(H5P_get(plist, H5D_XFER_TCONV_BUF_NAME, tconv)<0) - HGOTO_ERROR (H5E_PLIST, H5E_CANTGET, 0, "Can't get transfer type conversion buffer"); - if (bkg) - if(H5P_get(plist, H5D_XFER_BKGR_BUF_NAME, bkg)<0) - HGOTO_ERROR (H5E_PLIST, H5E_CANTGET, 0, "Can't get background type conversion buffer"); - - /* Get the size */ - if(H5P_get(plist, H5D_XFER_MAX_TEMP_BUF_NAME, &size)<0) - HGOTO_ERROR (H5E_PLIST, H5E_CANTSET, 0, "Can't set transfer buffer size"); - - /* Set the return value */ - ret_value=(hsize_t)size; - -done: - FUNC_LEAVE_API(ret_value); -} - -#else /* H5_WANT_H5_V1_4_COMPAT */ /*------------------------------------------------------------------------- * Function: H5Pset_buffer @@ -240,99 +134,6 @@ done: FUNC_LEAVE_API(ret_value); } -#endif /* H5_WANT_H5_V1_4_COMPAT */ - -#ifdef H5_WANT_H5_V1_4_COMPAT - -/*------------------------------------------------------------------------- - * Function: H5Pset_hyper_cache - * - * Purpose: Given a dataset transfer property list, indicate whether to - * cache the hyperslab blocks during the I/O (which speeds - * things up) and the maximum size of the hyperslab block to - * cache. If a block is smaller than to limit, it may still not - * be cached if no memory is available. Setting the limit to 0 - * indicates no limitation on the size of block to attempt to - * cache. - * - * The default is to cache blocks with no limit on block size - * for serial I/O and to not cache blocks for parallel I/O - * - * Return: Non-negative on success/Negative on failure - * - * Programmer: Quincey Koziol - * Monday, September 21, 1998 - * - * Modifications: - * - *------------------------------------------------------------------------- - */ -herr_t -H5Pset_hyper_cache(hid_t plist_id, unsigned cache, unsigned limit) -{ - H5P_genplist_t *plist; /* Property list pointer */ - herr_t ret_value=SUCCEED; - - FUNC_ENTER_API(H5Pset_hyper_cache, FAIL); - H5TRACE3("e","iIuIu",plist_id,cache,limit); - - /* Get the plist structure */ - if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER))) - HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID"); - - /* Update property list */ - cache = (cache>0) ? 1 : 0; - if (H5P_set(plist,H5D_XFER_HYPER_CACHE_NAME,&cache)<0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to set value"); - if (H5P_set(plist,H5D_XFER_HYPER_CACHE_LIM_NAME,&limit)<0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to set value"); - -done: - FUNC_LEAVE_API(ret_value); -} - - -/*------------------------------------------------------------------------- - * Function: H5Pget_hyper_cache - * - * Purpose: Reads values previously set with H5Pset_hyper_cache(). - * - * Return: Non-negative on success/Negative on failure - * - * Programmer: Quincey Koziol - * Monday, September 21, 1998 - * - * Modifications: - * - *------------------------------------------------------------------------- - */ -herr_t -H5Pget_hyper_cache(hid_t plist_id, unsigned *cache/*out*/, - unsigned *limit/*out*/) -{ - H5P_genplist_t *plist; /* Property list pointer */ - herr_t ret_value=SUCCEED; /* return value */ - - FUNC_ENTER_API(H5Pget_hyper_cache, FAIL); - H5TRACE3("e","ixx",plist_id,cache,limit); - - /* Get the plist structure */ - if(NULL == (plist = H5P_object_verify(plist_id,H5P_DATASET_XFER))) - HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID"); - - /* Return values */ - if (cache) - if (H5P_get(plist,H5D_XFER_HYPER_CACHE_NAME,cache)<0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get value"); - if (limit) - if (H5P_get(plist,H5D_XFER_HYPER_CACHE_LIM_NAME,limit)<0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get value"); - -done: - FUNC_LEAVE_API(ret_value); -} -#endif /* H5_WANT_H5_V1_4_COMPAT */ - /*------------------------------------------------------------------------- * Function: H5Pset_preserve diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c index d3f5d6a..d9c32b5 100644 --- a/src/H5Pfapl.c +++ b/src/H5Pfapl.c @@ -811,133 +811,6 @@ done: } -#ifdef H5_WANT_H5_V1_4_COMPAT -/*------------------------------------------------------------------------- - * Function: H5Pset_cache - * - * Purpose: Set the number of objects in the meta data cache and the - * maximum number of chunks and bytes in the raw data chunk - * cache. - * - * The RDCC_W0 value should be between 0 and 1 inclusive and - * indicates how much chunks that have been fully read or fully - * written are favored for preemption. A value of zero means - * fully read or written chunks are treated no differently than - * other chunks (the preemption is strictly LRU) while a value - * of one means fully read chunks are always preempted before - * other chunks. - * - * Return: Non-negative on success/Negative on failure - * - * Programmer: Robb Matzke - * Tuesday, May 19, 1998 - * - * Modifications: - * - * Raymond Lu - * Tuesday, Oct 23, 2001 - * Changed the file access list to the new generic property list. - * - *------------------------------------------------------------------------- - */ -herr_t -H5Pset_cache(hid_t plist_id, int mdc_nelmts, - int _rdcc_nelmts, size_t rdcc_nbytes, double rdcc_w0) -{ - H5P_genplist_t *plist; /* Property list pointer */ - size_t rdcc_nelmts=(size_t)_rdcc_nelmts; /* Work around variable changing size */ - herr_t ret_value=SUCCEED; /* return value */ - - FUNC_ENTER_API(H5Pset_cache, FAIL); - H5TRACE5("e","iIsIszd",plist_id,mdc_nelmts,_rdcc_nelmts,rdcc_nbytes, - rdcc_w0); - - /* Check arguments */ - if (mdc_nelmts<0) - HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "meta data cache size must be non-negative"); - if (rdcc_w0<0.0 || rdcc_w0>1.0) - HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "raw data cache w0 value must be between 0.0 and 1.0 inclusive"); - - /* Get the plist structure */ - if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS))) - HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID"); - - /* Set sizes */ - if(H5P_set(plist, H5F_ACS_META_CACHE_SIZE_NAME, &mdc_nelmts) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTSET,FAIL, "can't set meta data cache size"); - if(H5P_set(plist, H5F_ACS_DATA_CACHE_ELMT_SIZE_NAME, &rdcc_nelmts) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTSET,FAIL, "can't set data cache element size"); - if(H5P_set(plist, H5F_ACS_DATA_CACHE_BYTE_SIZE_NAME, &rdcc_nbytes) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTSET,FAIL, "can't set data cache byte size"); - if(H5P_set(plist, H5F_ACS_PREEMPT_READ_CHUNKS_NAME, &rdcc_w0) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTSET,FAIL, "can't set preempt read chunks"); - -done: - FUNC_LEAVE_API(ret_value); -} - - -/*------------------------------------------------------------------------- - * Function: H5Pget_cache - * - * Purpose: Retrieves the maximum possible number of elements in the meta - * data cache and the maximum possible number of elements and - * bytes and the RDCC_W0 value in the raw data chunk cache. Any - * (or all) arguments may be null pointers in which case the - * corresponding datum is not returned. - * - * Return: Non-negative on success/Negative on failure - * - * Programmer: Robb Matzke - * Tuesday, May 19, 1998 - * - * Modifications: - * - * Raymond Lu - * Tuesday, Oct 23, 2001 - * Changed the file access list to the new generic property - * list. - * - *------------------------------------------------------------------------- - */ -herr_t -H5Pget_cache(hid_t plist_id, int *mdc_nelmts, - int *_rdcc_nelmts, size_t *rdcc_nbytes, double *rdcc_w0) -{ - H5P_genplist_t *plist; /* Property list pointer */ - size_t rdcc_nelmts; /* Work around variable changing size */ - herr_t ret_value=SUCCEED; /* return value */ - - FUNC_ENTER_API(H5Pget_cache, FAIL); - H5TRACE5("e","i*Is*Is*z*d",plist_id,mdc_nelmts,_rdcc_nelmts,rdcc_nbytes, - rdcc_w0); - - /* Get the plist structure */ - if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS))) - HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID"); - - /* Get sizes */ - if (mdc_nelmts) - if(H5P_get(plist, H5F_ACS_META_CACHE_SIZE_NAME, mdc_nelmts) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL, "can't get meta data cache size"); - if (_rdcc_nelmts) { - if(H5P_get(plist, H5F_ACS_DATA_CACHE_ELMT_SIZE_NAME, &rdcc_nelmts) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL, "can't get data cache element size"); - *_rdcc_nelmts=rdcc_nelmts; - } /* end if */ - if (rdcc_nbytes) - if(H5P_get(plist, H5F_ACS_DATA_CACHE_BYTE_SIZE_NAME, rdcc_nbytes) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL, "can't get data cache byte size"); - if (rdcc_w0) - if(H5P_get(plist, H5F_ACS_PREEMPT_READ_CHUNKS_NAME, rdcc_w0) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL, "can't get preempt read chunks"); - -done: - FUNC_LEAVE_API(ret_value); -} - -#else /* H5_WANT_H5_V1_4_COMPAT */ - /*------------------------------------------------------------------------- * Function: H5Pset_cache * @@ -1056,7 +929,6 @@ H5Pget_cache(hid_t plist_id, int *mdc_nelmts, done: FUNC_LEAVE_API(ret_value); } -#endif /* H5_WANT_H5_V1_4_COMPAT */ /*------------------------------------------------------------------------- @@ -1318,105 +1190,6 @@ done: FUNC_LEAVE_API(ret_value); } -#ifdef H5_WANT_H5_V1_4_COMPAT - -/*------------------------------------------------------------------------- - * Function: H5Pset_sieve_buf_size - * - * Purpose: Sets the maximum size of the data seive buffer used for file - * drivers which are capable of using data sieving. The data sieve - * buffer is used when performing I/O on datasets in the file. Using a - * buffer which is large anough to hold several pieces of the dataset - * being read in for hyperslab selections boosts performance by quite a - * bit. - * - * The default value is set to 64KB, indicating that file I/O for raw data - * reads and writes will occur in at least 64KB blocks. - * Setting the value to 0 with this API function will turn off the - * data sieving, even if the VFL driver attempts to use that strategy. - * - * Return: Non-negative on success/Negative on failure - * - * Programmer: Quincey Koziol - * Thursday, September 21, 2000 - * - * Modifications: - * - * Raymond Lu - * Tuesday, Oct 23, 2001 - * Changed the file access list to the new generic property - * list. - * - *------------------------------------------------------------------------- - */ -herr_t -H5Pset_sieve_buf_size(hid_t plist_id, hsize_t _size) -{ - H5P_genplist_t *plist; /* Property list pointer */ - size_t size=(size_t)_size; /* Work around size difference */ - herr_t ret_value=SUCCEED; /* return value */ - - FUNC_ENTER_API(H5Pset_sieve_buf_size, FAIL); - H5TRACE2("e","ih",plist_id,_size); - - /* Get the plist structure */ - if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS))) - HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID"); - - /* Set values */ - if(H5P_set(plist, H5F_ACS_SIEVE_BUF_SIZE_NAME, &size) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set sieve buffer size"); - -done: - FUNC_LEAVE_API(ret_value); -} /* end H5Pset_sieve_buf_size() */ - - -/*------------------------------------------------------------------------- - * Function: H5Pget_sieve_buf_size - * - * Purpose: Returns the current settings for the data sieve buffer size - * property from a file access property list. - * - * Return: Non-negative on success/Negative on failure - * - * Programmer: Quincey Koziol - * Thursday, September 21, 2000 - * - * Modifications: - * - * Raymond Lu - * Tuesday, Oct 23, 2001 - * Changed the file access list to the new generic property - * list. - * - *------------------------------------------------------------------------- - */ -herr_t -H5Pget_sieve_buf_size(hid_t plist_id, hsize_t *_size/*out*/) -{ - H5P_genplist_t *plist; /* Property list pointer */ - size_t size; /* Work around size difference */ - herr_t ret_value=SUCCEED; /* return value */ - - FUNC_ENTER_API(H5Pget_sieve_buf_size, FAIL); - H5TRACE2("e","ix",plist_id,_size); - - /* Get the plist structure */ - if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_ACCESS))) - HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID"); - - /* Get values */ - if (_size) { - if(H5P_get(plist, H5F_ACS_SIEVE_BUF_SIZE_NAME, &size) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get sieve buffer size"); - *_size=size; - } /* end if */ - -done: - FUNC_LEAVE_API(ret_value); -} /* end H5Pget_sieve_buf_size() */ -#else /* H5_WANT_H5_V1_4_COMPAT */ /*------------------------------------------------------------------------- * Function: H5Pset_sieve_buf_size @@ -1510,7 +1283,6 @@ H5Pget_sieve_buf_size(hid_t plist_id, size_t *size/*out*/) done: FUNC_LEAVE_API(ret_value); } /* end H5Pget_sieve_buf_size() */ -#endif /* H5_WANT_H5_V1_4_COMPAT */ /*------------------------------------------------------------------------- diff --git a/src/H5Pfcpl.c b/src/H5Pfcpl.c index d709859..1fbb7e5 100644 --- a/src/H5Pfcpl.c +++ b/src/H5Pfcpl.c @@ -289,117 +289,6 @@ done: FUNC_LEAVE_API(ret_value); } -#ifdef H5_WANT_H5_V1_4_COMPAT - -/*------------------------------------------------------------------------- - * Function: H5Pset_sym_k - * - * Purpose: IK is one half the rank of a tree that stores a symbol - * table for a group. Internal nodes of the symbol table are on - * average 75% full. That is, the average rank of the tree is - * 1.5 times the value of IK. - * - * LK is one half of the number of symbols that can be stored in - * a symbol table node. A symbol table node is the leaf of a - * symbol table tree which is used to store a group. When - * symbols are inserted randomly into a group, the group's - * symbol table nodes are 75% full on average. That is, they - * contain 1.5 times the number of symbols specified by LK. - * - * Either (or even both) of IK and LK can be zero in which case - * that value is left unchanged. - * - * Return: Non-negative on success/Negative on failure - * - * Programmer: Robb Matzke - * Tuesday, January 6, 1998 - * - * Modifications: - * - * Raymond Lu, Oct 14, 2001 - * Changed to the new generic property list. - * - *------------------------------------------------------------------------- - */ -herr_t -H5Pset_sym_k(hid_t plist_id, int ik, int lk) -{ - int btree_k[H5B_NUM_BTREE_ID]; - H5P_genplist_t *plist; /* Property list pointer */ - herr_t ret_value=SUCCEED; /* Return value */ - - FUNC_ENTER_API(H5Pset_sym_k, FAIL); - H5TRACE3("e","iIsIs",plist_id,ik,lk); - - /* Get the plist structure */ - if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE))) - HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID"); - - /* Set values */ - if (ik > 0) { - if(H5P_get(plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get rank for btree interanl nodes"); - btree_k[H5B_SNODE_ID] = ik; - if(H5P_set(plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set rank for btree nodes"); - } - if (lk > 0) - if(H5P_set(plist, H5F_CRT_SYM_LEAF_NAME, &lk) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set rank for symbol table leaf nodes"); - -done: - FUNC_LEAVE_API(ret_value); -} - - -/*------------------------------------------------------------------------- - * Function: H5Pget_sym_k - * - * Purpose: Retrieves the symbol table B-tree 1/2 rank (IK) and the - * symbol table leaf node 1/2 size (LK). See H5Pset_sym_k() for - * details. Either (or even both) IK and LK may be null - * pointers. - * - * Return: Non-negative on success/Negative on failure - * - * Programmer: Robb Matzke - * Wednesday, January 7, 1998 - * - * Modifications: - * - * Raymond Lu - * Changed to the new generic property list. - * - *------------------------------------------------------------------------- - */ -herr_t -H5Pget_sym_k(hid_t plist_id, int *ik /*out */ , int *lk /*out */ ) -{ - int btree_k[H5B_NUM_BTREE_ID]; - H5P_genplist_t *plist; /* Property list pointer */ - herr_t ret_value=SUCCEED; /* Return value */ - - FUNC_ENTER_API(H5Pget_sym_k, FAIL); - H5TRACE3("e","ixx",plist_id,ik,lk); - - /* Get the plist structure */ - if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE))) - HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID"); - - /* Get values */ - if (ik) { - if(H5P_get(plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get rank for btree nodes"); - *ik = btree_k[H5B_SNODE_ID]; - } - if (lk) - if(H5P_get(plist, H5F_CRT_SYM_LEAF_NAME, lk) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get rank for symbol table leaf nodes"); - -done: - FUNC_LEAVE_API(ret_value); -} -#else /* H5_WANT_H5_V1_4_COMPAT */ /*------------------------------------------------------------------------- * Function: H5Pset_sym_k @@ -509,7 +398,6 @@ H5Pget_sym_k(hid_t plist_id, int *ik /*out */ , unsigned *lk /*out */ ) done: FUNC_LEAVE_API(ret_value); } -#endif /* H5_WANT_H5_V1_4_COMPAT */ /*------------------------------------------------------------------------- diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h index 65751dc..8d9b9d0 100644 --- a/src/H5Ppublic.h +++ b/src/H5Ppublic.h @@ -39,19 +39,6 @@ typedef long off_t; #endif /*__MWERKS__*/ -#ifdef H5_WANT_H5_V1_4_COMPAT -/* Backward compatibility typedef... */ -typedef hid_t H5P_class_t; /* Alias H5P_class_t to hid_t */ - -/* H5P_DATASET_XFER was the name from the beginning through 1.2. It was - * changed to H5P_DATA_XFER on v1.3.0. Then it was changed back to - * H5P_DATASET_XFER right before the release of v1.4.0-beta2. - * Define an alias here to help applications that had ported to v1.3. - * Should be removed in later version. - */ -#define H5P_DATA_XFER H5P_DATASET_XFER -#endif /* H5_WANT_H5_V1_4_COMPAT */ - #ifdef __cplusplus extern "C" { #endif @@ -170,13 +157,8 @@ H5_DLL herr_t H5Pset_sizes(hid_t plist_id, size_t sizeof_addr, size_t sizeof_size); H5_DLL herr_t H5Pget_sizes(hid_t plist_id, size_t *sizeof_addr/*out*/, size_t *sizeof_size/*out*/); -#ifdef H5_WANT_H5_V1_4_COMPAT -H5_DLL herr_t H5Pset_sym_k(hid_t plist_id, int ik, int lk); -H5_DLL herr_t H5Pget_sym_k(hid_t plist_id, int *ik/*out*/, int *lk/*out*/); -#else /* H5_WANT_H5_V1_4_COMPAT */ H5_DLL herr_t H5Pset_sym_k(hid_t plist_id, int ik, unsigned lk); H5_DLL herr_t H5Pget_sym_k(hid_t plist_id, int *ik/*out*/, unsigned *lk/*out*/); -#endif /* H5_WANT_H5_V1_4_COMPAT */ H5_DLL herr_t H5Pset_istore_k(hid_t plist_id, int ik); H5_DLL herr_t H5Pget_istore_k(hid_t plist_id, int *ik/*out*/); H5_DLL herr_t H5Pset_layout(hid_t plist_id, H5D_layout_t layout); @@ -197,17 +179,10 @@ H5_DLL herr_t H5Pset_family_offset(hid_t fapl_id, hsize_t offset); H5_DLL herr_t H5Pget_family_offset(hid_t fapl_id, hsize_t *offset); H5_DLL herr_t H5Pset_multi_type(hid_t fapl_id, H5FD_mem_t type); H5_DLL herr_t H5Pget_multi_type(hid_t fapl_id, H5FD_mem_t *type); -#ifdef H5_WANT_H5_V1_4_COMPAT -H5_DLL herr_t H5Pset_buffer(hid_t plist_id, hsize_t size, void *tconv, - void *bkg); -H5_DLL hsize_t H5Pget_buffer(hid_t plist_id, void **tconv/*out*/, - void **bkg/*out*/); -#else /* H5_WANT_H5_V1_4_COMPAT */ H5_DLL herr_t H5Pset_buffer(hid_t plist_id, size_t size, void *tconv, void *bkg); H5_DLL size_t H5Pget_buffer(hid_t plist_id, void **tconv/*out*/, void **bkg/*out*/); -#endif /* H5_WANT_H5_V1_4_COMPAT */ H5_DLL herr_t H5Pset_preserve(hid_t plist_id, hbool_t status); H5_DLL int H5Pget_preserve(hid_t plist_id); H5_DLL herr_t H5Pmodify_filter(hid_t plist_id, H5Z_filter_t filter, @@ -236,25 +211,11 @@ H5_DLL herr_t H5Pset_edc_check(hid_t plist_id, H5Z_EDC_t check); H5_DLL H5Z_EDC_t H5Pget_edc_check(hid_t plist_id); H5_DLL herr_t H5Pset_filter_callback(hid_t plist_id, H5Z_filter_func_t func, void* op_data); -#ifdef H5_WANT_H5_V1_4_COMPAT -H5_DLL herr_t H5Pset_cache(hid_t plist_id, int mdc_nelmts, int rdcc_nelmts, - size_t rdcc_nbytes, double rdcc_w0); -H5_DLL herr_t H5Pget_cache(hid_t plist_id, int *mdc_nelmts/*out*/, - int *rdcc_nelmts/*out*/, - size_t *rdcc_nbytes/*out*/, double *rdcc_w0); -#else /* H5_WANT_H5_V1_4_COMPAT */ H5_DLL herr_t H5Pset_cache(hid_t plist_id, int mdc_nelmts, size_t rdcc_nelmts, size_t rdcc_nbytes, double rdcc_w0); H5_DLL herr_t H5Pget_cache(hid_t plist_id, int *mdc_nelmts/*out*/, size_t *rdcc_nelmts/*out*/, size_t *rdcc_nbytes/*out*/, double *rdcc_w0); -#endif /* H5_WANT_H5_V1_4_COMPAT */ -#ifdef H5_WANT_H5_V1_4_COMPAT -H5_DLL herr_t H5Pset_hyper_cache(hid_t plist_id, unsigned cache, - unsigned limit); -H5_DLL herr_t H5Pget_hyper_cache(hid_t plist_id, unsigned *cache, - unsigned *limit); -#endif /* H5_WANT_H5_V1_4_COMPAT */ H5_DLL herr_t H5Pset_btree_ratios(hid_t plist_id, double left, double middle, double right); H5_DLL herr_t H5Pget_btree_ratios(hid_t plist_id, double *left/*out*/, @@ -287,13 +248,8 @@ H5_DLL herr_t H5Pget_vlen_mem_manager(hid_t plist_id, void **free_info); H5_DLL herr_t H5Pset_meta_block_size(hid_t fapl_id, hsize_t size); H5_DLL herr_t H5Pget_meta_block_size(hid_t fapl_id, hsize_t *size/*out*/); -#ifdef H5_WANT_H5_V1_4_COMPAT -H5_DLL herr_t H5Pset_sieve_buf_size(hid_t fapl_id, hsize_t size); -H5_DLL herr_t H5Pget_sieve_buf_size(hid_t fapl_id, hsize_t *size/*out*/); -#else /* H5_WANT_H5_V1_4_COMPAT */ H5_DLL herr_t H5Pset_sieve_buf_size(hid_t fapl_id, size_t size); H5_DLL herr_t H5Pget_sieve_buf_size(hid_t fapl_id, size_t *size/*out*/); -#endif /* H5_WANT_H5_V1_4_COMPAT */ H5_DLL herr_t H5Pset_hyper_vector_size(hid_t fapl_id, size_t size); H5_DLL herr_t H5Pget_hyper_vector_size(hid_t fapl_id, size_t *size/*out*/); H5_DLL herr_t H5Pset_small_data_block_size(hid_t fapl_id, hsize_t size); @@ -624,111 +624,6 @@ done: FUNC_LEAVE_API(ret_value); } /* end H5Rget_region() */ -#ifdef H5_WANT_H5_V1_4_COMPAT - -/*-------------------------------------------------------------------------- - NAME - H5R_get_object_type - PURPOSE - Retrieves the type of object that an object reference points to - USAGE - int H5R_get_object_type(file, ref) - H5F_t *file; IN: File the object being dereferenced is within - void *ref; IN: Reference to query. - - RETURNS - Success: An object type defined in H5Gpublic.h - Failure: H5G_UNKNOWN - DESCRIPTION - Given a reference to some object, this function returns the type of object - pointed to. - GLOBAL VARIABLES - COMMENTS, BUGS, ASSUMPTIONS - EXAMPLES - REVISION LOG ---------------------------------------------------------------------------*/ -static int -H5R_get_object_type(H5F_t *file, hid_t dxpl_id, void *_ref) -{ - H5G_entry_t ent; /* Symbol table entry */ - hobj_ref_t *ref=(hobj_ref_t *)_ref; /* Only object references currently supported */ - uint8_t *p; /* Pointer to OID to store */ - int ret_value; - - FUNC_ENTER_NOINIT(H5R_get_object_type); - - assert(ref); - assert(file); - - /* Initialize the symbol table entry */ - HDmemset(&ent,0,sizeof(H5G_entry_t)); - ent.type=H5G_NOTHING_CACHED; - ent.file=file; - - /* Get the object oid */ - p=(uint8_t *)ref->oid; - H5F_addr_decode(ent.file,(const uint8_t **)&p,&(ent.header)); - - /* Get the OID type */ - ret_value=H5G_get_type(&ent, dxpl_id); - -#ifdef LATER -done: -#endif /* LATER */ - FUNC_LEAVE_NOAPI(ret_value); -} /* end H5R_get_object_type() */ - - -/*-------------------------------------------------------------------------- - NAME - H5Rget_object_type - PURPOSE - Retrieves the type of object that an object reference points to - USAGE - int H5Rget_object_type(id, ref) - hid_t id; IN: Dataset reference object is in or location ID of - object that the dataset is located within. - void *ref; IN: Reference to query. - - RETURNS - Success: An object type defined in H5Gpublic.h - Failure: H5G_UNKNOWN - DESCRIPTION - Given a reference to some object, this function returns the type of object - pointed to. - GLOBAL VARIABLES - COMMENTS, BUGS, ASSUMPTIONS - EXAMPLES - REVISION LOG ---------------------------------------------------------------------------*/ -int -H5Rget_object_type(hid_t id, void *_ref) -{ - H5G_entry_t *loc = NULL; /* Symbol table entry */ - H5F_t *file=NULL; /* File object */ - hid_t ret_value; - - FUNC_ENTER_API(H5Rget_object_type, H5G_UNKNOWN); - H5TRACE2("Is","ix",id,_ref); - - /* Check args */ - if (NULL == (loc = H5G_loc(id))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location"); - if(_ref==NULL) - HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, H5G_UNKNOWN, "invalid reference pointer"); - - /* Get the file pointer from the entry */ - file=loc->file; - - /* Get the object information */ - if ((ret_value=H5R_get_object_type(file,H5AC_ind_dxpl_id,_ref))<0) - HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, H5G_UNKNOWN, "unable to determine object type"); - -done: - FUNC_LEAVE_API(ret_value); -} /* end H5Rget_object_type() */ -#endif /* H5_WANT_H5_V1_4_COMPAT */ - /*-------------------------------------------------------------------------- NAME @@ -849,21 +744,12 @@ done: EXAMPLES REVISION LOG --------------------------------------------------------------------------*/ -#ifdef H5_WANT_H5_V1_4_COMPAT -int -H5Rget_obj_type(hid_t id, H5R_type_t ref_type, void *_ref) -#else /* H5_WANT_H5_V1_4_COMPAT */ H5G_obj_t H5Rget_obj_type(hid_t id, H5R_type_t ref_type, void *_ref) -#endif /* H5_WANT_H5_V1_4_COMPAT */ { H5G_entry_t *loc = NULL; /* Symbol table entry */ H5F_t *file=NULL; /* File object */ -#ifdef H5_WANT_H5_V1_4_COMPAT - int ret_value; -#else /* H5_WANT_H5_V1_4_COMPAT */ H5G_obj_t ret_value; -#endif /* H5_WANT_H5_V1_4_COMPAT */ FUNC_ENTER_API(H5Rget_obj_type, H5G_UNKNOWN); H5TRACE3("Is","iRtx",id,ref_type,_ref); diff --git a/src/H5Rpublic.h b/src/H5Rpublic.h index cadc826..b567791 100644 --- a/src/H5Rpublic.h +++ b/src/H5Rpublic.h @@ -73,12 +73,7 @@ H5_DLL herr_t H5Rcreate(void *ref, hid_t loc_id, const char *name, H5R_type_t ref_type, hid_t space_id); H5_DLL hid_t H5Rdereference(hid_t dataset, H5R_type_t ref_type, void *ref); H5_DLL hid_t H5Rget_region(hid_t dataset, H5R_type_t ref_type, void *ref); -#ifdef H5_WANT_H5_V1_4_COMPAT -H5_DLL int H5Rget_object_type(hid_t dataset, void *_ref); -H5_DLL int H5Rget_obj_type(hid_t id, H5R_type_t ref_type, void *_ref); -#else /* H5_WANT_H5_V1_4_COMPAT */ H5_DLL H5G_obj_t H5Rget_obj_type(hid_t id, H5R_type_t ref_type, void *_ref); -#endif /* H5_WANT_H5_V1_4_COMPAT */ #ifdef __cplusplus } diff --git a/src/H5Spublic.h b/src/H5Spublic.h index 8272dfa..76de620 100644 --- a/src/H5Spublic.h +++ b/src/H5Spublic.h @@ -136,11 +136,7 @@ H5_DLL hssize_t H5Sget_select_hyper_nblocks(hid_t spaceid); H5_DLL hssize_t H5Sget_select_elem_npoints(hid_t spaceid); H5_DLL herr_t H5Sget_select_hyper_blocklist(hid_t spaceid, hsize_t startblock, hsize_t numblocks, hsize_t *buf); H5_DLL herr_t H5Sget_select_elem_pointlist(hid_t spaceid, hsize_t startpoint, hsize_t numpoints, hsize_t *buf); -#ifdef H5_WANT_H5_V1_4_COMPAT -H5_DLL herr_t H5Sget_select_bounds(hid_t spaceid, hsize_t *start, hsize_t *end); -#else /* H5_WANT_H5_V1_4_COMPAT */ H5_DLL herr_t H5Sget_select_bounds(hid_t spaceid, hssize_t *start, hssize_t *end); -#endif /* H5_WANT_H5_V1_4_COMPAT */ H5_DLL H5S_sel_type H5Sget_select_type(hid_t spaceid); #ifdef __cplusplus diff --git a/src/H5Sselect.c b/src/H5Sselect.c index b451ce7..7431715 100644 --- a/src/H5Sselect.c +++ b/src/H5Sselect.c @@ -495,39 +495,6 @@ done: EXAMPLES REVISION LOG --------------------------------------------------------------------------*/ -#ifdef H5_WANT_H5_V1_4_COMPAT -herr_t -H5Sget_select_bounds(hid_t spaceid, hsize_t *start, hsize_t *end) -{ - hssize_t tstart[H5O_LAYOUT_NDIMS]; /* Temporary starting coordinates */ - hssize_t tend[H5O_LAYOUT_NDIMS]; /* Temporary ending coordinates */ - H5S_t *space = NULL; /* Dataspace to modify selection of */ - unsigned u; /* Local index variable */ - herr_t ret_value; /* return value */ - - FUNC_ENTER_API(H5Sget_select_bounds, FAIL); - H5TRACE3("e","i*h*h",spaceid,start,end); - - /* Check args */ - if(start==NULL || end==NULL) - HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid pointer"); - if (NULL == (space=H5I_object_verify(spaceid, H5I_DATASPACE))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace"); - - ret_value = H5S_get_select_bounds(space,tstart,tend); - - if(ret_value>=0) { - /* Copy over the start & end values */ - for(u=0; u<space->extent.u.simple.rank; u++) { - H5_ASSIGN_OVERFLOW(start[u],tstart[u],hssize_t,hsize_t); - H5_ASSIGN_OVERFLOW(end[u],tend[u],hssize_t,hsize_t); - } /* end for */ - } /* end if */ - -done: - FUNC_LEAVE_API(ret_value); -} /* H5Sget_select_bounds() */ -#else /* H5_WANT_H5_V1_4_COMPAT */ herr_t H5Sget_select_bounds(hid_t spaceid, hssize_t *start, hssize_t *end) { @@ -548,7 +515,6 @@ H5Sget_select_bounds(hid_t spaceid, hssize_t *start, hssize_t *end) done: FUNC_LEAVE_API(ret_value); } /* H5Sget_select_bounds() */ -#endif /* H5_WANT_H5_V1_4_COMPAT */ /*-------------------------------------------------------------------------- @@ -189,56 +189,6 @@ H5Z_term_interface (void) return 0; } -#ifdef H5_WANT_H5_V1_4_COMPAT - -/*------------------------------------------------------------------------- - * Function: H5Zregister - * - * Purpose: This function registers new filter. The COMMENT argument is - * used for debugging and may be the null pointer. - * - * Return: Non-negative on success/Negative on failure - * - * Programmer: Robb Matzke - * Thursday, April 16, 1998 - * - * Modifications: - * Changed to pass H5Z_class_t struct to H5Z_register - * Quincey Koziol, April 5, 2003 - * - *------------------------------------------------------------------------- - */ -herr_t -H5Zregister(H5Z_filter_t id, const char *comment, H5Z_func_t func) -{ - H5Z_class_t cls; /* Filter class used to bundle parameters */ - herr_t ret_value=SUCCEED; /* Return value */ - - FUNC_ENTER_API(H5Zregister, FAIL); - H5TRACE3("e","Zfsx",id,comment,func); - - /* Check args */ - if (id<0 || id>H5Z_FILTER_MAX) - HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "invalid filter identification number"); - if (id<H5Z_FILTER_RESERVED) - HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "unable to modify predefined filters"); - if (!func) - HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no function specified"); - - /* Build class structure */ - cls.id=id; - cls.name=comment; - cls.can_apply=cls.set_local=NULL; - cls.filter=func; - - /* Do it */ - if (H5Z_register (&cls)<0) - HGOTO_ERROR (H5E_PLINE, H5E_CANTINIT, FAIL, "unable to register filter"); - -done: - FUNC_LEAVE_API(ret_value); -} -#else /* H5_WANT_H5_V1_4_COMPAT */ /*------------------------------------------------------------------------- * Function: H5Zregister @@ -280,7 +230,6 @@ H5Zregister(const H5Z_class_t *cls) done: FUNC_LEAVE_API(ret_value); } -#endif /* H5_WANT_H5_V1_4_COMPAT */ /*------------------------------------------------------------------------- diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h index 1463598..ac0a718 100644 --- a/src/H5Zpublic.h +++ b/src/H5Zpublic.h @@ -163,12 +163,7 @@ typedef struct H5Z_class_t { H5Z_func_t filter; /* The actual filter function */ } H5Z_class_t; -#ifdef H5_WANT_H5_V1_4_COMPAT -H5_DLL herr_t H5Zregister(H5Z_filter_t id, const char *comment, - H5Z_func_t filter); -#else /* H5_WANT_H5_V1_4_COMPAT */ H5_DLL herr_t H5Zregister(const H5Z_class_t *cls); -#endif /* H5_WANT_H5_V1_4_COMPAT */ H5_DLL herr_t H5Zunregister(H5Z_filter_t id); H5_DLL htri_t H5Zfilter_avail(H5Z_filter_t id); diff --git a/src/H5config.h.in b/src/H5config.h.in index 4be13d1..b8d57b7 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -128,6 +128,9 @@ /* Define to 1 if you have the `globus_io' library (-lglobus_io). */ #undef HAVE_LIBGLOBUS_IO +/* Define to 1 if you have the `lmpe' library (-llmpe). */ +#undef HAVE_LIBLMPE + /* Define to 1 if you have the `m' library (-lm). */ #undef HAVE_LIBM @@ -179,6 +182,9 @@ /* Define if we have MPE support */ #undef HAVE_MPE +/* Define to 1 if you have the <mpe.h> header file. */ +#undef HAVE_MPE_H + /* Define to 1 if you have the <netinet/tcp.h> header file. */ #undef HAVE_NETINET_TCP_H @@ -479,8 +485,8 @@ /* Define to 1 if your <sys/time.h> declares `struct tm'. */ #undef TM_IN_SYS_TIME -/* Define if the HDF5 v1.4 compatibility functions are to be compiled in */ -#undef WANT_H5_V1_4_COMPAT +/* Define if the HDF5 v1.6 compatibility functions are to be compiled in */ +#undef WANT_H5_V1_6_COMPAT /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ |