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-r153] Changes since 19980108

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

./MANIFEST
./src/H5Dconv.c		[REMOVED]
./src/H5Tconv.c		[NEW]
./src/Makefile.in
	Changed H5Dconv.c to H5Tconv.c

./html/Datatypes.html
	Updated data type conversion section.

./html/H5.apiv2.html
	Removed sections about datasets and data types since they're
	covered in their own chapters.

./src/H5D.c
	Supports data type conversion.

./src/H5Odtype.c
./src/H5Tpkg.h
	Changed `lo_pad' and `hi_pad' to `lsb_pad' and `msb_pad'.

./src/H5T.c
./src/H5Tpkg.h
./src/H5Tprivate.h
./src/H5Tpublic.h
./src/H5detect.c
	Added predefined data types. Added query/set more
	properties. Added type conversion infrastructure.

./test/dsets.c
	Tests data type conversion during read.
This commit is contained in:
Robb Matzke 1998-01-14 14:42:59 -05:00
parent 1063eb8a1e
commit d70c7d7a64
11 changed files with 1337 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MANIFEST
View File

@ -41,7 +41,6 @@
./src/H5Cprivate.h
./src/H5Cpublic.h
./src/H5D.c
./src/H5Dconv.c
./src/H5Dprivate.h
./src/H5Dpublic.h
./src/H5E.c
@ -94,6 +93,7 @@
./src/H5private.h
./src/H5public.h
./src/H5T.c
./src/H5Tconv.c
./src/H5Tpkg.h
./src/H5Tprivate.h
./src/H5Tpublic.h

157
src/H5D.c
View File

@ -856,10 +856,14 @@ herr_t
H5D_read (H5D_t *dataset, const H5T_t *type, const H5P_t *space,
const H5D_xfer_t *xfer_parms, void *buf/*out*/)
{
size_t nbytes;
size_t nelmts, src_size, dst_size;
size_t offset[H5O_ISTORE_NDIMS];
size_t size[H5O_ISTORE_NDIMS];
intn i;
herr_t ret_value = FAIL;
uint8 *conv_buf = NULL; /*data type conv buffer */
H5T_conv_t conv_func = NULL; /*conversion function */
hid_t src_id=-1, dst_id=-1; /*temporary type atoms */
FUNC_ENTER (H5D_read, FAIL);
@ -870,52 +874,81 @@ H5D_read (H5D_t *dataset, const H5T_t *type, const H5P_t *space,
assert (buf);
if (H5D_CONTIGUOUS!=dataset->create_parms.layout) {
HRETURN_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL,
"layout is not supported yet");
}
if (H5T_cmp (type, dataset->type)) {
HRETURN_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL,
"type conversion not supported yet");
HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL,
"layout is not supported yet");
}
if (space && H5P_cmp (space, dataset->space)) {
HRETURN_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL,
"space conversion not supported yet");
HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL,
"space conversion not supported yet");
}
/* Compute the size of the request */
nbytes = H5T_get_size (dataset->type) * H5P_get_npoints (dataset->space);
/*
* Convert data types to atoms because the conversion functions are
* application-level functions.
*/
if ((src_id=H5Aregister_atom (H5_DATATYPE, H5T_copy (dataset->type)))<0 ||
(dst_id=H5Aregister_atom (H5_DATATYPE, H5T_copy (type)))<0) {
HGOTO_ERROR (H5E_DATASET, H5E_CANTREGISTER, FAIL,
"unable to register types for conversion");
}
/* Compute the size of the request and allocate scratch buffers */
nelmts = H5P_get_npoints (dataset->space);
src_size = nelmts * H5T_get_size (dataset->type);
dst_size = nelmts * H5T_get_size (type);
conv_buf = H5MM_xmalloc (MAX (src_size, dst_size));
if (NULL==(conv_func=H5T_find (dataset->type, type))) {
HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL,
"unable to convert between src and dest data types");
}
/*
* Read data into the data type conversion buffer.
*/
switch (dataset->create_parms.layout) {
case H5D_CONTIGUOUS:
/*
* Read a block of contiguous data.
*/
/* Read a block of contiguous data */
if (H5F_block_read (dataset->ent.file, &(dataset->storage.cstore.addr),
nbytes, buf)<0) {
HRETURN_ERROR (H5E_IO, H5E_READERROR, FAIL, "read failed");
src_size, conv_buf)<0) {
HGOTO_ERROR (H5E_IO, H5E_READERROR, FAIL, "read failed");
}
break;
case H5D_CHUNKED:
/*
* Read one or more chunks from indexed storage.
*/
/* Read one or more chunks from indexed storage */
for (i=0; i<dataset->storage.istore.ndims; i++) offset[i] = 0;
H5P_get_dims (dataset->space, size);
size[dataset->storage.istore.ndims-1] = H5T_get_size (dataset->type);
if (H5F_istore_read (dataset->ent.file, &(dataset->storage.istore),
offset, size, buf)<0) {
HRETURN_ERROR (H5E_IO, H5E_READERROR, FAIL, "read failed");
offset, size, conv_buf)<0) {
HGOTO_ERROR (H5E_IO, H5E_READERROR, FAIL, "read failed");
}
break;
default:
assert ("not implemented yet" && 0);
HRETURN_ERROR (H5E_INTERNAL, H5E_UNSUPPORTED, FAIL,
"not implemented yet");
HGOTO_ERROR (H5E_INTERNAL, H5E_UNSUPPORTED, FAIL, "not implemented yet");
}
FUNC_LEAVE (SUCCEED);
/*
* Perform data type conversion.
*/
if ((conv_func)(src_id, dst_id, nelmts, conv_buf, NULL)<0) {
HGOTO_ERROR (H5E_DATASET, H5E_CANTINIT, FAIL,
"data type conversion failed");
}
/*
* Copy conversion buffer into destination.
*/
HDmemcpy (buf, conv_buf, dst_size);
ret_value = SUCCEED;
done:
if (src_id>=0) H5A_dec_ref (src_id);
if (dst_id>=0) H5A_dec_ref (dst_id);
conv_buf = H5MM_xfree (conv_buf);
FUNC_LEAVE (ret_value);
}
@ -945,10 +978,14 @@ herr_t
H5D_write (H5D_t *dataset, const H5T_t *type, const H5P_t *space,
const H5D_xfer_t *xfer_parms, const void *buf)
{
size_t nbytes;
size_t nelmts, src_size, dst_size;
size_t offset[H5O_ISTORE_NDIMS];
size_t size[H5O_ISTORE_NDIMS];
intn i;
herr_t ret_value = FAIL;
uint8 *conv_buf = NULL; /*data type conversion buffer */
H5T_conv_t conv_func = NULL; /*data type conversion function */
hid_t src_id=-1, dst_id=-1; /*temporary type atoms */
FUNC_ENTER (H5D_write, FAIL);
@ -962,49 +999,79 @@ H5D_write (H5D_t *dataset, const H5T_t *type, const H5P_t *space,
HRETURN_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL,
"layout is not supported yet");
}
if (H5T_cmp (type, dataset->type)) {
HRETURN_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL,
"type conversion not supported yet");
}
if (space && H5P_cmp (space, dataset->space)) {
HRETURN_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL,
"space conversion not supported yet");
}
/* Compute the size of the request */
nbytes = H5T_get_size (dataset->type) * H5P_get_npoints (dataset->space);
/*
* Convert data types to atoms because the conversion functions are
* application-level functions.
*/
if ((src_id=H5Aregister_atom (H5_DATATYPE, H5T_copy (dataset->type)))<0 ||
(dst_id=H5Aregister_atom (H5_DATATYPE, H5T_copy (type)))<0) {
HGOTO_ERROR (H5E_DATASET, H5E_CANTREGISTER, FAIL,
"unable to register types for conversion");
}
/* Compute the size of the request and allocate scratch buffers */
nelmts = H5P_get_npoints (dataset->space);
src_size = nelmts * H5T_get_size (type);
dst_size = nelmts * H5T_get_size (dataset->type);
conv_buf = H5MM_xmalloc (MAX (src_size, dst_size));
if (NULL==(conv_func=H5T_find (type, dataset->type))) {
HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL,
"unable to convert between src and dest data types");
}
/*
* Read data into the data type conversion buffer.
*/
HDmemcpy (conv_buf, buf, src_size);
/*
* Perform data type conversion.
*/
if ((conv_func)(src_id, dst_id, nelmts, conv_buf, NULL)<0) {
HGOTO_ERROR (H5E_DATASET, H5E_CANTINIT, FAIL,
"data type conversion failed");
}
/*
* Write data into the file.
*/
switch (dataset->create_parms.layout) {
case H5D_CONTIGUOUS:
/*
* Write a contiguous chunk of data.
*/
/* Write a contiguous chunk of data */
if (H5F_block_write (dataset->ent.file, &(dataset->storage.cstore.addr),
nbytes, buf)<0) {
HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, FAIL, "write failed");
dst_size, conv_buf)<0) {
HGOTO_ERROR (H5E_IO, H5E_WRITEERROR, FAIL, "write failed");
}
break;
case H5D_CHUNKED:
/*
* Write one or more chunks to indexed storage.
*/
/* Write one or more chunks to indexed storage */
for (i=0; i<dataset->storage.istore.ndims; i++) offset[i] = 0;
H5P_get_dims (dataset->space, size);
size[dataset->storage.istore.ndims-1] = H5T_get_size (dataset->type);
if (H5F_istore_write (dataset->ent.file, &(dataset->storage.istore),
offset, size, buf)<0) {
HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, FAIL, "write failed");
offset, size, conv_buf)<0) {
HGOTO_ERROR (H5E_IO, H5E_WRITEERROR, FAIL, "write failed");
}
break;
default:
assert ("not implemented yet" && 0);
HRETURN_ERROR (H5E_INTERNAL, H5E_UNSUPPORTED, FAIL,
"not implemented yet");
HGOTO_ERROR (H5E_INTERNAL, H5E_UNSUPPORTED, FAIL, "not implemented yet");
}
FUNC_LEAVE (SUCCEED);
ret_value = SUCCEED;
done:
if (src_id>=0) H5A_dec_ref (src_id);
if (dst_id>=0) H5A_dec_ref (dst_id);
conv_buf = H5MM_xfree (conv_buf);
FUNC_LEAVE (ret_value);
}

133
src/H5Dconv.c
View File

@ -1,133 +0,0 @@
/****************************************************************************
* NCSA HDF *
* Software Development Group *
* National Center for Supercomputing Applications *
* University of Illinois at Urbana-Champaign *
* 605 E. Springfield, Champaign IL 61820 *
* *
* For conditions of distribution and use, see the accompanying *
* hdf/COPYING file. *
* *
****************************************************************************/
#ifdef RCSID
static char RcsId[] = "@(#)$Revision$";
#endif
/* $Id$ */
/*LINTLIBRARY */
/*+
FILE
H5Dconv.c
HDF5 trivial datatype converion routines
EXPORTED ROUTINES
LIBRARY-SCOPED ROUTINES
LOCAL ROUTINES
+ */
#include <H5private.h> /* Generic Functions */
#include <H5Dprivate.h> /* Dataset functions */
#include <H5Eprivate.h> /* Error handling */
#define PABLO_MASK H5D_mask
/*--------------------- Locally scoped variables -----------------------------*/
/* Interface initialization */
static intn interface_initialize_g = FALSE;
#define INTERFACE_INIT NULL
/*--------------------------------------------------------------------------
NAME
H5D_convert_buf
PURPOSE
Byte-Swap a buffer of data
USAGE
herr_t H5D_convert_buf(dst, src, len, size)
VOIDP dst; OUT: Buffer to fill with converted data
VOIDP src; IN: Buffer to converted data from
uintn len; IN: Number of bytes to convert
uintn size; IN: Size of quantity to byte-swap
RETURNS
SUCCEED/FAIL
DESCRIPTION
This function is a byte-swapping memcpy.
--------------------------------------------------------------------------*/
herr_t H5D_convert_buf(void *dst, const void *src, uintn len, uintn size)
{
const char *s=(const char *)src;
char *d=(char *)dst;
herr_t ret_value = SUCCEED;
FUNC_ENTER(H5D_convert_buf, FAIL);
/* Clear errors and check args and all the boring stuff. */
H5ECLEAR;
assert(dst);
assert(src);
assert(len>0);
assert(size==8 || size==4 || size==2 || size==1);
switch(size)
{
case 1: /* straight memcpy() */
HDmemcpy(d,s,len);
break;
case 2: /* 2-byte swapping */
while(len>0)
{
*d++=*(s+1);
*d++=*s;
s+=2;
len-=2;
} /* end while */
break;
case 4: /* 4-byte swapping */
while(len>0)
{
*d++=*(s+3);
*d++=*(s+2);
*d++=*(s+1);
*d++=*s;
s+=4;
len-=4;
} /* end while */
break;
case 8: /* 8-byte swapping */
while(len>0)
{
*d++=*(s+7);
*d++=*(s+6);
*d++=*(s+5);
*d++=*(s+4);
*d++=*(s+3);
*d++=*(s+2);
*d++=*(s+1);
*d++=*s;
s+=8;
len-=8;
} /* end while */
break;
default:
HGOTO_ERROR(H5E_INTERNAL, H5E_UNSUPPORTED, FAIL,
"not implemented yet");
} /* end switch */
done:
if(ret_value == FAIL)
{ /* Error condition cleanup */
} /* end if */
/* Normal function cleanup */
FUNC_LEAVE(ret_value);
} /* end H5D_convert_buf() */

34
src/H5Odtype.c
View File

@ -95,8 +95,8 @@ H5O_dtype_decode_helper (const uint8 **pp, H5T_t *dt)
* Integer types...
*/
dt->u.atomic.order = (flags & 0x1) ? H5T_ORDER_BE : H5T_ORDER_LE;
dt->u.atomic.lo_pad = (flags & 0x2) ? H5T_PAD_ONE : H5T_PAD_ZERO;
dt->u.atomic.hi_pad = (flags & 0x4) ? H5T_PAD_ONE : H5T_PAD_ZERO;
dt->u.atomic.lsb_pad = (flags & 0x2) ? H5T_PAD_ONE : H5T_PAD_ZERO;
dt->u.atomic.msb_pad = (flags & 0x4) ? H5T_PAD_ONE : H5T_PAD_ZERO;
dt->u.atomic.u.i.sign = (flags & 0x8) ? H5T_SGN_2 : H5T_SGN_NONE;
UINT16DECODE (*pp, dt->u.atomic.offset);
UINT16DECODE (*pp, dt->u.atomic.prec);
@ -107,8 +107,8 @@ H5O_dtype_decode_helper (const uint8 **pp, H5T_t *dt)
* Floating-point types...
*/
dt->u.atomic.order = (flags & 0x1) ? H5T_ORDER_BE : H5T_ORDER_LE;
dt->u.atomic.lo_pad = (flags & 0x2) ? H5T_PAD_ONE : H5T_PAD_ZERO;
dt->u.atomic.hi_pad = (flags & 0x4) ? H5T_PAD_ONE : H5T_PAD_ZERO;
dt->u.atomic.lsb_pad = (flags & 0x2) ? H5T_PAD_ONE : H5T_PAD_ZERO;
dt->u.atomic.msb_pad = (flags & 0x4) ? H5T_PAD_ONE : H5T_PAD_ZERO;
dt->u.atomic.u.f.pad = (flags & 0x8) ? H5T_PAD_ONE : H5T_PAD_ZERO;
switch ((flags>>4) & 0x03) {
case 0:
@ -232,7 +232,7 @@ H5O_dtype_encode_helper (uint8 **pp, const H5T_t *dt)
"byte order is not supported in file format yet");
}
switch (dt->u.atomic.lo_pad) {
switch (dt->u.atomic.lsb_pad) {
case H5T_PAD_ZERO:
break; /*nothing*/
case H5T_PAD_ONE:
@ -243,7 +243,7 @@ H5O_dtype_encode_helper (uint8 **pp, const H5T_t *dt)
"bit padding is not supported in file format yet");
}
switch (dt->u.atomic.hi_pad) {
switch (dt->u.atomic.msb_pad) {
case H5T_PAD_ZERO:
break; /*nothing*/
case H5T_PAD_ONE:
@ -284,7 +284,7 @@ H5O_dtype_encode_helper (uint8 **pp, const H5T_t *dt)
"byte order is not supported in file format yet");
}
switch (dt->u.atomic.lo_pad) {
switch (dt->u.atomic.lsb_pad) {
case H5T_PAD_ZERO:
break; /*nothing*/
case H5T_PAD_ONE:
@ -295,7 +295,7 @@ H5O_dtype_encode_helper (uint8 **pp, const H5T_t *dt)
"bit padding is not supported in file format yet");
}
switch (dt->u.atomic.hi_pad) {
switch (dt->u.atomic.msb_pad) {
case H5T_PAD_ZERO:
break; /*nothing*/
case H5T_PAD_ONE:
@ -739,7 +739,7 @@ H5O_dtype_debug (H5F_t *f, const void *mesg, FILE *stream,
(unsigned long)(dt->u.atomic.offset),
1==dt->u.atomic.offset?"":"s");
switch (dt->u.atomic.lo_pad) {
switch (dt->u.atomic.lsb_pad) {
case H5T_PAD_ZERO:
s = "zero";
break;
@ -747,18 +747,13 @@ H5O_dtype_debug (H5F_t *f, const void *mesg, FILE *stream,
s = "one";
break;
default:
if (dt->u.atomic.lo_pad<0) {
sprintf (buf, "H5T_PAD_%d", -(dt->u.atomic.lo_pad));
} else {
sprintf (buf, "bit-%d", dt->u.atomic.lo_pad);
}
s = buf;
s = "pad?";
break;
}
fprintf (stream, "%*s%-*s %s\n", indent, "", fwidth,
"Low pad type:", s);
switch (dt->u.atomic.hi_pad) {
switch (dt->u.atomic.msb_pad) {
case H5T_PAD_ZERO:
s = "zero";
break;
@ -766,12 +761,7 @@ H5O_dtype_debug (H5F_t *f, const void *mesg, FILE *stream,
s = "one";
break;
default:
if (dt->u.atomic.hi_pad<0) {
sprintf (buf, "H5T_PAD_%d", -(dt->u.atomic.hi_pad));
} else {
sprintf (buf, "bit-%d", dt->u.atomic.hi_pad);
}
s = buf;
s = "pad?";
break;
}
fprintf (stream, "%*s%-*s %s\n", indent, "", fwidth,

1046
src/H5T.c
View File

File diff suppressed because it is too large Load Diff

28
src/H5Tpkg.h
View File

@ -22,8 +22,8 @@ typedef struct H5T_atomic_t {
H5T_order_t order; /*byte order */
size_t prec; /*precision in bits */
size_t offset; /*bit position of lsb of value */
intn lo_pad; /*type of lsb padding */
intn hi_pad; /*type of msb padding */
intn lsb_pad;/*type of lsb padding */
intn msb_pad;/*type of msb padding */
union {
struct {
H5T_sign_t sign; /*type of integer sign */
@ -42,7 +42,7 @@ typedef struct H5T_atomic_t {
struct {
H5T_cset_t cset; /*character set */
H5T_str_t spad; /*space or null padding of extra bytes */
H5T_str_t pad; /*space or null padding of extra bytes */
} s;
} u;
} H5T_atomic_t;
@ -72,5 +72,27 @@ typedef struct H5T_member_t {
struct H5T_t type; /*type of this member */
} H5T_member_t;
/* The data type conversion database */
typedef struct H5T_path_t {
H5T_t *src; /*source data type ID */
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 */
} H5T_path_t;
/* The master list of soft conversion functions */
typedef struct H5T_soft_t {
H5T_class_t src; /*source data type class */
H5T_class_t dst; /*destination data type class */
H5T_conv_t func; /*the conversion function */
} H5T_soft_t;
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);
#endif

2
src/H5Tprivate.h
View File

@ -45,6 +45,6 @@ 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);
#endif

73
src/H5Tpublic.h
View File

@ -32,7 +32,9 @@ typedef enum H5T_class_t {
H5T_STRING =3, /*character string types */
H5T_BITFIELD =4, /*bit field types */
H5T_OPAQUE =5, /*opaque types */
H5T_COMPOUND =6 /*compound types */
H5T_COMPOUND =6, /*compound types */
H5T_NCLASSES =7 /*This must be last */
} H5T_class_t;
/* Byte orders */
@ -51,7 +53,7 @@ typedef enum H5T_sign_t {
H5T_SGN_NONE =0, /*this is an unsigned type */
H5T_SGN_2 =1, /*two's complement */
H5T_SGN_N =2 /*this must be last */
H5T_NSGN =2 /*this must be last! */
} H5T_sign_t;
/* Floating-point normalization schemes */
@ -66,14 +68,18 @@ typedef enum H5T_norm_t {
/* Character set to use for text strings */
typedef enum H5T_cset_t {
H5T_CSET_ERROR =-1, /*error */
H5T_CSET_ASCII =0 /*US ASCII */
H5T_CSET_ASCII =0, /*US ASCII */
H5T_NCSET =1 /*this must be last! */
} H5T_cset_t;
/* Type of padding to use in character strings */
typedef enum H5T_str_t {
H5T_STR_ERROR =-1, /*error */
H5T_STR_NULL =0, /*pad with null term like in C */
H5T_STR_SPACE =1 /*pad with spaces like in Fortran */
H5T_STR_SPACE =1, /*pad with spaces like in Fortran */
H5T_NSTR =2 /*this must be last! */
} H5T_str_t;
/* Type of padding to use in other atomic types */
@ -86,6 +92,9 @@ typedef enum H5T_pad_t {
H5T_NPAD =3 /*THIS MUST BE LAST */
} 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)
@ -98,8 +107,29 @@ typedef enum H5T_pad_t {
#define H5T_NATIVE_UINT (H5init(), H5T_NATIVE_UINT_g)
#define H5T_NATIVE_LONG (H5init(), H5T_NATIVE_LONG_g)
#define H5T_NATIVE_ULONG (H5init(), H5T_NATIVE_ULONG_g)
#define H5T_NATIVE_LLONG (H5init(), H5T_NATIVE_LLONG_g)
#define H5T_NATIVE_ULLONG (H5init(), H5T_NATIVE_ULLONG_g)
#define H5T_NATIVE_HYPER (H5init(), H5T_NATIVE_HYPER_g)
#define H5T_NATIVE_UHYPER (H5init(), H5T_NATIVE_UHYPER_g)
#define H5T_NATIVE_INT8 (H5init(), H5T_NATIVE_INT8_g)
#define H5T_NATIVE_UINT8 (H5init(), H5T_NATIVE_UINT8_g)
#define H5T_NATIVE_INT16 (H5init(), H5T_NATIVE_INT16_g)
#define H5T_NATIVE_UINT16 (H5init(), H5T_NATIVE_UINT16_g)
#define H5T_NATIVE_INT32 (H5init(), H5T_NATIVE_INT32_g)
#define H5T_NATIVE_UINT32 (H5init(), H5T_NATIVE_UINT32_g)
#define H5T_NATIVE_INT64 (H5init(), H5T_NATIVE_INT64_g)
#define H5T_NATIVE_UINT64 (H5init(), H5T_NATIVE_UINT64_g)
#define H5T_NATIVE_FLOAT (H5init(), H5T_NATIVE_FLOAT_g)
#define H5T_NATIVE_DOUBLE (H5init(), H5T_NATIVE_DOUBLE_g)
#define H5T_NATIVE_TIME (H5init(), H5T_NATIVE_TIME_g)
#define H5T_NATIVE_STRING (H5init(), H5T_NATIVE_STRING_g)
#define H5T_NATIVE_BITFIELD (H5init(), H5T_NATIVE_BITFIELD_g)
#define H5T_NATIVE_OPAQUE (H5init(), H5T_NATIVE_OPAQUE_g)
#ifdef __cplusplus
extern "C" {
#endif
extern hid_t H5T_NATIVE_CHAR_g;
extern hid_t H5T_NATIVE_UCHAR_g;
@ -108,19 +138,32 @@ extern hid_t H5T_NATIVE_USHORT_g;
extern hid_t H5T_NATIVE_INT_g;
extern hid_t H5T_NATIVE_UINT_g;
extern hid_t H5T_NATIVE_LONG_g;
extern hid_t H5T_NATIVE_INT8_g;
extern hid_t H5T_NATIVE_UINT8_g;
extern hid_t H5T_NATIVE_INT16_g;
extern hid_t H5T_NATIVE_UINT16_g;
extern hid_t H5T_NATIVE_INT32_g;
extern hid_t H5T_NATIVE_UINT32_g;
extern hid_t H5T_NATIVE_INT64_g;
extern hid_t H5T_NATIVE_UINT64_g;
extern hid_t H5T_NATIVE_ULONG_g;
extern hid_t H5T_NATIVE_LLONG_g;
extern hid_t H5T_NATIVE_ULLONG_g;
extern hid_t H5T_NATIVE_HYPER_g;
extern hid_t H5T_NATIVE_UHYPER_g;
extern hid_t H5T_NATIVE_FLOAT_g;
extern hid_t H5T_NATIVE_DOUBLE_g;
#ifdef __cplusplus
extern "C" {
#endif
extern hid_t H5T_NATIVE_TIME_g;
extern hid_t H5T_NATIVE_STRING_g;
extern hid_t H5T_NATIVE_BITFIELD_g;
extern hid_t H5T_NATIVE_OPAQUE_g;
/* Operations defined on all data types */
hid_t H5Tcreate (H5T_class_t type, size_t size);
hid_t H5Tcopy (hid_t type_id);
herr_t H5Tclose (hid_t type_id);
hbool_t H5Tequal (hid_t type1_id, hid_t type2_id);
herr_t H5Tlock (hid_t type_id);
/* Operations defined on compound data types */
herr_t H5Tinsert (hid_t parent_id, const char *name, off_t offset,
@ -133,30 +176,44 @@ size_t H5Tget_size (hid_t type_id);
H5T_order_t H5Tget_order (hid_t type_id);
size_t H5Tget_precision (hid_t type_id);
size_t H5Tget_offset (hid_t type_id);
herr_t H5Tget_pad (hid_t type_id, H5T_pad_t *lsb/*out*/,
H5T_pad_t *msb/*out*/);
H5T_sign_t H5Tget_sign (hid_t type_id);
herr_t H5Tget_fields (hid_t type_id, size_t *spos/*out*/,
size_t *epos/*out*/, size_t *esize/*out*/,
size_t *mpos/*out*/, size_t *msize/*out*/);
size_t H5Tget_ebias (hid_t type_id);
H5T_norm_t H5Tget_norm (hid_t type_id);
H5T_pad_t H5Tget_inpad (hid_t type_id);
H5T_str_t H5Tget_strpad (hid_t type_id);
intn H5Tget_nmembers (hid_t type_id);
char *H5Tget_member_name (hid_t type_id, int membno);
size_t H5Tget_member_offset (hid_t type_id, int membno);
int H5Tget_member_dims (hid_t type_id, int membno,
int dims[]/*out*/, int perm[]/*out*/);
hid_t H5Tget_member_type (hid_t type_id, int membno);
H5T_cset_t H5Tget_cset (hid_t type_id);
/* Setting property values */
herr_t H5Tset_size (hid_t type_id, size_t size);
herr_t H5Tset_order (hid_t type_id, H5T_order_t order);
herr_t H5Tset_precision (hid_t type_id, size_t prec);
herr_t H5Tset_offset (hid_t type_id, size_t offset);
herr_t H5Tset_pad (hid_t type_id, H5T_pad_t lsb, H5T_pad_t msb);
herr_t H5Tset_sign (hid_t type_id, H5T_sign_t sign);
herr_t H5Tset_fields (hid_t type_id, size_t spos, size_t epos, size_t esize,
size_t mpos, size_t msize);
herr_t H5Tset_ebias (hid_t type_id, size_t ebias);
herr_t H5Tset_norm (hid_t type_id, H5T_norm_t norm);
herr_t H5Tset_inpad (hid_t type_id, H5T_pad_t pad);
herr_t H5Tset_cset (hid_t type_id, H5T_cset_t cset);
herr_t H5Tset_strpad (hid_t type_id, H5T_str_t strpad);
/* Type conversion database */
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);
#ifdef __cplusplus
}

31
src/H5detect.c
View File

@ -282,11 +282,6 @@ static hbool_t interface_initialize_g = FALSE;\n\
\n");
/* Global definitions for each type */
for (i=0; i<nd; i++) {
printf ("hid_t H5T_NATIVE_%s_g = FAIL;\n", d[i].varname);
}
/* Function declaration */
printf ("\n\
herr_t\n\
@ -316,8 +311,8 @@ H5T_init (void)\n\
dt->size = %d;\n\
dt->u.atomic.order = H5T_ORDER_%s;\n\
dt->u.atomic.prec = %d;\n\
dt->u.atomic.lo_pad = H5T_PAD_ZERO;\n\
dt->u.atomic.hi_pad = H5T_PAD_ZERO;\n",
dt->u.atomic.lsb_pad = H5T_PAD_ZERO;\n\
dt->u.atomic.lsb_pad = H5T_PAD_ZERO;\n",
d[i].msize?"FLOAT":"INTEGER", /*class */
d[i].size+abs (d[i].padding), /*size */
d[i].perm[0]?"BE":"LE", /*byte order */
@ -922,16 +917,18 @@ main (int argc, char *argv[]) {
print_header();
DETECT_I (signed char, CHAR, d[nd]); nd++;
DETECT_I (unsigned char, UCHAR, d[nd]); nd++;
DETECT_I (short, SHORT, d[nd]); nd++;
DETECT_I (unsigned short, USHORT, d[nd]); nd++;
DETECT_I (int, INT, d[nd]); nd++;
DETECT_I (unsigned int, UINT, d[nd]); nd++;
DETECT_I (long, LONG, d[nd]); nd++;
DETECT_I (unsigned long, ULONG, d[nd]); nd++;
DETECT_F (float, FLOAT, d[nd]); nd++;
DETECT_F (double, DOUBLE, d[nd]); nd++;
DETECT_I (signed char, CHAR, d[nd]); nd++;
DETECT_I (unsigned char, UCHAR, d[nd]); nd++;
DETECT_I (short, SHORT, d[nd]); nd++;
DETECT_I (unsigned short, USHORT, d[nd]); nd++;
DETECT_I (int, INT, d[nd]); nd++;
DETECT_I (unsigned int, UINT, d[nd]); nd++;
DETECT_I (long, LONG, d[nd]); nd++;
DETECT_I (unsigned long, ULONG, d[nd]); nd++;
DETECT_I (long long, LLONG, d[nd]); nd++;
DETECT_I (unsigned long long, ULLONG, d[nd]); nd++;
DETECT_F (float, FLOAT, d[nd]); nd++;
DETECT_F (double, DOUBLE, d[nd]); nd++;
print_results (nd, d);
exit (0);

10
src/Makefile.in
View File

@ -14,11 +14,11 @@ LIB=libhdf5.a
PROGS=debug
# Source and object files for the library (lexicographically)...
LIB_SRC=H5.c H5A.c H5AC.c H5B.c H5C.c H5D.c H5Dconv.c H5E.c H5F.c H5Fcore.c \
H5Ffamily.c H5Fistore.c H5Flow.c H5Fsec2.c H5Fsplit.c H5Fstdio.c \
H5G.c H5Gent.c H5Gnode.c H5Gstab.c H5H.c H5M.c H5MF.c H5MM.c H5O.c \
H5Ocont.c H5Ocstore.c H5Odtype.c H5Oefl.c H5Oistore.c H5Oname.c \
H5Onull.c H5Osdspace.c H5Ostab.c H5P.c H5T.c H5Tinit.c H5V.c
LIB_SRC=H5.c H5A.c H5AC.c H5B.c H5C.c H5D.c H5E.c H5F.c H5Fcore.c H5Ffamily.c \
H5Fistore.c H5Flow.c H5Fsec2.c H5Fsplit.c H5Fstdio.c H5G.c H5Gent.c \
H5Gnode.c H5Gstab.c H5H.c H5M.c H5MF.c H5MM.c H5O.c H5Ocont.c \
H5Ocstore.c H5Odtype.c H5Oefl.c H5Oistore.c H5Oname.c H5Onull.c \
H5Osdspace.c H5Ostab.c H5P.c H5T.c H5Tconv.c H5Tinit.c H5V.c
LIB_OBJ=$(LIB_SRC:.c=.o)

87
test/dsets.c
View File

@ -22,6 +22,7 @@
#define DSET_DEFAULT_NAME "default"
#define DSET_CHUNKED_NAME "chunked"
#define DSET_SIMPLE_IO_NAME "simple_io"
#define DSET_TCONV_NAME "tconv"
/*-------------------------------------------------------------------------
@ -275,6 +276,89 @@ test_simple_io (hid_t file)
return FAIL;
}
/*-------------------------------------------------------------------------
* Function: test_tconv
*
* Purpose: Test some simple data type conversion stuff.
*
* Return: Success: SUCCEED
*
* Failure: FAIL
*
* Programmer: Robb Matzke
* Wednesday, January 14, 1998
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static herr_t
test_tconv (hid_t file)
{
uint8 out[4*1000000];
uint8 in[4*1000000];
intn i;
size_t dims[1];
hid_t space, dataset, type;
herr_t status;
printf ("%-70s", "Testing data type conversion");
/* Initialize the dataset */
for (i=0; i<1000000; i++) ((int32*)out)[i] = 0x11223344;
/* Create the data space */
space = H5Pcreate (H5P_SIMPLE);
assert (space>=0);
dims[0] = 1000000;
status = H5Pset_space (space, 1, dims);
assert (status>=0);
/* Create the data set */
dataset = H5Dcreate (file, DSET_TCONV_NAME, H5T_NATIVE_INT32, space,
H5C_DEFAULT);
assert (dataset>=0);
/* Write the data to the dataset */
status = H5Dwrite (dataset, H5T_NATIVE_INT32, H5P_ALL, H5C_DEFAULT, out);
assert (status>=0);
/* Create a new type with the opposite byte order */
type = H5Tcopy (H5T_NATIVE_INT32);
switch (H5Tget_order (type)) {
case H5T_ORDER_BE:
H5Tset_order (type, H5T_ORDER_LE);
break;
case H5T_ORDER_LE:
H5Tset_order (type, H5T_ORDER_BE);
break;
default:
assert ("funny byte order" && 0);
break;
}
/* Read data with byte order conversion */
status = H5Dread (dataset, type, H5P_ALL, H5C_DEFAULT, in);
assert (status>=0);
/* Check */
for (i=0; i<1000000; i++) {
assert (in[4*i+0] == out[4*i+3]);
assert (in[4*i+1] == out[4*i+2]);
assert (in[4*i+2] == out[4*i+1]);
assert (in[4*i+3] == out[4*i+0]);
}
H5Dclose (dataset);
H5Tclose (type);
puts (" PASSED");
return SUCCEED;
}
/*-------------------------------------------------------------------------
* Function: main
@ -310,6 +394,9 @@ main (void)
status = test_simple_io (file);
nerrors += status<0 ? 1 : 0;
status = test_tconv (file);
nerrors += status<0 ? 1 : 0;
status = H5Fclose (file);
if (nerrors) {