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-r361] Added Attribute (H5A) code.

Browse Source
This commit is contained in:
Quincey Koziol 1998-04-23 17:24:38 -05:00
parent eba569241e
commit ca0a7c164e
20 changed files with 2124 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1330
src/H5A.c Normal file
View File

File diff suppressed because it is too large Load Diff

46
src/H5Apkg.h Normal file
View File

@ -0,0 +1,46 @@
/*
* Copyright (C) 1997 NCSA
* All rights reserved.
*
* Programmer: Robb Matzke <matzke@llnl.gov>
* Monday, December 8, 1997
*
* Purpose: This file contains declarations which are visible only within
* the H5A package. Source files outside the H5A package should
* include H5Aprivate.h instead.
*/
#ifndef H5A_PACKAGE
#error "Do not include this file outside the H5A package!"
#endif
#ifndef _H5Apkg_H
#define _H5Apkg_H
/*
* Define this to enable debugging.
*/
#ifdef NDEBUG
# undef H5A_DEBUG
#endif
#include <H5HGprivate.h>
#include <H5Aprivate.h>
struct H5A_t {
uintn initialized;/* Indicate whether the attribute has been modified */
uintn ent_opened; /* Object header entry opened? */
H5G_entry_t ent; /* Object Header entry (for both datasets & groups) */
char *name; /* Attribute's name */
H5T_t *dt; /* Attribute's datatype */
size_t dt_size; /* Size of datatype on disk */
H5S_t *ds; /* Attribute's dataspace */
size_t ds_size; /* Size of dataspace on disk */
void *data; /* Attribute data (on a temporary basis) */
size_t data_size; /* Size of data on disk */
H5HG_t sh_heap; /*if defined, attribute is in global heap */
H5F_t *sh_file; /*file pointer if this is a shared attribute */
};
/* Function prototypes for H5T package scope */
#endif

30
src/H5Aprivate.h Normal file
View File

@ -0,0 +1,30 @@
/****************************************************************************
* 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. *
* *
****************************************************************************/
/*
* This file contains private information about the H5D module
*/
#ifndef _H5Aprivate_H
#define _H5Aprivate_H
#include <H5Apublic.h>
#define H5A_RESERVED_ATOMS 0
typedef struct H5A_t H5A_t;
/* Private headers needed by this file */
/* Functions defined in H5A.c */
H5A_t * H5A_copy(const H5A_t *old_attr);
herr_t H5A_close(H5A_t *attr);
#endif

47
src/H5Apublic.h Normal file
View File

@ -0,0 +1,47 @@
/****************************************************************************
* 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. *
* *
****************************************************************************/
/*
* This file contains public declarations for the H5A module.
*/
#ifndef _H5Apublic_H
#define _H5Apublic_H
/* Public headers needed by this file */
#ifdef __cplusplus
extern "C" {
#endif
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 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 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);
int H5Anum_attrs(hid_t loc_id);
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
}
#endif
#endif /* _H5Apublic_H */

15
src/H5D.c
View File

@ -14,12 +14,12 @@
static char RcsId[] = "@(#)$Revision$";
#endif
/* $Id$ */
#define H5D_PACKAGE /*suppress error about including H5Tpkg */
#include <H5private.h> /* Generic Functions */
#include <H5Iprivate.h> /* IDs */
#include <H5ACprivate.h> /* Cache */
#include <H5Dprivate.h> /* Dataset functions */
#include <H5Dpkg.h> /* Dataset functions */
#include <H5Eprivate.h> /* Error handling */
#include <H5Gprivate.h> /* Group headers */
#include <H5HLprivate.h> /* Name heap */
@ -37,17 +37,6 @@ static char RcsId[] = "@(#)$Revision$";
*/
#define H5D_OPTIMIZE_PIPE 1
/*
* A dataset is the following struct.
*/
struct H5D_t {
H5G_entry_t ent; /*cached object header stuff */
H5T_t *type; /*datatype of this dataset */
H5S_t *space; /*dataspace of this dataset */
H5D_create_t *create_parms; /*creation parameters */
H5O_layout_t layout; /*data layout */
};
/* Default dataset creation property list */
const H5D_create_t H5D_create_dflt = {
H5D_CONTIGUOUS, /* Layout */

40
src/H5Dpkg.h Normal file
View File

@ -0,0 +1,40 @@
/*
* Copyright (C) 1997 NCSA
* All rights reserved.
*
* Programmer: Robb Matzke <matzke@llnl.gov>
* Monday, December 8, 1997
*
* Purpose: This file contains declarations which are visible only within
* the H5D package. Source files outside the H5D package should
* include H5Dprivate.h instead.
*/
#ifndef H5D_PACKAGE
#error "Do not include this file outside the H5D package!"
#endif
#ifndef _H5Dpkg_H
#define _H5Dpkg_H
/*
* Define this to enable debugging.
*/
#ifdef NDEBUG
# undef H5D_DEBUG
#endif
#include <H5Dprivate.h>
/*
* A dataset is the following struct.
*/
struct H5D_t {
H5G_entry_t ent; /*cached object header stuff */
H5T_t *type; /*datatype of this dataset */
H5S_t *space; /*dataspace of this dataset */
H5D_create_t *create_parms; /*creation parameters */
H5O_layout_t layout; /*data layout */
};
#endif

2
src/H5Epublic.h
View File

@ -46,6 +46,7 @@ typedef enum H5E_major_t {
H5E_DATASET, /*Dataset */
H5E_STORAGE, /*data storage */
H5E_TEMPLATE, /*Property lists */
H5E_ATTR, /*Attribute */
H5E_COMP, /*Data compression */
H5E_EFL /*External file list */
} H5E_major_t;
@ -108,6 +109,7 @@ typedef enum H5E_minor_t {
H5E_VERSION, /*wrong version number */
H5E_ALIGNMENT, /*alignment error */
H5E_BADMESG, /*unrecognized message */
H5E_CANTDELETE, /* Can't delete message */
/* Group related errors */
H5E_CANTOPENOBJ, /*Can't open object */

1
src/H5Iprivate.h
View File

@ -67,6 +67,7 @@
#define H5I_DATASETID_HASHSIZE 64
#define H5I_OID_HASHSIZE 64
#define H5I_GROUPID_HASHSIZE 64
#define H5I_ATTRID_HASHSIZE 64
/* Atom information structure used */
typedef struct H5I_id_info_t {

1
src/H5Ipublic.h
View File

@ -40,6 +40,7 @@ typedef enum {
H5_DATASPACE, /*group ID for Dataspace objects */
H5_DATASET, /*group ID for Dataset objects */
H5_DIRECTORY, /*group ID for Directory objects */
H5_ATTR, /*group ID for Attribute objects */
MAXGROUP /*highest group in group_t (Invalid as true group)*/
} H5I_group_t;

4
src/H5O.c
View File

@ -62,7 +62,7 @@ static const H5O_class_t *const message_type_g[] = {
NULL, /*0x0009 Not assigned */
NULL, /*0x000A Not assigned */
H5O_COMPRESS, /*0x000B Data storage -- compressed object */
NULL, /*0x000C Attribute list */
H5O_ATTR, /*0x000C Attribute list */
H5O_NAME, /*0x000D Object name */
NULL, /*0x000E Object modification date and time */
NULL, /*0x000F Shared header message */
@ -975,7 +975,7 @@ H5O_find_in_ohdr(H5F_t *f, const haddr_t *addr, const H5O_class_t **type_p,
*
* The OVERWRITE argument is either a sequence number of a
* message to overwrite (usually zero) or the constant
* H5O_NEW_MESSAGE (-1) to indicate that a new message is to
* H5O_NEW_MESG (-1) to indicate that a new message is to
* be created. If the message to overwrite doesn't exist then
* it is created (but only if it can be inserted so its sequence
* number is OVERWRITE; that is, you can create a message with

560
src/H5Oattr.c Normal file
View File

@ -0,0 +1,560 @@
/****************************************************************************
* 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$ */
#define H5A_PACKAGE /*prevent warning from including H5Tpkg.h */
#include <H5private.h>
#include <H5Eprivate.h>
#include <H5Gprivate.h>
#include <H5MMprivate.h>
#include <H5Oprivate.h>
#include <H5Apkg.h>
#define PABLO_MASK H5O_attr_mask
/* PRIVATE PROTOTYPES */
static herr_t H5O_attr_encode (H5F_t *f, uint8 *p, const void *mesg);
static void *H5O_attr_decode (H5F_t *f, const uint8 *p, H5HG_t *hobj);
static void *H5O_attr_copy (const void *_mesg, void *_dest);
static size_t H5O_attr_size (H5F_t *f, const void *_mesg);
static herr_t H5O_attr_reset (void *_mesg);
static herr_t H5O_attr_debug (H5F_t *f, const void *_mesg,
FILE * stream, intn indent, intn fwidth);
/* This message derives from H5O */
const H5O_class_t H5O_ATTR[1] = {{
H5O_ATTR_ID, /* message id number */
"attribute", /* message name for debugging */
sizeof(H5A_t), /* native message size */
H5O_attr_decode, /* decode message */
H5O_attr_encode, /* encode message */
H5O_attr_copy, /* copy the native value */
H5O_attr_size, /* size of raw message */
H5O_attr_reset, /* reset method */
NULL, /* no share method (currently) */
H5O_attr_debug, /* debug the message */
}};
/* Interface initialization */
static hbool_t interface_initialize_g = FALSE;
#define INTERFACE_INIT NULL
/*--------------------------------------------------------------------------
NAME
H5O_attr_decode
PURPOSE
Decode a attribute message and return a pointer to a memory struct
with the decoded information
USAGE
void *H5O_attr_decode(f, raw_size, p)
H5F_t *f; IN: pointer to the HDF5 file struct
size_t raw_size; IN: size of the raw information buffer
const uint8 *p; IN: the raw information buffer
RETURNS
Pointer to the new message in native order on success, NULL on failure
DESCRIPTION
This function decodes the "raw" disk form of a attribute message
into a struct in memory native format. The struct is allocated within this
function using malloc() and is returned to the caller.
--------------------------------------------------------------------------*/
static void *
H5O_attr_decode(H5F_t *f, const uint8 *p, H5HG_t __unused__ *hobj)
{
H5A_t *attr = NULL;
H5S_simple_t *simple; /*simple dimensionality information */
size_t name_len; /* Attribute name length */
FUNC_ENTER(H5O_attr_decode, NULL);
/* check args */
assert(f);
assert(p);
attr = H5MM_xcalloc(1, sizeof(H5A_t));
/* Decode and store the name */
UINT16DECODE(p, name_len);
attr->name=H5MM_xmalloc(name_len+1);
HDmemcpy(attr->name,p,name_len);
attr->name[name_len]='\0';
p+=name_len; /* advance the memory pointer */
/* decode the attribute datatype */
if((attr->dt=(H5O_DTYPE[0].decode)(f,p,NULL))==NULL) {
HRETURN_ERROR(H5E_ATTR, H5E_CANTDECODE, NULL,
"can't decode attribute datatype");
}
attr->dt_size=(H5O_DTYPE[0].raw_size)(f,attr->dt);
p+=attr->dt_size;
/* decode the attribute dataspace */
attr->ds = H5MM_xcalloc(1, sizeof(H5S_t));
if((simple=(H5O_SDSPACE[0].decode)(f,p,NULL))!=NULL) {
attr->ds->type = H5S_SIMPLE;
HDmemcpy(&(attr->ds->u.simple),simple, sizeof(H5S_simple_t));
H5MM_xfree(simple);
} else {
attr->ds->type = H5S_SCALAR;
} /* end else */
attr->ds_size=(H5O_SDSPACE[0].raw_size)(f,&(attr->ds->u.simple));
p+=attr->ds_size;
/* Compute the size of the data */
attr->data_size=H5S_get_npoints(attr->ds)*H5T_get_size(attr->dt);
/* Go get the data */
attr->data = H5MM_xmalloc(attr->data_size);
HDmemcpy(attr->data,p,attr->data_size);
/* Indicate that the fill values aren't to be written out */
attr->initialized=1;
#ifdef LOTSLATER
if (hobj) {
attr->sh_heap = *hobj;
attr->sh_file = f;
}
#endif
FUNC_LEAVE(attr);
}
/*--------------------------------------------------------------------------
NAME
H5O_attr_encode
PURPOSE
Encode a simple attribute message
USAGE
herr_t H5O_attr_encode(f, raw_size, p, mesg)
H5F_t *f; IN: pointer to the HDF5 file struct
const uint8 *p; IN: the raw information buffer
const void *mesg; IN: Pointer to the simple datatype struct
RETURNS
SUCCEED/FAIL
DESCRIPTION
This function encodes the native memory form of the attribute
message in the "raw" disk form.
--------------------------------------------------------------------------*/
static herr_t
H5O_attr_encode(H5F_t *f, uint8 *p, const void *mesg)
{
const H5A_t *attr = (const H5A_t *) mesg;
size_t name_len; /* Attribute name length */
FUNC_ENTER(H5O_attr_encode, FAIL);
/* check args */
assert(f);
assert(p);
assert(attr);
/* encode the attribute name */
name_len=HDstrlen(attr->name);
UINT16ENCODE(p, name_len);
HDmemcpy(p,attr->name,name_len);
p+=name_len;
/* encode the attribute datatype */
if((H5O_DTYPE[0].encode)(f,p,attr->dt)<0) {
HRETURN_ERROR(H5E_ATTR, H5E_CANTENCODE, FAIL,
"can't encode attribute datatype");
}
p+=attr->dt_size;
/* encode the attribute dataspace */
if((H5O_SDSPACE[0].encode)(f,p,&(attr->ds->u.simple))<0) {
HRETURN_ERROR(H5E_ATTR, H5E_CANTENCODE, FAIL,
"can't encode attribute dataspace");
}
p+=attr->ds_size;
/* Store attribute data */
HDmemcpy(p,attr->data,attr->data_size);
FUNC_LEAVE(SUCCEED);
}
/*--------------------------------------------------------------------------
NAME
H5O_attr_copy
PURPOSE
Copies a message from MESG to DEST, allocating DEST if necessary.
USAGE
void *H5O_attr_copy(mesg, dest)
const void *mesg; IN: Pointer to the source attribute struct
const void *dest; IN: Pointer to the destination attribute struct
RETURNS
Pointer to DEST on success, NULL on failure
DESCRIPTION
This function copies a native (memory) attribute message,
allocating the destination structure if necessary.
--------------------------------------------------------------------------*/
static void *
H5O_attr_copy(const void *_src, void *_dst)
{
const H5A_t *src = (const H5A_t *) _src;
H5A_t *dst = NULL;
FUNC_ENTER(H5O_attr_copy, NULL);
/* check args */
assert(src);
/* copy */
if (NULL == (dst = H5A_copy(src))) {
HRETURN_ERROR(H5E_ATTR, H5E_CANTINIT, NULL, "can't copy attribute");
}
/* was result already allocated? */
if (_dst) {
*((H5A_t *) _dst) = *dst;
H5MM_xfree(dst);
dst = (H5A_t *) _dst;
}
FUNC_LEAVE((void *) dst);
}
/*--------------------------------------------------------------------------
NAME
H5O_attr_size
PURPOSE
Return the raw message size in bytes
USAGE
size_t H5O_attr_size(f, mesg)
H5F_t *f; IN: pointer to the HDF5 file struct
const void *mesg; IN: Pointer to the source attribute struct
RETURNS
Size of message on success, 0 on failure
DESCRIPTION
This function returns the size of the raw attribute message on
success. (Not counting the message type or size fields, only the data
portion of the message). It doesn't take into account alignment.
--------------------------------------------------------------------------*/
static size_t
H5O_attr_size(H5F_t __unused__ *f, const void *mesg)
{
size_t ret_value = 0;
const H5A_t *attr = (const H5A_t *) mesg;
FUNC_ENTER(H5O_attr_size, 0);
assert(attr);
/* Get size of name */
ret_value=2; /* Size to store length of name */
ret_value+=HDstrlen(attr->name); /* Add length of name (non-zero terminated) */
/* Get size of datatype information */
ret_value+=attr->dt_size;
/* Get size of [simple] dataspace information */
ret_value+=attr->ds_size;
/* Get size of attribute data */
ret_value+=attr->data_size;
FUNC_LEAVE(ret_value);
}
/*-------------------------------------------------------------------------
* Function: H5O_attr_reset
*
* Purpose: Frees resources within a attribute message, but doesn't free
* the message itself.
*
* Return: Success: SUCCEED
*
* Failure: FAIL
*
* Programmer: Robb Matzke
* Tuesday, December 9, 1997
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static herr_t
H5O_attr_reset(void *_mesg)
{
H5A_t *attr = (H5A_t *) _mesg;
H5A_t *tmp = NULL;
FUNC_ENTER(H5O_attr_reset, FAIL);
if (attr) {
tmp = H5MM_xmalloc(sizeof(H5A_t));
*tmp = *attr;
H5A_close(tmp);
HDmemset(attr, 0, sizeof(H5A_t));
}
FUNC_LEAVE(SUCCEED);
}
/*--------------------------------------------------------------------------
NAME
H5O_attr_debug
PURPOSE
Prints debugging information for an attribute message
USAGE
void *H5O_attr_debug(f, mesg, stream, indent, fwidth)
H5F_t *f; IN: pointer to the HDF5 file struct
const void *mesg; IN: Pointer to the source attribute struct
FILE *stream; IN: Pointer to the stream for output data
intn indent; IN: Amount to indent information by
intn fwidth; IN: Field width (?)
RETURNS
SUCCEED/FAIL
DESCRIPTION
This function prints debugging output to the stream passed as a
parameter.
--------------------------------------------------------------------------*/
static herr_t
H5O_attr_debug(H5F_t __unused__ *f, const void __unused__ *mesg, FILE __unused__ * stream,
intn __unused__ indent, intn __unused__ fwidth)
{
const H5A_t *attr = (const H5A_t *) mesg;
#ifdef LATER
const char *s;
char buf[256];
intn i, j;
#endif /* LATER */
FUNC_ENTER(H5O_attr_debug, FAIL);
/* check args */
assert(f);
assert(attr);
assert(stream);
assert(indent >= 0);
assert(fwidth >= 0);
#ifdef LATER
switch (dt->type) {
case H5T_INTEGER:
s = "integer";
break;
case H5T_FLOAT:
s = "floating-point";
break;
case H5T_TIME:
s = "date and time";
break;
case H5T_STRING:
s = "text string";
break;
case H5T_BITFIELD:
s = "bit field";
break;
case H5T_OPAQUE:
s = "opaque";
break;
case H5T_COMPOUND:
s = "compound";
break;
default:
sprintf(buf, "H5T_CLASS_%d", (int) (dt->type));
s = buf;
break;
}
fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
"Type class:",
s);
fprintf(stream, "%*s%-*s %lu byte%s\n", indent, "", fwidth,
"Size:",
(unsigned long) (dt->size), 1 == dt->size ? "" : "s");
if (H5T_COMPOUND == dt->type) {
fprintf(stream, "%*s%-*s %d\n", indent, "", fwidth,
"Number of members:",
dt->u.compnd.nmembs);
for (i = 0; i < dt->u.compnd.nmembs; i++) {
sprintf(buf, "Member %d:", i);
fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
buf,
dt->u.compnd.memb[i].name);
fprintf(stream, "%*s%-*s %lu\n", indent + 3, "", MAX(0, fwidth-3),
"Byte offset:",
(unsigned long) (dt->u.compnd.memb[i].offset));
fprintf(stream, "%*s%-*s %d%s\n", indent + 3, "", MAX(0, fwidth-3),
"Dimensionality:",
dt->u.compnd.memb[i].ndims,
0 == dt->u.compnd.memb[i].ndims ? " (scalar)" : "");
if (dt->u.compnd.memb[i].ndims > 0) {
fprintf(stream, "%*s%-*s {", indent + 3, "", MAX(0, fwidth-3),
"Size:");
for (j = 0; j < dt->u.compnd.memb[i].ndims; j++) {
fprintf(stream, "%s%lu", j ? ", " : "",
(unsigned long) (dt->u.compnd.memb[i].dim[j]));
}
fprintf(stream, "}\n");
fprintf(stream, "%*s%-*s {", indent + 3, "", MAX(0, fwidth-3),
"Permutation:");
for (j = 0; j < dt->u.compnd.memb[i].ndims; j++) {
fprintf(stream, "%s%lu", j ? ", " : "",
(unsigned long) (dt->u.compnd.memb[i].perm[j]));
}
fprintf(stream, "}\n");
}
H5O_dtype_debug(f, dt->u.compnd.memb[i].type, stream,
indent + 3, MAX(0, fwidth - 3));
}
} else {
switch (dt->u.atomic.order) {
case H5T_ORDER_LE:
s = "little endian";
break;
case H5T_ORDER_BE:
s = "big endian";
break;
case H5T_ORDER_VAX:
s = "VAX";
break;
case H5T_ORDER_NONE:
s = "none";
break;
default:
sprintf(buf, "H5T_ORDER_%d", dt->u.atomic.order);
s = buf;
break;
}
fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
"Byte order:",
s);
fprintf(stream, "%*s%-*s %lu bit%s\n", indent, "", fwidth,
"Precision:",
(unsigned long) (dt->u.atomic.prec),
1 == dt->u.atomic.prec ? "" : "s");
fprintf(stream, "%*s%-*s %lu bit%s\n", indent, "", fwidth,
"Offset:",
(unsigned long) (dt->u.atomic.offset),
1 == dt->u.atomic.offset ? "" : "s");
switch (dt->u.atomic.lsb_pad) {
case H5T_PAD_ZERO:
s = "zero";
break;
case H5T_PAD_ONE:
s = "one";
break;
default:
s = "pad?";
break;
}
fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
"Low pad type:", s);
switch (dt->u.atomic.msb_pad) {
case H5T_PAD_ZERO:
s = "zero";
break;
case H5T_PAD_ONE:
s = "one";
break;
default:
s = "pad?";
break;
}
fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
"High pad type:", s);
if (H5T_FLOAT == dt->type) {
switch (dt->u.atomic.u.f.pad) {
case H5T_PAD_ZERO:
s = "zero";
break;
case H5T_PAD_ONE:
s = "one";
break;
default:
if (dt->u.atomic.u.f.pad < 0) {
sprintf(buf, "H5T_PAD_%d", -(dt->u.atomic.u.f.pad));
} else {
sprintf(buf, "bit-%d", dt->u.atomic.u.f.pad);
}
s = buf;
break;
}
fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
"Internal pad type:", s);
switch (dt->u.atomic.u.f.norm) {
case H5T_NORM_IMPLIED:
s = "implied";
break;
case H5T_NORM_MSBSET:
s = "msb set";
break;
case H5T_NORM_NONE:
s = "none";
break;
default:
sprintf(buf, "H5T_NORM_%d", (int) (dt->u.atomic.u.f.norm));
s = buf;
}
fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
"Normalization:", s);
fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
"Sign bit location:",
(unsigned long) (dt->u.atomic.u.f.sign));
fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
"Exponent location:",
(unsigned long) (dt->u.atomic.u.f.epos));
fprintf(stream, "%*s%-*s 0x%08lx\n", indent, "", fwidth,
"Exponent bias:",
(unsigned long) (dt->u.atomic.u.f.ebias));
fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
"Exponent size:",
(unsigned long) (dt->u.atomic.u.f.esize));
fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
"Mantissa location:",
(unsigned long) (dt->u.atomic.u.f.mpos));
fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
"Mantissa size:",
(unsigned long) (dt->u.atomic.u.f.msize));
} else if (H5T_INTEGER == dt->type) {
switch (dt->u.atomic.u.i.sign) {
case H5T_SGN_NONE:
s = "none";
break;
case H5T_SGN_2:
s = "2's comp";
break;
default:
sprintf(buf, "H5T_SGN_%d", (int) (dt->u.atomic.u.i.sign));
s = buf;
break;
}
fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
"Sign scheme:", s);
}
}
#endif /* LATER */
FUNC_LEAVE(SUCCEED);
}

8
src/H5Oprivate.h
View File

@ -179,6 +179,14 @@ typedef struct H5O_compress_t {
uint8 *client_data; /*client data passed to algorithm */
} H5O_compress_t;
/*
* Attribute Message.
*/
#define H5O_ATTR_ID 0x000C
extern const H5O_class_t H5O_ATTR[1];
/* operates on an H5A_t struct */
/*
* Object name message.
*/

2
src/H5Osdspace.c
View File

@ -258,7 +258,7 @@ H5O_sdspace_size(H5F_t *f, const void *mesg)
*/
size_t ret_value = 8;
FUNC_ENTER(H5O_sim_dtype_size, 0);
FUNC_ENTER(H5O_sdspace_size, 0);
/* add in the dimension sizes */
ret_value += sdim->rank * H5F_SIZEOF_SIZE (f);

35
src/H5S.c
View File

@ -238,9 +238,7 @@ H5S_close(H5S_t *ds)
break;
case H5S_SIMPLE:
H5MM_xfree(ds->u.simple.size);
H5MM_xfree(ds->u.simple.max);
H5MM_xfree(ds->u.simple.perm);
H5S_close_simple(&(ds->u.simple));
break;
case H5S_COMPLEX:
@ -261,6 +259,37 @@ H5S_close(H5S_t *ds)
FUNC_LEAVE(SUCCEED);
}
/*-------------------------------------------------------------------------
* Function: H5S_close_simple
*
* Purpose: Releases all memory associated with a simple data space.
* (but doesn't free the simple space itself)
*
* Return: Success: SUCCEED
*
* Failure: FAIL
*
* Programmer: Quincey Koziol
* Friday, April 17, 1998
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
herr_t
H5S_close_simple(H5S_simple_t *simple)
{
FUNC_ENTER(H5S_close_simple, FAIL);
assert(simple);
H5MM_xfree(simple->size);
H5MM_xfree(simple->max);
H5MM_xfree(simple->perm);
FUNC_LEAVE(SUCCEED);
}
/*-------------------------------------------------------------------------
* Function: H5Scopy
*

1
src/H5Sprivate.h
View File

@ -108,6 +108,7 @@ typedef struct H5S_tconv_t {
} H5S_conv_t;
H5S_t *H5S_copy (const H5S_t *src);
herr_t H5S_close_simple (H5S_simple_t *simple);
herr_t H5S_close (H5S_t *ds);
hsize_t H5S_get_npoints (const H5S_t *ds);
hsize_t H5S_get_npoints_max(const H5S_t *ds);

4
src/H5T.c
View File

@ -3006,9 +3006,9 @@ H5T_insert(H5T_t *parent, const char *name, size_t offset, const H5T_t *member)
/* Does the new member overlap any existing member ? */
for (i = 0; i < parent->u.compnd.nmembs; i++) {
if ((offset < parent->u.compnd.memb[i].offset &&
if ((offset <= parent->u.compnd.memb[i].offset &&
offset + member->size > parent->u.compnd.memb[i].offset) ||
(parent->u.compnd.memb[i].offset < offset &&
(parent->u.compnd.memb[i].offset <= offset &&
parent->u.compnd.memb[i].offset +
parent->u.compnd.memb[i].type->size > offset)) {
HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINSERT, FAIL,

2
src/H5Tpublic.h
View File

@ -20,7 +20,7 @@
#include <H5public.h>
#include <H5Ipublic.h>
#define HOFFSET(S,M) ((size_t)((const char*)&S.M-(const char*)&S))
#define HOFFSET(S,M) (offsetof(S,M))
#define HPOFFSET(P,M) ((size_t)((const char*)&(P->M)-(const char*)P))
/* These are the various classes of data types */

1
src/H5public.h
View File

@ -18,6 +18,7 @@
#include <H5config.h> /*from configure */
#include <sys/types.h>
#include <stddef.h>
#ifdef HAVE_PARALLEL
# include <mpi.h>
# include <mpio.h>

29
src/Makefile.in
View File

@ -16,12 +16,12 @@ PROGS=debug h5ls
# Source and object files for the library (lexicographically)...
PARALLEL_SRC=H5Fmpio.c
LIB_SRC=H5.c H5AC.c H5B.c H5D.c H5E.c H5F.c H5Farray.c H5Fcore.c H5Ffamily.c \
H5Fistore.c H5Flow.c H5Fsec2.c H5Fsplit.c H5Fstdio.c H5G.c H5Gent.c \
H5Gnode.c H5Gstab.c H5HG.c H5HL.c H5I.c H5MF.c H5MM.c H5O.c H5Ocomp.c \
H5Ocont.c H5Odtype.c H5Oefl.c H5Olayout.c H5Oname.c H5Onull.c \
H5Osdspace.c H5Oshared.c H5Ostab.c H5P.c H5S.c H5Ssimp.c H5T.c \
H5Tconv.c H5Tinit.c H5V.c H5Z.c @PARALLEL_SRC@
LIB_SRC=H5.c H5A.c H5AC.c H5B.c H5D.c H5E.c H5F.c H5Farray.c H5Fcore.c \
H5Ffamily.c H5Fistore.c H5Flow.c H5Fsec2.c H5Fsplit.c H5Fstdio.c H5G.c \
H5Gent.c H5Gnode.c H5Gstab.c H5HG.c H5HL.c H5I.c H5MF.c H5MM.c \
H5O.c H5Oattr.c H5Ocomp.c H5Ocont.c H5Odtype.c H5Oefl.c H5Olayout.c \
H5Oname.c H5Onull.c H5Osdspace.c H5Oshared.c H5Ostab.c H5P.c H5S.c \
H5Ssimp.c H5T.c H5Tconv.c H5Tinit.c H5V.c H5Z.c @PARALLEL_SRC@
LIB_OBJ=$(LIB_SRC:.c=.o)
@ -33,16 +33,17 @@ PROG_SRC=debug.c h5ls.c
PROG_OBJ=$(PROG_SRC:.c=.o)
# Public header files (to be installed)...
PUB_HDR=H5public.h H5ACpublic.h H5Bpublic.h H5Ppublic.h H5Dpublic.h \
H5Epublic.h H5Fpublic.h H5Gpublic.h H5HGpublic.h H5HLpublic.h \
H5Ipublic.h H5MFpublic.h H5MMpublic.h H5Opublic.h H5Spublic.h \
H5Tpublic.h H5Zpublic.h H5config.h hdf5.h
PUB_HDR=H5public.h H5Apublic.h H5ACpublic.h H5Bpublic.h H5Ppublic.h \
H5Dpublic.h H5Epublic.h H5Fpublic.h H5Gpublic.h H5HGpublic.h H5HLpublic.h \
H5Ipublic.h H5MFpublic.h H5MMpublic.h H5Opublic.h H5Spublic.h \
H5Tpublic.h H5config.h hdf5.h
# Other header files (not to be installed)...
PRIVATE_HDR=H5private.h H5ACprivate.h H5Bprivate.h H5Pprivate.h H5Dprivate.h \
H5Eprivate.h H5Fprivate.h H5Gprivate.h H5Gpkg.h H5HGprivate.h \
H5HLprivate.h H5Iprivate.h H5MFprivate.h H5MMprivate.h H5Oprivate.h \
H5Sprivate.h H5Tprivate.h H5Tpkg.h H5Vprivate.h H5Zprivate.h
PRIVATE_HDR=H5private.h H5Aprivate.h H5Apkg.h H5ACprivate.h H5Bprivate.h \
H5Pprivate.h H5Dprivate.h H5Dpkg.h H5Eprivate.h H5Fprivate.h H5Gprivate.h \
H5Gpkg.h H5HGprivate.h H5HLprivate.h H5Iprivate.h H5MFprivate.h \
H5MMprivate.h H5Oprivate.h H5Sprivate.h H5Tprivate.h H5Tpkg.h H5Vprivate.h \
H5Zprivate.h
# Number format detection
H5Tinit.c: H5detect

3
src/hdf5.h
View File

@ -19,6 +19,8 @@
#define _HDF5_H
#include <H5public.h>
#include <H5Ipublic.h> /* IDs (this has to come near the top, to define hid_t) */
#include <H5Apublic.h> /* Attributes */
#include <H5ACpublic.h> /* Metadata cache */
#include <H5Bpublic.h> /* B-trees */
#include <H5Dpublic.h> /* Datasets */
@ -27,7 +29,6 @@
#include <H5Gpublic.h> /* Groups */
#include <H5HGpublic.h> /* Global heaps */
#include <H5HLpublic.h> /* Local heaps */
#include <H5Ipublic.h> /* IDs */
#include <H5MFpublic.h> /* File memory management */
#include <H5MMpublic.h> /* Core memory management */
#include <H5Opublic.h> /* Object headers */