[svn-r12229] Purpose:

new feature

Description:
1) separated the HL library into "public" and "private" header files, with the same caracteristics as the basic library
2) added the public headers to hdf5.h (with a conditional include macro, defined in configure.in)
3) added the path to HL in all Makefile.am 's , because of the inclusion in hdf5.h

Solution:

Platforms tested:
linux 32, 64
AIX
solaris
with fortran and c++

(one packet table example fails)

Misc. update:

1 files changed, 173 insertions, 23 deletions

diff --git a/hl/src/H5TB.c b/hl/src/H5TB.c
index 8a2cdd6..720bb0a 100644
--- a/hl/src/H5TB.c
+++ b/hl/src/H5TB.c
@@ -12,38 +12,33 @@
  * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include "H5TB.h"
-#include "H5HL_private.h"
+#include "H5TBprivate.h"
 #include <stdlib.h>
 #include <string.h>
 
-#if 0
-#define SHRINK
-#endif
-
 
 /*-------------------------------------------------------------------------
  *
- * Private functions
+ * internal functions
  *
  *-------------------------------------------------------------------------
  */
 
-int H5TB_find_field(const char *field,
-                    const char *field_list);
+static int H5TB_find_field(const char *field,
+                           const char *field_list);
 
-herr_t H5TB_attach_attributes(const char *table_title,
-                              hid_t loc_id,
-                              const char *dset_name,
-                              hsize_t nfields,
-                              hid_t tid );
+static herr_t H5TB_attach_attributes(const char *table_title,
+                                     hid_t loc_id,
+                                     const char *dset_name,
+                                     hsize_t nfields,
+                                     hid_t tid );
 
-hid_t H5TB_create_type(hid_t loc_id,
-                       const char *dset_name,
-                       size_t dst_size,
-                       const size_t *dst_offset,
-                       const size_t *dst_sizes,
-                       hid_t ftype_id);
+static hid_t H5TB_create_type(hid_t loc_id,
+                              const char *dset_name,
+                              size_t dst_size,
+                              const size_t *dst_offset,
+                              const size_t *dst_sizes,
+                              hid_t ftype_id);
 
 /*-------------------------------------------------------------------------
  *
@@ -3439,7 +3434,7 @@ out:
 
 /*-------------------------------------------------------------------------
  *
- * Private functions
+ * internal functions
  *
  *-------------------------------------------------------------------------
  */
@@ -3458,7 +3453,7 @@ out:
  *-------------------------------------------------------------------------
  */
 
-
+static
 int H5TB_find_field( const char *field, const char *field_list )
 {
  const char *start = field_list;
@@ -3496,7 +3491,7 @@ int H5TB_find_field( const char *field, const char *field_list )
  *-------------------------------------------------------------------------
  */
 
-
+static
 herr_t H5TB_attach_attributes( const char *table_title,
                                hid_t loc_id,
                                const char *dset_name,
@@ -3567,6 +3562,7 @@ out:
  *-------------------------------------------------------------------------
  */
 
+static
 hid_t H5TB_create_type(hid_t loc_id,
                        const char *dset_name,
                        size_t dst_size,
@@ -3651,3 +3647,157 @@ out:
 
 }
 
+
+/*-------------------------------------------------------------------------
+ *
+ * Functions shared between H5TB and H5PT
+ *
+ *-------------------------------------------------------------------------
+ */
+
+/*-------------------------------------------------------------------------
+ * Function: H5TBcommon_append_records
+ *
+ * Purpose: Common code for reading records shared between H5PT and H5TB
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
+ *             James Laird, jlaird@ncsa.uiuc.edu
+ *
+ * Date: March 8, 2004
+ *
+ * Comments: Called by H5TBappend_records and H5PTappend_records
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t H5TBcommon_append_records( hid_t dataset_id,
+                                  hid_t mem_type_id,
+                                  hsize_t nrecords,
+                                  hsize_t orig_table_size,
+                                  const void * data)
+{
+  hsize_t  count[1];
+  hsize_t offset[1];
+  hid_t    space_id = H5I_BADID;
+  hid_t    mem_space_id = H5I_BADID;
+  hsize_t  dims[1];
+  hsize_t  mem_dims[1];
+
+    /* Extend the dataset */
+  dims[0] = nrecords + orig_table_size;
+  if ( H5Dextend ( dataset_id, dims ) < 0 )
+    goto out;
+
+  /* Create a simple memory data space */
+  mem_dims[0]=nrecords;
+  if ( (mem_space_id = H5Screate_simple( 1, mem_dims, NULL )) < 0 )
+    goto out;
+
+  /* Get a copy of the new file data space for writing */
+  if ( (space_id = H5Dget_space( dataset_id )) < 0 )
+    goto out;
+
+  /* Define a hyperslab in the dataset */
+  offset[0] = orig_table_size;
+  count[0] = nrecords;
+  if ( H5Sselect_hyperslab( space_id, H5S_SELECT_SET, offset, NULL, count, NULL) < 0 )
+    goto out;
+
+  /* Write the records */
+  if ( H5Dwrite( dataset_id, mem_type_id, mem_space_id, space_id, H5P_DEFAULT, data ) <
+0 )
+    goto out;
+
+  /* Terminate access to the dataspace */
+  if ( H5Sclose( mem_space_id ) < 0 )
+    goto out;
+
+  if ( H5Sclose( space_id ) < 0 )
+    goto out;
+
+  return 0;
+
+out:
+  H5E_BEGIN_TRY
+  H5Sclose(mem_space_id);
+  H5Sclose(space_id);
+  H5E_END_TRY
+  return -1;
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5TBcommon_read_records
+ *
+ * Purpose: Common code for reading records shared between H5PT and H5TB
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
+ *             James Laird, jlaird@ncsa.uiuc.edu
+ *
+ * Date: March 8, 2004
+ *
+ * Comments: Called by H5TBread_records and H5PTread_records
+ *
+ * Modifications:
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t H5TBcommon_read_records( hid_t dataset_id,
+                                                    hid_t mem_type_id,
+                                                        hsize_t start,
+                                                        hsize_t nrecords,
+                                                        hsize_t table_size,
+                                                        void *data)
+{
+  hsize_t  count[1];
+  hsize_t offset[1];
+  hid_t    space_id = H5I_BADID;
+  hid_t    mem_space_id = H5I_BADID;
+  hsize_t  mem_size[1];
+
+  /* Make sure the read request is in bounds */
+  if ( start + nrecords > table_size )
+    goto out;
+
+  /* Get the dataspace handle */
+  if ( (space_id = H5Dget_space( dataset_id )) < 0 )
+    goto out;
+
+  /* Define a hyperslab in the dataset of the size of the records */
+  offset[0] = start;
+  count[0]  = nrecords;
+  if ( H5Sselect_hyperslab( space_id, H5S_SELECT_SET, offset, NULL, count, NULL) < 0 )
+    goto out;
+
+  /* Create a memory dataspace handle */
+  mem_size[0] = count[0];
+  if ((mem_space_id = H5Screate_simple( 1, mem_size, NULL )) < 0 )
+    goto out;
+  if ((H5Dread( dataset_id, mem_type_id, mem_space_id, space_id, H5P_DEFAULT, data)) < 0
+ )
+    goto out;
+
+  /* Terminate access to the memory dataspace */
+  if ( H5Sclose( mem_space_id ) < 0 )
+    goto out;
+
+  /* Terminate access to the dataspace */
+  if ( H5Sclose( space_id ) < 0 )
+    goto out;
+
+  return 0;
+
+out:
+  H5E_BEGIN_TRY
+  H5Sclose(space_id);
+  H5Sclose(mem_space_id);
+  H5E_END_TRY
+  return -1;
+}
+