[svn-r7994] Purpose:

h5repack new features

Description:
added checking routines for the filters that were applied to the output file
added tests for szip filter

Solution:

Platforms tested:
linux
solaris

(IRIX is not available)
:

Misc. update:

1 files changed, 241 insertions, 0 deletions

diff --git a/tools/h5repack/h5repack_verify.c b/tools/h5repack/h5repack_verify.c
new file mode 100644
index 0000000..f3c1583
--- /dev/null
+++ b/tools/h5repack/h5repack_verify.c
@@ -0,0 +1,241 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic HDF5 document set and   *
+ * is linked from the top-level documents page.  It can also be found at     *
+ * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
+ * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include "hdf5.h"
+#include "h5test.h"
+#include "h5repack.h"
+
+
+
+/*-------------------------------------------------------------------------
+ * Function: has_filter
+ *
+ * Purpose: verify if a filter is present in the property list DCPL_ID
+ *
+ * Return: 1 has, 0 does not, -1 error
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: December 19, 2003
+ *
+ *-------------------------------------------------------------------------
+ */
+
+int has_filter(hid_t dcpl_id,
+               H5Z_filter_t filtnin) 
+{
+ 
+ int          nfilters;       /* number of filters */
+ unsigned     filt_flags;     /* filter flags */
+ H5Z_filter_t filtn;          /* filter identification number */
+ unsigned     cd_values[20];  /* filter client data values */
+ size_t       cd_nelmts;      /* filter client number of values */
+ char         f_name[256];    /* filter name */
+ int          have=0;         /* flag, filter is present */
+ hsize_t      chsize[64];     /* chunk size in elements */
+ H5D_layout_t layout;         /* layout */
+ int          rank;           /* rank */
+ int          i;              /* index */
+ 
+ /* if no information about the input filter is requested return exit */
+ if (filtnin==-1)
+  return 1;
+ 
+ /* get information about filters */
+ if ((nfilters = H5Pget_nfilters(dcpl_id))<0) 
+  return -1;
+
+/* 
+  H5D_COMPACT	  	= 0
+  H5D_CONTIGUOUS	= 1
+  H5D_CHUNKED		  = 2
+ */
+ layout = H5Pget_layout(dcpl_id);
+ if (layout==H5D_CHUNKED)
+ {
+  if ((rank = H5Pget_chunk(dcpl_id,NELMTS(chsize),chsize/*out*/))<0)
+   return -1;
+ }
+ 
+ for (i=0; i<nfilters; i++) 
+ {
+  cd_nelmts = NELMTS(cd_values);
+  filtn = H5Pget_filter(dcpl_id, 
+   i, 
+   &filt_flags, 
+   &cd_nelmts,
+   cd_values, 
+   sizeof(f_name), 
+   f_name);
+
+  if (filtnin==filtn)
+   have=1;
+
+ } 
+
+ return have;
+}
+
+
+
+/*-------------------------------------------------------------------------
+ * Function: h5repack_verify
+ *
+ * Purpose: verify if the filters specified in the options list are
+ *  present on the output file
+ *
+ * Return: 1=filter present, 0=filter not present, -1=error
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: December 19, 2003
+ *
+ *-------------------------------------------------------------------------
+ */
+
+int h5repack_verify(const char *fname,
+                    pack_opt_t *options)
+{
+ hid_t  fid;      /* file ID */
+ hid_t  dset_id;  /* dataset ID */ 
+ hid_t  dcpl_id;  /* dataset creation property list ID */ 
+ hid_t  space_id; /* space ID */ 
+ int    ret=1, i;
+ trav_table_t  *travt=NULL;
+
+ /* open the file */
+ if ((fid=H5Fopen(fname,H5F_ACC_RDONLY,H5P_DEFAULT))<0 )
+  return -1;
+
+ for ( i=0; i<options->op_tbl->nelems; i++) 
+ {
+  char* name=options->op_tbl->objs[i].path;
+  pack_info_t obj=options->op_tbl->objs[i];
+
+/*-------------------------------------------------------------------------
+ * open
+ *-------------------------------------------------------------------------
+ */
+  if ((dset_id=H5Dopen(fid,name))<0) 
+   goto error;
+  if ((space_id=H5Dget_space(dset_id))<0) 
+   goto error;
+  if ((dcpl_id=H5Dget_create_plist(dset_id))<0) 
+   goto error;
+
+/*-------------------------------------------------------------------------
+ * filter check
+ *-------------------------------------------------------------------------
+ */
+  if (has_filter(dcpl_id,obj.filter.filtn)==0)
+   ret=0;
+
+/*-------------------------------------------------------------------------
+ * close
+ *-------------------------------------------------------------------------
+ */
+  if (H5Pclose(dcpl_id)<0) 
+   goto error;
+  if (H5Sclose(space_id)<0) 
+   goto error;
+  if (H5Dclose(dset_id)<0) 
+   goto error;
+
+ }
+
+
+/*-------------------------------------------------------------------------
+ * check for the "all" objects option
+ *-------------------------------------------------------------------------
+ */
+
+ if (options->all_filter==1)
+ {
+  
+  /* init table */
+  trav_table_init(&travt);
+  
+  /* get the list of objects in the file */
+  if (h5trav_gettable(fid,travt)<0)
+   goto error;
+
+  for ( i=0; i<travt->nobjs; i++)
+  {
+   char* name=travt->objs[i].name;
+
+   switch ( travt->objs[i].type )
+   {
+   case H5G_DATASET:
+   
+ /*-------------------------------------------------------------------------
+  * open
+  *-------------------------------------------------------------------------
+  */
+    if ((dset_id=H5Dopen(fid,name))<0) 
+     goto error;
+    if ((space_id=H5Dget_space(dset_id))<0) 
+     goto error;
+    if ((dcpl_id=H5Dget_create_plist(dset_id))<0) 
+     goto error;
+    
+ /*-------------------------------------------------------------------------
+  * filter check
+  *-------------------------------------------------------------------------
+  */
+    if (has_filter(dcpl_id,options->filter_g.filtn)==0)
+     ret=0;
+    
+  /*-------------------------------------------------------------------------
+   * close
+   *-------------------------------------------------------------------------
+   */
+    if (H5Pclose(dcpl_id)<0) 
+     goto error;
+    if (H5Sclose(space_id)<0) 
+     goto error;
+    if (H5Dclose(dset_id)<0) 
+     goto error;
+    
+    break;
+   default:
+    break;
+   } /* switch */
+   
+  } /* i */
+  
+  /* free table */
+  trav_table_free(travt);
+ }
+ 
+/*-------------------------------------------------------------------------
+ * close
+ *-------------------------------------------------------------------------
+ */
+ 
+ if (H5Fclose(fid)<0)
+  return -1;
+
+ return ret;
+
+error:
+ H5E_BEGIN_TRY {
+  H5Pclose(dcpl_id);
+  H5Sclose(space_id);
+  H5Dclose(dset_id);
+  H5Fclose(fid);
+  trav_table_free(travt);
+ } H5E_END_TRY;
+ return -1;
+}
+