diff options
author | Robb Matzke <matzke@llnl.gov> | 1999-02-18 16:21:34 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1999-02-18 16:21:34 (GMT) |
commit | 37cfaf1665f1a036c4a907367c7e25b7ac849013 (patch) | |
tree | cbdea15114da44de5f1d74057fdb8de449d18f41 /src/H5Sprivate.h | |
parent | 901051cecb91bffb1920c0b31bec2f0661363a1a (diff) | |
download | hdf5-37cfaf1665f1a036c4a907367c7e25b7ac849013.zip hdf5-37cfaf1665f1a036c4a907367c7e25b7ac849013.tar.gz hdf5-37cfaf1665f1a036c4a907367c7e25b7ac849013.tar.bz2 |
[svn-r1078] Changes since 19990215
----------------------
./src/H5.c
Fixed more dependency problems in H5_term_library(). There was
a bug in the previous version that could cause the wrong EOF
marker to be written to the boot block under certain
circumstances. Hopefully this fixes it although I don't ready
access to a test case (Mark Miller will test it).
./src/H5F.c
./src/H5Fprivate.h
Added an H5F_close_all() that is similar to
H5F_term_interface() but which doesn't close the
interface. Files that don't have open object headers are
closed, others are delayed until all object headers close. All
files are flushed.
./src/H5ACprivate.h
./src/H5Bprivate.h
./src/H5Dprivate.h
./src/H5Eprivate.h
./src/H5Fprivate.h
./src/H5Gpkg.h
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5HGprivate.h
./src/H5HLprivate.h
./src/H5Iprivate.h
./src/H5MFprivate.h
./src/H5MMprivate.h
./src/H5Oprivate.h
./src/H5Pprivate.h
./src/H5Ppublic.h
./src/H5RAprivate.h
./src/H5Sprivate.h
./src/H5Spublic.h
./src/H5Tpkg.h
./src/H5Tprivate.h
./src/H5Tpublic.h
./src/H5Vprivate.h
./src/H5Zprivate.h
./src/H5private.h
./src/H5public.h
Reindented after __DLL__ was added.
Diffstat (limited to 'src/H5Sprivate.h')
-rw-r--r-- | src/H5Sprivate.h | 161 |
1 files changed, 86 insertions, 75 deletions
diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h index 9032b7c..f4d4959 100644 --- a/src/H5Sprivate.h +++ b/src/H5Sprivate.h @@ -288,77 +288,85 @@ __DLLVAR__ const H5S_mconv_t H5S_ALL_MCONV[]; __DLLVAR__ const H5S_fconv_t H5S_HYPER_FCONV[]; __DLLVAR__ const H5S_mconv_t H5S_HYPER_MCONV[]; -__DLL__ H5S_t *H5S_create (H5S_class_t type); -__DLL__ H5S_t *H5S_copy (const H5S_t *src); -__DLL__ herr_t H5S_close_simple (H5S_simple_t *simple); -__DLL__ herr_t H5S_close (H5S_t *ds); -__DLL__ hsize_t H5S_get_simple_extent_npoints (const H5S_t *ds); +__DLL__ H5S_t *H5S_create(H5S_class_t type); +__DLL__ H5S_t *H5S_copy(const H5S_t *src); +__DLL__ herr_t H5S_close_simple(H5S_simple_t *simple); +__DLL__ herr_t H5S_close(H5S_t *ds); +__DLL__ hsize_t H5S_get_simple_extent_npoints(const H5S_t *ds); __DLL__ hsize_t H5S_get_npoints_max(const H5S_t *ds); -__DLL__ intn H5S_get_simple_extent_ndims (const H5S_t *ds); -__DLL__ intn H5S_get_simple_extent_dims (const H5S_t *ds, hsize_t dims[]/*out*/, - hsize_t max_dims[]/*out*/); -__DLL__ herr_t H5S_modify (H5G_entry_t *ent, const H5S_t *space); -__DLL__ H5S_t *H5S_read (H5G_entry_t *ent); -__DLL__ intn H5S_cmp (const H5S_t *ds1, const H5S_t *ds2); -__DLL__ htri_t H5S_is_simple (const H5S_t *sdim); -__DLL__ uintn H5S_nelem (const H5S_t *space); -__DLL__ H5S_conv_t *H5S_find (const H5S_t *mem_space, const H5S_t *file_space); -__DLL__ herr_t H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op, - const hssize_t start[], - const hsize_t _stride[], - const hsize_t count[], - const hsize_t _block[]); -__DLL__ intn H5S_get_hyperslab (const H5S_t *ds, hssize_t offset[]/*out*/, - hsize_t size[]/*out*/, hsize_t stride[]/*out*/); +__DLL__ intn H5S_get_simple_extent_ndims(const H5S_t *ds); +__DLL__ intn H5S_get_simple_extent_dims(const H5S_t *ds, hsize_t dims[]/*out*/, + hsize_t max_dims[]/*out*/); +__DLL__ herr_t H5S_modify(H5G_entry_t *ent, const H5S_t *space); +__DLL__ H5S_t *H5S_read(H5G_entry_t *ent); +__DLL__ intn H5S_cmp(const H5S_t *ds1, const H5S_t *ds2); +__DLL__ htri_t H5S_is_simple(const H5S_t *sdim); +__DLL__ uintn H5S_nelem(const H5S_t *space); +__DLL__ H5S_conv_t *H5S_find(const H5S_t *mem_space, const H5S_t *file_space); +__DLL__ herr_t H5S_select_hyperslab(H5S_t *space, H5S_seloper_t op, + const hssize_t start[], + const hsize_t _stride[], + const hsize_t count[], + const hsize_t _block[]); +__DLL__ intn H5S_get_hyperslab(const H5S_t *ds, hssize_t offset[]/*out*/, + hsize_t size[]/*out*/, hsize_t stride[]/*out*/); __DLL__ herr_t H5S_release_simple(H5S_simple_t *simple); __DLL__ herr_t H5S_extent_copy(H5S_extent_t *dst, const H5S_extent_t *src); -__DLL__ herr_t H5S_select_copy (H5S_t *dst, const H5S_t *src); -__DLL__ herr_t H5S_extent_release (H5S_t *space); -__DLL__ herr_t H5S_select_release (H5S_t *space); -__DLL__ herr_t H5S_sel_iter_release (const H5S_t *space,H5S_sel_iter_t *sel_iter); -__DLL__ herr_t H5S_select_elements (H5S_t *space, H5S_seloper_t op, size_t num_elem, const hssize_t **coord); -__DLL__ herr_t H5S_select_all (H5S_t *space); -__DLL__ herr_t H5S_select_none (H5S_t *space); -__DLL__ hssize_t H5S_get_select_npoints (const H5S_t *space); -__DLL__ intn H5S_extend (H5S_t *space, const hsize_t *size); -__DLL__ herr_t H5S_set_extent_simple (H5S_t *space, int rank, const hsize_t *dims, - const hsize_t *max); -__DLL__ htri_t H5S_select_valid (const H5S_t *space); -__DLL__ herr_t H5S_debug(H5F_t *f, const void *_mesg, FILE *stream, intn indent, - intn fwidth); +__DLL__ herr_t H5S_select_copy(H5S_t *dst, const H5S_t *src); +__DLL__ herr_t H5S_extent_release(H5S_t *space); +__DLL__ herr_t H5S_select_release(H5S_t *space); +__DLL__ herr_t H5S_sel_iter_release(const H5S_t *space, + H5S_sel_iter_t *sel_iter); +__DLL__ herr_t H5S_select_elements(H5S_t *space, H5S_seloper_t op, + size_t num_elem, const hssize_t **coord); +__DLL__ herr_t H5S_select_all(H5S_t *space); +__DLL__ herr_t H5S_select_none(H5S_t *space); +__DLL__ hssize_t H5S_get_select_npoints(const H5S_t *space); +__DLL__ intn H5S_extend(H5S_t *space, const hsize_t *size); +__DLL__ herr_t H5S_set_extent_simple(H5S_t *space, int rank, + const hsize_t *dims, const hsize_t *max); +__DLL__ htri_t H5S_select_valid(const H5S_t *space); +__DLL__ herr_t H5S_debug(H5F_t *f, const void *_mesg, FILE *stream, + intn indent, intn fwidth); __DLL__ herr_t H5S_register(H5S_sel_type cls, const H5S_fconv_t *fconv, - const H5S_mconv_t *mconv); + const H5S_mconv_t *mconv); __DLL__ hssize_t H5S_select_serial_size(const H5S_t *space); __DLL__ herr_t H5S_select_serialize(const H5S_t *space, uint8_t *buf); __DLL__ herr_t H5S_select_deserialize(H5S_t *space, const uint8_t *buf); /* Point select functions */ -__DLL__ herr_t H5S_point_add (H5S_t *space, size_t num_elemn, const hssize_t **coord); -__DLL__ herr_t H5S_point_release (H5S_t *space); -__DLL__ hsize_t H5S_point_npoints (const H5S_t *space); -__DLL__ herr_t H5S_point_copy (H5S_t *dst, const H5S_t *src); -__DLL__ htri_t H5S_point_select_valid (const H5S_t *space); +__DLL__ herr_t H5S_point_add(H5S_t *space, size_t num_elemn, + const hssize_t **coord); +__DLL__ herr_t H5S_point_release(H5S_t *space); +__DLL__ hsize_t H5S_point_npoints(const H5S_t *space); +__DLL__ herr_t H5S_point_copy(H5S_t *dst, const H5S_t *src); +__DLL__ htri_t H5S_point_select_valid(const H5S_t *space); __DLL__ hssize_t H5S_point_select_serial_size(const H5S_t *space); __DLL__ herr_t H5S_point_select_serialize(const H5S_t *space, uint8_t *buf); __DLL__ herr_t H5S_point_select_deserialize(H5S_t *space, const uint8_t *buf); /* "All" select functions */ -__DLL__ herr_t H5S_all_release (H5S_t *space); -__DLL__ hsize_t H5S_all_npoints (const H5S_t *space); +__DLL__ herr_t H5S_all_release(H5S_t *space); +__DLL__ hsize_t H5S_all_npoints(const H5S_t *space); __DLL__ herr_t H5S_all_select_serialize(const H5S_t *space, uint8_t *buf); __DLL__ herr_t H5S_all_select_deserialize(H5S_t *space, const uint8_t *buf); /* Hyperslab selection functions */ -__DLL__ herr_t H5S_hyper_add (H5S_t *space, const hssize_t *start, const hsize_t *end); -__DLL__ herr_t H5S_hyper_release (H5S_t *space); -__DLL__ herr_t H5S_hyper_sel_iter_release (H5S_sel_iter_t *sel_iter); -__DLL__ hsize_t H5S_hyper_npoints (const H5S_t *space); -__DLL__ int H5S_hyper_compare_regions (const void *r1, const void *r2); -__DLL__ int H5S_hyper_compare_bounds (const void *r1, const void *r2); -__DLL__ herr_t H5S_hyper_copy (H5S_t *dst, const H5S_t *src); -__DLL__ htri_t H5S_hyper_select_valid (const H5S_t *space); -__DLL__ herr_t H5S_hyper_node_add (H5S_hyper_node_t **head, intn endflag, intn rank, const hssize_t *start, const hsize_t *size); -__DLL__ herr_t H5S_hyper_clip (H5S_t *space, H5S_hyper_node_t *nodes, H5S_hyper_node_t **uniq, H5S_hyper_node_t **overlap); +__DLL__ herr_t H5S_hyper_add(H5S_t *space, const hssize_t *start, + const hsize_t *end); +__DLL__ herr_t H5S_hyper_release(H5S_t *space); +__DLL__ herr_t H5S_hyper_sel_iter_release(H5S_sel_iter_t *sel_iter); +__DLL__ hsize_t H5S_hyper_npoints(const H5S_t *space); +__DLL__ int H5S_hyper_compare_regions(const void *r1, const void *r2); +__DLL__ int H5S_hyper_compare_bounds(const void *r1, const void *r2); +__DLL__ herr_t H5S_hyper_copy(H5S_t *dst, const H5S_t *src); +__DLL__ htri_t H5S_hyper_select_valid(const H5S_t *space); +__DLL__ herr_t H5S_hyper_node_add(H5S_hyper_node_t **head, intn endflag, + intn rank, const hssize_t *start, + const hsize_t *size); +__DLL__ herr_t H5S_hyper_clip(H5S_t *space, H5S_hyper_node_t *nodes, + H5S_hyper_node_t **uniq, + H5S_hyper_node_t **overlap); __DLL__ hssize_t H5S_hyper_select_serial_size(const H5S_t *space); __DLL__ herr_t H5S_hyper_select_serialize(const H5S_t *space, uint8_t *buf); __DLL__ herr_t H5S_hyper_select_deserialize(H5S_t *space, const uint8_t *buf); @@ -368,27 +376,30 @@ __DLL__ herr_t H5S_none_select_serialize(const H5S_t *space, uint8_t *buf); __DLL__ herr_t H5S_none_select_deserialize(H5S_t *space, const uint8_t *buf); #ifdef HAVE_PARALLEL - /* MPI-IO function to read directly from app buffer to file rky980813 */ - __DLL__ herr_t H5S_mpio_spaces_read (H5F_t *f, const struct H5O_layout_t *layout, - const struct H5O_pline_t *pline, - const struct H5O_efl_t *efl, size_t elmt_size, - const H5S_t *file_space, const H5S_t *mem_space, - const H5D_transfer_t xfer_mode, void *buf/*out*/, - hbool_t *must_convert /*out*/ ); - - /* MPI-IO function to write directly from app buffer to file rky980813 */ - __DLL__ herr_t H5S_mpio_spaces_write(H5F_t *f, const struct H5O_layout_t *layout, - const struct H5O_pline_t *pline, - const struct H5O_efl_t *efl, size_t elmt_size, - const H5S_t *file_space, const H5S_t *mem_space, - const H5D_transfer_t xfer_mode, const void *buf, - hbool_t *must_convert /*out*/ ); - +/* MPI-IO function to read directly from app buffer to file rky980813 */ +__DLL__ herr_t H5S_mpio_spaces_read(H5F_t *f, + const struct H5O_layout_t *layout, + const struct H5O_pline_t *pline, + const struct H5O_efl_t *efl, + size_t elmt_size, const H5S_t *file_space, + const H5S_t *mem_space, + const H5D_transfer_t xfer_mode, + void *buf/*out*/, + hbool_t *must_convert /*out*/ ); + +/* MPI-IO function to write directly from app buffer to file rky980813 */ +__DLL__ herr_t H5S_mpio_spaces_write(H5F_t *f, + const struct H5O_layout_t *layout, + const struct H5O_pline_t *pline, + const struct H5O_efl_t *efl, + size_t elmt_size, const H5S_t *file_space, + const H5S_t *mem_space, + const H5D_transfer_t xfer_mode, + const void *buf, + hbool_t *must_convert /*out*/ ); #ifndef _H5S_IN_H5S_C - /* Global var whose value comes from environment variable */ - __DLLVAR__ hbool_t H5_mpi_opt_types_g; +/* Global var whose value comes from environment variable */ +__DLLVAR__ hbool_t H5_mpi_opt_types_g; #endif /* _H5S_IN_H5S_C */ - -#endif - -#endif +#endif /* HAVE_PARALLEL */ +#endif /* _H5Sprivate_H */ |