mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-31 17:10:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r529] Changes since 19980722

Browse Source 
----------------------

./src/H5.c
	Handle hid_t of type H5_TEMPBUF, arguments usually called tbuf_id.

	Added array tracing where the array rank is stored in a simple
	data space.  Just use the name of the data space argument when
	declaring the array argument:

	    herr_t
	    H5Sselect_hyperslab (hid_t space_id, H5S_seloper_t op,
				 const hssize_t start[/*space_id*/],
				 const hsize_t _stride[/*space_id*/],
				 const hsize_t count[/*space_id*/],
				 const hsize_t _block[/*space_id*/])

	and when the program runs you'll see array values printed:

	    H5Sselect_hyperslab(space=218103813, op=H5S_SELECT_SET,
                                start=0xbfffef4c {0}, _stride=NULL,
                                count=0xbfffef44 {64},
				_block=NULL) = SUCCEED;

	Added more symbolic data types to the tracing output.

./src/H5A.c
./src/H5Apublic.h
./src/H5D.c
./src/H5Dpublic.h
./src/H5F.c
./src/H5Fpublic.h
./src/H5G.c
./src/H5Gpublic.h
./src/H5P.c
./src/H5Ppublic.h
./src/H5S.c
./src/H5Sall.c
./src/H5Shyper.c
./src/H5Spoint.c
./src/H5Spublic.h
./src/H5Sselect.c
./src/H5Ssimp.c
./src/H5TB.c
./src/H5V.c
	Changed some API argument names to be more consistent with
	other API functions and to produce better tracing output.
	Reformatted some long lines. Indented printf statements.

./tools/h5ls.c
	Fixed warnings about unsigned vs. signed comparisons.
This commit is contained in:
Robb Matzke 1998-07-22 13:45:46 -05:00
parent c638ee5659
commit 29a029d7e7
22 changed files with 1203 additions and 909 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@ -1,4 +1,4 @@
This is hdf5-1.0.25 released on 1998-06-22 13:52 UTC
This is hdf5-1.0.25 released on 1998-06-22 13:53 UTC
Please refer to the INSTALL file for installation instructions.
------------------------------------------------------------------------------

75
src/H5.c
View File

@ -143,7 +143,7 @@ H5_init_library(void)
REVISION LOG
--------------------------------------------------------------------------*/
herr_t
H5_add_exit(void (*func) (void))
H5_add_exit(void (*func)(void))
{
H5_exit_t *new_exit;
@ -1396,6 +1396,66 @@ H5_trace (hbool_t returning, const char *func, const char *type, ...)
fprintf(out, "H5T_NATIVE_DOUBLE");
} else if (obj==H5T_NATIVE_LDOUBLE_g) {
fprintf(out, "H5T_NATIVE_LDOUBLE");
} else if (obj==H5T_IEEE_F32BE_g) {
fprintf(out, "H5T_IEEE_F32BE");
} else if (obj==H5T_IEEE_F32LE_g) {
fprintf(out, "H5T_IEEE_F32LE");
} else if (obj==H5T_IEEE_F64BE_g) {
fprintf(out, "H5T_IEEE_F64BE");
} else if (obj==H5T_IEEE_F64LE_g) {
fprintf(out, "H5T_IEEE_F64LE");
} else if (obj==H5T_STD_I8BE_g) {
fprintf(out, "H5T_STD_I8BE");
} else if (obj==H5T_STD_I8LE_g) {
fprintf(out, "H5T_STD_I8LE");
} else if (obj==H5T_STD_I16BE_g) {
fprintf(out, "H5T_STD_I16BE");
} else if (obj==H5T_STD_I16LE_g) {
fprintf(out, "H5T_STD_I16LE");
} else if (obj==H5T_STD_I32BE_g) {
fprintf(out, "H5T_STD_I32BE");
} else if (obj==H5T_STD_I32LE_g) {
fprintf(out, "H5T_STD_I32LE");
} else if (obj==H5T_STD_I64BE_g) {
fprintf(out, "H5T_STD_I64BE");
} else if (obj==H5T_STD_I64LE_g) {
fprintf(out, "H5T_STD_I64LE");
} else if (obj==H5T_STD_U8BE_g) {
fprintf(out, "H5T_STD_U8BE");
} else if (obj==H5T_STD_U8LE_g) {
fprintf(out, "H5T_STD_U8LE");
} else if (obj==H5T_STD_U16BE_g) {
fprintf(out, "H5T_STD_U16BE");
} else if (obj==H5T_STD_U16LE_g) {
fprintf(out, "H5T_STD_U16LE");
} else if (obj==H5T_STD_U32BE_g) {
fprintf(out, "H5T_STD_U32BE");
} else if (obj==H5T_STD_U32LE_g) {
fprintf(out, "H5T_STD_U32LE");
} else if (obj==H5T_STD_U64BE_g) {
fprintf(out, "H5T_STD_U64BE");
} else if (obj==H5T_STD_U64LE_g) {
fprintf(out, "H5T_STD_U64LE");
} else if (obj==H5T_STD_B8BE_g) {
fprintf(out, "H5T_STD_B8BE");
} else if (obj==H5T_STD_B8LE_g) {
fprintf(out, "H5T_STD_B8LE");
} else if (obj==H5T_STD_B16BE_g) {
fprintf(out, "H5T_STD_B16BE");
} else if (obj==H5T_STD_B16LE_g) {
fprintf(out, "H5T_STD_B16LE");
} else if (obj==H5T_STD_B32BE_g) {
fprintf(out, "H5T_STD_B32BE");
} else if (obj==H5T_STD_B32LE_g) {
fprintf(out, "H5T_STD_B32LE");
} else if (obj==H5T_STD_B64BE_g) {
fprintf(out, "H5T_STD_B64BE");
} else if (obj==H5T_STD_B64LE_g) {
fprintf(out, "H5T_STD_B64LE");
} else if (obj==H5T_C_S1_g) {
fprintf(out, "H5T_C_S1");
} else if (obj==H5T_FORTRAN_S1_g) {
fprintf(out, "H5T_FORTRAN_S1");
} else {
fprintf(out, "%ld", (long)obj);
if (strcmp (argname, "type")) {
@ -1408,6 +1468,13 @@ H5_trace (hbool_t returning, const char *func, const char *type, ...)
if (strcmp (argname, "space")) {
fprintf (out, " (space)");
}
/*Save the rank of simple data spaces for arrays*/
{
H5S_t *space = H5I_object(obj);
if (H5S_SIMPLE==space->extent.type) {
asize[argno] = space->extent.u.simple.rank;
}
}
break;
case H5_DATASET:
fprintf(out, "%ld", (long)obj);
@ -1421,6 +1488,12 @@ H5_trace (hbool_t returning, const char *func, const char *type, ...)
fprintf (out, " (attr)");
}
break;
case H5_TEMPBUF:
fprintf(out, "%ld", (long)obj);
if (strcmp(argname, "tbuf")) {
fprintf(out, " (tbuf");
}
break;
default:
fprintf(out, "%ld", (long)obj);
fprintf (out, " (unknown class)");

63
src/H5A.c
View File

@ -116,12 +116,12 @@ H5A_term_interface(void)
PURPOSE
Creates a dataset as an attribute of another dataset or group
USAGE
hid_t H5Acreate (loc_id, name, datatype, dataspace, create_plist)
hid_t H5Acreate (loc_id, name, type_id, space_id, plist_id)
hid_t loc_id; IN: Object (dataset or group) to be attached to
const char *name; IN: Name of attribute to create
hid_t datatype; IN: ID of datatype for attribute
hid_t dataspace; IN: ID of dataspace for attribute
hid_t create_plist; IN: ID of creation property list (currently not used)
hid_t type_id; IN: ID of datatype for attribute
hid_t space_id; IN: ID of dataspace for attribute
hid_t plist_id; IN: ID of creation property list (currently not used)
RETURNS
SUCCEED/FAIL
@ -133,7 +133,7 @@ H5A_term_interface(void)
attribute for an object must be unique for that object. The 'type_id'
and 'space_id' are created with the H5T and H5S interfaces respectively.
Currently only simple dataspaces are allowed for attribute dataspaces.
The 'create_plist_id' property list is currently un-used, but will be
The 'plist_id' property list is currently un-used, but will be
used int the future for optional properties of attributes. The attribute
ID returned from this function must be released with H5Aclose or resource
leaks will develop.
@ -150,8 +150,8 @@ H5A_term_interface(void)
*
--------------------------------------------------------------------------*/
hid_t
H5Acreate (hid_t loc_id, const char *name, hid_t datatype, hid_t dataspace,
hid_t create_plist)
H5Acreate (hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
hid_t plist_id)
{
void *obj = NULL;
H5G_entry_t *ent = NULL;
@ -160,7 +160,7 @@ H5Acreate (hid_t loc_id, const char *name, hid_t datatype, hid_t dataspace,
hid_t ret_value = FAIL;
FUNC_ENTER(H5Acreate, FAIL);
H5TRACE5("i","isiii",loc_id,name,datatype,dataspace,create_plist);
H5TRACE5("i","isiii",loc_id,name,type_id,space_id,plist_id);
/* check arguments */
if (NULL==(obj=H5I_object (loc_id))) {
@ -186,17 +186,17 @@ H5Acreate (hid_t loc_id, const char *name, hid_t datatype, hid_t dataspace,
if (!name || !*name) {
HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name");
}
if (H5_DATATYPE != H5I_group(datatype) ||
NULL == (type = H5I_object(datatype))) {
if (H5_DATATYPE != H5I_group(type_id) ||
NULL == (type = H5I_object(type_id))) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a type");
}
if (H5_DATASPACE != H5I_group(dataspace) ||
NULL == (space = H5I_object(dataspace))) {
if (H5_DATASPACE != H5I_group(space_id) ||
NULL == (space = H5I_object(space_id))) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space");
}
if (H5P_DEFAULT!=create_plist &&
(H5P_DATASET_CREATE != H5P_get_class(create_plist) ||
NULL == H5I_object(create_plist))) {
if (H5P_DEFAULT!=plist_id &&
(H5P_DATASET_CREATE != H5P_get_class(plist_id) ||
NULL == H5I_object(plist_id))) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
"not a dataset creation property list");
}
@ -262,7 +262,8 @@ H5A_create(const H5G_entry_t *ent, const char *name, const H5T_t *type,
/* Compute the internal sizes */
attr->dt_size=(H5O_DTYPE[0].raw_size)(attr->ent.file,type);
attr->ds_size=(H5O_SDSPACE[0].raw_size)(attr->ent.file,&(space->extent.u.simple));
attr->ds_size=(H5O_SDSPACE[0].raw_size)(attr->ent.file,
&(space->extent.u.simple));
attr->data_size=H5S_extent_npoints(space)*H5T_get_size(type);
/* Hold the symbol table entry (and file) open */
@ -581,9 +582,9 @@ done:
PURPOSE
Write out data to an attribute
USAGE
herr_t H5Awrite (attr_id, mem_dt, buf)
herr_t H5Awrite (attr_id, type_id, buf)
hid_t attr_id; IN: Attribute to write
hid_t mem_dt; IN: Memory datatype of buffer
hid_t type_id; IN: Memory datatype of buffer
void *buf; IN: Buffer of data to write
RETURNS
SUCCEED/FAIL
@ -594,22 +595,22 @@ done:
This function writes a complete attribute to disk.
--------------------------------------------------------------------------*/
herr_t
H5Awrite (hid_t attr_id, hid_t mem_dt, void *buf)
H5Awrite (hid_t attr_id, hid_t type_id, void *buf)
{
H5A_t *attr = NULL;
const H5T_t *mem_type = NULL;
herr_t ret_value = FAIL;
FUNC_ENTER(H5Awrite, FAIL);
H5TRACE3("e","iix",attr_id,mem_dt,buf);
H5TRACE3("e","iix",attr_id,type_id,buf);
/* check arguments */
if (H5_ATTR != H5I_group(attr_id) ||
(NULL == (attr = H5I_object(attr_id)))) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an attribute");
}
if (H5_DATATYPE != H5I_group(mem_dt) ||
NULL == (mem_type = H5I_object(mem_dt))) {
if (H5_DATATYPE != H5I_group(type_id) ||
NULL == (mem_type = H5I_object(type_id))) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
}
if (NULL == buf) {
@ -752,9 +753,9 @@ done:
PURPOSE
Read in data from an attribute
USAGE
herr_t H5Aread (attr_id, mem_dt, buf)
herr_t H5Aread (attr_id, type_id, buf)
hid_t attr_id; IN: Attribute to read
hid_t mem_dt; IN: Memory datatype of buffer
hid_t type_id; IN: Memory datatype of buffer
void *buf; IN: Buffer for data to read
RETURNS
SUCCEED/FAIL
@ -765,22 +766,22 @@ done:
This function reads a complete attribute from disk.
--------------------------------------------------------------------------*/
herr_t
H5Aread (hid_t attr_id, hid_t mem_dt, void *buf)
H5Aread (hid_t attr_id, hid_t type_id, void *buf)
{
H5A_t *attr = NULL;
const H5T_t *mem_type = NULL;
herr_t ret_value = FAIL;
H5A_t *attr = NULL;
const H5T_t *mem_type = NULL;
herr_t ret_value = FAIL;
FUNC_ENTER(H5Aread, FAIL);
H5TRACE3("e","iix",attr_id,mem_dt,buf);
H5TRACE3("e","iix",attr_id,type_id,buf);
/* check arguments */
if (H5_ATTR != H5I_group(attr_id) ||
(NULL == (attr = H5I_object(attr_id)))) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an attribute");
}
if (H5_DATATYPE != H5I_group(mem_dt) ||
NULL == (mem_type = H5I_object(mem_dt))) {
if (H5_DATATYPE != H5I_group(type_id) ||
NULL == (mem_type = H5I_object(type_id))) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
}
if (NULL == buf) {

16
src/H5Apublic.h
View File

@ -27,17 +27,19 @@ typedef int (*H5A_operator_t)(hid_t location_id/*in*/,
const char *attr_name/*in*/, void *operator_data/*in,out*/);
/* Public function prototypes */
hid_t H5Acreate(hid_t loc_id, const char *name, hid_t datatype, hid_t dataspace, hid_t create_plist);
hid_t H5Acreate(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
hid_t plist_id);
hid_t H5Aopen_name(hid_t loc_id, const char *name);
hid_t H5Aopen_idx(hid_t loc_id, unsigned idx);
herr_t H5Awrite(hid_t attr_id, hid_t mem_dt, void *buf);
herr_t H5Aread(hid_t attr_id, hid_t mem_dt, void *buf);
herr_t H5Awrite(hid_t attr_id, hid_t type_id, void *buf);
herr_t H5Aread(hid_t attr_id, hid_t type_id, void *buf);
herr_t H5Aclose(hid_t attr_id);
hid_t H5Aget_space(hid_t attr);
hid_t H5Aget_type(hid_t attr);
size_t H5Aget_name(hid_t attr, char *buf, size_t buf_size);
hid_t H5Aget_space(hid_t attr_id);
hid_t H5Aget_type(hid_t attr_id);
size_t H5Aget_name(hid_t attr_id, char *buf, size_t buf_size);
int H5Anum_attrs(hid_t loc_id);
int H5Aiterate(hid_t loc_id, unsigned *attr_num, H5A_operator_t op, void *op_data);
int H5Aiterate(hid_t loc_id, unsigned *attr_num, H5A_operator_t op,
void *op_data);
herr_t H5Adelete(hid_t loc_id, const char *name);
#ifdef __cplusplus

281
src/H5D.c
View File

@ -152,7 +152,7 @@ H5D_term_interface(void)
* and initial persistent properties including the type of each
* datapoint as stored in the file (TYPE_ID), the size of the
* dataset (SPACE_ID), and other initial miscellaneous
* properties (CREATE_PARMS_ID).
* properties (PLIST_ID).
*
* All arguments are copied into the dataset, so the caller is
* allowed to derive new types, data spaces, and creation
@ -186,7 +186,7 @@ H5D_term_interface(void)
*/
hid_t
H5Dcreate (hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
hid_t create_parms_id)
hid_t plist_id)
{
H5G_t *loc = NULL;
H5T_t *type = NULL;
@ -196,7 +196,7 @@ H5Dcreate (hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
const H5D_create_t *create_parms = NULL;
FUNC_ENTER(H5Dcreate, FAIL);
H5TRACE5("i","isiii",loc_id,name,type_id,space_id,create_parms_id);
H5TRACE5("i","isiii",loc_id,name,type_id,space_id,plist_id);
/* Check arguments */
if (NULL == (loc = H5G_loc(loc_id))) {
@ -213,9 +213,9 @@ H5Dcreate (hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
NULL == (space = H5I_object(space_id))) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space");
}
if (create_parms_id >= 0) {
if (H5P_DATASET_CREATE != H5P_get_class(create_parms_id) ||
NULL == (create_parms = H5I_object(create_parms_id))) {
if (plist_id >= 0) {
if (H5P_DATASET_CREATE != H5P_get_class(plist_id) ||
NULL == (create_parms = H5I_object(plist_id))) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
"not a dataset creation property list");
}
@ -314,24 +314,24 @@ H5Dopen (hid_t loc_id, const char *name)
*-------------------------------------------------------------------------
*/
herr_t
H5Dclose (hid_t dataset_id)
H5Dclose (hid_t dset_id)
{
H5D_t *dataset = NULL; /* dataset object to release */
H5D_t *dset = NULL; /* dataset object to release */
FUNC_ENTER(H5Dclose, FAIL);
H5TRACE1("e","i",dataset_id);
H5TRACE1("e","i",dset_id);
/* Check args */
if (H5_DATASET != H5I_group(dataset_id) ||
NULL == (dataset = H5I_object(dataset_id)) ||
NULL == dataset->ent.file) {
if (H5_DATASET != H5I_group(dset_id) ||
NULL == (dset = H5I_object(dset_id)) ||
NULL == dset->ent.file) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset");
}
/*
* Decrement the counter on the dataset. It will be freed if the count
* reaches zero.
*/
if (H5I_dec_ref(dataset_id) < 0) {
if (H5I_dec_ref(dset_id) < 0) {
HRETURN_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't free");
}
FUNC_LEAVE(SUCCEED);
@ -358,23 +358,23 @@ H5Dclose (hid_t dataset_id)
*-------------------------------------------------------------------------
*/
hid_t
H5Dget_space (hid_t dataset_id)
H5Dget_space (hid_t dset_id)
{
H5D_t *dataset = NULL;
H5D_t *dset = NULL;
H5S_t *space = NULL;
hid_t ret_value = FAIL;
FUNC_ENTER (H5Dget_space, FAIL);
H5TRACE1("i","i",dataset_id);
H5TRACE1("i","i",dset_id);
/* Check args */
if (H5_DATASET!=H5I_group (dataset_id) ||
NULL==(dataset=H5I_object (dataset_id))) {
if (H5_DATASET!=H5I_group (dset_id) ||
NULL==(dset=H5I_object (dset_id))) {
HRETURN_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset");
}
/* Read the data space message and return a data space object */
if (NULL==(space=H5S_read (&(dataset->ent)))) {
if (NULL==(space=H5S_read (&(dset->ent)))) {
HRETURN_ERROR (H5E_DATASET, H5E_CANTINIT, FAIL,
"unable to load space info from dataset header");
}
@ -414,24 +414,24 @@ H5Dget_space (hid_t dataset_id)
*-------------------------------------------------------------------------
*/
hid_t
H5Dget_type (hid_t dataset_id)
H5Dget_type (hid_t dset_id)
{
H5D_t *dataset = NULL;
H5D_t *dset = NULL;
H5T_t *copied_type = NULL;
hid_t ret_value = FAIL;
FUNC_ENTER (H5Dget_type, FAIL);
H5TRACE1("i","i",dataset_id);
H5TRACE1("i","i",dset_id);
/* Check args */
if (H5_DATASET!=H5I_group (dataset_id) ||
NULL==(dataset=H5I_object (dataset_id))) {
if (H5_DATASET!=H5I_group (dset_id) ||
NULL==(dset=H5I_object (dset_id))) {
HRETURN_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset");
}
/* Copy the data type and mark it read-only */
if (NULL==(copied_type=H5T_copy (dataset->type, H5T_COPY_REOPEN))) {
if (NULL==(copied_type=H5T_copy (dset->type, H5T_COPY_REOPEN))) {
HRETURN_ERROR (H5E_DATASET, H5E_CANTINIT, FAIL,
"unable to copy the data type");
}
@ -471,24 +471,24 @@ H5Dget_type (hid_t dataset_id)
*-------------------------------------------------------------------------
*/
hid_t
H5Dget_create_plist (hid_t dataset_id)
H5Dget_create_plist (hid_t dset_id)
{
H5D_t *dataset = NULL;
H5D_t *dset = NULL;
H5D_create_t *copied_parms = NULL;
hid_t ret_value = FAIL;
FUNC_ENTER (H5Dget_create_plist, FAIL);
H5TRACE1("i","i",dataset_id);
H5TRACE1("i","i",dset_id);
/* Check args */
if (H5_DATASET!=H5I_group (dataset_id) ||
NULL==(dataset=H5I_object (dataset_id))) {
if (H5_DATASET!=H5I_group (dset_id) ||
NULL==(dset=H5I_object (dset_id))) {
HRETURN_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset");
}
/* Copy the creation property list */
if (NULL==(copied_parms=H5P_copy (H5P_DATASET_CREATE,
dataset->create_parms))) {
dset->create_parms))) {
HRETURN_ERROR (H5E_DATASET, H5E_CANTINIT, FAIL,
"unable to copy the creation property list");
}
@ -507,12 +507,12 @@ H5Dget_create_plist (hid_t dataset_id)
/*-------------------------------------------------------------------------
* Function: H5Dread
*
* Purpose: Reads (part of) a DATASET from the file into application
* Purpose: Reads (part of) a DSET from the file into application
* memory BUF. The part of the dataset to read is defined with
* MEM_SPACE_ID and FILE_SPACE_ID. The data points are
* converted from their file type to the MEM_TYPE_ID specified.
* Additional miscellaneous data transfer properties can be
* passed to this function with the XFER_PARMS_ID argument.
* passed to this function with the PLIST_ID argument.
*
* The FILE_SPACE_ID can be the constant H5S_ALL which indicates
* that the entire file data space is to be referenced.
@ -524,7 +524,7 @@ H5Dget_create_plist (hid_t dataset_id)
* The number of elements in the memory data space must match
* the number of elements in the file data space.
*
* The XFER_PARMS_ID can be the constant H5P_DEFAULT in which
* The PLIST_ID can be the constant H5P_DEFAULT in which
* case the default data transfer properties are used.
*
* Return: Success: SUCCEED
@ -547,23 +547,23 @@ H5Dget_create_plist (hid_t dataset_id)
*-------------------------------------------------------------------------
*/
herr_t
H5Dread (hid_t dataset_id, hid_t mem_type_id, hid_t mem_space_id,
hid_t file_space_id, hid_t xfer_parms_id, void *buf/*out*/)
H5Dread (hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
hid_t file_space_id, hid_t plist_id, void *buf/*out*/)
{
H5D_t *dataset = NULL;
H5D_t *dset = NULL;
const H5T_t *mem_type = NULL;
const H5S_t *mem_space = NULL;
const H5S_t *file_space = NULL;
const H5D_xfer_t *xfer_parms = NULL;
FUNC_ENTER(H5Dread, FAIL);
H5TRACE6("e","iiiiix",dataset_id,mem_type_id,mem_space_id,file_space_id,
xfer_parms_id,buf);
H5TRACE6("e","iiiiix",dset_id,mem_type_id,mem_space_id,file_space_id,
plist_id,buf);
/* check arguments */
if (H5_DATASET != H5I_group(dataset_id) ||
NULL == (dataset = H5I_object(dataset_id)) ||
NULL == dataset->ent.file) {
if (H5_DATASET != H5I_group(dset_id) ||
NULL == (dset = H5I_object(dset_id)) ||
NULL == dset->ent.file) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset");
}
if (H5_DATATYPE != H5I_group(mem_type_id) ||
@ -582,10 +582,10 @@ H5Dread (hid_t dataset_id, hid_t mem_type_id, hid_t mem_space_id,
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space");
}
}
if (H5P_DEFAULT == xfer_parms_id) {
if (H5P_DEFAULT == plist_id) {
xfer_parms = &H5D_xfer_dflt;
} else if (H5P_DATASET_XFER != H5P_get_class(xfer_parms_id) ||
NULL == (xfer_parms = H5I_object(xfer_parms_id))) {
} else if (H5P_DATASET_XFER != H5P_get_class(plist_id) ||
NULL == (xfer_parms = H5I_object(plist_id))) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms");
}
if (!buf) {
@ -593,7 +593,7 @@ H5Dread (hid_t dataset_id, hid_t mem_type_id, hid_t mem_space_id,
}
/* read raw data */
if (H5D_read(dataset, mem_type, mem_space, file_space, xfer_parms,
if (H5D_read(dset, mem_type, mem_space, file_space, xfer_parms,
buf/*out*/) < 0) {
HRETURN_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "can't read data");
}
@ -603,13 +603,13 @@ H5Dread (hid_t dataset_id, hid_t mem_type_id, hid_t mem_space_id,
/*-------------------------------------------------------------------------
* Function: H5Dwrite
*
* Purpose: Writes (part of) a DATASET from application memory BUF to the
* Purpose: Writes (part of) a DSET from application memory BUF to the
* file. The part of the dataset to write is defined with the
* MEM_SPACE_ID and FILE_SPACE_ID arguments. The data points
* are converted from their current type (MEM_TYPE_ID) to their
* file data type. Additional miscellaneous data transfer
* properties can be passed to this function with the
* XFER_PARMS_ID argument.
* PLIST_ID argument.
*
* The FILE_SPACE_ID can be the constant H5S_ALL which indicates
* that the entire file data space is to be referenced.
@ -621,7 +621,7 @@ H5Dread (hid_t dataset_id, hid_t mem_type_id, hid_t mem_space_id,
* The number of elements in the memory data space must match
* the number of elements in the file data space.
*
* The XFER_PARMS_ID can be the constant H5P_DEFAULT in which
* The PLIST_ID can be the constant H5P_DEFAULT in which
* case the default data transfer properties are used.
*
* Return: Success: SUCCEED
@ -638,23 +638,23 @@ H5Dread (hid_t dataset_id, hid_t mem_type_id, hid_t mem_space_id,
*-------------------------------------------------------------------------
*/
herr_t
H5Dwrite (hid_t dataset_id, hid_t mem_type_id, hid_t mem_space_id,
hid_t file_space_id, hid_t xfer_parms_id, const void *buf)
H5Dwrite (hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
hid_t file_space_id, hid_t plist_id, const void *buf)
{
H5D_t *dataset = NULL;
H5D_t *dset = NULL;
const H5T_t *mem_type = NULL;
const H5S_t *mem_space = NULL;
const H5S_t *file_space = NULL;
const H5D_xfer_t *xfer_parms = NULL;
FUNC_ENTER(H5Dwrite, FAIL);
H5TRACE6("e","iiiiix",dataset_id,mem_type_id,mem_space_id,file_space_id,
xfer_parms_id,buf);
H5TRACE6("e","iiiiix",dset_id,mem_type_id,mem_space_id,file_space_id,
plist_id,buf);
/* check arguments */
if (H5_DATASET != H5I_group(dataset_id) ||
NULL == (dataset = H5I_object(dataset_id)) ||
NULL == dataset->ent.file) {
if (H5_DATASET != H5I_group(dset_id) ||
NULL == (dset = H5I_object(dset_id)) ||
NULL == dset->ent.file) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset");
}
if (H5_DATATYPE != H5I_group(mem_type_id) ||
@ -673,10 +673,10 @@ H5Dwrite (hid_t dataset_id, hid_t mem_type_id, hid_t mem_space_id,
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space");
}
}
if (H5P_DEFAULT == xfer_parms_id) {
if (H5P_DEFAULT == plist_id) {
xfer_parms = &H5D_xfer_dflt;
} else if (H5P_DATASET_XFER != H5P_get_class(xfer_parms_id) ||
NULL == (xfer_parms = H5I_object(xfer_parms_id))) {
} else if (H5P_DATASET_XFER != H5P_get_class(plist_id) ||
NULL == (xfer_parms = H5I_object(plist_id))) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms");
}
if (!buf) {
@ -684,7 +684,7 @@ H5Dwrite (hid_t dataset_id, hid_t mem_type_id, hid_t mem_space_id,
}
/* write raw data */
if (H5D_write(dataset, mem_type, mem_space, file_space, xfer_parms,
if (H5D_write(dset, mem_type, mem_space, file_space, xfer_parms,
buf) < 0) {
HRETURN_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "can't write data");
}
@ -710,16 +710,16 @@ H5Dwrite (hid_t dataset_id, hid_t mem_type_id, hid_t mem_space_id,
*-------------------------------------------------------------------------
*/
herr_t
H5Dextend (hid_t dataset_id, const hsize_t *size)
H5Dextend (hid_t dset_id, const hsize_t *size)
{
H5D_t *dataset = NULL;
H5D_t *dset = NULL;
FUNC_ENTER (H5Dextend, FAIL);
H5TRACE2("e","i*h",dataset_id,size);
H5TRACE2("e","i*h",dset_id,size);
/* Check args */
if (H5_DATASET!=H5I_group (dataset_id) ||
NULL==(dataset=H5I_object (dataset_id))) {
if (H5_DATASET!=H5I_group (dset_id) ||
NULL==(dset=H5I_object (dset_id))) {
HRETURN_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset");
}
if (!size) {
@ -727,7 +727,7 @@ H5Dextend (hid_t dataset_id, const hsize_t *size)
}
/* Increase size */
if (H5D_extend (dataset, size)<0) {
if (H5D_extend (dset, size)<0) {
HRETURN_ERROR (H5E_DATASET, H5E_CANTINIT, FAIL,
"unable to extend dataset");
}
@ -1226,10 +1226,10 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
uint8 *bkg_buf = NULL; /*background buffer */
H5T_conv_t tconv_func = NULL; /*conversion function */
hid_t src_id = -1, dst_id = -1;/*temporary type atoms */
H5S_conv_t sconv_func={NULL}; /*space conversion funcs*/
H5S_sel_iter_t mem_iter, /* memory selection iteration information */
bkg_iter, /* background iteration information */
file_iter; /* file selection iteration information */
H5S_conv_t sconv_func={NULL}; /*space conversion funcs*/
H5S_sel_iter_t mem_iter; /* mem selection iteration info*/
H5S_sel_iter_t bkg_iter; /*background iteration info*/
H5S_sel_iter_t file_iter; /*file selection iter info*/
H5T_cdata_t *cdata = NULL; /*type conversion data */
herr_t ret_value = FAIL;
herr_t status;
@ -1292,7 +1292,7 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
* turns off background preservation.
*/
#ifdef QAK
printf("%s: check 1.0, nelmts=%d\n",FUNC,(int)nelmts);
printf("%s: check 1.0, nelmts=%d\n",FUNC,(int)nelmts);
#endif /* QAK */
if (nelmts!=H5S_select_npoints (file_space)) {
HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL,
@ -1303,8 +1303,10 @@ printf("%s: check 1.0, nelmts=%d\n",FUNC,(int)nelmts);
HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL,
"unable to convert between src and dest data types");
} else if (H5T_conv_noop!=tconv_func) {
if ((src_id=H5I_register(H5_DATATYPE, H5T_copy(dataset->type, H5T_COPY_ALL)))<0 ||
(dst_id=H5I_register(H5_DATATYPE, H5T_copy(mem_type, H5T_COPY_ALL)))<0) {
if ((src_id=H5I_register(H5_DATATYPE,
H5T_copy(dataset->type, H5T_COPY_ALL)))<0 ||
(dst_id=H5I_register(H5_DATATYPE,
H5T_copy(mem_type, H5T_COPY_ALL)))<0) {
HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL,
"unable to register types for conversion");
}
@ -1314,7 +1316,7 @@ printf("%s: check 1.0, nelmts=%d\n",FUNC,(int)nelmts);
"unable to convert from file to memory data space");
}
#ifdef QAK
printf("%s: check 1.0\n",FUNC);
printf("%s: check 1.0\n",FUNC);
#endif /* QAK */
#ifdef HAVE_PARALLEL
@ -1359,7 +1361,7 @@ printf("%s: check 1.0\n",FUNC);
H5E_clear ();
}
#ifdef QAK
printf("%s: check 2.0\n",FUNC);
printf("%s: check 2.0\n",FUNC);
#endif /* QAK */
@ -1374,7 +1376,8 @@ printf("%s: check 2.0\n",FUNC);
HGOTO_ERROR (H5E_DATASET, H5E_CANTINIT, FAIL,
"temporary buffer max size is too small");
}
if (FAIL == (sconv_func.finit)(&(dataset->layout), file_space, &file_iter)) {
if (FAIL == (sconv_func.finit)(&(dataset->layout),
file_space, &file_iter)) {
HGOTO_ERROR (H5E_DATASET, H5E_CANTINIT, FAIL,
"unable to initialize file selection information");
}
@ -1387,7 +1390,7 @@ printf("%s: check 2.0\n",FUNC);
"unable to initialize background selection information");
}
#ifdef QAK
printf("%s: check 3.0, request_nelmts=%d\n",FUNC,(int)request_nelmts);
printf("%s: check 3.0, request_nelmts=%d\n",FUNC,(int)request_nelmts);
#endif /* QAK */
/*
@ -1423,14 +1426,18 @@ printf("%s: check 3.0, request_nelmts=%d\n",FUNC,(int)request_nelmts);
#endif
#ifdef QAK
printf("%s: check 4.0, nelmts=%d, need_bkg=%d\n",FUNC,(int)nelmts,(int)need_bkg);
printf("%s: check 4.0, nelmts=%d, need_bkg=%d\n",
FUNC,(int)nelmts,(int)need_bkg);
#endif /* QAK */
/* Start strip mining... */
for (smine_start=0; smine_start<nelmts; smine_start+=smine_nelmts) {
/* Go figure out how many elements to read from the file */
smine_nelmts = (sconv_func.favail)(file_space,&file_iter, MIN(request_nelmts,(nelmts-smine_start)));
smine_nelmts = (sconv_func.favail)(file_space,&file_iter,
MIN(request_nelmts,
(nelmts-smine_start)));
#ifdef QAK
printf("%s: check 5.0, nelmts=%d, smine_start=%d, smine_nelmts=%d\n",FUNC,(int)nelmts,(int)smine_start,(int)smine_nelmts);
printf("%s: check 5.0, nelmts=%d, smine_start=%d, smine_nelmts=%d\n",
FUNC,(int)nelmts,(int)smine_start,(int)smine_nelmts);
#endif /* QAK */
/*
@ -1447,33 +1454,34 @@ printf("%s: check 5.0, nelmts=%d, smine_start=%d, smine_nelmts=%d\n",FUNC,(int)n
HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file gather failed");
}
#ifdef QAK
printf("%s: check 6.0\n",FUNC);
printf("%s: check 6.0\n",FUNC);
#endif /* QAK */
#ifdef QAK
printf("%s: check 6.5\n",FUNC);
{
int i;
uint16 *b;
printf("%s: check 6.5\n",FUNC);
{
int i;
uint16 *b;
if(qak_debug) {
b=tconv_buf;
printf("\ntconv_buf:");
for (i=0; i<smine_nelmts; i++,b++) {
printf("(%d)%u ",i,(unsigned)*b);
}
printf("\n");
}
}
if(qak_debug) {
b=tconv_buf;
printf("\ntconv_buf:");
for (i=0; i<smine_nelmts; i++,b++) {
printf("(%d)%u ",i,(unsigned)*b);
}
printf("\n");
}
}
#endif /* QAK */
if ((H5D_OPTIMIZE_PIPE && H5T_BKG_YES==need_bkg) ||
(!H5D_OPTIMIZE_PIPE && need_bkg)) {
if ((sconv_func.mgath)(buf, H5T_get_size (mem_type), mem_space,
&bkg_iter, smine_nelmts, bkg_buf/*out*/)!=smine_nelmts) {
&bkg_iter, smine_nelmts,
bkg_buf/*out*/)!=smine_nelmts) {
HGOTO_ERROR (H5E_IO, H5E_READERROR, FAIL, "mem gather failed");
}
}
#ifdef QAK
printf("%s: check 7.0\n",FUNC);
printf("%s: check 7.0\n",FUNC);
#endif /* QAK */
/*
@ -1494,7 +1502,7 @@ printf("%s: check 7.0\n",FUNC);
}
#ifdef QAK
printf("%s: check 8.0\n",FUNC);
printf("%s: check 8.0\n",FUNC);
#endif /* QAK */
/*
* Scatter the data into memory.
@ -1504,7 +1512,7 @@ printf("%s: check 8.0\n",FUNC);
HGOTO_ERROR (H5E_IO, H5E_READERROR, FAIL, "scatter failed");
}
#ifdef QAK
printf("%s: check 9.0\n",FUNC);
printf("%s: check 9.0\n",FUNC);
#endif /* QAK */
}
@ -1560,14 +1568,14 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
uint8 *bkg_buf = NULL; /*background buffer */
H5T_conv_t tconv_func = NULL; /*conversion function */
hid_t src_id = -1, dst_id = -1;/*temporary type atoms */
H5S_conv_t sconv_func= {NULL}; /*space conversion funcs*/
H5S_sel_iter_t mem_iter, /* memory selection iteration information */
bkg_iter, /* background iteration information */
file_iter; /* file selection iteration information */
H5S_conv_t sconv_func= {NULL}; /*space conversion funcs*/
H5S_sel_iter_t mem_iter; /*memory selection iteration info*/
H5S_sel_iter_t bkg_iter; /*background iteration info*/
H5S_sel_iter_t file_iter; /*file selection iteration info*/
H5T_cdata_t *cdata = NULL; /*type conversion data */
herr_t ret_value = FAIL, status;
size_t src_type_size; /*size of source type */
size_t dst_type_size; /*size of destination type*/
size_t dst_type_size; /*size of destination type*/
size_t target_size; /*desired buffer size */
size_t request_nelmts; /*requested strip mine */
H5T_bkg_t need_bkg; /*type of background buf*/
@ -1625,7 +1633,7 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
* turns off background preservation.
*/
#ifdef QAK
printf("%s: check 0.5, nelmts=%d\n",FUNC,(int)nelmts);
printf("%s: check 0.5, nelmts=%d\n",FUNC,(int)nelmts);
#endif /* QAK */
if (nelmts!=H5S_select_npoints (file_space)) {
HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL,
@ -1649,7 +1657,7 @@ printf("%s: check 0.5, nelmts=%d\n",FUNC,(int)nelmts);
"unable to convert from memory to file data space");
}
#ifdef QAK
printf("%s: check 1.0\n",FUNC);
printf("%s: check 1.0\n",FUNC);
#endif /* QAK */
#ifdef HAVE_PARALLEL
@ -1661,12 +1669,12 @@ printf("%s: check 1.0\n",FUNC);
if (H5T_conv_noop==tconv_func &&
NULL!=sconv_func.write) {
status = (sconv_func.write)(dataset->ent.file,
&(dataset->layout),
&(dataset->create_parms->compress),
&(dataset->create_parms->efl),
H5T_get_size (dataset->type),
file_space, mem_space,
xfer_parms->xfer_mode, buf);
&(dataset->layout),
&(dataset->create_parms->compress),
&(dataset->create_parms->efl),
H5T_get_size (dataset->type),
file_space, mem_space,
xfer_parms->xfer_mode, buf);
if (status>=0) goto succeed;
HGOTO_ERROR (H5E_DATASET, H5E_WRITEERROR, FAIL,
"collective write failed");
@ -1695,7 +1703,7 @@ printf("%s: check 1.0\n",FUNC);
H5E_clear ();
}
#ifdef QAK
printf("%s: check 2.0\n",FUNC);
printf("%s: check 2.0\n",FUNC);
#endif /* QAK */
@ -1710,7 +1718,7 @@ printf("%s: check 2.0\n",FUNC);
HGOTO_ERROR (H5E_DATASET, H5E_CANTINIT, FAIL,
"temporary buffer max size is too small");
}
if (FAIL == (sconv_func.finit)(&(dataset->layout), file_space, &file_iter)) {
if (FAIL==(sconv_func.finit)(&(dataset->layout), file_space, &file_iter)) {
HGOTO_ERROR (H5E_DATASET, H5E_CANTINIT, FAIL,
"unable to initialize file selection information");
}
@ -1723,7 +1731,7 @@ printf("%s: check 2.0\n",FUNC);
"unable to initialize memory selection information");
}
#ifdef QAK
printf("%s: check 3.0, request_nelmts=%d\n",FUNC,(int)request_nelmts);
printf("%s: check 3.0, request_nelmts=%d\n",FUNC,(int)request_nelmts);
#endif /* QAK */
/*
@ -1758,15 +1766,19 @@ printf("%s: check 3.0, request_nelmts=%d\n",FUNC,(int)request_nelmts);
}
#endif
#ifdef QAK
printf("%s: check 4.0, nelmts=%d, need_bkg=%d\n",FUNC,(int)nelmts,(int)need_bkg);
printf("%s: check 4.0, nelmts=%d, need_bkg=%d\n",
FUNC,(int)nelmts,(int)need_bkg);
#endif /* QAK */
/* Start strip mining... */
for (smine_start=0; smine_start<nelmts; smine_start+=smine_nelmts) {
/* Go figure out how many elements to read from the file */
smine_nelmts = (sconv_func.favail)(file_space,&file_iter, MIN(request_nelmts,(nelmts-smine_start)));
smine_nelmts = (sconv_func.favail)(file_space,&file_iter,
MIN(request_nelmts,
(nelmts-smine_start)));
#ifdef QAK
printf("%s: check 5.0, nelmts=%d, smine_start=%d, smine_nelmts=%d\n",FUNC,(int)nelmts,(int)smine_start,(int)smine_nelmts);
printf("%s: check 5.0, nelmts=%d, smine_start=%d, smine_nelmts=%d\n",
FUNC,(int)nelmts,(int)smine_start,(int)smine_nelmts);
#endif /* QAK */
/*
@ -1779,20 +1791,20 @@ printf("%s: check 5.0, nelmts=%d, smine_start=%d, smine_nelmts=%d\n",FUNC,(int)n
HGOTO_ERROR (H5E_IO, H5E_WRITEERROR, FAIL, "mem gather failed");
}
#ifdef QAK
{
int i;
uint16 *b;
{
int i;
uint16 *b;
if(qak_debug) {
b=tconv_buf;
printf("\ntconv_buf:");
for (i=0; i<smine_nelmts; i++,b++) {
printf("(%d)%d ",i,(int)*b);
}
printf("\n");
}
}
printf("%s: check 6.0\n",FUNC);
if(qak_debug) {
b=tconv_buf;
printf("\ntconv_buf:");
for (i=0; i<smine_nelmts; i++,b++) {
printf("(%d)%d ",i,(int)*b);
}
printf("\n");
}
}
printf("%s: check 6.0\n",FUNC);
#endif /* QAK */
if ((H5D_OPTIMIZE_PIPE && H5T_BKG_YES==need_bkg) ||
(!H5D_OPTIMIZE_PIPE && need_bkg)) {
@ -1802,7 +1814,8 @@ printf("%s: check 6.0\n",FUNC);
H5T_get_size (dataset->type), file_space,
&bkg_iter, smine_nelmts, xfer_parms->xfer_mode,
bkg_buf/*out*/)!=smine_nelmts) {
HGOTO_ERROR (H5E_IO, H5E_WRITEERROR, FAIL, "file gather failed");
HGOTO_ERROR (H5E_IO, H5E_WRITEERROR, FAIL,
"file gather failed");
}
}
@ -1814,7 +1827,7 @@ printf("%s: check 6.0\n",FUNC);
#endif
cdata->command = H5T_CONV_CONV;
status = (tconv_func) (src_id, dst_id, cdata, smine_nelmts, tconv_buf,
bkg_buf);
bkg_buf);
#ifdef H5T_DEBUG
H5T_timer_end (&timer, cdata, smine_nelmts);
#endif
@ -2016,7 +2029,7 @@ H5D_allocate (H5D_t *dataset)
FUNC_ENTER(H5D_allocate, FAIL);
#ifdef AKC
printf("Enter %s:\n", FUNC);
printf("Enter %s:\n", FUNC);
#endif
/* Check args */

20
src/H5Dpublic.h
View File

@ -44,17 +44,17 @@ extern "C" {
#endif
hid_t H5Dcreate (hid_t file_id, const char *name, hid_t type_id,
hid_t space_id, hid_t create_parms_id);
hid_t space_id, hid_t plist_id);
hid_t H5Dopen (hid_t file_id, const char *name);
herr_t H5Dclose (hid_t dataset_id);
hid_t H5Dget_space (hid_t dataset_id);
hid_t H5Dget_type (hid_t dataset_id);
hid_t H5Dget_create_plist (hid_t dataset_id);
herr_t H5Dread (hid_t dataset_id, hid_t mem_type_id, hid_t mem_space_id,
hid_t file_space_id, hid_t xfer_parms_id, void *buf/*out*/);
herr_t H5Dwrite (hid_t dataset_id, hid_t mem_type_id, hid_t mem_space_id,
hid_t file_space_id, hid_t xfer_parms_id, const void *buf);
herr_t H5Dextend (hid_t dataset_id, const hsize_t *size);
herr_t H5Dclose (hid_t dset_id);
hid_t H5Dget_space (hid_t dset_id);
hid_t H5Dget_type (hid_t dset_id);
hid_t H5Dget_create_plist (hid_t dset_id);
herr_t H5Dread (hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
hid_t file_space_id, hid_t plist_id, void *buf/*out*/);
herr_t H5Dwrite (hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
hid_t file_space_id, hid_t plist_id, const void *buf);
herr_t H5Dextend (hid_t dset_id, const hsize_t *size);
#ifdef __cplusplus
}

20
src/H5F.c
View File

@ -250,17 +250,17 @@ H5F_encode_length_unusual(const H5F_t *f, uint8 **p, uint8 *l)
*-------------------------------------------------------------------------
*/
hid_t
H5Fget_create_template (hid_t fid)
H5Fget_create_template (hid_t file_id)
{
H5F_t *file = NULL;
hid_t ret_value = FAIL;
H5F_create_t *tmpl = NULL;
FUNC_ENTER(H5Fget_create_template, FAIL);
H5TRACE1("i","i",fid);
H5TRACE1("i","i",file_id);
/* check args */
if (H5_FILE != H5I_group(fid) || NULL==(file=H5I_object (fid))) {
if (H5_FILE != H5I_group(file_id) || NULL==(file=H5I_object (file_id))) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file");
}
@ -1474,8 +1474,8 @@ H5F_close(H5F_t *f)
Close an open HDF5 file.
USAGE
herr_t H5Fclose(fid)
int32 fid; IN: File ID of file to close
herr_t H5Fclose(file_id)
int32 file_id; IN: File ID of file to close
ERRORS
ARGS BADTYPE Not a file atom.
@ -1500,18 +1500,18 @@ H5F_close(H5F_t *f)
changed.
--------------------------------------------------------------------------*/
herr_t
H5Fclose (hid_t fid)
H5Fclose (hid_t file_id)
{
herr_t ret_value = SUCCEED;
FUNC_ENTER(H5Fclose, FAIL);
H5TRACE1("e","i",fid);
H5TRACE1("e","i",file_id);
/* Check/fix arguments. */
if (H5_FILE != H5I_group(fid)) {
if (H5_FILE != H5I_group(file_id)) {
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file atom");
}
if (NULL == H5I_object(fid)) {
if (NULL == H5I_object(file_id)) {
HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "unable to unatomize file");
}
@ -1519,7 +1519,7 @@ H5Fclose (hid_t fid)
* Decrement reference count on atom. When it reaches zero the file will
* be closed.
*/
if (H5I_dec_ref (fid)<0) {
if (H5I_dec_ref (file_id)<0) {
HGOTO_ERROR (H5E_ATOM, H5E_CANTINIT, FAIL, "problems closing file");
}

4
src/H5Fpublic.h
View File

@ -81,8 +81,8 @@ hbool_t H5Fis_hdf5 (const char *filename);
hid_t H5Fcreate (const char *filename, unsigned flags, hid_t create_plist,
hid_t access_plist);
hid_t H5Fopen (const char *filename, unsigned flags, hid_t access_plist);
herr_t H5Fclose (hid_t fid);
hid_t H5Fget_create_template (hid_t fid);
herr_t H5Fclose (hid_t file_id);
hid_t H5Fget_create_template (hid_t file_id);
hid_t H5Fget_access_template (hid_t file_id);
#ifdef __cplusplus

10
src/H5G.c
View File

@ -224,21 +224,21 @@ H5Gopen (hid_t loc_id, const char *name)
*-------------------------------------------------------------------------
*/
herr_t
H5Gclose (hid_t grp_id)
H5Gclose (hid_t group_id)
{
FUNC_ENTER(H5Gclose, FAIL);
H5TRACE1("e","i",grp_id);
H5TRACE1("e","i",group_id);
/* Check args */
if (H5_GROUP != H5I_group(grp_id) ||
NULL == H5I_object(grp_id)) {
if (H5_GROUP != H5I_group(group_id) ||
NULL == H5I_object(group_id)) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group");
}
/*
* Decrement the counter on the group atom. It will be freed if the count
* reaches zero.
*/
if (H5I_dec_ref(grp_id) < 0) {
if (H5I_dec_ref(group_id) < 0) {
HRETURN_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to close group");
}
FUNC_LEAVE(SUCCEED);

14
src/H5Gpublic.h
View File

@ -53,13 +53,13 @@ typedef struct H5G_stat_t {
typedef herr_t (*H5G_iterate_t)(hid_t group, const char *group_name,
void *op_data);
hid_t H5Gcreate (hid_t file_id, const char *name, size_t size_hint);
hid_t H5Gopen (hid_t file_id, const char *name);
herr_t H5Gclose (hid_t grp_id);
herr_t H5Gset (hid_t file, const char *name);
herr_t H5Gpush (hid_t file, const char *name);
herr_t H5Gpop (hid_t file);
herr_t H5Giterate (hid_t file, const char *name, int *idx, H5G_iterate_t op,
hid_t H5Gcreate (hid_t loc_id, const char *name, size_t size_hint);
hid_t H5Gopen (hid_t loc_id, const char *name);
herr_t H5Gclose (hid_t group_id);
herr_t H5Gset (hid_t loc_id, const char *name);
herr_t H5Gpush (hid_t loc_id, const char *name);
herr_t H5Gpop (hid_t loc_id);
herr_t H5Giterate (hid_t loc_id, const char *name, int *idx, H5G_iterate_t op,
void *op_data);
herr_t H5Gmove (hid_t loc_id, const char *src, const char *dst);
herr_t H5Glink (hid_t loc_id, H5G_link_t type, const char *cur_name,

550
src/H5P.c
View File

File diff suppressed because it is too large Load Diff

72
src/H5Ppublic.h
View File

@ -44,49 +44,50 @@ extern "C" {
/* Public functions */
hid_t H5Pcreate (H5P_class_t type);
herr_t H5Pclose (hid_t tid);
hid_t H5Pcopy (hid_t tid);
H5P_class_t H5Pget_class (hid_t tid);
herr_t H5Pget_version (hid_t tid, int *boot/*out*/, int *freelist/*out*/,
herr_t H5Pclose (hid_t plist_id);
hid_t H5Pcopy (hid_t plist_id);
H5P_class_t H5Pget_class (hid_t plist_id);
herr_t H5Pget_version (hid_t plist_id, int *boot/*out*/, int *freelist/*out*/,
int *stab/*out*/, int *shhdr/*out*/);
herr_t H5Pset_userblock (hid_t tid, hsize_t size);
herr_t H5Pget_userblock (hid_t tid, hsize_t *size);
herr_t H5Pset_userblock (hid_t plist_id, hsize_t size);
herr_t H5Pget_userblock (hid_t plist_id, hsize_t *size);
herr_t H5Pset_alignment (hid_t fapl_id, hsize_t threshold, hsize_t alignment);
herr_t H5Pget_alignment (hid_t fapl_id, hsize_t *threshold/*out*/,
hsize_t *alignment/*out*/);
herr_t H5Pset_sizes (hid_t tid, size_t sizeof_addr, size_t sizeof_size);
herr_t H5Pget_sizes (hid_t tid, size_t *sizeof_addr/*out*/,
herr_t H5Pset_sizes (hid_t plist_id, size_t sizeof_addr, size_t sizeof_size);
herr_t H5Pget_sizes (hid_t plist_id, size_t *sizeof_addr/*out*/,
size_t *sizeof_size/*out*/);
herr_t H5Pset_sym_k (hid_t tid, int ik, int lk);
herr_t H5Pget_sym_k (hid_t tid, int *ik/*out*/, int *lk/*out*/);
herr_t H5Pset_istore_k (hid_t tid, int ik);
herr_t H5Pget_istore_k (hid_t tid, int *ik/*out*/);
herr_t H5Pset_layout (hid_t tid, H5D_layout_t layout);
H5D_layout_t H5Pget_layout (hid_t tid);
herr_t H5Pset_chunk (hid_t tid, int ndims, const hsize_t dim[]);
int H5Pget_chunk (hid_t tid, int max_ndims, hsize_t dim[]/*out*/);
herr_t H5Pset_sym_k (hid_t plist_id, int ik, int lk);
herr_t H5Pget_sym_k (hid_t plist_id, int *ik/*out*/, int *lk/*out*/);
herr_t H5Pset_istore_k (hid_t plist_id, int ik);
herr_t H5Pget_istore_k (hid_t plist_id, int *ik/*out*/);
herr_t H5Pset_layout (hid_t plist_id, H5D_layout_t layout);
H5D_layout_t H5Pget_layout (hid_t plist_id);
herr_t H5Pset_chunk (hid_t plist_id, int ndims, const hsize_t dim[]);
int H5Pget_chunk (hid_t plist_id, int max_ndims, hsize_t dim[]/*out*/);
herr_t H5Pset_external (hid_t plist_id, const char *name, off_t offset,
hsize_t size);
int H5Pget_external_count (hid_t plist_id);
herr_t H5Pget_external (hid_t plist_id, int idx, size_t name_size,
char *name/*out*/, off_t *offset/*out*/,
hsize_t *size/*out*/);
H5F_driver_t H5Pget_driver (hid_t tid);
herr_t H5Pset_stdio (hid_t tid);
herr_t H5Pget_stdio (hid_t tid);
herr_t H5Pset_sec2 (hid_t tid);
herr_t H5Pget_sec2 (hid_t tid);
herr_t H5Pset_core (hid_t tid, size_t increment);
herr_t H5Pget_core (hid_t tid, size_t *increment/*out*/);
herr_t H5Pset_split (hid_t tid, const char *meta_ext, hid_t meta_tid,
const char *raw_ext, hid_t raw_tid);
herr_t H5Pget_split (hid_t tid, size_t meta_ext_size, char *meta_ext/*out*/,
hid_t *meta_properties/*out*/, size_t raw_ext_size,
char *raw_ext/*out*/, hid_t *raw_properties/*out*/);
H5F_driver_t H5Pget_driver (hid_t plist_id);
herr_t H5Pset_stdio (hid_t plist_id);
herr_t H5Pget_stdio (hid_t plist_id);
herr_t H5Pset_sec2 (hid_t plist_id);
herr_t H5Pget_sec2 (hid_t plist_id);
herr_t H5Pset_core (hid_t plist_id, size_t increment);
herr_t H5Pget_core (hid_t plist_id, size_t *increment/*out*/);
herr_t H5Pset_split (hid_t plist_id, const char *meta_ext, hid_t meta_plist_id,
const char *raw_ext, hid_t raw_plist_id);
herr_t H5Pget_split (hid_t plist_id, size_t meta_ext_size,
char *meta_ext/*out*/, hid_t *meta_properties/*out*/,
size_t raw_ext_size, char *raw_ext/*out*/,
hid_t *raw_properties/*out*/);
herr_t H5Pset_family (hid_t tid, hsize_t memb_size, hid_t memb_tid);
herr_t H5Pget_family (hid_t tid, hsize_t *memb_size/*out*/,
hid_t *memb_tid/*out*/);
herr_t H5Pset_family (hid_t plist_id, hsize_t memb_size, hid_t memb_plist_id);
herr_t H5Pget_family (hid_t plist_id, hsize_t *memb_size/*out*/,
hid_t *memb_plist_id/*out*/);
herr_t H5Pset_buffer (hid_t plist_id, size_t size, void *tconv, void *bkg);
size_t H5Pget_buffer (hid_t plist_id, void **tconv/*out*/, void **bkg/*out*/);
herr_t H5Pset_preserve (hid_t plist_id, hbool_t status);
@ -105,10 +106,11 @@ herr_t H5Pget_cache (hid_t plist_id, int *mdc_nelmts, size_t *rdcc_nbytes,
double *rdcc_w0);
#ifdef HAVE_PARALLEL
herr_t H5Pset_mpi (hid_t tid, MPI_Comm comm, MPI_Info info);
herr_t H5Pget_mpi (hid_t tid, MPI_Comm *comm/*out*/, MPI_Info *info/*out*/);
herr_t H5Pset_xfer (hid_t tid, H5D_transfer_t data_xfer_mode);
herr_t H5Pget_xfer (hid_t tid, H5D_transfer_t *data_xfer_mode/*out*/);
herr_t H5Pset_mpi (hid_t plist_id, MPI_Comm comm, MPI_Info info);
herr_t H5Pget_mpi (hid_t plist_id, MPI_Comm *comm/*out*/,
MPI_Info *info/*out*/);
herr_t H5Pset_xfer (hid_t plist_id, H5D_transfer_t data_xfer_mode);
herr_t H5Pget_xfer (hid_t plist_id, H5D_transfer_t *data_xfer_mode/*out*/);
#endif
#ifdef __cplusplus

51
src/H5S.c
View File

@ -616,7 +616,8 @@ H5Sextent_ndims (hid_t space_id)
H5TRACE1("Is","i",space_id);
/* Check args */
if (H5_DATASPACE != H5I_group(space_id) || NULL == (ds = H5I_object(space_id))) {
if (H5_DATASPACE != H5I_group(space_id) ||
NULL == (ds = H5I_object(space_id))) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space");
}
ret_value = H5S_extent_ndims(ds);
@ -973,8 +974,8 @@ H5S_is_simple(const H5S_t *sdim)
PURPOSE
Check if a dataspace is simple
USAGE
hbool_t H5Sis_simple(sid)
hid_t sid; IN: ID of dataspace object to query
hbool_t H5Sis_simple(space_id)
hid_t space_id; IN: ID of dataspace object to query
RETURNS
TRUE/FALSE/FAIL
DESCRIPTION
@ -982,16 +983,16 @@ H5S_is_simple(const H5S_t *sdim)
has orthogonal, evenly spaced dimensions.
--------------------------------------------------------------------------*/
hbool_t
H5Sis_simple (hid_t sid)
H5Sis_simple (hid_t space_id)
{
H5S_t *space = NULL; /* dataspace to modify */
hbool_t ret_value = FAIL;
FUNC_ENTER(H5Sis_simple, FAIL);
H5TRACE1("b","i",sid);
H5TRACE1("b","i",space_id);
/* Check args and all the boring stuff. */
if ((space = H5I_object(sid)) == NULL)
if ((space = H5I_object(space_id)) == NULL)
HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "not a data space");
ret_value = H5S_is_simple(space);
@ -1011,8 +1012,8 @@ H5Sis_simple (hid_t sid)
PURPOSE
Sets the size of a simple dataspace
USAGE
herr_t H5Sset_extent_simple(sid, rank, dims, max)
hid_t sid; IN: Dataspace object to query
herr_t H5Sset_extent_simple(space_id, rank, dims, max)
hid_t space_id; IN: Dataspace object to query
intn rank; IN: # of dimensions for the dataspace
const size_t *dims; IN: Size of each dimension for the dataspace
const size_t *max; IN: Maximum size of each dimension for the dataspace
@ -1029,17 +1030,17 @@ H5Sis_simple (hid_t sid)
dimension in the array (the slowest) may be unlimited in size.
--------------------------------------------------------------------------*/
herr_t
H5Sset_extent_simple (hid_t sid, int rank, const hsize_t dims[/*rank*/],
H5Sset_extent_simple (hid_t space_id, int rank, const hsize_t dims[/*rank*/],
const hsize_t max[/*rank*/])
{
H5S_t *space = NULL; /* dataspace to modify */
intn u; /* local counting variable */
FUNC_ENTER(H5Sset_extent_simple, FAIL);
H5TRACE4("e","iIs*[a1]h*[a1]h",sid,rank,dims,max);
H5TRACE4("e","iIs*[a1]h*[a1]h",space_id,rank,dims,max);
/* Check args */
if ((space = H5I_object(sid)) == NULL) {
if ((space = H5I_object(space_id)) == NULL) {
HRETURN_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "not a data space");
}
if (rank > 0 && dims == NULL) {
@ -1051,8 +1052,10 @@ H5Sset_extent_simple (hid_t sid, int rank, const hsize_t dims[/*rank*/],
#ifdef OLD_WAY
if (dims) {
for (u=0; u<rank; u++) {
if (((max!=NULL && max[u]!=H5S_UNLIMITED) || max==NULL) && dims[u]==0) {
HRETURN_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "invalid dimension size");
if (((max!=NULL && max[u]!=H5S_UNLIMITED) || max==NULL) &&
dims[u]==0) {
HRETURN_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL,
"invalid dimension size");
}
}
}
@ -1178,8 +1181,10 @@ H5S_find (H5S_conv_t *conv, const H5S_t *mem_space, const H5S_t *file_space)
/* Check args */
assert (conv);
assert (mem_space && (H5S_SIMPLE==mem_space->extent.type || H5S_SCALAR==mem_space->extent.type));
assert (file_space && (H5S_SIMPLE==file_space->extent.type || H5S_SCALAR==mem_space->extent.type));
assert (mem_space && (H5S_SIMPLE==mem_space->extent.type ||
H5S_SCALAR==mem_space->extent.type));
assert (file_space && (H5S_SIMPLE==file_space->extent.type ||
H5S_SCALAR==mem_space->extent.type));
/*
* We can't do conversion if the source and destination select a
@ -1211,7 +1216,7 @@ H5S_find (H5S_conv_t *conv, const H5S_t *mem_space, const H5S_t *file_space)
switch(file_space->select.type) {
case H5S_SEL_POINTS:
#ifdef QAK
printf("%s: file space has point selection\n",FUNC);
printf("%s: file space has point selection\n",FUNC);
#endif /* QAK */
conv->finit = H5S_point_init;
conv->favail = H5S_point_favail;
@ -1223,7 +1228,7 @@ printf("%s: file space has point selection\n",FUNC);
case H5S_SEL_ALL:
#ifdef QAK
printf("%s: file space has all selection\n",FUNC);
printf("%s: file space has all selection\n",FUNC);
#endif /* QAK */
conv->finit = H5S_all_init;
conv->favail = H5S_all_favail;
@ -1235,7 +1240,7 @@ printf("%s: file space has all selection\n",FUNC);
case H5S_SEL_HYPERSLABS:
#ifdef QAK
printf("%s: file space has hyperslab selection\n",FUNC);
printf("%s: file space has hyperslab selection\n",FUNC);
#endif /* QAK */
conv->finit = H5S_hyper_init;
conv->favail = H5S_hyper_favail;
@ -1248,7 +1253,7 @@ printf("%s: file space has hyperslab selection\n",FUNC);
case H5S_SEL_NONE:
default:
#ifdef QAK
printf("%s: file space has unknown selection\n",FUNC);
printf("%s: file space has unknown selection\n",FUNC);
#endif /* QAK */
HRETURN_ERROR (H5E_DATASPACE, H5E_BADVALUE, FAIL,
"invalid file dataspace selection type");
@ -1258,7 +1263,7 @@ printf("%s: file space has unknown selection\n",FUNC);
switch(mem_space->select.type) {
case H5S_SEL_POINTS:
#ifdef QAK
printf("%s: memory space has point selection\n",FUNC);
printf("%s: memory space has point selection\n",FUNC);
#endif /* QAK */
conv->minit = H5S_point_init;
conv->binit = H5S_point_init;
@ -1270,7 +1275,7 @@ printf("%s: memory space has point selection\n",FUNC);
case H5S_SEL_ALL:
#ifdef QAK
printf("%s: memory space has all selection\n",FUNC);
printf("%s: memory space has all selection\n",FUNC);
#endif /* QAK */
conv->minit = H5S_all_init;
conv->binit = H5S_all_init;
@ -1282,7 +1287,7 @@ printf("%s: memory space has all selection\n",FUNC);
case H5S_SEL_HYPERSLABS:
#ifdef QAK
printf("%s: memory space has hyperslab selection\n",FUNC);
printf("%s: memory space has hyperslab selection\n",FUNC);
#endif /* QAK */
conv->minit = H5S_hyper_init;
conv->binit = H5S_hyper_init;
@ -1295,7 +1300,7 @@ printf("%s: memory space has hyperslab selection\n",FUNC);
case H5S_SEL_NONE:
default:
#ifdef QAK
printf("%s: memory space has unknown selection\n",FUNC);
printf("%s: memory space has unknown selection\n",FUNC);
#endif /* QAK */
HRETURN_ERROR (H5E_DATASPACE, H5E_BADVALUE, FAIL,
"invalid file dataspace selection type");

33
src/H5Sall.c
View File

@ -54,9 +54,11 @@ H5S_all_init (const struct H5O_layout_t __unused__ *layout,
/*-------------------------------------------------------------------------
* Function: H5S_all_favail
*
* Purpose: Figure out the optimal number of elements to transfer to/from the file
* Purpose: Figure out the optimal number of elements to transfer to/from
* the file.
*
* Return: non-negative number of elements on success, negative on failure
* Return: non-negative number of elements on success, negative on
* failure.
*
* Programmer: Quincey Koziol
* Tuesday, June 16, 1998
@ -107,7 +109,8 @@ H5S_all_favail (const H5S_t *space, const H5S_sel_iter_t *sel_iter, size_t max)
* bytes of a datum which this function treats as opaque.
* FILE_SPACE describes the data space of the dataset on disk
* and the elements that have been selected for reading (via
* hyperslab, etc). This function will copy at most NELMTS elements.
* hyperslab, etc). This function will copy at most NELMTS
* elements.
*
* Return: Success: Number of elements copied.
*
@ -122,10 +125,10 @@ H5S_all_favail (const H5S_t *space, const H5S_sel_iter_t *sel_iter, size_t max)
*/
size_t
H5S_all_fgath (H5F_t *f, const struct H5O_layout_t *layout,
const struct H5O_compress_t *comp, const struct H5O_efl_t *efl,
size_t elmt_size, const H5S_t *file_space, H5S_sel_iter_t *file_iter,
size_t nelmts,
const H5D_transfer_t xfer_mode, void *_buf/*out*/)
const struct H5O_compress_t *comp, const struct H5O_efl_t *efl,
size_t elmt_size, const H5S_t *file_space,
H5S_sel_iter_t *file_iter, size_t nelmts,
const H5D_transfer_t xfer_mode, void *_buf/*out*/)
{
hssize_t file_offset[H5O_LAYOUT_NDIMS]; /*offset of slab in file*/
hsize_t hsize[H5O_LAYOUT_NDIMS]; /*size of hyperslab */
@ -212,10 +215,10 @@ H5S_all_fgath (H5F_t *f, const struct H5O_layout_t *layout,
*/
herr_t
H5S_all_fscat (H5F_t *f, const struct H5O_layout_t *layout,
const struct H5O_compress_t *comp, const struct H5O_efl_t *efl,
size_t elmt_size, const H5S_t *file_space, H5S_sel_iter_t *file_iter,
size_t nelmts,
const H5D_transfer_t xfer_mode, const void *_buf)
const struct H5O_compress_t *comp, const struct H5O_efl_t *efl,
size_t elmt_size, const H5S_t *file_space,
H5S_sel_iter_t *file_iter, size_t nelmts,
const H5D_transfer_t xfer_mode, const void *_buf)
{
hssize_t file_offset[H5O_LAYOUT_NDIMS]; /*offset of hyperslab */
hsize_t hsize[H5O_LAYOUT_NDIMS]; /*size of hyperslab */
@ -298,8 +301,8 @@ H5S_all_fscat (H5F_t *f, const struct H5O_layout_t *layout,
*/
size_t
H5S_all_mgath (const void *_buf, size_t elmt_size,
const H5S_t *mem_space, H5S_sel_iter_t *mem_iter,
size_t nelmts, void *_tconv_buf/*out*/)
const H5S_t *mem_space, H5S_sel_iter_t *mem_iter,
size_t nelmts, void *_tconv_buf/*out*/)
{
hssize_t mem_offset[H5O_LAYOUT_NDIMS]; /*slab offset in app buf*/
hsize_t mem_size[H5O_LAYOUT_NDIMS]; /*total size of app buf */
@ -388,8 +391,8 @@ H5S_all_mgath (const void *_buf, size_t elmt_size,
*/
herr_t
H5S_all_mscat (const void *_tconv_buf, size_t elmt_size,
const H5S_t *mem_space, H5S_sel_iter_t *mem_iter,
size_t nelmts, void *_buf/*out*/)
const H5S_t *mem_space, H5S_sel_iter_t *mem_iter,
size_t nelmts, void *_buf/*out*/)
{
hssize_t mem_offset[H5O_LAYOUT_NDIMS]; /*slab offset in app buf*/
hsize_t mem_size[H5O_LAYOUT_NDIMS]; /*total size of app buf */

536
src/H5Shyper.c
View File

File diff suppressed because it is too large Load Diff

148
src/H5Spoint.c
View File

@ -34,7 +34,7 @@ static intn interface_initialize_g = FALSE;
*/
herr_t
H5S_point_init (const struct H5O_layout_t __unused__ *layout,
const H5S_t *space, H5S_sel_iter_t *sel_iter)
const H5S_t *space, H5S_sel_iter_t *sel_iter)
{
FUNC_ENTER (H5S_point_init, FAIL);
@ -44,7 +44,7 @@ H5S_point_init (const struct H5O_layout_t __unused__ *layout,
assert (sel_iter);
#ifdef QAK
printf("%s: check 1.0\n",FUNC);
printf("%s: check 1.0\n",FUNC);
#endif /* QAK */
/* Initialize the number of points to iterate over */
sel_iter->pnt.elmt_left=space->select.num_elem;
@ -88,7 +88,7 @@ herr_t H5S_point_add (H5S_t *space, size_t num_elem, const hssize_t **_coord)
assert(coord);
#ifdef QAK
printf("%s: check 1.0\n",FUNC);
printf("%s: check 1.0\n",FUNC);
#endif /* QAK */
top=curr=NULL;
for(i=0; i<num_elem; i++) {
@ -98,27 +98,30 @@ printf("%s: check 1.0\n",FUNC);
"can't allocate point node");
#ifdef QAK
printf("%s: check 1.1, rank=%d\n",FUNC,(int)space->extent.u.simple.rank);
printf("%s: check 1.1, rank=%d\n",
FUNC,(int)space->extent.u.simple.rank);
#endif /* QAK */
if((new->pnt = H5MM_malloc(space->extent.u.simple.rank*sizeof(hssize_t)))==NULL)
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
"can't allocate coordinate information");
#ifdef QAK
printf("%s: check 1.2\n",FUNC);
printf("%s: check 1.2\n",FUNC);
#endif /* QAK */
/* Copy over the coordinates */
HDmemcpy(new->pnt,coord+(i*space->extent.u.simple.rank),(space->extent.u.simple.rank*sizeof(hssize_t)));
#ifdef QAK
printf("%s: check 1.3\n",FUNC);
{
intn j;
printf("%s: check 1.3\n",FUNC);
{
intn j;
for(j=0; j<space->extent.u.simple.rank; j++) {
printf("%s: pnt[%d]=%d\n",FUNC,(int)j,(int)new->pnt[j]);
printf("%s: coord[%d][%d]=%d\n",FUNC,(int)i,(int)j,(int)*(coord+(i*space->extent.u.simple.rank)+j));
}
}
for(j=0; j<space->extent.u.simple.rank; j++) {
printf("%s: pnt[%d]=%d\n",FUNC,(int)j,(int)new->pnt[j]);
printf("%s: coord[%d][%d]=%d\n",
FUNC, (int)i, (int)j,
(int)*(coord+(i*space->extent.u.simple.rank)+j));
}
}
#endif /* QAK */
/* Link into list */
@ -130,7 +133,7 @@ printf("%s: check 1.3\n",FUNC);
curr=new;
} /* end for */
#ifdef QAK
printf("%s: check 2.0\n",FUNC);
printf("%s: check 2.0\n",FUNC);
#endif /* QAK */
/* Append current list, if there is one */
@ -145,7 +148,7 @@ printf("%s: check 2.0\n",FUNC);
ret_value=SUCCEED;
#ifdef QAK
printf("%s: check 3.0\n",FUNC);
printf("%s: check 3.0\n",FUNC);
#endif /* QAK */
done:
@ -176,7 +179,8 @@ H5S_point_favail (const H5S_t __unused__ *space, const H5S_sel_iter_t *sel_iter,
assert (sel_iter);
#ifdef QAK
printf("%s: check 1.0, ret=%d\n",FUNC,(int)MIN(sel_iter->pnt.elmt_left,max));
printf("%s: check 1.0, ret=%d\n",
FUNC,(int)MIN(sel_iter->pnt.elmt_left,max));
#endif /* QAK */
FUNC_LEAVE (MIN(sel_iter->pnt.elmt_left,max));
} /* H5S_point_favail() */
@ -191,7 +195,8 @@ printf("%s: check 1.0, ret=%d\n",FUNC,(int)MIN(sel_iter->pnt.elmt_left,max));
* bytes of a datum which this function treats as opaque.
* FILE_SPACE describes the data space of the dataset on disk
* and the elements that have been selected for reading (via
* hyperslab, etc). This function will copy at most NELMTS elements.
* hyperslab, etc). This function will copy at most NELMTS
* elements.
*
* Notes: This could be optimized by gathering selected elements near (how
* near?) each other into one I/O request and then moving the correct
@ -210,10 +215,11 @@ printf("%s: check 1.0, ret=%d\n",FUNC,(int)MIN(sel_iter->pnt.elmt_left,max));
*/
size_t
H5S_point_fgath (H5F_t *f, const struct H5O_layout_t *layout,
const struct H5O_compress_t *comp, const struct H5O_efl_t *efl,
size_t elmt_size, const H5S_t *file_space, H5S_sel_iter_t *file_iter,
size_t nelmts,
const H5D_transfer_t xfer_mode, void *_buf/*out*/)
const struct H5O_compress_t *comp,
const struct H5O_efl_t *efl, size_t elmt_size,
const H5S_t *file_space, H5S_sel_iter_t *file_iter,
size_t nelmts, const H5D_transfer_t xfer_mode,
void *_buf/*out*/)
{
hssize_t file_offset[H5O_LAYOUT_NDIMS]; /*offset of slab in file*/
hsize_t hsize[H5O_LAYOUT_NDIMS]; /*size of hyperslab */
@ -235,7 +241,7 @@ H5S_point_fgath (H5F_t *f, const struct H5O_layout_t *layout,
assert (buf);
#ifdef QAK
printf("%s: check 1.0\n",FUNC);
printf("%s: check 1.0\n",FUNC);
#endif /* QAK */
ndims=file_space->extent.u.simple.rank;
/* initialize hyperslab size and offset in memory buffer */
@ -245,29 +251,35 @@ printf("%s: check 1.0\n",FUNC);
} /* end for */
hsize[ndims] = elmt_size;
/* Walk though and request each element we need and put it into the buffer */
/*
* Walk though and request each element we need and put it into the
* buffer.
*/
num_read=0;
while(num_read<nelmts) {
if(file_iter->pnt.elmt_left>0) {
/* Copy the location of the point to get */
HDmemcpy(file_offset,file_iter->pnt.curr->pnt,ndims*sizeof(hssize_t));
HDmemcpy(file_offset, file_iter->pnt.curr->pnt,
ndims*sizeof(hssize_t));
file_offset[ndims] = 0;
/* Go read the point */
if (H5F_arr_read (f, layout, comp, efl, hsize, hsize, zero, file_offset,
xfer_mode, buf/*out*/)<0) {
if (H5F_arr_read (f, layout, comp, efl, hsize, hsize, zero,
file_offset, xfer_mode, buf/*out*/)<0) {
HRETURN_ERROR (H5E_DATASPACE, H5E_READERROR, 0, "read error");
}
#ifdef QAK
printf("%s: check 3.0\n",FUNC);
{
for(i=0; i<ndims; i++) {
printf("%s: %d - pnt=%d\n",FUNC,(int)i,(int)file_iter->pnt.curr->pnt[i]);
printf("%s: %d - file_offset=%d\n",FUNC,(int)i,(int)file_offset[i]);
}
printf("%s: *buf=%u\n",FUNC,(unsigned)*buf);
}
printf("%s: check 3.0\n",FUNC);
{
for(i=0; i<ndims; i++) {
printf("%s: %d - pnt=%d\n",
FUNC, (int)i, (int)file_iter->pnt.curr->pnt[i]);
printf("%s: %d - file_offset=%d\n",
FUNC, (int)i, (int)file_offset[i]);
}
printf("%s: *buf=%u\n",FUNC,(unsigned)*buf);
}
#endif /* QAK */
/* Increment the offset of the buffer */
buf+=elmt_size;
@ -308,10 +320,11 @@ printf("%s: *buf=%u\n",FUNC,(unsigned)*buf);
*/
herr_t
H5S_point_fscat (H5F_t *f, const struct H5O_layout_t *layout,
const struct H5O_compress_t *comp, const struct H5O_efl_t *efl,
size_t elmt_size, const H5S_t *file_space, H5S_sel_iter_t *file_iter,
size_t nelmts,
const H5D_transfer_t xfer_mode, const void *_buf)
const struct H5O_compress_t *comp,
const struct H5O_efl_t *efl, size_t elmt_size,
const H5S_t *file_space, H5S_sel_iter_t *file_iter,
size_t nelmts, const H5D_transfer_t xfer_mode,
const void *_buf)
{
hssize_t file_offset[H5O_LAYOUT_NDIMS]; /*offset of hyperslab */
hsize_t hsize[H5O_LAYOUT_NDIMS]; /*size of hyperslab */
@ -333,7 +346,7 @@ H5S_point_fscat (H5F_t *f, const struct H5O_layout_t *layout,
assert (buf);
#ifdef QAK
printf("%s: check 1.0, layout->ndims=%d\n",FUNC,(int)layout->ndims);
printf("%s: check 1.0, layout->ndims=%d\n",FUNC,(int)layout->ndims);
#endif /* QAK */
ndims=file_space->extent.u.simple.rank;
/* initialize hyperslab size and offset in memory buffer */
@ -343,34 +356,40 @@ printf("%s: check 1.0, layout->ndims=%d\n",FUNC,(int)layout->ndims);
} /* end for */
hsize[ndims] = elmt_size;
/* Walk though and request each element we need and put it into the buffer */
/*
* Walk though and request each element we need and put it into the
* buffer.
*/
num_written=0;
while(num_written<nelmts && file_iter->pnt.elmt_left>0) {
#ifdef QAK
printf("%s: check 2.0\n",FUNC);
{
for(i=0; i<ndims; i++) {
printf("%s: %d - pnt=%d\n",FUNC,(int)i,(int)file_iter->pnt.curr->pnt[i]);
}
}
printf("%s: check 2.0\n",FUNC);
{
for(i=0; i<ndims; i++) {
printf("%s: %d - pnt=%d\n",
FUNC, (int)i, (int)file_iter->pnt.curr->pnt[i]);
}
}
#endif /* QAK */
/* Copy the location of the point to get */
HDmemcpy(file_offset,file_iter->pnt.curr->pnt,ndims*sizeof(hssize_t));
file_offset[ndims] = 0;
#ifdef QAK
printf("%s: check 3.0\n",FUNC);
{
for(i=0; i<ndims; i++) {
printf("%s: %d - pnt=%d\n",FUNC,(int)i,(int)file_iter->pnt.curr->pnt[i]);
printf("%s: %d - file_offset=%d\n",FUNC,(int)i,(int)file_offset[i]);
}
printf("%s: *buf=%u\n",FUNC,(unsigned)*buf);
}
printf("%s: check 3.0\n",FUNC);
{
for(i=0; i<ndims; i++) {
printf("%s: %d - pnt=%d\n",
FUNC,(int)i,(int)file_iter->pnt.curr->pnt[i]);
printf("%s: %d - file_offset=%d\n",
FUNC,(int)i,(int)file_offset[i]);
}
printf("%s: *buf=%u\n",FUNC,(unsigned)*buf);
}
#endif /* QAK */
/* Go write the point */
if (H5F_arr_write (f, layout, comp, efl, hsize, hsize, zero, file_offset,
xfer_mode, buf)<0) {
if (H5F_arr_write (f, layout, comp, efl, hsize, hsize, zero,
file_offset, xfer_mode, buf)<0) {
HRETURN_ERROR (H5E_DATASPACE, H5E_WRITEERROR, 0, "write error");
}
@ -384,7 +403,8 @@ printf("%s: *buf=%u\n",FUNC,(unsigned)*buf);
file_iter->pnt.elmt_left--;
file_iter->pnt.curr=file_iter->pnt.curr->next;
#ifdef QAK
printf("%s: check 5.0, file_iter->pnt.curr=%p\n",FUNC,file_iter->pnt.curr);
printf("%s: check 5.0, file_iter->pnt.curr=%p\n",
FUNC,file_iter->pnt.curr);
#endif
} /* end while */
@ -413,8 +433,8 @@ printf("%s: check 5.0, file_iter->pnt.curr=%p\n",FUNC,file_iter->pnt.curr);
*/
size_t
H5S_point_mgath (const void *_buf, size_t elmt_size,
const H5S_t *mem_space, H5S_sel_iter_t *mem_iter,
size_t nelmts, void *_tconv_buf/*out*/)
const H5S_t *mem_space, H5S_sel_iter_t *mem_iter,
size_t nelmts, void *_tconv_buf/*out*/)
{
hsize_t mem_size[H5O_LAYOUT_NDIMS]; /*total size of app buf */
const uint8 *buf=(const uint8 *)_buf; /* Get local copies for address arithmetic */
@ -435,7 +455,7 @@ H5S_point_mgath (const void *_buf, size_t elmt_size,
assert (tconv_buf);
#ifdef QAK
printf("%s: check 1.0\n",FUNC);
printf("%s: check 1.0\n",FUNC);
#endif /* QAK */
if ((space_ndims=H5S_extent_dims (mem_space, mem_size, NULL))<0) {
HRETURN_ERROR (H5E_DATASPACE, H5E_CANTINIT, 0,
@ -451,7 +471,7 @@ printf("%s: check 1.0\n",FUNC);
} /* end for */
#ifdef QAK
printf("%s: check 2.0, acc=%d, off=%d\n",FUNC,(int)acc,(int)off);
printf("%s: check 2.0, acc=%d, off=%d\n",FUNC,(int)acc,(int)off);
#endif /* QAK */
/* Copy the elements into the type conversion buffer */
HDmemcpy(tconv_buf,buf+off,elmt_size);
@ -491,8 +511,8 @@ printf("%s: check 2.0, acc=%d, off=%d\n",FUNC,(int)acc,(int)off);
*/
herr_t
H5S_point_mscat (const void *_tconv_buf, size_t elmt_size,
const H5S_t *mem_space, H5S_sel_iter_t *mem_iter,
size_t nelmts, void *_buf/*out*/)
const H5S_t *mem_space, H5S_sel_iter_t *mem_iter,
size_t nelmts, void *_buf/*out*/)
{
hsize_t mem_size[H5O_LAYOUT_NDIMS]; /*total size of app buf */
uint8 *buf=(uint8 *)_buf; /* Get local copies for address arithmetic */
@ -513,7 +533,7 @@ H5S_point_mscat (const void *_tconv_buf, size_t elmt_size,
assert (buf);
#ifdef QAK
printf("%s: check 1.0\n",FUNC);
printf("%s: check 1.0\n",FUNC);
#endif /* QAK */
/*
* Retrieve hyperslab information to determine what elements are being

15
src/H5Spublic.h
View File

@ -44,8 +44,9 @@ extern "C" {
/* Functions in H5S.c */
hid_t H5Screate(H5S_class_t type);
hid_t H5Screate_simple (int rank, const hsize_t dims[], const hsize_t maxdims[]);
herr_t H5Sset_extent_simple (hid_t sid, int rank, const hsize_t dims[],
hid_t H5Screate_simple (int rank, const hsize_t dims[],
const hsize_t maxdims[]);
herr_t H5Sset_extent_simple (hid_t space_id, int rank, const hsize_t dims[],
const hsize_t max[]);
hid_t H5Scopy (hid_t space_id);
herr_t H5Sclose (hid_t space_id);
@ -55,11 +56,11 @@ int H5Sextent_dims (hid_t space_id, hsize_t dims[], hsize_t maxdims[]);
hbool_t H5Sis_simple (hid_t space_id);
herr_t H5Sset_space (hid_t space_id, int rank, const hsize_t *dims);
hsize_t H5Sselect_npoints (hid_t spaceid);
herr_t H5Sselect_hyperslab (hid_t spaceid, H5S_seloper_t op,
const hssize_t *start, const hsize_t *_stride, const hsize_t *count,
const hsize_t *_block);
herr_t H5Sselect_elements (hid_t spaceid, H5S_seloper_t op, size_t num_elemn,
const hssize_t **coord);
herr_t H5Sselect_hyperslab (hid_t space_id, H5S_seloper_t op,
const hssize_t start[], const hsize_t _stride[],
const hsize_t count[], const hsize_t _block[]);
herr_t H5Sselect_elements (hid_t space_id, H5S_seloper_t op, size_t num_elemn,
const hssize_t **coord);
#ifdef __cplusplus
}

86
src/H5Sselect.c
View File

@ -19,8 +19,8 @@
#define PABLO_MASK H5S_select_mask
#define INTERFACE_INIT H5S_select_init
static intn interface_initialize_g = FALSE;
static herr_t H5S_select_init(void);
static void H5S_select_term(void);
static herr_t H5S_select_init(void);
static void H5S_select_term(void);
/*--------------------------------------------------------------------------
@ -180,9 +180,11 @@ H5S_select_release (H5S_t *space)
REVISION LOG
--------------------------------------------------------------------------*/
herr_t
H5Sselect_hyperslab (hid_t spaceid, H5S_seloper_t op,
const hssize_t *start, const hsize_t *_stride, const hsize_t *count,
const hsize_t *_block)
H5Sselect_hyperslab (hid_t space_id, H5S_seloper_t op,
const hssize_t start[/*space_id*/],
const hsize_t _stride[/*space_id*/],
const hsize_t count[/*space_id*/],
const hsize_t _block[/*space_id*/])
{
H5S_t *space = NULL; /* Dataspace to modify selection of */
hsize_t *stride, /* Stride array */
@ -195,11 +197,12 @@ H5Sselect_hyperslab (hid_t spaceid, H5S_seloper_t op,
herr_t ret_value=FAIL; /* return value */
FUNC_ENTER (H5Sselect_hyperslab, FAIL);
H5TRACE6("e","iSs*Hs*h*h*h",spaceid,op,start,_stride,count,_block);
H5TRACE6("e","iSs*[a0]Hs*[a0]h*[a0]h*[a0]h",space_id,op,start,_stride,
count,_block);
/* Check args */
if (H5_DATASPACE != H5I_group(spaceid) ||
NULL == (space=H5I_object(spaceid))) {
if (H5_DATASPACE != H5I_group(space_id) ||
NULL == (space=H5I_object(space_id))) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space");
}
if(start==NULL || count==NULL) {
@ -234,18 +237,22 @@ H5Sselect_hyperslab (hid_t spaceid, H5S_seloper_t op,
block=(hsize_t *)_block;
} /* end else */
/* Check for overlapping blocks (remove when real block-merging algorithm is in place) */
if(op==H5S_SELECT_SET && _block!=NULL) {
for(i=0; i<space->extent.u.simple.rank; i++) {
if(stride[i]<block[i]) {
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
"hyperslab blocks overlap");
} /* end if */
} /* end for */
} /* end if */
/*
* Check for overlapping blocks (remove when real block-merging algorithm
* is in place).
*/
if(op==H5S_SELECT_SET && _block!=NULL) {
for(i=0; i<space->extent.u.simple.rank; i++) {
if(stride[i]<block[i]) {
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
"hyperslab blocks overlap");
} /* end if */
} /* end for */
} /* end if */
/* Determine if selection is contiguous */
contig=1; /* assume hyperslab is contiguous, until proven otherwise */
/* assume hyperslab is contiguous, until proven otherwise */
contig=1;
for(i=0; i<space->extent.u.simple.rank; i++) {
/* contiguous hyperslabs have the block size equal to the stride */
if(stride[i]!=block[i]) {
@ -255,7 +262,7 @@ if(op==H5S_SELECT_SET && _block!=NULL) {
} /* end for */
#ifdef QAK
printf("%s: check 1.0\n",FUNC);
printf("%s: check 1.0\n",FUNC);
#endif /* QAK */
/* If we are setting a new selection, remove current selection first */
if(op==H5S_SELECT_SET) {
@ -266,25 +273,31 @@ printf("%s: check 1.0\n",FUNC);
} /* end if */
#ifdef QAK
printf("%s: check 2.0\n",FUNC);
printf("%s: check 2.0\n",FUNC);
#endif /* QAK */
/* Allocate space for the hyperslab selection information if necessary */
if(space->select.type!=H5S_SEL_HYPERSLABS || space->select.sel_info.hyper_lst==NULL) {
if((space->select.sel_info.hyper_lst = H5MM_calloc(sizeof(H5S_hyper_list_t)))==NULL)
if(space->select.type!=H5S_SEL_HYPERSLABS ||
space->select.sel_info.hyper_lst==NULL) {
if((space->select.sel_info.hyper_lst =
H5MM_calloc(sizeof(H5S_hyper_list_t)))==NULL)
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
"can't allocate hyperslab information");
if((space->select.sel_info.hyper_lst->lo_bounds = H5MM_calloc(space->extent.u.simple.rank*sizeof(H5S_hyper_bound_t *)))==NULL)
"can't allocate hyperslab information");
if((space->select.sel_info.hyper_lst->lo_bounds =
H5MM_calloc(space->extent.u.simple.rank*
sizeof(H5S_hyper_bound_t *)))==NULL)
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
"can't allocate hyperslab lo bound information");
if((space->select.sel_info.hyper_lst->hi_bounds = H5MM_calloc(space->extent.u.simple.rank*sizeof(H5S_hyper_bound_t *)))==NULL)
"can't allocate hyperslab lo bound information");
if((space->select.sel_info.hyper_lst->hi_bounds =
H5MM_calloc(space->extent.u.simple.rank*
sizeof(H5S_hyper_bound_t *)))==NULL)
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
"can't allocate hyperslab lo bound information");
"can't allocate hyperslab lo bound information");
} /* end if */
/* Generate list of blocks to add/remove based on selection operation */
/* Generate list of blocks to add/remove based on selection operation */
#ifdef QAK
printf("%s: check 3.0\n",FUNC);
printf("%s: check 3.0\n",FUNC);
#endif /* QAK */
/* Add hyperslab to selection */
if(contig) { /* Check for trivial case */
@ -314,9 +327,10 @@ printf("%s: check 3.0\n",FUNC);
slab[j]=start[j]+((i/slice[j])%count[j])*stride[j];
/* Add the block to the list of hyperslab selections */
if(H5S_hyper_add(space,(const hssize_t *)slab,(const hsize_t *)block)<0) {
if(H5S_hyper_add(space,(const hssize_t *)slab,
(const hsize_t *)block)<0) {
HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINSERT, FAIL,
"can't insert hyperslab");
"can't insert hyperslab");
} /* end if */
} /* end for */
} /* end if */
@ -325,7 +339,7 @@ printf("%s: check 3.0\n",FUNC);
space->select.type=H5S_SEL_HYPERSLABS;
ret_value=SUCCEED;
#ifdef QAK
printf("%s: check 4.0\n",FUNC);
printf("%s: check 4.0\n",FUNC);
#endif /* QAK */
done:
@ -389,7 +403,7 @@ herr_t H5Sselect_elements (hid_t spaceid, H5S_seloper_t op, size_t num_elem,
} /* end if */
#ifdef QAK
printf("%s: check 1.0\n",FUNC);
printf("%s: check 1.0\n",FUNC);
#endif /* QAK */
/* If we are setting a new selection, remove current selection first */
if(op==H5S_SELECT_SET) {
@ -400,7 +414,7 @@ printf("%s: check 1.0\n",FUNC);
} /* end if */
#ifdef QAK
printf("%s: check 2.0\n",FUNC);
printf("%s: check 2.0\n",FUNC);
#endif /* QAK */
/* Allocate space for the point selection information if necessary */
if(space->select.type!=H5S_SEL_POINTS || space->select.sel_info.pnt_lst==NULL) {
@ -410,7 +424,7 @@ printf("%s: check 2.0\n",FUNC);
} /* end if */
#ifdef QAK
printf("%s: check 3.0\n",FUNC);
printf("%s: check 3.0\n",FUNC);
#endif /* QAK */
/* Add points to selection */
if(H5S_point_add(space,num_elem,coord)<0) {
@ -422,7 +436,7 @@ printf("%s: check 3.0\n",FUNC);
space->select.type=H5S_SEL_POINTS;
ret_value=SUCCEED;
#ifdef QAK
printf("%s: check 4.0\n",FUNC);
printf("%s: check 4.0\n",FUNC);
#endif /* QAK */
done:

48
src/H5Ssimp.c
View File

@ -537,11 +537,13 @@ H5S_simp_read (H5F_t *f, const struct H5O_layout_t *layout,
*/
switch(file_space->select.type) {
case H5S_SEL_NONE: /* no selection defined */
HRETURN_ERROR (H5E_DATASPACE, H5E_BADVALUE, FAIL, "selection not defined");
HRETURN_ERROR (H5E_DATASPACE, H5E_BADVALUE, FAIL,
"selection not defined");
case H5S_SEL_POINTS: /* point sequence selection defined */
case H5S_SEL_HYPERSLABS: /* hyperslab selection defined */
HRETURN_ERROR (H5E_DATASPACE, H5E_UNSUPPORTED, FAIL, "selection type not supprted currently");
HRETURN_ERROR (H5E_DATASPACE, H5E_UNSUPPORTED, FAIL,
"selection type not supprted currently");
case H5S_SEL_ALL: /* entire dataspace selection */
for (i=0; i<file_space->extent.u.simple.rank; i++)
@ -551,11 +553,13 @@ H5S_simp_read (H5F_t *f, const struct H5O_layout_t *layout,
switch(mem_space->select.type) {
case H5S_SEL_NONE: /* no selection defined */
HRETURN_ERROR (H5E_DATASPACE, H5E_BADVALUE, FAIL, "selection not defined");
HRETURN_ERROR (H5E_DATASPACE, H5E_BADVALUE, FAIL,
"selection not defined");
case H5S_SEL_POINTS: /* point sequence selection defined */
case H5S_SEL_HYPERSLABS: /* hyperslab selection defined */
HRETURN_ERROR (H5E_DATASPACE, H5E_UNSUPPORTED, FAIL, "selection type not supprted currently");
HRETURN_ERROR (H5E_DATASPACE, H5E_UNSUPPORTED, FAIL,
"selection type not supprted currently");
case H5S_SEL_ALL: /* entire dataspace selection */
for (i=0; i<mem_space->extent.u.simple.rank; i++)
@ -565,7 +569,8 @@ H5S_simp_read (H5F_t *f, const struct H5O_layout_t *layout,
switch(file_space->select.type) {
case H5S_SEL_NONE: /* no selection defined */
HRETURN_ERROR (H5E_DATASPACE, H5E_BADVALUE, FAIL, "selection not defined");
HRETURN_ERROR (H5E_DATASPACE, H5E_BADVALUE, FAIL,
"selection not defined");
case H5S_SEL_POINTS: /* point sequence selection defined */
case H5S_SEL_HYPERSLABS: /* hyperslab selection defined */
@ -573,7 +578,8 @@ H5S_simp_read (H5F_t *f, const struct H5O_layout_t *layout,
for (i=0; i<file_space->u.simple.rank; i++)
file_offset[i] = file_space->h.start[i];
#endif
HRETURN_ERROR (H5E_DATASPACE, H5E_UNSUPPORTED, FAIL, "selection type not supprted currently");
HRETURN_ERROR (H5E_DATASPACE, H5E_UNSUPPORTED, FAIL,
"selection type not supprted currently");
case H5S_SEL_ALL: /* entire dataspace selection */
for (i=0; i<file_space->extent.u.simple.rank; i++)
@ -583,7 +589,8 @@ H5S_simp_read (H5F_t *f, const struct H5O_layout_t *layout,
switch(mem_space->select.type) {
case H5S_SEL_NONE: /* no selection defined */
HRETURN_ERROR (H5E_DATASPACE, H5E_BADVALUE, FAIL, "selection not defined");
HRETURN_ERROR (H5E_DATASPACE, H5E_BADVALUE, FAIL,
"selection not defined");
case H5S_SEL_POINTS: /* point sequence selection defined */
case H5S_SEL_HYPERSLABS: /* hyperslab selection defined */
@ -591,7 +598,8 @@ H5S_simp_read (H5F_t *f, const struct H5O_layout_t *layout,
for (i=0; i<mem_space->u.simple.rank; i++)
mem_offset[i] = mem_space->h.start[i];
#endif
HRETURN_ERROR (H5E_DATASPACE, H5E_UNSUPPORTED, FAIL, "selection type not supprted currently");
HRETURN_ERROR (H5E_DATASPACE, H5E_UNSUPPORTED, FAIL,
"selection type not supprted currently");
case H5S_SEL_ALL: /* entire dataspace selection */
for (i=0; i<mem_space->extent.u.simple.rank; i++)
@ -681,11 +689,13 @@ H5S_simp_write (H5F_t *f, const struct H5O_layout_t *layout,
*/
switch(file_space->select.type) {
case H5S_SEL_NONE: /* no selection defined */
HRETURN_ERROR (H5E_DATASPACE, H5E_BADVALUE, FAIL, "selection not defined");
HRETURN_ERROR (H5E_DATASPACE, H5E_BADVALUE, FAIL,
"selection not defined");
case H5S_SEL_POINTS: /* point sequence selection defined */
case H5S_SEL_HYPERSLABS: /* hyperslab selection defined */
HRETURN_ERROR (H5E_DATASPACE, H5E_UNSUPPORTED, FAIL, "selection type not supprted currently");
HRETURN_ERROR (H5E_DATASPACE, H5E_UNSUPPORTED, FAIL,
"selection type not supprted currently");
case H5S_SEL_ALL: /* entire dataspace selection */
for (i=0; i<file_space->extent.u.simple.rank; i++)
@ -695,11 +705,13 @@ H5S_simp_write (H5F_t *f, const struct H5O_layout_t *layout,
switch(mem_space->select.type) {
case H5S_SEL_NONE: /* no selection defined */
HRETURN_ERROR (H5E_DATASPACE, H5E_BADVALUE, FAIL, "selection not defined");
HRETURN_ERROR (H5E_DATASPACE, H5E_BADVALUE, FAIL,
"selection not defined");
case H5S_SEL_POINTS: /* point sequence selection defined */
case H5S_SEL_HYPERSLABS: /* hyperslab selection defined */
HRETURN_ERROR (H5E_DATASPACE, H5E_UNSUPPORTED, FAIL, "selection type not supprted currently");
HRETURN_ERROR (H5E_DATASPACE, H5E_UNSUPPORTED, FAIL,
"selection type not supprted currently");
case H5S_SEL_ALL: /* entire dataspace selection */
for (i=0; i<mem_space->extent.u.simple.rank; i++)
@ -709,7 +721,8 @@ H5S_simp_write (H5F_t *f, const struct H5O_layout_t *layout,
switch(file_space->select.type) {
case H5S_SEL_NONE: /* no selection defined */
HRETURN_ERROR (H5E_DATASPACE, H5E_BADVALUE, FAIL, "selection not defined");
HRETURN_ERROR (H5E_DATASPACE, H5E_BADVALUE, FAIL,
"selection not defined");
case H5S_SEL_POINTS: /* point sequence selection defined */
case H5S_SEL_HYPERSLABS: /* hyperslab selection defined */
@ -717,7 +730,8 @@ H5S_simp_write (H5F_t *f, const struct H5O_layout_t *layout,
for (i=0; i<file_space->u.simple.rank; i++)
file_offset[i] = file_space->h.start[i];
#endif
HRETURN_ERROR (H5E_DATASPACE, H5E_UNSUPPORTED, FAIL, "selection type not supprted currently");
HRETURN_ERROR (H5E_DATASPACE, H5E_UNSUPPORTED, FAIL,
"selection type not supprted currently");
case H5S_SEL_ALL: /* entire dataspace selection */
for (i=0; i<file_space->extent.u.simple.rank; i++)
@ -727,7 +741,8 @@ H5S_simp_write (H5F_t *f, const struct H5O_layout_t *layout,
switch(mem_space->select.type) {
case H5S_SEL_NONE: /* no selection defined */
HRETURN_ERROR (H5E_DATASPACE, H5E_BADVALUE, FAIL, "selection not defined");
HRETURN_ERROR (H5E_DATASPACE, H5E_BADVALUE, FAIL,
"selection not defined");
case H5S_SEL_POINTS: /* point sequence selection defined */
case H5S_SEL_HYPERSLABS: /* hyperslab selection defined */
@ -735,7 +750,8 @@ H5S_simp_write (H5F_t *f, const struct H5O_layout_t *layout,
for (i=0; i<mem_space->u.simple.rank; i++)
mem_offset[i] = mem_space->h.start[i];
#endif
HRETURN_ERROR (H5E_DATASPACE, H5E_UNSUPPORTED, FAIL, "selection type not supprted currently");
HRETURN_ERROR (H5E_DATASPACE, H5E_UNSUPPORTED, FAIL,
"selection type not supprted currently");
case H5S_SEL_ALL: /* entire dataspace selection */
for (i=0; i<mem_space->extent.u.simple.rank; i++)

41
src/H5TB.c
View File

@ -282,8 +282,8 @@ done:
PURPOSE
Get the pointer to a temp. buffer memory
USAGE
void *H5TBbuf_ptr(tbid)
hid_t tbid; IN: Temp. buffer ID
void *H5TBbuf_ptr(tbuf_id)
hid_t tbuf_id; IN: Temp. buffer ID
RETURNS
Non-NULL pointer to buffer memory on success, NULL on failure
DESCRIPTION
@ -294,15 +294,15 @@ done:
REVISION LOG
--------------------------------------------------------------------------*/
void *
H5TBbuf_ptr(hid_t tbid)
H5TBbuf_ptr(hid_t tbuf_id)
{
void *ret_value = NULL;
H5TB_t *tbuf; /* Pointer to temporary buffer */
FUNC_ENTER (H5TBbuf_ptr, NULL);
if (H5_TEMPBUF != H5I_group(tbid) ||
NULL == (tbuf = H5I_object(tbid))) {
if (H5_TEMPBUF != H5I_group(tbuf_id) ||
NULL == (tbuf = H5I_object(tbuf_id))) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a temp. buffer");
}
@ -335,7 +335,7 @@ done:
REVISION LOG
--------------------------------------------------------------------------*/
herr_t
H5TBresize_ptr (hid_t tbid, hsize_t size)
H5TBresize_ptr (hid_t tbuf_id, hsize_t size)
{
herr_t ret_value = FAIL;
H5TB_t *tbuf, /* Pointer to temporary buffer */
@ -343,10 +343,10 @@ H5TBresize_ptr (hid_t tbid, hsize_t size)
void * old_ptr; /* Pointer to the previous buffer */
FUNC_ENTER (H5TBresize_ptr, FAIL);
H5TRACE2("e","ih",tbid,size);
H5TRACE2("e","ih",tbuf_id,size);
if (H5_TEMPBUF != H5I_group(tbid) ||
NULL == (tbuf = H5I_object(tbid))) {
if (H5_TEMPBUF != H5I_group(tbuf_id) ||
NULL == (tbuf = H5I_object(tbuf_id))) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a temp. buffer");
}
@ -387,7 +387,11 @@ H5TBresize_ptr (hid_t tbid, hsize_t size)
} /* end while */
/* Insert into correct position in list */
if(curr!=NULL) { /* can't be adding to the beginning of list, so this is in the middle somewhere */
if(curr!=NULL) {
/*
* Can't be adding to the beginning of list, so this is in the
* middle somewhere.
*/
curr->prev->next=tbuf;
tbuf->prev=curr->prev;
curr->prev=tbuf;
@ -434,7 +438,10 @@ H5TBgarbage_coll (void)
FUNC_ENTER (H5TBgarbage_coll, FAIL);
H5TRACE0("e","");
/* Step through the list, remove each unused node, repair the list and free the node */
/*
* Step through the list, remove each unused node, repair the list and
* free the node.
*/
curr=H5TB_list_head;
while(curr!=NULL) {
next=curr->next;
@ -475,8 +482,8 @@ done:
PURPOSE
Release a temp. buffer back to the list of unused ones.
USAGE
herr_t H5TBrelease_buf(tbid)
hid_t tbid; IN: Temp. buffer ID to release
herr_t H5TBrelease_buf(tbuf_id)
hid_t tbuf_id; IN: Temp. buffer ID to release
RETURNS
non-negative on success, negative on failure
DESCRIPTION
@ -487,16 +494,16 @@ done:
REVISION LOG
--------------------------------------------------------------------------*/
herr_t
H5TBrelease_buf (hid_t tbid)
H5TBrelease_buf (hid_t tbuf_id)
{
herr_t ret_value = FAIL;
H5TB_t *tbuf; /* Pointer to temporary buffer */
FUNC_ENTER (H5TBresize_ptr, FAIL);
H5TRACE1("e","i",tbid);
H5TRACE1("e","i",tbuf_id);
if (H5_TEMPBUF != H5I_group(tbid) ||
NULL == (tbuf = H5I_object(tbid))) {
if (H5_TEMPBUF != H5I_group(tbuf_id) ||
NULL == (tbuf = H5I_object(tbuf_id))) {
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a temp. buffer");
}

17
src/H5V.c
View File

@ -411,14 +411,17 @@ H5V_hyper_copy(intn n, const hsize_t *_size,
}
#endif
#ifdef QAK
{
intn i;
{
intn i;
printf("%s: n=%d, _dst=%p, _src=%p\n",FUNC,(int)n,_dst,_src);
for(i=0; i<n; i++) {
printf("%d: size=%d, dst_size=%d, dst_offset=%d, src_size=%d, src_offset=%d\n",i,(int)size[i],(int)dst_size[i],(int)dst_offset[i],(int)src_size[i],(int)src_offset[i]);
} /* end for */
}
printf("%s: n=%d, _dst=%p, _src=%p\n",FUNC,(int)n,_dst,_src);
for(i=0; i<n; i++) {
printf("%d: size=%d, dst_size=%d, dst_offset=%d, src_size=%d, "
"src_offset=%d\n",
i, (int)size[i], (int)dst_size[i], (int)dst_offset[i],
(int)src_size[i], (int)src_offset[i]);
} /* end for */
}
#endif /* QAK */
/* Copy the size vector so we can modify it */

10
tools/h5ls.c
View File

@ -74,8 +74,8 @@ static void
dump_dataset_values(hid_t dset)
{
hid_t file_space, mem_space, type;
hsize_t start, file_nelmts, mem_nelmts;
hssize_t zero = 0;
hsize_t file_nelmts, mem_nelmts;
hssize_t start, zero=0;
unsigned char buf[1024];
hsize_t i;
@ -87,8 +87,10 @@ dump_dataset_values(hid_t dset)
file_nelmts = H5Sextent_npoints(file_space);
mem_nelmts = sizeof(buf);
mem_space = H5Screate_simple(1, &mem_nelmts, NULL);
for (start=0; start<file_nelmts; start+=mem_nelmts) {
mem_nelmts = MIN(mem_nelmts, file_nelmts-start);
for (start=0;
start<(hssize_t)file_nelmts;
start+=(hssize_t)mem_nelmts) {
mem_nelmts = MIN(mem_nelmts, file_nelmts-(hsize_t)start);
H5Sselect_hyperslab(file_space, H5S_SELECT_SET, &start, NULL,
&mem_nelmts, NULL);
H5Sselect_hyperslab(mem_space, H5S_SELECT_SET, &zero, NULL,