[svn-r12815]

1) added a new parameter to the h5diff function diff_array that contains
the beginning position of the hyperslab, so that the total position in
the array is printed correctly when reading by hyperslabs.
2) added a new test to h5diff  that reads and diffs by hyperslabs. The
test reads a 1GB dataset, from which a 1KB hyperslab was written with
differences .
3) added the generation of 2 files to the generator program to test the
h5diff hyperslab read.
4) changed the h5diff binary pre-generated file names to be more
descriptive (e.g, instead of file1.h5, made it h5diff_basic1.h5)
5) changed the name of the h5repack options text file to info.h5repack 

1 files changed, 122 insertions, 130 deletions

diff --git a/tools/lib/h5diff.h b/tools/lib/h5diff.h
index 7320a63..ab873ae 100644
--- a/tools/lib/h5diff.h
+++ b/tools/lib/h5diff.h
@@ -115,6 +115,7 @@ hsize_t diff_match( hid_t file1_id,
 hsize_t diff_array( void *_mem1,
                     void *_mem2,
                     hsize_t nelmts,
+                    hsize_t hyper_start,
                     int rank,
                     hsize_t *dims,
                     diff_opt_t *options,
@@ -161,28 +162,7 @@ const char* get_sign(H5T_sign_t sign);
 void        print_dims( int r, hsize_t *d );
 int         print_objname(diff_opt_t *options, hsize_t nfound);
 
-hsize_t diff_native_uchar(unsigned char *mem1,
-                          unsigned char *mem2,
-                          hsize_t       i,
-                          int           rank,
-                          hsize_t       *acc,
-                          hsize_t       *pos,
-                          diff_opt_t    *options,
-                          const char    *obj1,
-                          const char    *obj2,
-                          int           *ph);
-
-
-hsize_t diff_char(unsigned char *mem1,
-                  unsigned char *mem2,
-                  hsize_t       i,
-                  int           rank,
-                  hsize_t       *acc,
-                  hsize_t       *pos,
-                  diff_opt_t    *options,
-                  const char    *obj1,
-                  const char    *obj2,
-                  int           *ph);
+
 
 hsize_t diff_datum(void       *_mem1,
                    void       *_mem2,
@@ -201,136 +181,148 @@ hsize_t diff_datum(void       *_mem1,
 
 
 hsize_t diff_float(unsigned char *mem1,
-	unsigned char *mem2,
-	hsize_t       nelmts,
-	int           rank,
-	hsize_t       *acc,
-	hsize_t       *pos,
-	diff_opt_t    *options,
-	const char    *obj1,
-	const char    *obj2,
-	int           *ph);
+ unsigned char *mem2,
+ hsize_t       nelmts,
+ hsize_t       hyper_start,
+ int           rank,
+ hsize_t       *acc,
+ hsize_t       *pos,
+ diff_opt_t    *options,
+ const char    *obj1,
+ const char    *obj2,
+ int           *ph);
 
 hsize_t diff_double(unsigned char *mem1,
-	unsigned char *mem2,
-	hsize_t       nelmts,
-	int           rank,
-	hsize_t       *acc,
-	hsize_t       *pos,
-	diff_opt_t    *options,
-	const char    *obj1,
-	const char    *obj2,
-	int           *ph);
+ unsigned char *mem2,
+ hsize_t       nelmts,
+ hsize_t       hyper_start,
+ int           rank,
+ hsize_t       *acc,
+ hsize_t       *pos,
+ diff_opt_t    *options,
+ const char    *obj1,
+ const char    *obj2,
+ int           *ph);
 
 hsize_t diff_schar(unsigned char *mem1,
-	unsigned char *mem2,
-	hsize_t       nelmts,
-	int           rank,
-	hsize_t       *acc,
-	hsize_t       *pos,
-	diff_opt_t    *options,
-	const char    *obj1,
-	const char    *obj2,
-	int           *ph);
+ unsigned char *mem2,
+ hsize_t       nelmts,
+ hsize_t       hyper_start,
+ int           rank,
+ hsize_t       *acc,
+ hsize_t       *pos,
+ diff_opt_t    *options,
+ const char    *obj1,
+ const char    *obj2,
+ int           *ph);
 
 hsize_t diff_uchar(unsigned char *mem1,
-	unsigned char *mem2,
-	hsize_t       nelmts,
-	int           rank,
-	hsize_t       *acc,
-	hsize_t       *pos,
-	diff_opt_t    *options,
-	const char    *obj1,
-	const char    *obj2,
-	int           *ph);
+ unsigned char *mem2,
+ hsize_t       nelmts,
+ hsize_t       hyper_start,
+ int           rank,
+ hsize_t       *acc,
+ hsize_t       *pos,
+ diff_opt_t    *options,
+ const char    *obj1,
+ const char    *obj2,
+ int           *ph);
 
 hsize_t diff_short(unsigned char *mem1,
-	unsigned char *mem2,
-	hsize_t       nelmts,
-	int           rank,
-	hsize_t       *acc,
-	hsize_t       *pos,
-	diff_opt_t    *options,
-	const char    *obj1,
-	const char    *obj2,
-	int           *ph);
+ unsigned char *mem2,
+ hsize_t       nelmts,
+ hsize_t       hyper_start,
+ int           rank,
+ hsize_t       *acc,
+ hsize_t       *pos,
+ diff_opt_t    *options,
+ const char    *obj1,
+ const char    *obj2,
+ int           *ph);
 
 hsize_t diff_ushort(unsigned char *mem1,
-	unsigned char *mem2,
-	hsize_t       nelmts,
-	int           rank,
-	hsize_t       *acc,
-	hsize_t       *pos,
-	diff_opt_t    *options,
-	const char    *obj1,
-	const char    *obj2,
-	int           *ph);
+ unsigned char *mem2,
+ hsize_t       nelmts,
+ hsize_t       hyper_start,
+ int           rank,
+ hsize_t       *acc,
+ hsize_t       *pos,
+ diff_opt_t    *options,
+ const char    *obj1,
+ const char    *obj2,
+ int           *ph);
 
 hsize_t diff_int(unsigned char *mem1,
-	unsigned char *mem2,
-	hsize_t       nelmts,
-	int           rank,
-	hsize_t       *acc,
-	hsize_t       *pos,
-	diff_opt_t    *options,
-	const char    *obj1,
-	const char    *obj2,
-	int           *ph);
+ unsigned char *mem2,
+ hsize_t       nelmts,
+ hsize_t       hyper_start,
+ int           rank,
+ hsize_t       *acc,
+ hsize_t       *pos,
+ diff_opt_t    *options,
+ const char    *obj1,
+ const char    *obj2,
+ int           *ph);
 
 hsize_t diff_uint(unsigned char *mem1,
-	unsigned char *mem2,
-	hsize_t       nelmts,
-	int           rank,
-	hsize_t       *acc,
-	hsize_t       *pos,
-	diff_opt_t    *options,
-	const char    *obj1,
-	const char    *obj2,
-	int           *ph);
+ unsigned char *mem2,
+ hsize_t       nelmts,
+ hsize_t       hyper_start,
+ int           rank,
+ hsize_t       *acc,
+ hsize_t       *pos,
+ diff_opt_t    *options,
+ const char    *obj1,
+ const char    *obj2,
+ int           *ph);
 
 hsize_t diff_long(unsigned char *mem1,
-	unsigned char *mem2,
-	hsize_t       nelmts,
-	int           rank,
-	hsize_t       *acc,
-	hsize_t       *pos,
-	diff_opt_t    *options,
-	const char    *obj1,
-	const char    *obj2,
-	int           *ph);
+ unsigned char *mem2,
+ hsize_t       nelmts,
+ hsize_t       hyper_start,
+ int           rank,
+ hsize_t       *acc,
+ hsize_t       *pos,
+ diff_opt_t    *options,
+ const char    *obj1,
+ const char    *obj2,
+ int           *ph);
 
 hsize_t diff_ulong(unsigned char *mem1,
-	unsigned char *mem2,
-	hsize_t       nelmts,
-	int           rank,
-	hsize_t       *acc,
-	hsize_t       *pos,
-	diff_opt_t    *options,
-	const char    *obj1,
-	const char    *obj2,
-	int           *ph);
+ unsigned char *mem2,
+ hsize_t       nelmts,
+ hsize_t       hyper_start,
+ int           rank,
+ hsize_t       *acc,
+ hsize_t       *pos,
+ diff_opt_t    *options,
+ const char    *obj1,
+ const char    *obj2,
+ int           *ph);
 
 hsize_t diff_llong(unsigned char *mem1,
-	unsigned char *mem2,
-	hsize_t       nelmts,
-	int           rank,
-	hsize_t       *acc,
-	hsize_t       *pos,
-	diff_opt_t    *options,
-	const char    *obj1,
-	const char    *obj2,
-	int           *ph);
+ unsigned char *mem2,
+ hsize_t       nelmts,
+ hsize_t       hyper_start,
+ int           rank,
+ hsize_t       *acc,
+ hsize_t       *pos,
+ diff_opt_t    *options,
+ const char    *obj1,
+ const char    *obj2,
+ int           *ph);
 
 hsize_t diff_ullong(unsigned char *mem1,
-	unsigned char *mem2,
-	hsize_t       nelmts,
-	int           rank,
-	hsize_t       *acc,
-	hsize_t       *pos,
-	diff_opt_t    *options,
-	const char    *obj1,
-	const char    *obj2,
-	int           *ph);
+ unsigned char *mem2,
+ hsize_t       nelmts,
+ hsize_t       hyper_start,
+ int           rank,
+ hsize_t       *acc,
+ hsize_t       *pos,
+ diff_opt_t    *options,
+ const char    *obj1,
+ const char    *obj2,
+ int           *ph);