mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-03-31 17:10:47 +08:00
[svn-r168] Changes since 19980122
---------------------- ./MANIFEST Added new files. ./src/H5D.c Added support for partial datatype I/O which is needed when merging struct members between file and disk. This isn't the efficient version because the merge requires an extra gather (step 1b in my pipeline diagram) that isn't turned off when it isn't needed. ./src/H5T.c ./src/H5Tpkg.h ./src/H5Tprivate.h ./src/H5Tpublic.h Conversion functions take an extra argument which is a pointer to a blob of private data that can be used by the conversion function to save anything that's expensive to compute and is constant for a particular conversion path. ./src/H5Tconv.c Compound data type conversion is beginning to work! We can handle conversions between compound types that have members which are not arrays. It also supports partial conversion so we can omit certain members of the source and not clobber extra members in the destination. ./test/Makefile.in ./test/cmpd_dset.c [NEW] Added a test case that demonstrates how to use compound data types in a dataset. The output doesn't match the output of the other test cases yet, the the entire example is more readable and written entirely with the API.
This commit is contained in:
Robb Matzke
parent
dd36e4a341
commit
6ee36e2b3a
3
MANIFEST
3
MANIFEST
@ -104,6 +104,7 @@
|
||||
./src/Makefile.in
|
||||
./src/Naming-Conventions
|
||||
./test/Makefile.in
|
||||
./test/cmpd_dset.c
|
||||
./test/dsets.c
|
||||
./test/dtypes.c
|
||||
./test/hyperslab.c
|
||||
@ -119,3 +120,5 @@
|
||||
./tgif/APIGrammar.obj
|
||||
./tgif/FileGrammar.obj
|
||||
./tgif/UserView.obj
|
||||
./tgif/IOPipe.obj
|
||||
./tgif/RobbPipe.obj
|
||||
41
src/H5D.c
41
src/H5D.c
@ -832,10 +832,12 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5P_t *mem_space,
|
||||
{
|
||||
size_t nelmts ; /*number of elements */
|
||||
uint8 *tconv_buf = NULL; /*data type conv buffer */
|
||||
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 */
|
||||
const H5P_conv_t *sconv_func = NULL; /*space conversion funcs*/
|
||||
H5P_number_t numbering; /*element numbering info*/
|
||||
void *cdata = NULL; /*type conversion data */
|
||||
herr_t ret_value = FAIL;
|
||||
|
||||
FUNC_ENTER(H5D_read, FAIL);
|
||||
@ -863,7 +865,7 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5P_t *mem_space,
|
||||
* Locate the type conversion function and data space conversion
|
||||
* functions, and set up the element numbering information.
|
||||
*/
|
||||
if (NULL == (tconv_func = H5T_find(dataset->type, mem_type))) {
|
||||
if (NULL == (tconv_func = H5T_find(dataset->type, mem_type, &cdata))) {
|
||||
HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL,
|
||||
"unable to convert between src and dest data types");
|
||||
}
|
||||
@ -893,23 +895,31 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5P_t *mem_space,
|
||||
size_t src_size = nelmts * H5T_get_size(dataset->type);
|
||||
size_t dst_size = nelmts * H5T_get_size(mem_type);
|
||||
tconv_buf = H5MM_xmalloc(MAX(src_size, dst_size));
|
||||
bkg_buf = H5MM_xmalloc (dst_size);
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Gather the data from disk into the data type conversion buffer.
|
||||
* Gather the data from disk into the data type conversion buffer. Also
|
||||
* gather data from application to background buffer (this step is not
|
||||
* needed for most conversions, but we leave that as an exercise for
|
||||
* later ;-)
|
||||
*/
|
||||
if ((sconv_func->fgath)(dataset->ent.file, &(dataset->layout),
|
||||
H5T_get_size (dataset->type), file_space,
|
||||
&numbering, 0, nelmts,
|
||||
tconv_buf/*out*/)!=nelmts) {
|
||||
HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "gather failed");
|
||||
HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file gather failed");
|
||||
}
|
||||
if ((sconv_func->mgath)(buf, H5T_get_size (mem_type), mem_space,
|
||||
&numbering, 0, nelmts, bkg_buf/*out*/)!=nelmts) {
|
||||
HGOTO_ERROR (H5E_IO, H5E_READERROR, FAIL, "mem gather failed");
|
||||
}
|
||||
|
||||
/*
|
||||
* Perform data type conversion.
|
||||
*/
|
||||
if ((tconv_func) (src_id, dst_id, nelmts, tconv_buf, NULL) < 0) {
|
||||
if ((tconv_func) (src_id, dst_id, &cdata, nelmts, tconv_buf, bkg_buf)<0) {
|
||||
HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL,
|
||||
"data type conversion failed");
|
||||
}
|
||||
@ -919,7 +929,7 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5P_t *mem_space,
|
||||
*/
|
||||
if ((sconv_func->mscat)(tconv_buf, H5T_get_size (mem_type), mem_space,
|
||||
&numbering, 0, nelmts, buf/*out*/)<0) {
|
||||
HGOTO_ERROR (H5E_IO, H5E_WRITEERROR, FAIL, "scatter failed");
|
||||
HGOTO_ERROR (H5E_IO, H5E_READERROR, FAIL, "scatter failed");
|
||||
}
|
||||
ret_value = SUCCEED;
|
||||
|
||||
@ -927,6 +937,7 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5P_t *mem_space,
|
||||
if (src_id >= 0) H5A_dec_ref(src_id);
|
||||
if (dst_id >= 0) H5A_dec_ref(dst_id);
|
||||
tconv_buf = H5MM_xfree(tconv_buf);
|
||||
bkg_buf = H5MM_xfree (bkg_buf);
|
||||
FUNC_LEAVE(ret_value);
|
||||
}
|
||||
|
||||
@ -954,10 +965,12 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5P_t *mem_space,
|
||||
{
|
||||
size_t nelmts;
|
||||
uint8 *tconv_buf = NULL; /*data type conv buffer */
|
||||
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 */
|
||||
const H5P_conv_t *sconv_func = NULL; /*space conversion funcs*/
|
||||
H5P_number_t numbering; /*element numbering info*/
|
||||
void *cdata = NULL; /*type conversion data */
|
||||
herr_t ret_value = FAIL;
|
||||
|
||||
FUNC_ENTER(H5D_write, FAIL);
|
||||
@ -985,7 +998,7 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5P_t *mem_space,
|
||||
* Locate the type conversion function and data space conversion
|
||||
* functions, and set up the element numbering information.
|
||||
*/
|
||||
if (NULL == (tconv_func = H5T_find(mem_type, dataset->type))) {
|
||||
if (NULL == (tconv_func = H5T_find(mem_type, dataset->type, &cdata))) {
|
||||
HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL,
|
||||
"unable to convert between src and dest data types");
|
||||
}
|
||||
@ -1015,22 +1028,31 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5P_t *mem_space,
|
||||
size_t src_size = nelmts * H5T_get_size(mem_type);
|
||||
size_t dst_size = nelmts * H5T_get_size(dataset->type);
|
||||
tconv_buf = H5MM_xmalloc(MAX(src_size, dst_size));
|
||||
bkg_buf = H5MM_xmalloc (dst_size);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* Gather data into the data type conversion buffer.
|
||||
* Gather data from application buffer into the data type conversion
|
||||
* buffer. Also gather data from the file into the background buffer
|
||||
* (this step is not needed for most conversions, but we leave that as an
|
||||
* exercise for later ;-)
|
||||
*/
|
||||
if ((sconv_func->mgath)(buf, H5T_get_size (mem_type), mem_space,
|
||||
&numbering, 0, nelmts, tconv_buf/*out*/)!=nelmts) {
|
||||
HGOTO_ERROR (H5E_IO, H5E_WRITEERROR, FAIL, "gather failed");
|
||||
HGOTO_ERROR (H5E_IO, H5E_WRITEERROR, FAIL, "mem gather failed");
|
||||
}
|
||||
if ((sconv_func->fgath)(dataset->ent.file, &(dataset->layout),
|
||||
H5T_get_size (dataset->type), file_space,
|
||||
&numbering, 0, nelmts, bkg_buf/*out*/)!=nelmts) {
|
||||
HGOTO_ERROR (H5E_IO, H5E_WRITEERROR, FAIL, "file gather failed");
|
||||
}
|
||||
|
||||
/*
|
||||
* Perform data type conversion.
|
||||
*/
|
||||
if ((tconv_func) (src_id, dst_id, nelmts, tconv_buf, NULL) < 0) {
|
||||
if ((tconv_func) (src_id, dst_id, &cdata, nelmts, tconv_buf, bkg_buf)<0) {
|
||||
HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL,
|
||||
"data type conversion failed");
|
||||
}
|
||||
@ -1049,5 +1071,6 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5P_t *mem_space,
|
||||
if (src_id >= 0) H5A_dec_ref(src_id);
|
||||
if (dst_id >= 0) H5A_dec_ref(dst_id);
|
||||
tconv_buf = H5MM_xfree(tconv_buf);
|
||||
bkg_buf = H5MM_xfree (bkg_buf);
|
||||
FUNC_LEAVE(ret_value);
|
||||
}
|
||||
|
||||
226
src/H5Tconv.c
226
src/H5Tconv.c
@ -36,8 +36,8 @@ static intn interface_initialize_g = FALSE;
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
herr_t
|
||||
H5T_conv_noop(hid_t src_id, hid_t dst_id, size_t nelmts,
|
||||
void *buf, const void *background)
|
||||
H5T_conv_noop(hid_t src_id, hid_t dst_id, void **pcdata, size_t nelmts,
|
||||
void *buf, void *background)
|
||||
{
|
||||
FUNC_ENTER(H5T_conv_noop, FAIL);
|
||||
FUNC_LEAVE(SUCCEED);
|
||||
@ -63,8 +63,8 @@ H5T_conv_noop(hid_t src_id, hid_t dst_id, size_t nelmts,
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
herr_t
|
||||
H5T_conv_order(hid_t src_id, hid_t dst_id, size_t nelmts,
|
||||
void *_buf, const void *background)
|
||||
H5T_conv_order(hid_t src_id, hid_t dst_id, void **pcdata, size_t nelmts,
|
||||
void *_buf, void *background)
|
||||
{
|
||||
uint8 *buf = (uint8 *) _buf;
|
||||
uint8 tmp;
|
||||
@ -81,10 +81,6 @@ H5T_conv_order(hid_t src_id, hid_t dst_id, size_t nelmts,
|
||||
NULL == (dst = H5A_object(dst_id))) {
|
||||
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
|
||||
}
|
||||
if (background) {
|
||||
HRETURN_ERROR(H5E_ARGS, H5E_UNSUPPORTED, FAIL,
|
||||
"background values not supported in this conv path");
|
||||
}
|
||||
|
||||
if (!buf) {
|
||||
/* Capability query */
|
||||
@ -123,6 +119,7 @@ H5T_conv_order(hid_t src_id, hid_t dst_id, size_t nelmts,
|
||||
}
|
||||
HRETURN(SUCCEED);
|
||||
}
|
||||
|
||||
/* The conversion */
|
||||
md = src->size / 2;
|
||||
for (i = 0; i < nelmts; i++, buf += src->size) {
|
||||
@ -166,15 +163,26 @@ H5T_conv_order(hid_t src_id, hid_t dst_id, size_t nelmts,
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
herr_t
|
||||
H5T_conv_struct(hid_t src_id, hid_t dst_id, size_t nelmts,
|
||||
void *_buf, const void *background)
|
||||
H5T_conv_struct(hid_t src_id, hid_t dst_id, void **_pcdata, size_t nelmts,
|
||||
void *_buf, void *_bkg)
|
||||
{
|
||||
H5T_conv_struct_t **pcdata = (H5T_conv_struct_t **)_pcdata;
|
||||
uint8 *buf = (uint8 *)_buf; /*cast for pointer arithmetic */
|
||||
uint8 *bkg = (uint8 *)_bkg; /*background pointer arithmetic */
|
||||
H5T_t *src = NULL; /*source data type */
|
||||
H5T_t *dst = NULL; /*destination data type */
|
||||
intn *dst2src_map = NULL; /*maps dst member to src member */
|
||||
intn i;
|
||||
|
||||
H5T_t *type = NULL; /*temporary type pointer */
|
||||
hid_t tid; /*temporary type ID */
|
||||
intn *src2dst = NULL; /*maps src member to dst member */
|
||||
H5T_member_t *src_memb = NULL; /*source struct member descript.*/
|
||||
H5T_member_t *dst_memb = NULL; /*destination struct memb desc. */
|
||||
H5T_conv_t tconv_func = NULL; /*member data type conv. func. */
|
||||
size_t offset; /*byte offset wrt struct */
|
||||
size_t src_delta, dst_delta; /*source & destination stride */
|
||||
intn elmtno, i, j; /*counters */
|
||||
void *memb_cdata = NULL; /*member conversion data */
|
||||
herr_t ret_value = FAIL;
|
||||
|
||||
FUNC_ENTER (H5T_conv_struct, FAIL);
|
||||
|
||||
/* Check args */
|
||||
@ -184,64 +192,186 @@ H5T_conv_struct(hid_t src_id, hid_t dst_id, size_t nelmts,
|
||||
NULL == (dst = H5A_object(dst_id))) {
|
||||
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
|
||||
}
|
||||
if (background) {
|
||||
HRETURN_ERROR(H5E_ARGS, H5E_UNSUPPORTED, FAIL,
|
||||
"background values not supported in this conv path");
|
||||
}
|
||||
|
||||
/* Capability query? */
|
||||
if (!buf) {
|
||||
assert (H5T_COMPOUND==src->type);
|
||||
assert (H5T_COMPOUND==dst->type);
|
||||
|
||||
#ifndef LATER
|
||||
/*
|
||||
* Struct members must be scalar for now.
|
||||
*/
|
||||
for (i=0; i<src->u.compnd.nmembs; i++) {
|
||||
assert (0==src->u.compnd.memb[i].ndims);
|
||||
}
|
||||
for (i=0; i<dst->u.compnd.nmembs; i++) {
|
||||
assert (0==dst->u.compnd.memb[i].ndims);
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Okay, we've determined that this conversion function applies to
|
||||
* the data types supplied as arguments. Now we build information
|
||||
* which is expensive to calculate but is constant for all
|
||||
* conversions from SRC_ID to DST_ID. Notice: the thing marked with
|
||||
* `!' really is `dst' and not `src' because we're only interested in
|
||||
* the members of the source type that are also in the destination
|
||||
* type.
|
||||
*/
|
||||
assert (pcdata);
|
||||
*pcdata = H5MM_xcalloc (1, sizeof(H5T_conv_struct_t));
|
||||
src2dst = H5MM_xmalloc (src->u.compnd.nmembs * sizeof(intn));
|
||||
(*pcdata)->src2dst = src2dst;
|
||||
(*pcdata)->src_memb_id = H5MM_xmalloc (/*!*/dst->u.compnd.nmembs *
|
||||
sizeof(hid_t));
|
||||
(*pcdata)->dst_memb_id = H5MM_xmalloc (dst->u.compnd.nmembs *
|
||||
sizeof(hid_t));
|
||||
|
||||
/*
|
||||
* Insure that members are sorted.
|
||||
*/
|
||||
H5T_sort_by_offset (src);
|
||||
H5T_sort_by_offset (dst);
|
||||
|
||||
/*
|
||||
* Build a mapping from source member number to destination member
|
||||
* number. If some source member is not a destination member then that
|
||||
* mapping element will be negative. Also create atoms for each
|
||||
* source and destination member data type so we can look up the
|
||||
* member data type conversion functions later.
|
||||
*/
|
||||
for (i=0; i<src->u.compnd.nmembs; i++) {
|
||||
src2dst[i] = -1;
|
||||
for (j=0; j<dst->u.compnd.nmembs; j++) {
|
||||
if (!HDstrcmp (src->u.compnd.memb[i].name,
|
||||
dst->u.compnd.memb[j].name)) {
|
||||
src2dst[i] = j;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (src2dst[i]>=0) {
|
||||
type = &(src->u.compnd.memb[i].type);
|
||||
tid = H5A_register (H5_DATATYPE, type);
|
||||
assert (tid>=0);
|
||||
(*pcdata)->src_memb_id[i] = tid;
|
||||
|
||||
type = &(dst->u.compnd.memb[src2dst[i]].type);
|
||||
tid = H5A_register (H5_DATATYPE, type);
|
||||
assert (tid>=0);
|
||||
(*pcdata)->dst_memb_id[i] = tid;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
HRETURN (SUCCEED);
|
||||
}
|
||||
|
||||
/*
|
||||
* Build a mapping from destination member number to source member number
|
||||
* Here comes the real conversion...
|
||||
*/
|
||||
assert (pcdata && *pcdata);
|
||||
assert ((*pcdata)->src2dst);
|
||||
assert ((*pcdata)->src_memb_id);
|
||||
assert ((*pcdata)->dst_memb_id);
|
||||
|
||||
/*
|
||||
* Insure that members are sorted.
|
||||
*/
|
||||
H5T_sort_by_offset (src);
|
||||
H5T_sort_by_offset (dst);
|
||||
dst2src_map = H5MM_xmalloc (dst->u.compnd.nmembs * sizeof(intn));
|
||||
for (i=0; i<src->u.compnd.nmembs; i++) {
|
||||
}
|
||||
|
||||
|
||||
src2dst = (*pcdata)->src2dst;
|
||||
|
||||
/*
|
||||
* For each source member which will be present in the destination,
|
||||
* convert the member to the destination type unless it is larger than
|
||||
* the source type. Then move the member to the left-most unoccupied
|
||||
* position in the buffer. This makes the data point as small as
|
||||
* possible with all the free space on the right side.
|
||||
* Direction of conversion.
|
||||
*/
|
||||
for (i=0; i<src->u.compnd.nmembs; i++) {
|
||||
if (dst->size <= src->size) {
|
||||
src_delta = src->size;
|
||||
dst_delta = dst->size;
|
||||
} else {
|
||||
src_delta = -(src->size);
|
||||
dst_delta = -(dst->size);
|
||||
buf += (nelmts-1) * src->size;
|
||||
bkg += (nelmts-1) * dst->size;
|
||||
}
|
||||
|
||||
for (elmtno=0; elmtno<nelmts; elmtno++) {
|
||||
/*
|
||||
* For each source member which will be present in the destination,
|
||||
* convert the member to the destination type unless it is larger than
|
||||
* the source type. Then move the member to the left-most unoccupied
|
||||
* position in the buffer. This makes the data point as small as
|
||||
* possible with all the free space on the right side.
|
||||
*/
|
||||
for (i=0, offset=0; i<src->u.compnd.nmembs; i++) {
|
||||
if (src2dst[i]<0) continue;
|
||||
src_memb = src->u.compnd.memb + i;
|
||||
dst_memb = dst->u.compnd.memb + src2dst[i];
|
||||
|
||||
if (dst_memb->type.size <= src_memb->type.size) {
|
||||
tconv_func = H5T_find (&(dst_memb->type), &(src_memb->type),
|
||||
&memb_cdata);
|
||||
if (!tconv_func) {
|
||||
HGOTO_ERROR (H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
|
||||
"unable to convert member data type");
|
||||
}
|
||||
|
||||
/*
|
||||
* For each source member which will be present in the destination,
|
||||
* convert the member to the destination type if it is larger than the
|
||||
* source type (that is, has not been converted yet). Then copy the
|
||||
* member to the destination offset in the background buffer.
|
||||
*/
|
||||
for (i=src->u.compnd.nmembs-1; i>=0; --i) {
|
||||
(tconv_func)((*pcdata)->src_memb_id[i],
|
||||
(*pcdata)->dst_memb_id[i], &memb_cdata, 1,
|
||||
buf + src_memb->offset, bkg + dst_memb->offset);
|
||||
|
||||
HDmemmove (buf + offset, buf + src_memb->offset,
|
||||
dst_memb->type.size);
|
||||
offset += dst_memb->type.size;
|
||||
} else {
|
||||
HDmemmove (buf + offset, buf + src_memb->offset,
|
||||
src_memb->type.size);
|
||||
offset += src_memb->type.size;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* For each source member which will be present in the destination,
|
||||
* convert the member to the destination type if it is larger than the
|
||||
* source type (that is, has not been converted yet). Then copy the
|
||||
* member to the destination offset in the background buffer.
|
||||
*/
|
||||
for (i=src->u.compnd.nmembs-1; i>=0; --i) {
|
||||
if (src2dst[i]<0) continue;
|
||||
src_memb = src->u.compnd.memb + i;
|
||||
dst_memb = dst->u.compnd.memb + src2dst[i];
|
||||
offset -= dst_memb->type.size;
|
||||
|
||||
if (dst_memb->type.size > src_memb->type.size) {
|
||||
tconv_func = H5T_find (&(src_memb->type), &(dst_memb->type),
|
||||
&memb_cdata);
|
||||
if (!tconv_func) {
|
||||
HGOTO_ERROR (H5E_DATATYPE, H5E_UNSUPPORTED, FAIL,
|
||||
"unable to convert member data type");
|
||||
}
|
||||
|
||||
(tconv_func)((*pcdata)->src_memb_id[i],
|
||||
(*pcdata)->dst_memb_id[i], &memb_cdata, 1,
|
||||
buf + offset, bkg + dst_memb->offset);
|
||||
}
|
||||
HDmemmove (bkg+dst_memb->offset, buf+offset, dst_memb->type.size);
|
||||
}
|
||||
assert (0==offset);
|
||||
|
||||
/*
|
||||
* Update buf and background.
|
||||
*/
|
||||
buf += src_delta;
|
||||
bkg += dst_delta;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Copy the background buffer back into the in-place conversion buffer.
|
||||
*/
|
||||
HDmemcpy (buf, background, dst->size);
|
||||
HDmemcpy (_buf, _bkg, nelmts*dst->size);
|
||||
ret_value = SUCCEED;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
HRETURN_ERROR (H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "not implemented yet");
|
||||
FUNC_LEAVE (SUCCEED);
|
||||
done:
|
||||
FUNC_LEAVE (ret_value);
|
||||
}
|
||||
|
||||
|
||||
20
src/H5Tpkg.h
20
src/H5Tpkg.h
@ -78,6 +78,7 @@ typedef struct H5T_path_t {
|
||||
H5T_t *dst; /*destination data type ID */
|
||||
H5T_conv_t hard; /*hard conversion function or null */
|
||||
H5T_conv_t soft; /*soft conversion function or null */
|
||||
void *cdata; /*extra conversion data */
|
||||
} H5T_path_t;
|
||||
|
||||
/* The master list of soft conversion functions */
|
||||
@ -87,17 +88,24 @@ typedef struct H5T_soft_t {
|
||||
H5T_conv_t func; /*the conversion function */
|
||||
} H5T_soft_t;
|
||||
|
||||
/* Conversion data for H5T_conv_struct() */
|
||||
typedef struct H5T_conv_struct_t {
|
||||
intn *src2dst; /*mapping from src to dst memb ID */
|
||||
hid_t *src_memb_id; /*source member type ID's */
|
||||
hid_t *dst_memb_id; /*destination member type ID's */
|
||||
} H5T_conv_struct_t;
|
||||
|
||||
/* Function prototypes for H5T package scope */
|
||||
H5T_path_t *H5T_path_find (const H5T_t *src, const H5T_t *dst,
|
||||
hbool_t create);
|
||||
|
||||
/* Conversion functions */
|
||||
herr_t H5T_conv_noop (hid_t src_id, hid_t dst_id, size_t nelmts, void *buf,
|
||||
const void *background);
|
||||
herr_t H5T_conv_order (hid_t src_id, hid_t dst_id, size_t nelmts, void *_buf,
|
||||
const void *background);
|
||||
herr_t H5T_conv_struct (hid_t src_id, hid_t dst_id, size_t nelmts,
|
||||
void *_buf, const void *background);
|
||||
herr_t H5T_conv_noop (hid_t src_id, hid_t dst_id, void **pcdata,
|
||||
size_t nelmts, void *buf, void *bkg);
|
||||
herr_t H5T_conv_order (hid_t src_id, hid_t dst_id, void **pcdata,
|
||||
size_t nelmts, void *_buf, void *bkg);
|
||||
herr_t H5T_conv_struct (hid_t src_id, hid_t dst_id, void **pcdata,
|
||||
size_t nelmts, void *_buf, void *bkg);
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
@ -40,5 +40,5 @@ herr_t H5T_insert (H5T_t *parent, const char *name, off_t offset,
|
||||
herr_t H5T_sort_by_offset (H5T_t *dt);
|
||||
herr_t H5T_pack (H5T_t *dt);
|
||||
herr_t H5T_debug (H5T_t *dt, FILE * stream);
|
||||
H5T_conv_t H5T_find (const H5T_t *src, const H5T_t *dst);
|
||||
H5T_conv_t H5T_find (const H5T_t *src, const H5T_t *dst, void **pcdata);
|
||||
#endif
|
||||
|
||||
@ -20,6 +20,9 @@
|
||||
#include <H5public.h>
|
||||
#include <H5Apublic.h>
|
||||
|
||||
#define HOFFSET(S,M) ((const char*)&S.M-(const char*)&S)
|
||||
#define HPOFFSET(P,M) ((const char*)&(P->M)-(const char*)P)
|
||||
|
||||
/* These are the various classes of data types */
|
||||
typedef enum H5T_class_t {
|
||||
H5T_NO_CLASS = -1, /*error */
|
||||
@ -90,9 +93,8 @@ typedef enum H5T_pad_t {
|
||||
} H5T_pad_t;
|
||||
|
||||
/* All data type conversion functions are... */
|
||||
typedef herr_t (*H5T_conv_t) (hid_t, hid_t, size_t, void *, const void *);
|
||||
#define HOFFSET(S,M) ((const char*)&S.M-(const char*)&S)
|
||||
#define HPOFFSET(P,M) ((const char*)&(P->M)-(const char*)P)
|
||||
typedef herr_t (*H5T_conv_t) (hid_t src_id, hid_t dst_id, void **pcdata,
|
||||
size_t nelmts, void *buf, void *bkg);
|
||||
|
||||
/* The predefined types */
|
||||
#define H5T_NATIVE_CHAR (H5init(), H5T_NATIVE_CHAR_g)
|
||||
@ -207,7 +209,7 @@ herr_t H5Tset_strpad (hid_t type_id, H5T_str_t strpad);
|
||||
herr_t H5Tregister_hard (hid_t src_id, hid_t dst_id, H5T_conv_t func);
|
||||
herr_t H5Tregister_soft (H5T_class_t src, H5T_class_t dst, H5T_conv_t func);
|
||||
herr_t H5Tunregister (H5T_conv_t func);
|
||||
H5T_conv_t H5Tfind (hid_t src_id, hid_t dst_id);
|
||||
H5T_conv_t H5Tfind (hid_t src_id, hid_t dst_id, void **pcdata);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@ CPPFLAGS=-I. -I../src @CPPFLAGS@
|
||||
|
||||
# These are our main targets. They should be listed in the order to be
|
||||
# executed, generally most specific tests to least specific tests.
|
||||
PROGS=testhdf5 hyperslab istore dtypes dsets
|
||||
PROGS=testhdf5 hyperslab istore dtypes dsets cmpd_dset
|
||||
TESTS=$(PROGS)
|
||||
|
||||
# Source and object files for programs... The PROG_SRC list contains all the
|
||||
@ -19,7 +19,7 @@ TESTS=$(PROGS)
|
||||
# other source lists are for the individual tests, the files of which may
|
||||
# overlap with other tests.
|
||||
PROG_SRC=testhdf5.c tfile.c theap.c tmeta.c tohdr.c tstab.c th5p.c dtypes.c \
|
||||
hyperslab.c istore.c dsets.c
|
||||
hyperslab.c istore.c dsets.c cmpd_dset.c
|
||||
PROG_OBJ=$(PROG_SRC:.c=.o)
|
||||
|
||||
TESTHDF5_SRC=testhdf5.c tfile.c theap.c tmeta.c tohdr.c tstab.c th5p.c
|
||||
@ -37,6 +37,9 @@ HYPERSLAB_OBJ=$(HYPERSLAB_SRC:.c=.o)
|
||||
ISTORE_SRC=istore.c
|
||||
ISTORE_OBJ=$(ISTORE_SRC:.c=.o)
|
||||
|
||||
CMPD_DSET_SRC=cmpd_dset.c
|
||||
CMPD_DSET_OBJ=$(CMPD_DSET_SRC:.c=.o)
|
||||
|
||||
# Private header files (not to be installed)...
|
||||
PRIVATE_HDR=testhdf5.h
|
||||
|
||||
@ -56,4 +59,7 @@ hyperslab: $(HYPERSLAB_OBJ) ../src/libhdf5.a
|
||||
istore: $(ISTORE_OBJ) ../src/libhdf5.a
|
||||
$(CC) $(CFLAGS) -o $@ $(ISTORE_OBJ) ../src/libhdf5.a $(LIBS)
|
||||
|
||||
cmpd_dset: $(CMPD_DSET_OBJ) ../src/libhdf5.a
|
||||
$(CC) $(CFLAGS) -o $@ $(CMPD_DSET_OBJ) ../src/libhdf5.a $(LIBS)
|
||||
|
||||
@CONCLUDE@
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user