summaryrefslogtreecommitdiffstats
path: root/src/H5Tpublic.h
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1997-12-10 22:41:07 (GMT)
committerRobb Matzke <matzke@llnl.gov>1997-12-10 22:41:07 (GMT)
commit082dd8cda9ef3d49be23dfce49e10dd30d0758bc (patch)
treee60a32468ba14f758849f34454fdd8722b72edaa /src/H5Tpublic.h
parent3aee91269b83b09a186d214c55873fbbfa15602d (diff)
downloadhdf5-082dd8cda9ef3d49be23dfce49e10dd30d0758bc.zip
hdf5-082dd8cda9ef3d49be23dfce49e10dd30d0758bc.tar.gz
hdf5-082dd8cda9ef3d49be23dfce49e10dd30d0758bc.tar.bz2
[svn-r139] ./src/*.[ch]
Removed the interface initialization argument from FUNC_ENTER() and made it a locally-defined preprocessor symbol, INTERFACE_INIT. Changed `offset' to `address' and `length' to `size' in documentation so it's more consistent. `Offset' still appears occassionally when it refers to a byte offset within some other data structure. Moved interface termination function prototypes from public header files to .c files and made them static. ./src/H5.c ./src/H5public.h Added H5init() because it's possible that the predefined data types are not initialized. This happens only if the first call to the hdf5 library passes a predefined data type symbol as an argument. There should be some way to fix this... ./src/H5A.c ./src/H5Aprivate.h ./src/H5Apublic.h The free_func returns SUCCEED or FAIL, although the return value is ignored by H5A. This is so we can use the various H5*_close() functions to free things. H5Ainc_ref() and H5Adec_ref() are no longer public. Many of the other atom functions should also be made private, but I'll save that for later... Added additional template groups called H5_TEMPLATE_0 through H5_TEMPLATE_7 that are used by the various template subclasses. Increased the number of bits used for atom groups to prevent negative atoms. ./src/H5AC.c ./src/H5ACprivate.h Changed H5AC_new() to H5AC_create() to make names more consistent. ./src/H5B.c ./src/H5Bprivate.h Changed H5B_new() to H5B_create() to make names more consistent. ./src/H5C.c ./src/H5Cprivate.h ./src/H5Cpublic.h Now supports multiple subclasses of templates, although it's done with big switch statements. The default values for templates are defined in the source file to which that template belongs. This got rid of lots of needless preprocessor constants. Added H5Ccreate() to create a new template. Changed H5C_release() to H5Cclose() to make the naming more consistent. ./src/H5D.c ./src/H5Dprivate.h ./src/H5Dpublic.h Enhanced to use the new dataset interface, and uses the enhanced data type and data space interfaces, which haven't been completely implemented. The dataset interface doesn't handle non-contiguous storage, compression, or data type and space conversions yet. ./src/H5F.c ./src/H5Fprivate.h ./src/H5Fpublic.h Removed H5Fflush() since just calls H5F_flush(), which doesn't do what the user would probably think it does, namely, flush everything. It only flushes those things sitting in the H5AC cache and the boot block. Changed the `file_create_parms' field of H5F_low_t to just `create_parms' since the `file' part is obvious. ./src/H5Fistore.c Added some support for external files. Mostly just in the file format and not supported much by the library yet. I need to finish some dataset functions first. Changed H5F_istore_new() to H5F_istore_create() to make names more uniform across packages. ./src/H5Flow.c Flushing a file causes the file to be physically extended to the logical eof. This prevents H5F_open() from thinking a file has been truncated. Most of the time the file will already be that large, and when it isn't Unix will often just allocate the final block anyway. ./src/H5G.c ./src/H5Gent.c ./src/H5Gnode.c ./src/H5Gpkg.h ./src/H5Gprivate.h ./src/H5Gstab.c Removed H5G_basename() Removed (temporarily) data type information from symbol table entries and renamed H5G_CACHED_SDATA to H5G_CACHED_SDSPACE to reflect that it's a simple data space and has nothing to do with raw data. Changed H5G_node_new() to H5G_node_create() and H5G_stab_new() to H5G_stab_create() to make names more uniform across packages. Fixed an undefined address bug that happens when H5G_node_debug() program doesn't pass enough info to H5G_node_load(). ./src/H5H.c ./src/H5Hprivate.h Changed H5H_new() to H5H_create() to make the names more uniform across packages. ./src/H5M.c ./src/H5Mprivate.h ./src/H5Mpublic.h Nulled all the create functions. Most of the other callbacks are to public functions. Removed H5Mcreate(). Changed hobjtype_t to group_t since it has to be the same thing anyway. ./src/H5O.c ./src/H5Oprivate.h ./src/H5Osdim.c ./src/H5Osdtyp.c Changed H5O_SIM_DIM to H5O_SDSPACE (simple data space) since `simple data space' is its official name, not `simple dimensions'. Will eventually add H5O_CDSPACE for comples data spaces. Changed _sim_dim_ to _dspace_. Replaced H5O_SIM_DTYPE and the compound data type messages with a single H5O_DTYPE message. Changed _sim_dtype_ to _dtype_. Changed H5O_STD_STORE to H5O_CSTORE (contiguous storage) since contiguous storage is not necessarily standard. Changed _std_store_ to _cstore_ in H5Ocstore.c Added the H5O_EFL (external file list) message. Changed H5O_new() to H5O_create() to make names more uniform across packages. ./src/H5Oefl.c NEW External file list message for specifying which non-hdf5 files contain raw data for a dataset. ./src/H5P.c ./src/H5Pprivate.h ./src/H5Ppublic.h Renamed and moved data structures to make the names conform to our naming scheme. ./src/H5T.c ./src/H5Tprivate.h ./src/H5Tpublic.h ./src/H5Tpkg.h NEW Data structures redesigned to be more flexible. The interface was redesigned to make it more regular and to make some names more uniform across packages. ./src/H5detect.c Output was changed to produce a file that conforms to the hdf5 coding standard. ./src/Makefile.in Generates H5Tinit.c by running H5detect. ./src/debug.c Moved command argument processing.
Diffstat (limited to 'src/H5Tpublic.h')
-rw-r--r--src/H5Tpublic.h129
1 files changed, 78 insertions, 51 deletions
diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h
index 10f86b5..f1bbe9e 100644
--- a/src/H5Tpublic.h
+++ b/src/H5Tpublic.h
@@ -23,62 +23,89 @@
#include <H5public.h>
#include <H5Apublic.h>
-/* Define atomic datatype bases */
-#define H5T_CHAR MAKE_ATOM(H5_DATATYPE,0)
-#define H5T_INT MAKE_ATOM(H5_DATATYPE,1)
-#define H5T_FLOAT MAKE_ATOM(H5_DATATYPE,2)
-#define H5T_DATE MAKE_ATOM(H5_DATATYPE,3)
-#define H5T_TIME MAKE_ATOM(H5_DATATYPE,4)
-#define H5T_SPTR MAKE_ATOM(H5_DATATYPE,5)
-#define H5T_PPTR MAKE_ATOM(H5_DATATYPE,6)
-#define H5T_COMPOUND MAKE_ATOM(H5_DATATYPE,7)
-
-/* Define atomic datatype architectures */
-#define H5T_BIGENDIAN 0
-#define H5T_LITTLEENDIAN 1
-
-/* Define the machine's architecture */
-/*
-WARNING!
- This is _extremly_ crude is is only valid for very generic architectures,
- anything with a wierd size of integer or wacky floating-point format will
- _not_ work with this hack. It needs to be replaced with Robb's much more
- comprehensive code from H5detect.c. -QAK
-WARNING!
-*/
-#define H5T_ARCH_BIGENDIAN 0
-#define H5T_ARCH_LITTLEENDIAN 1
-#ifdef WORDS_BIGENDIAN
-#define H5T_ARCH_TYPE H5T_ARCH_BIGENDIAN
-#else /* WORDS_BIGENDIAN */
-#define H5T_ARCH_TYPE H5T_ARCH_LITTLEENDIAN
-#endif /* WORDS_BIGENDIAN */
-
-typedef struct {
- hid_t base; /* Basic datatype */
- uint8 len; /* Length of base-type, in bytes */
- uint8 arch; /* Architecture of the base-type */
- } h5_atomic_type_t;
+/* These are the various classes of data types */
+typedef enum H5T_class_t {
+ H5T_NO_CLASS =-1, /*error */
+ H5T_FIXED =0, /*fixed-point types */
+ H5T_FLOAT =1, /*floating-point types */
+ H5T_DATE =2, /*date and time types */
+ H5T_STRING =3, /*character string types */
+ H5T_BITFIELD =4, /*bit field types */
+ H5T_OPAQUE =5, /*opaque types */
+ H5T_COMPOUND =6 /*compound types */
+} H5T_class_t;
+
+/* Byte orders */
+typedef enum H5T_order_t {
+ H5T_ORDER_ERROR =-1, /*error */
+ H5T_ORDER_LE =0, /*little endian */
+ H5T_ORDER_BE =1, /*bit endian */
+ H5T_ORDER_VAX =2, /*VAX mixed endian */
+ H5T_ORDER_NONE =3 /*no particular order (strings, bits,..)*/
+} H5T_order_t;
+
+/* Types of fixed-point sign schemes */
+typedef enum H5T_sign_t {
+ H5T_SGN_ERROR =-1, /*error */
+ H5T_SGN_NONE =0, /*this is an unsigned type */
+ H5T_SGN_2 =1 /*two's complement */
+} H5T_sign_t;
+
+/* Floating-point normalization schemes */
+typedef enum H5T_norm_t {
+ H5T_NORM_ERROR =-1, /*error */
+ H5T_NORM_IMPLIED =0, /*msb of mantissa isn't stored, always 1*/
+ H5T_NORM_MSBSET =1, /*msb of mantissa is always 1 */
+ H5T_NORM_NONE =2 /*not normalized */
+} 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_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_t;
+
+
+
+#define H5T_PAD_ZERO (-1) /*pad with all zeros */
+#define H5T_PAD_ONE (-2) /*pad with all ones */
+#define H5T_PAD_FROM(X) (X) /*pad with value of bit X */
+
+/* The predefined types */
+extern hid_t H5T_NATIVE_CHAR;
+extern hid_t H5T_NATIVE_UCHAR;
+extern hid_t H5T_NATIVE_SHORT;
+extern hid_t H5T_NATIVE_USHORT;
+extern hid_t H5T_NATIVE_INT;
+extern hid_t H5T_NATIVE_UINT;
+extern hid_t H5T_NATIVE_LONG;
+extern hid_t H5T_NATIVE_ULONG;
+extern hid_t H5T_NATIVE_FLOAT;
+extern hid_t H5T_NATIVE_DOUBLE;
#ifdef __cplusplus
extern "C" {
#endif
-/* Functions in H5T.c */
-uint32 H5Tget_num_fields(hid_t tid);
-hbool_t H5Tis_field_atomic(hid_t tid,uintn fidx);
-hbool_t H5Tis_atomic(hid_t tid);
-herr_t H5Tset_type(hid_t tid,hid_t base,uint8 len,uint8 arch);
-herr_t H5Tget_type(hid_t tid,hid_t *base,uint8 *len,uint8 *arch);
-uintn H5Tsize(hid_t tid, hbool_t mem_flag);
-intn H5Tarch(hid_t tid);
-herr_t H5Tadd_field (hid_t tid, const char *name, hid_t base, uint8 len,
- uint8 arch, hid_t space);
-herr_t H5Tget_fields(hid_t tid, hid_t *field_list);
-
-/* Private functions which need to be globally visible */
-void H5T_term_interface (void);
-void H5T_destroy(void *datatype);
+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);
+
+H5T_class_t H5Tget_class (hid_t type_id);
+size_t H5Tget_size (hid_t type_id);
+intn H5Tget_num_members (hid_t type_id);
+
+herr_t H5Tinsert_member (hid_t parent_id, const char *name, off_t offset,
+ hid_t member_id);
+
#ifdef __cplusplus
}