summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/h5diff/Makefile.in13
-rw-r--r--tools/h5diff/h5diff.c2442
-rw-r--r--tools/h5diff/h5diff_array.c1101
-rw-r--r--tools/h5diff/h5diff_dset.c405
-rw-r--r--tools/h5diff/h5diff_main.c328
-rw-r--r--tools/h5diff/h5diff_util.c421
-rw-r--r--tools/h5diff/h5trav.c315
-rw-r--r--tools/h5diff/h5trav.h56
-rw-r--r--tools/h5diff/h5trav_table.c210
-rw-r--r--tools/h5diff/test_h5diff.c (renamed from tools/h5diff/h5difftst.c)0
10 files changed, 2660 insertions, 2631 deletions
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index 4ce10db..ae5b212 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -48,10 +48,11 @@ MOSTLYCLEAN=*.h5
## Source and object files for programs...
##
-PROG_SRC=h5diff.c h5trav.c h5difftst.c
+PROG_SRC=h5diff.c h5diff_array.c h5diff_dset.c h5diff_main.c h5diff_util.c h5trav.c h5trav_table.c test_h5diff.c
PROG_OBJ=$(PROG_SRC:.c=.lo)
+OBJS=h5diff.lo h5diff_array.lo h5diff_dset.lo h5diff_main.lo h5diff_util.lo h5trav.lo h5trav_table.lo
-PRIVATE_HDR=h5trav.h
+PRIVATE_HDR=h5trav.h h5diff.h
## Source and object files for the tests
##
@@ -67,11 +68,11 @@ check test _test: $(PROGS)
##
$(PROGS): $(LIBHDF5)
-h5diff: h5diff.lo h5trav.lo
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5diff.lo h5trav.lo $(LIBHDF5) $(LDFLAGS) $(LIBS)
+h5diff: $(OBJS)
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ $(OBJS) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-h5difftst: h5difftst.lo
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5difftst.lo $(LIBHDF5) $(LDFLAGS) $(LIBS)
+h5difftst: test_h5diff.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ test_h5diff.lo $(LIBHDF5) $(LDFLAGS) $(LIBS)
@CONCLUDE@
diff --git a/tools/h5diff/h5diff.c b/tools/h5diff/h5diff.c
index 0e18b11..9ea7423 100644
--- a/tools/h5diff/h5diff.c
+++ b/tools/h5diff/h5diff.c
@@ -12,223 +12,41 @@
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include <stdio.h>
+
+#include "h5diff.h"
#include <stdlib.h>
-#include <math.h>
#include <assert.h>
-#include "hdf5.h"
-#include "h5trav.h"
-#include "H5private.h"
-
-
-
-#if 0
-#define H5DIFF_DEBUG
-#endif
-
-#define FFORMAT "%-15.10g %-15.10g %-15.10g\n"
-#define IFORMAT "%-15d %-15d %-15d\n"
-#define UIFORMAT "%-15u %-15u %-15u\n"
-#define LIFORMAT "%-15ld %-15ld %-15ld\n"
-#define ULIFORMAT "%-15lu %-15lu %-15lu\n"
-/* with -p option */
-#define FPFORMAT "%-15.10g %-15.10g %-15.10g %-14.10g\n"
-#define IPFORMAT "%-15d %-15d %-15d %-14d\n"
-#define UIPFORMAT "%-15u %-15u %-15u %-14u\n"
-#define LPIFORMAT "%-15ld %-15ld %-15ld %-14ld\n"
-#define ULPIFORMAT "%-15lu %-15lu %-15lu %-14lu\n"
-#define SPACES " "
-
-
-typedef struct options_t
-{
- int r; /* report only what objects differ */
- int d; /* delta */
- double delta; /* delta value */
- int p; /* relative error */
- double percent; /* relative error value */
- int n; /* count */
- int count; /* count value */
-} options_t;
-
-/* Due to alignment issue in Alpha clusters, options must be declared here
- * not as a local variable in main().
- */
-options_t options = {0,0,0,0,0,0,0};
-
-/*-------------------------------------------------------------------------
- * prototypes
- *-------------------------------------------------------------------------
- */
-
-static int diff_dataset( hid_t file1_id, hid_t file2_id, const char *obj1_name,
- const char *obj2_name, options_t opts );
-static int diff( hid_t file1_id, const char *obj1_name, hid_t file2_id, const char *obj2_name,
- options_t opts, int type );
-static int compare( hid_t file1_id, const char *file1_name, const char *obj1_name,
- int nobjects1, info_t *info1,
- hid_t file2_id, const char *file2_name, const char *obj2_name,
- int nobjects2, info_t *info2,
- options_t opts );
-static int match( hid_t file1_id, int nobjects1, info_t *info1,
- hid_t file2_id, int nobjects2, info_t *info2, options_t opts );
-static int array_diff( void *buf1, void *buf2, hsize_t tot_cnt, int rank, hsize_t *dims,
- options_t opts, const char *obj1, const char *obj2,
- hid_t m_type );
-
-/*-------------------------------------------------------------------------
- * utility functions
- *-------------------------------------------------------------------------
- */
-
-#ifdef NOT_YET
-static void list( const char *filename, int nobjects, info_t *info );
-#endif /* NOT_YET */
-static int h5diff_can_diff( hid_t type_id );
-static void print_datatype(hid_t type);
-static int check_n_input( const char* );
-static int check_f_input( const char* );
-static int get_index( const char *obj, int nobjects, info_t *info );
-static int compare_object( char *obj1, char *obj2 );
-static void usage(void);
-static const char* h5diff_basename(const char *name);
-static const char* get_type(int type);
-static const char* get_class(H5T_class_t tclass);
-static const char* get_sign(H5T_sign_t sign);
-static void print_dims( int r, hsize_t *d );
-static void print_pos( int *ph, int p, unsigned int curr_pos, int *acc,
- int *pos, int rank, const char *obj1, const char *obj2 );
-#if defined (H5DIFF_DEBUG)
-static void print_sizes( const char *obj1, const char *obj2,
- hid_t f_type1, hid_t f_type2,
- hid_t m_type1, hid_t m_type2 );
-#endif
-/*-------------------------------------------------------------------------
- * Function: usage
- *
- * Purpose: print a usage message
- *
- * Return: void
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: May 9, 2003
- *
- *-------------------------------------------------------------------------
- */
-static
-void usage(void)
-{
- printf("Usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] \n");
- printf("\n");
- printf("file1 File name of the first HDF5 file\n");
- printf("file2 File name of the second HDF5 file\n");
- printf("[obj1] Name of an HDF5 object, in absolute path\n");
- printf("[obj2] Name of an HDF5 object, in absolute path\n");
- printf("[OPTIONS] are:\n");
- printf("[-h] Print out this information\n");
- printf("[-r] Print only what objects differ, not the differences\n");
- printf("[-n count] Print difference up to count number\n");
- printf("[-d delta] Print difference when it is greater than limit delta\n");
- printf("[-p relative] Print difference when it is greater than a relative limit\n");
- printf("\n");
- printf("Items in [] are optional\n");
- printf("[obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes)\n");
- printf("The 'count' value must be a positive integer\n");
- printf("The 'delta' and 'relative' values must be positive numbers\n");
- printf("The -d compare criteria is |a - b| > delta\n");
- printf("The -p compare criteria is |1 - b/a| > relative\n");
- printf("\n");
- printf("Examples:\n");
- printf("\n");
- printf("1) h5diff file1 file2 /a/b /a/c\n");
- printf("\n");
- printf(" Compares object '/a/b' in file1 with '/a/c' in file2\n");
- printf("\n");
- printf("2) h5diff file1 file2 /a/b\n");
- printf("\n");
- printf(" Compares object '/a/b' in both files\n");
- printf("\n");
- printf("3) h5diff file1 file2\n");
- printf("\n");
- printf(" Compares all objects in both files\n");
- printf("\n");
- exit(0);
-}
-
/*-------------------------------------------------------------------------
- * Function: main
+ * Function: h5diff
*
- * Purpose: H5diff main program
+ * Purpose: public function, can be called in an applicattion program.
+ * return differences between 2 HDF5 files
*
* Return: An exit status of 0 means no differences were found, 1 means some
* differences were found.
*
* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
*
- * Date: May 9, 2003
- *
- * Comments:
- *
- * Modifications:
+ * Date: October 22, 2003
*
*-------------------------------------------------------------------------
*/
-int main(int argc, const char *argv[])
+int h5diff(const char *fname1,
+ const char *fname2,
+ const char *objname1,
+ const char *objname2,
+ options_t options)
{
- int i;
- const char *s = NULL;
- hid_t file1_id, file2_id;
- int nobjects1, nobjects2;
- info_t *info1=NULL;
- info_t *info2=NULL;
- const char *file1_name = NULL;
- const char *file2_name = NULL;
- const char *obj1_name = NULL;
- const char *obj2_name = NULL;
- int nfound=0, ret;
+ int nobjects1, nobjects2;
+ info_t *info1=NULL;
+ info_t *info2=NULL;
+ hid_t file1_id, file2_id;
+ int nfound;
-/*-------------------------------------------------------------------------
- * print the command line options
- *-------------------------------------------------------------------------
- */
-
- printf("$h5diff");
- for (i=1; i<argc ; i++)
- {
- printf(" %s", argv[i] );
- }
- printf("\n");
-
-
-/*-------------------------------------------------------------------------
- * initial check of command line options
- *-------------------------------------------------------------------------
- */
-
- if ( argc==2 && (strcmp("-h",argv[1])==0) )
- usage();
-
- if ( argc<3 )
- {
- printf("Number of arguments is only %d\n", argc );
- usage();
- }
-
-/*-------------------------------------------------------------------------
- * file names are first
- *-------------------------------------------------------------------------
- */
-
- if ( argc>=3 )
- {
- file1_name = argv[1];
- file2_name = argv[2];
- }
/*-------------------------------------------------------------------------
* open the files first; if they are not valid, no point in continuing
@@ -239,110 +57,20 @@ int main(int argc, const char *argv[])
H5E_BEGIN_TRY {
/* Open the files */
- if ((file1_id=H5Fopen(file1_name,H5F_ACC_RDONLY,H5P_DEFAULT))<0 )
+ if ((file1_id=H5Fopen(fname1,H5F_ACC_RDONLY,H5P_DEFAULT))<0 )
{
- printf("h5diff: %s: No such file or directory\n", file1_name );
+ printf("h5diff: %s: No such file or directory\n", fname1 );
exit(1);
}
- if ((file2_id=H5Fopen(file2_name,H5F_ACC_RDONLY,H5P_DEFAULT))<0 )
+ if ((file2_id=H5Fopen(fname2,H5F_ACC_RDONLY,H5P_DEFAULT))<0 )
{
- printf("h5diff: %s: No such file or directory\n", file2_name );
+ printf("h5diff: %s: No such file or directory\n", fname2 );
exit(1);
}
/* enable error reporting */
} H5E_END_TRY;
-
-/*-------------------------------------------------------------------------
- * parse command line options
- *-------------------------------------------------------------------------
- */
- for (i=3; i<argc ; i++)
- {
- /* get the single-letter switches */
- if ( '-'==argv[i][0] )
- {
- for (s=argv[i]+1; *s; s++)
- {
- switch (*s) {
- default:
- printf("-%s is an invalid option\n", s );
- usage();
- break;
- case 'h':
- usage();
- case 'r':
- options.r = 1;
- break;
- case 'd':
- /* if it is not another option */
- if ( i<argc-1 &&'-' != argv[i+1][0] )
- {
- options.d=1;
- if ( check_f_input(argv[i+1])==-1)
- {
- printf("<-d %s> is not a valid option\n", argv[i+1] );
- usage();
- }
- options.delta = atof(argv[i+1]);
- }
- else
- {
- printf("<-d %s> is not a valid option\n", argv[i+1] );
- usage();
- }
- break;
- case 'p':
- if ( i<argc-1 &&'-' !=argv[i+1][0] )
- {
- options.p=1;
- if ( check_f_input(argv[i+1])==-1)
- {
- printf("<-p %s> is not a valid option\n", argv[i+1] );
- usage();
- }
- options.percent = atof(argv[i+1]);
- }
- break;
- case 'n':
- if ( i<argc-1 && '-' !=argv[i+1][0] )
- {
- options.n=1;
- if ( check_n_input(argv[i+1])==-1)
- {
- printf("<-n %s> is not a valid option\n", argv[i+1] );
- usage();
- }
- options.count = atoi(argv[i+1]);
- }
- break;
- } /*switch*/
- } /*for*/
- } /*if*/
-
- else /* not single-letter switches */
-
- {
- /* check if it is not a -d, -p parameter */
- if ( '-' !=argv[i-1][0] )
- {
- if ( obj1_name==NULL )
- obj1_name = argv[i];
- if ( obj2_name==NULL )
- {
- /* check if we have a second object name */
- if ( i+1<argc && '-' !=argv[i+1][0] )
- /* yes */
- obj2_name = argv[i+1];
- else
- /* no */
- obj2_name = obj1_name;
- }
- }
- }
-
- }/*for*/
-
+
/*-------------------------------------------------------------------------
* get the number of objects in the files
*-------------------------------------------------------------------------
@@ -369,10 +97,11 @@ int main(int argc, const char *argv[])
*-------------------------------------------------------------------------
*/
- if ( obj1_name )
+ if ( objname1 )
{
- nfound=compare(file1_id,file1_name,obj1_name,nobjects1,info1,
- file2_id,file2_name,obj2_name,nobjects2,info2,options);
+ assert(objname2);
+ nfound=compare(file1_id,fname1,objname1,nobjects1,info1,
+ file2_id,fname2,objname2,nobjects2,info2,options);
}
/*-------------------------------------------------------------------------
@@ -386,169 +115,16 @@ int main(int argc, const char *argv[])
file2_id,nobjects2,info2,options);
}
- /* close */
- assert( (H5Fclose(file1_id)) >=0);
- assert( (H5Fclose(file2_id)) >=0);
info_free(info1,nobjects1);
info_free(info2,nobjects2);
- printf("\n");
- ret= (nfound==0 ? 0 : 1 );
- return ret;
-
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: check_n_input
- *
- * Purpose: check for valid input
- *
- * Return: 1 for ok, -1 for fail
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: May 9, 2003
- *
- * Comments:
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static
-int check_n_input( const char *str )
-{
- unsigned i;
- char c;
-
- for ( i = 0; i < strlen(str); i++)
- {
- c = str[i];
- if ( i==0 )
- {
- if ( c < 49 || c > 57 ) /* ascii values between 1 and 9 */
- return -1;
- }
- else
- if ( c < 48 || c > 57 ) /* 0 also */
- return -1;
- }
- return 1;
-}
-
-/*-------------------------------------------------------------------------
- * Function: check_f_input
- *
- * Purpose: check for valid input
- *
- * Return: 1 for ok, -1 for fail
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: May 9, 2003
- *
- * Comments:
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static
-int check_f_input( const char *str )
-{
- unsigned i;
- char c;
-
- /* '0' values not allowed */
- if ( strlen(str)==1 && str[0]=='0' )
- return -1;
-
- for ( i = 0; i < strlen(str); i++)
- {
- c = str[i];
- if ( c < 48 || c > 57 ) /* ascii values between 0 and 9 */
- if ( c!= 46) /* . */
- return -1;
- }
- return 1;
-}
-
-/*-------------------------------------------------------------------------
- * Function: list
- *
- * Purpose: print list of objects in file
- *
- * Return: void
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: May 9, 2003
- *
- * Comments:
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-#ifdef NOT_YET
-static
-void list( const char *filename, int nobjects, info_t *info )
-{
- int i;
-
- printf("File <%s>: # of entries = %d\n", filename, nobjects );
- for ( i = 0; i < nobjects; i++)
- {
- switch ( info[i].type )
- {
- case H5G_GROUP:
- printf("%s %20s\n", info[i].name, "group" );
- break;
- case H5G_DATASET:
- printf("%s %20s\n", info[i].name, "dataset" );
- break;
- case H5G_TYPE:
- printf("%s %20s\n", info[i].name, "datatype" );
- break;
- case H5G_LINK:
- printf("%s %20s\n", info[i].name, "link" );
- break;
- default:
- printf("%s %20s\n", info[i].name, "User defined object" );
- break;
- }
- }
+ /* close */
+ assert( (H5Fclose(file1_id)) >=0);
+ assert( (H5Fclose(file2_id)) >=0);
+ return nfound;
}
-#endif /* NOT_YET */
-
-
-/*-------------------------------------------------------------------------
- * Function: compare_object
- *
- * Purpose: do the compare criteria
- *
- * Return: strcmp value
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: May 9, 2003
- *
- * Comments:
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static
-int compare_object( char *obj1, char *obj2 )
-{
- int cmp;
- cmp = strcmp(obj1,obj2);
- return cmp;
-}
/*-------------------------------------------------------------------------
@@ -570,9 +146,9 @@ int compare_object( char *obj1, char *obj2 )
*
*-------------------------------------------------------------------------
*/
-static
int match( hid_t file1_id, int nobjects1, info_t *info1,
- hid_t file2_id, int nobjects2, info_t *info2, options_t opts )
+ hid_t file2_id, int nobjects2, info_t *info2,
+ options_t options )
{
int cmp;
int more_names_exist = (nobjects1>0 && nobjects2>0) ? 1 : 0;
@@ -594,7 +170,8 @@ int match( hid_t file1_id, int nobjects1, info_t *info1,
while ( more_names_exist )
{
- cmp = compare_object( info1[curr1].name, info2[curr2].name );
+ /* criteria is string compare */
+ cmp = strcmp( info1[curr1].name, info2[curr2].name );
if ( cmp == 0 )
{
infile[0]=1; infile[1]=1;
@@ -648,15 +225,19 @@ int match( hid_t file1_id, int nobjects1, info_t *info1,
*-------------------------------------------------------------------------
*/
- printf("file1 file2\n");
- printf("---------------------------------------\n");
- for (i = 0; i < table->nobjs; i++)
+ if (options.verbose)
{
- c1 = (table->objs[i].flags[0]) ? 'x' : ' ';
- c2 = (table->objs[i].flags[1]) ? 'x' : ' ';
- printf("%5c %6c %-15s\n", c1, c2, table->objs[i].objname);
+ printf("\n");
+ printf("file1 file2\n");
+ printf("---------------------------------------\n");
+ for (i = 0; i < table->nobjs; i++)
+ {
+ c1 = (table->objs[i].flags[0]) ? 'x' : ' ';
+ c2 = (table->objs[i].flags[1]) ? 'x' : ' ';
+ printf("%5c %6c %-15s\n", c1, c2, table->objs[i].objname);
+ }
+ printf("\n");
}
- printf("\n");
/*-------------------------------------------------------------------------
@@ -669,7 +250,7 @@ int match( hid_t file1_id, int nobjects1, info_t *info1,
if ( table->objs[i].flags[0] && table->objs[i].flags[1] )
nfound+=diff( file1_id, table->objs[i].objname,
file2_id, table->objs[i].objname,
- opts, table->objs[i].type );
+ options, table->objs[i].type );
}
/* free table */
@@ -678,46 +259,6 @@ int match( hid_t file1_id, int nobjects1, info_t *info1,
}
-
-/*-------------------------------------------------------------------------
- * Function: get_index
- *
- * Purpose: get index in list
- *
- * Return:
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: May 9, 2003
- *
- * Comments:
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-
-int get_index( const char *obj, int nobjects, info_t *info )
-{
- char *pdest;
- int result;
- int i;
-
- for ( i = 0; i < nobjects; i++)
- {
- if ( strcmp(obj,info[i].name)==0 )
- return i;
-
- pdest = strstr( info[i].name, obj );
- result = (int)(pdest - info[i].name);
-
- /* found at position 1, meaning without '/' */
- if( pdest != NULL && result==1 )
- return i;
- }
- return -1;
-}
-
/*-------------------------------------------------------------------------
* Function: compare
*
@@ -736,19 +277,18 @@ int get_index( const char *obj, int nobjects, info_t *info )
*-------------------------------------------------------------------------
*/
-static
int compare( hid_t file1_id, const char *file1_name, const char *obj1_name,
int nobjects1, info_t *info1,
hid_t file2_id, const char *file2_name, const char *obj2_name,
int nobjects2, info_t *info2,
- options_t opts )
+ options_t options )
{
int f1=0, f2=0;
int nfound=0;
- int i = get_index( obj1_name, nobjects1, info1 );
- int j = get_index( obj2_name, nobjects2, info2 );
+ int i = info_getindex( obj1_name, nobjects1, info1 );
+ int j = info_getindex( obj2_name, nobjects2, info2 );
if ( i == -1 )
{
@@ -777,7 +317,7 @@ int compare( hid_t file1_id, const char *file1_name, const char *obj1_name,
return 0;
}
- nfound=diff( file1_id, obj1_name, file2_id, obj2_name, opts, info1[i].type );
+ nfound=diff( file1_id, obj1_name, file2_id, obj2_name, options, info1[i].type );
return nfound;
}
@@ -801,16 +341,15 @@ int compare( hid_t file1_id, const char *file1_name, const char *obj1_name,
*-------------------------------------------------------------------------
*/
-static
int diff( hid_t file1_id, const char *obj1_name, hid_t file2_id, const char *obj2_name,
- options_t opts, int type )
+ options_t options, int type )
{
int nfound=0;
switch ( type )
{
case H5G_DATASET:
- nfound=diff_dataset(file1_id,file2_id,obj1_name,obj2_name,opts);
+ nfound=diff_dataset(file1_id,file2_id,obj1_name,obj2_name,options);
break;
default:
@@ -821,1520 +360,18 @@ int diff( hid_t file1_id, const char *obj1_name, hid_t file2_id, const char *obj
break;
}
- printf("\n");
- return nfound;
-}
-
-/*-------------------------------------------------------------------------
- * Function: diff_dataset
- *
- * Purpose: check for comparable datasets and read into a compatible
- * memory type
- *
- * Return: Number of differences found
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: May 9, 2003
- *
- * Comments:
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static
-int diff_dataset( hid_t file1_id, hid_t file2_id, const char *obj1_name,
- const char *obj2_name, options_t opts )
-{
- hid_t dset1_id =-1;
- hid_t dset2_id =-1;
- hid_t space1_id =-1;
- hid_t space2_id =-1;
- hid_t f_type1=-1, f_type2=-1; /* file data type */
- hid_t m_type1=-1, m_type2=-1; /* memory data type */
- size_t m_size1, m_size2; /* size of type in memory */
- H5T_sign_t sign1, sign2; /* sign of type */
- int rank1, rank2;
- void *buf1=NULL, *buf2=NULL;
- hsize_t tot_cnt1, tot_cnt2;
- hsize_t dims1[32], dims2[32];
- hsize_t maxdim1[32], maxdim2[32];
- H5T_class_t tclass1;
- H5T_class_t tclass2;
- int nfound=0; /* number of differences found */
- const char *name1=NULL; /* relative names */
- const char *name2=NULL;
- int maxdim_diff=0; /* maximum dimensions are different */
- int dim_diff=0; /* current dimensions are different */
- int can1, can2; /* supported diff */
- int i;
-
-
- /* disable error reporting */
- H5E_BEGIN_TRY {
-
-/*-------------------------------------------------------------------------
- * open the handles
- *-------------------------------------------------------------------------
- */
-
- /* Open the datasets */
- if ( (dset1_id = H5Dopen(file1_id,obj1_name)) < 0 )
- {
- printf("Cannot open dataset <%s>\n", obj1_name );
- goto out;
- }
- if ( (dset2_id = H5Dopen(file2_id,obj2_name)) < 0 )
- {
- printf("Cannot open dataset <%s>\n", obj2_name );
- goto out;
- }
- /* enable error reporting */
- } H5E_END_TRY;
-
- /* Get the dataspace handle */
- if ( (space1_id = H5Dget_space(dset1_id)) < 0 )
- goto out;
-
- /* Get rank */
- if ( (rank1 = H5Sget_simple_extent_ndims(space1_id)) < 0 )
- goto out;
-
- /* Get the dataspace handle */
- if ( (space2_id = H5Dget_space(dset2_id)) < 0 )
- goto out;
-
- /* Get rank */
- if ( (rank2 = H5Sget_simple_extent_ndims(space2_id)) < 0 )
- goto out;
-
- /* Get dimensions */
- if ( H5Sget_simple_extent_dims(space1_id,dims1,maxdim1) < 0 )
- goto out;
-
- /* Get dimensions */
- if ( H5Sget_simple_extent_dims(space2_id,dims2,maxdim2) < 0 )
- goto out;
-
-/*-------------------------------------------------------------------------
- * Get the file data type
- *-------------------------------------------------------------------------
- */
-
- /* Get the data type */
- if ( (f_type1 = H5Dget_type(dset1_id)) < 0 )
- goto out;
-
- /* Get the data type */
- if ( (f_type2 = H5Dget_type(dset2_id)) < 0 )
- goto out;
-
-
-/*-------------------------------------------------------------------------
- * check for the same class
- *-------------------------------------------------------------------------
- */
-
- if ((tclass1=H5Tget_class(f_type1))<0)
- goto out;
-
- if ((tclass2=H5Tget_class(f_type2))<0)
- goto out;
-
- if ( tclass1 != tclass2 )
- {
- printf("Comparison not supported\n");
- printf("<%s> is of class %s and <%s> is of class %s\n",
- obj1_name, get_class(tclass1),
- obj2_name, get_class(tclass2) );
- goto out;
- }
-
-/*-------------------------------------------------------------------------
- * check for non supported classes
- *-------------------------------------------------------------------------
- */
-
- assert(tclass1==tclass2);
- switch (tclass1)
- {
- case H5T_TIME:
- case H5T_STRING:
- case H5T_BITFIELD:
- case H5T_OPAQUE:
- case H5T_COMPOUND:
- case H5T_REFERENCE:
- case H5T_ENUM:
- case H5T_VLEN:
- case H5T_ARRAY:
- printf("Comparison not supported\n");
- printf("<%s> is of class %s and <%s> is of class %s\n",
- obj1_name, get_class(tclass1),
- obj2_name, get_class(tclass2) );
- goto out;
- default:
- break;
- }
-
-/*-------------------------------------------------------------------------
- * check for the same rank
- *-------------------------------------------------------------------------
- */
-
- if ( rank1 != rank2 )
- {
- printf("Comparison not supported\n");
- printf("<%s> has rank %d, dimensions ", obj1_name, rank1);
- print_dims(rank1,dims1);
- printf(", max dimensions ");
- print_dims(rank1,maxdim1);
- printf("\n" );
- printf("<%s> has rank %d, dimensions ", obj2_name, rank2);
- print_dims(rank2,dims2);
- printf(", max dimensions ");
- print_dims(rank2,maxdim2);
- goto out;
- }
-
-/*-------------------------------------------------------------------------
- * check for different dimensions
- *-------------------------------------------------------------------------
- */
-
- assert(rank1==rank2);
- for ( i=0; i<rank1; i++)
- {
- if ( maxdim1[i] != maxdim2[i] )
- maxdim_diff=1;
- if ( dims1[i] != dims2[i] )
- dim_diff=1;
- }
-
-/*-------------------------------------------------------------------------
- * current dimensions
- *-------------------------------------------------------------------------
- */
-
- if (dim_diff==1)
- {
- printf("Comparison not supported\n");
- printf("<%s> has rank %d, dimensions ", obj1_name, rank1);
- print_dims(rank1,dims1);
- printf(", max dimensions ");
- print_dims(rank1,maxdim1);
- printf("\n" );
- printf("<%s> has rank %d, dimensions ", obj2_name, rank2);
- print_dims(rank2,dims2);
- printf(", max dimensions ");
- print_dims(rank2,maxdim2);
- goto out;
- }
-
-/*-------------------------------------------------------------------------
- * maximum dimensions; just give a warning
- *-------------------------------------------------------------------------
- */
- if (maxdim_diff==1)
- {
- printf( "Warning: Different maximum dimensions\n");
- printf("<%s> has max dimensions ", obj1_name);
- print_dims(rank1,maxdim1);
- printf("\n");
- printf("<%s> has max dimensions ", obj2_name);
- print_dims(rank2,maxdim2);
- printf("\n");
- }
-
-/*-------------------------------------------------------------------------
- * get number of elements
- *-------------------------------------------------------------------------
- */
-
- tot_cnt1 = 1;
- for (i = 0; i < rank1; i++)
- {
- tot_cnt1 *= dims1[i];
- }
-
- tot_cnt2 = 1;
- for (i = 0; i < rank2; i++)
- {
- tot_cnt2 *= dims2[i];
- }
-
- assert(tot_cnt1==tot_cnt2);
-
-/*-------------------------------------------------------------------------
- * check for equal file datatype; warning only
- *-------------------------------------------------------------------------
- */
-
- if ( (H5Tequal(f_type1, f_type2)==0) )
- {
- printf("Warning: Different storage datatype\n");
- printf("<%s> has file datatype ", obj1_name);
- print_datatype(f_type1);
- printf("\n");
- printf("<%s> has file datatype ", obj2_name);
- print_datatype(f_type2);
+ if (options.verbose)
printf("\n");
- }
-
-/*-------------------------------------------------------------------------
- * memory type and sizes
- *-------------------------------------------------------------------------
- */
-
- m_type1 = H5Tget_native_type( f_type1 , H5T_DIR_DEFAULT);
- m_type2 = H5Tget_native_type( f_type2 , H5T_DIR_DEFAULT);
-
- m_size1 = H5Tget_size( m_type1 );
- m_size2 = H5Tget_size( m_type2 );
-
-#if defined (H5DIFF_DEBUG)
- print_sizes(obj1_name,obj2_name,f_type1,f_type2,m_type1,m_type2);
-#endif
-
-/*-------------------------------------------------------------------------
- * check for the comparable types in array_diff
- *-------------------------------------------------------------------------
- */
-
- can1=h5diff_can_diff(m_type1);
- can2=h5diff_can_diff(m_type2);
- if ( can1==0 || can2==0 )
- {
- printf("Comparison not supported\n");
- if ( can1==0 )
- printf("<%s> type is not supported\n", obj1_name);
- if ( can2==0 )
- printf("<%s> type is not supported\n", obj2_name);
- goto out;
- }
-
-/*-------------------------------------------------------------------------
- * check for different signed/unsigned types
- *-------------------------------------------------------------------------
- */
-
- sign1=H5Tget_sign(m_type1);
- sign2=H5Tget_sign(m_type2);
- if ( sign1 != sign2 )
- {
- printf("Comparison not supported\n");
- printf("<%s> has sign %s\n", obj1_name, get_sign(sign1));
- printf("<%s> has sign %s", obj2_name, get_sign(sign2));
- goto out;
- }
-
-
-/*-------------------------------------------------------------------------
- * "upgrade" the smaller memory size
- *-------------------------------------------------------------------------
- */
-
- if ( m_size1 != m_size2 )
- {
- if ( m_size1 < m_size2 )
- {
- assert( (H5Tclose(m_type1)) >=0);
- m_type1 = H5Tget_native_type( f_type2 , H5T_DIR_DEFAULT);
- m_size1 = H5Tget_size( m_type1 );
- }
- else
- {
- assert( (H5Tclose(m_type2)) >=0);
- m_type2 = H5Tget_native_type( f_type1 , H5T_DIR_DEFAULT);
- m_size2 = H5Tget_size( m_type2 );
- }
-#if defined (H5DIFF_DEBUG)
- printf("WARNING: Size was upgraded\n");
- print_sizes(obj1_name,obj2_name,f_type1,f_type2,m_type1,m_type2);
-#endif
- }
- assert(m_size1==m_size2);
-
- buf1 = (void *) malloc((unsigned) (tot_cnt1*m_size1));
- buf2 = (void *) malloc((unsigned) (tot_cnt2*m_size2));
-
- if ( buf1 == NULL || buf2 == NULL )
- {
- printf( "cannot read into memory\n" );
- goto out;
- }
-
-/*-------------------------------------------------------------------------
- * read
- *-------------------------------------------------------------------------
- */
-
- if ( H5Dread(dset1_id,m_type1,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf1) < 0 )
- goto out;
-
- if ( H5Dread(dset2_id,m_type2,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf2) < 0 )
- goto out;
-
-/*-------------------------------------------------------------------------
- * array compare
- *-------------------------------------------------------------------------
- */
- printf( "Comparing <%s> with <%s>\n", obj1_name, obj2_name );
- name1=h5diff_basename(obj1_name);
- name2=h5diff_basename(obj2_name);
- nfound = array_diff(buf1,buf2,tot_cnt1,rank1,dims1,opts,name1,name2,m_type1);
- printf("%d differences found\n", nfound );
-
-/*-------------------------------------------------------------------------
- * close
- *-------------------------------------------------------------------------
- */
-
-out:
-
- if ( buf1) free(buf1);
- if ( buf2) free(buf2);
-
- /* Close */
- if ( dset1_id!=-1 ) assert( (H5Dclose(dset1_id)) >=0);
- if ( dset2_id!=-1 ) assert( (H5Dclose(dset2_id)) >=0);
- if ( space1_id!=-1 ) assert( (H5Sclose(space1_id)) >=0);
- if ( space2_id!=-1 ) assert( (H5Sclose(space2_id)) >=0);
- if ( f_type1!=-1 ) assert( (H5Tclose(f_type1)) >=0);
- if ( f_type2!=-1 ) assert( (H5Tclose(f_type2)) >=0);
- if ( m_type1!=-1 ) assert( (H5Tclose(m_type1)) >=0);
- if ( m_type2!=-1 ) assert( (H5Tclose(m_type2)) >=0);
-
- return nfound;
-
-}
-
-
-
-
-/*-------------------------------------------------------------------------
- * Function: array_diff
- *
- * Purpose: compare array; currenttly only the NATIVE types below are supported
- *
- * Return: number of differences found
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: May 30, 2003
- *
- * Comments:
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static
-int array_diff( void *buf1, void *buf2, hsize_t tot_cnt, int rank, hsize_t *dims,
- options_t opts, const char *obj1, const char *obj2,
- hid_t m_type )
-{
- char fmt_llong[255], fmt_ullong[255];
- char fmt_llongp[255], fmt_ullongp[255];
- size_t type_size;/* just check */
- int nfound=0; /* number of differences found */
- int ph=1; /* print header */
- int acc[32]; /* accumulator and matrix position */
- int pos[32];
- unsigned i;
- int j;
- char *_buf1 = (char*)buf1;
- char *_buf2 = (char*)buf2;
-
-
- /* Build default formats for long long types */
- sprintf(fmt_llong, "%%%sd %%%sd %%%sd\n",
- H5_PRINTF_LL_WIDTH, H5_PRINTF_LL_WIDTH, H5_PRINTF_LL_WIDTH);
- sprintf(fmt_ullong, "%%%su %%%su %%%su\n",
- H5_PRINTF_LL_WIDTH, H5_PRINTF_LL_WIDTH, H5_PRINTF_LL_WIDTH);
- sprintf(fmt_llongp, "%%%sd %%%sd %%%sd %%%sd\n",
- H5_PRINTF_LL_WIDTH, H5_PRINTF_LL_WIDTH, H5_PRINTF_LL_WIDTH, H5_PRINTF_LL_WIDTH);
- sprintf(fmt_ullongp, "%%%su %%%su %%%su %%%su\n",
- H5_PRINTF_LL_WIDTH, H5_PRINTF_LL_WIDTH, H5_PRINTF_LL_WIDTH, H5_PRINTF_LL_WIDTH);
-
-
- acc[rank-1]=1;
- for(j=(rank-2); j>=0; j--)
- {
- acc[j]=acc[j+1]*(int)dims[j+1];
- }
-
- /* Get the size. */
- type_size = H5Tget_size( m_type );
-
-/*-------------------------------------------------------------------------
- * H5T_NATIVE_SCHAR
- *-------------------------------------------------------------------------
- */
- if (H5Tequal(m_type, H5T_NATIVE_SCHAR))
- {
- char temp1_char;
- char temp2_char;
- assert(type_size==sizeof(char));
- for ( i = 0; i < tot_cnt; i++)
- {
- memcpy(&temp1_char, _buf1, sizeof(char));
- memcpy(&temp2_char, _buf2, sizeof(char));
- /* -d and !-p */
- if (opts.d && !opts.p)
- {
- if (abs(temp1_char-temp2_char) > opts.delta)
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(IFORMAT,temp1_char,temp2_char,abs(temp1_char-temp2_char));
- }
- nfound++;
- }
- }
- /* !-d and -p */
- else if (!opts.d && opts.p)
- {
- if ( temp1_char!=0 && abs(1-temp2_char/temp1_char) > opts.percent )
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(IPFORMAT,temp1_char,temp2_char,abs(temp1_char-temp2_char),
- abs(1-temp2_char/temp1_char));
- }
- nfound++;
- }
- }
- /* -d and -p */
- else if ( opts.d && opts.p)
- {
- if ( temp1_char!=0 && abs(1-temp2_char/temp1_char) > opts.percent &&
- abs(temp1_char-temp2_char) > opts.delta )
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(IPFORMAT,temp1_char,temp2_char,abs(temp1_char-temp2_char),
- abs(1-temp2_char/temp1_char));
- }
- nfound++;
- }
- }
- else if (temp1_char != temp2_char)
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(IFORMAT,temp1_char,temp2_char,abs(temp1_char-temp2_char));
- }
- nfound++;
- }
-
- _buf1+=sizeof(char);
- _buf2+=sizeof(char);
- }/* i */
-
- } /*H5T_NATIVE_SCHAR*/
-
-
-/*-------------------------------------------------------------------------
- * H5T_NATIVE_UCHAR
- *-------------------------------------------------------------------------
- */
- else if (H5Tequal(m_type, H5T_NATIVE_UCHAR))
- {
- unsigned char temp1_uchar;
- unsigned char temp2_uchar;
- assert(type_size==sizeof(unsigned char));
- for ( i = 0; i < tot_cnt; i++)
- {
- memcpy(&temp1_uchar, _buf1, sizeof(unsigned char));
- memcpy(&temp2_uchar, _buf2, sizeof(unsigned char));
- /* -d and !-p */
- if (opts.d && !opts.p)
- {
- if (abs(temp1_uchar-temp2_uchar) > opts.delta)
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(IFORMAT,temp1_uchar,temp2_uchar,abs(temp1_uchar-temp2_uchar));
- }
- nfound++;
- }
- }
- /* !-d and -p */
- else if (!opts.d && opts.p)
- {
- if ( temp1_uchar!=0 && abs(1-temp2_uchar/temp1_uchar) > opts.percent )
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(IPFORMAT,temp1_uchar,temp2_uchar,abs(temp1_uchar-temp2_uchar),
- abs(1-temp2_uchar/temp1_uchar));
- }
- nfound++;
- }
- }
- /* -d and -p */
- else if ( opts.d && opts.p)
- {
- if ( temp1_uchar!=0 && abs(1-temp2_uchar/temp1_uchar) > opts.percent &&
- abs(temp1_uchar-temp2_uchar) > opts.delta )
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(IPFORMAT,temp1_uchar,temp2_uchar,abs(temp1_uchar-temp2_uchar),
- abs(1-temp2_uchar/temp1_uchar));
- }
- nfound++;
- }
- }
- else if (temp1_uchar != temp2_uchar)
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(IFORMAT,temp1_uchar,temp2_uchar,abs(temp1_uchar-temp2_uchar));
- }
- nfound++;
- }
-
- _buf1+=sizeof(unsigned char);
- _buf2+=sizeof(unsigned char);
- }/* i */
-
- } /*H5T_NATIVE_UCHAR*/
-
-
-/*-------------------------------------------------------------------------
- * H5T_NATIVE_SHORT
- *-------------------------------------------------------------------------
- */
-
- else if (H5Tequal(m_type, H5T_NATIVE_SHORT))
- {
- short temp1_short;
- short temp2_short;
- assert(type_size==sizeof(short));
- for ( i = 0; i < tot_cnt; i++)
- {
- memcpy(&temp1_short, _buf1, sizeof(short));
- memcpy(&temp2_short, _buf2, sizeof(short));
- /* -d and !-p */
- if (opts.d && !opts.p)
- {
- if (abs(temp1_short-temp2_short) > opts.delta)
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(IFORMAT,temp1_short,temp2_short,abs(temp1_short-temp2_short));
- }
- nfound++;
- }
- }
- /* !-d and -p */
- else if (!opts.d && opts.p)
- {
- if ( temp1_short!=0 && abs(1-temp2_short/temp1_short) > opts.percent )
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(IPFORMAT,temp1_short,temp2_short,abs(temp1_short-temp2_short),
- abs(1-temp2_short/temp1_short));
- }
- nfound++;
- }
- }
- /* -d and -p */
- else if ( opts.d && opts.p)
- {
- if ( temp1_short!=0 && abs(1-temp2_short/temp1_short) > opts.percent &&
- abs(temp1_short-temp2_short) > opts.delta )
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(IPFORMAT,temp1_short,temp2_short,abs(temp1_short-temp2_short),
- abs(1-temp2_short/temp1_short));
- }
- nfound++;
- }
- }
- else if (temp1_short != temp2_short)
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(IFORMAT,temp1_short,temp2_short,abs(temp1_short-temp2_short));
- }
- nfound++;
- }
-
- _buf1+=sizeof(short);
- _buf2+=sizeof(short);
- }/* i */
-
- } /*H5T_NATIVE_SHORT*/
-
-/*-------------------------------------------------------------------------
- * H5T_NATIVE_USHORT
- *-------------------------------------------------------------------------
- */
-
- else if (H5Tequal(m_type, H5T_NATIVE_USHORT))
- {
- unsigned short temp1_ushort;
- unsigned short temp2_ushort;
- assert(type_size==sizeof(short));
- for ( i = 0; i < tot_cnt; i++)
- {
- memcpy(&temp1_ushort, _buf1, sizeof(unsigned short));
- memcpy(&temp2_ushort, _buf2, sizeof(unsigned short));
- /* -d and !-p */
- if (opts.d && !opts.p)
- {
- if (abs(temp1_ushort-temp2_ushort) > opts.delta)
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(IFORMAT,temp1_ushort,temp2_ushort,abs(temp1_ushort-temp2_ushort));
- }
- nfound++;
- }
- }
- /* !-d and -p */
- else if (!opts.d && opts.p)
- {
- if ( temp1_ushort!=0 && abs(1-temp2_ushort/temp1_ushort) > opts.percent )
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(IPFORMAT,temp1_ushort,temp2_ushort,abs(temp1_ushort-temp2_ushort),
- abs(1-temp2_ushort/temp1_ushort));
- }
- nfound++;
- }
- }
- /* -d and -p */
- else if ( opts.d && opts.p)
- {
- if ( temp1_ushort!=0 && abs(1-temp2_ushort/temp1_ushort) > opts.percent &&
- abs(temp1_ushort-temp2_ushort) > opts.delta )
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(IPFORMAT,temp1_ushort,temp2_ushort,abs(temp1_ushort-temp2_ushort),
- abs(1-temp2_ushort/temp1_ushort));
- }
- nfound++;
- }
- }
- else if (temp1_ushort != temp2_ushort)
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(IFORMAT,temp1_ushort,temp2_ushort,abs(temp1_ushort-temp2_ushort));
- }
- nfound++;
- }
-
- _buf1+=sizeof(unsigned short);
- _buf2+=sizeof(unsigned short);
- }/* i */
-
- } /*H5T_NATIVE_USHORT*/
-
-
-/*-------------------------------------------------------------------------
- * H5T_NATIVE_INT
- *-------------------------------------------------------------------------
- */
-
- else if (H5Tequal(m_type, H5T_NATIVE_INT))
- {
- int temp1_int;
- int temp2_int;
- assert(type_size==sizeof(int));
- for ( i = 0; i < tot_cnt; i++)
- {
- memcpy(&temp1_int, _buf1, sizeof(int));
- memcpy(&temp2_int, _buf2, sizeof(int));
- /* -d and !-p */
- if (opts.d && !opts.p)
- {
- if (abs(temp1_int-temp2_int) > opts.delta)
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(IFORMAT,temp1_int,temp2_int,abs(temp1_int-temp2_int));
- }
- nfound++;
- }
- }
- /* !-d and -p */
- else if (!opts.d && opts.p)
- {
- if ( temp1_int!=0 && abs(1-temp2_int/temp1_int) > opts.percent )
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(IPFORMAT,temp1_int,temp2_int,abs(temp1_int-temp2_int),
- abs(1-temp2_int/temp1_int));
- }
- nfound++;
- }
- }
- /* -d and -p */
- else if ( opts.d && opts.p)
- {
- if ( temp1_int!=0 && abs(1-temp2_int/temp1_int) > opts.percent &&
- abs(temp1_int-temp2_int) > opts.delta )
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(IPFORMAT,temp1_int,temp2_int,abs(temp1_int-temp2_int),
- abs(1-temp2_int/temp1_int));
- }
- nfound++;
- }
- }
- else if (temp1_int != temp2_int)
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(IFORMAT,temp1_int,temp2_int,abs(temp1_int-temp2_int));
- }
- nfound++;
- }
-
- _buf1+=sizeof(int);
- _buf2+=sizeof(int);
- }/* i */
-
- } /*H5T_NATIVE_INT*/
-
-
-/*-------------------------------------------------------------------------
- * H5T_NATIVE_UINT
- *-------------------------------------------------------------------------
- */
-
- else if (H5Tequal(m_type, H5T_NATIVE_UINT))
- {
- unsigned int temp1_uint;
- unsigned int temp2_uint;
- assert(type_size==sizeof(int));
- for ( i = 0; i < tot_cnt; i++)
- {
- memcpy(&temp1_uint, _buf1, sizeof(unsigned int));
- memcpy(&temp2_uint, _buf2, sizeof(unsigned int));
- /* -d and !-p */
- if (opts.d && !opts.p)
- {
- if (abs((int)(temp1_uint-temp2_uint)) > opts.delta)
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(UIFORMAT,temp1_uint,temp2_uint,abs((int)(temp1_uint-temp2_uint)));
- }
- nfound++;
- }
- }
- /* !-d and -p */
- else if (!opts.d && opts.p)
- {
- if ( temp1_uint!=0 && abs((int)(1-temp2_uint/temp1_uint)) > opts.percent )
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(UIPFORMAT,temp1_uint,temp2_uint,abs((int)(temp1_uint-temp2_uint)),
- abs((int)(1-temp2_uint/temp1_uint)));
- }
- nfound++;
- }
- }
- /* -d and -p */
- else if ( opts.d && opts.p)
- {
- if ( temp1_uint!=0 && abs((int)(1-temp2_uint/temp1_uint)) > opts.percent &&
- abs((int)(temp1_uint-temp2_uint)) > opts.delta )
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(UIPFORMAT,temp1_uint,temp2_uint,abs((int)(temp1_uint-temp2_uint)),
- abs((int)(1-temp2_uint/temp1_uint)));
- }
- nfound++;
- }
- }
- else if (temp1_uint != temp2_uint)
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(UIFORMAT,temp1_uint,temp2_uint,abs((int)(temp1_uint-temp2_uint)));
- }
- nfound++;
- }
-
- _buf1+=sizeof(unsigned int);
- _buf2+=sizeof(unsigned int);
- }/* i */
-
- } /*H5T_NATIVE_UINT*/
-
-
-/*-------------------------------------------------------------------------
- * H5T_NATIVE_LONG
- *-------------------------------------------------------------------------
- */
-
- else if (H5Tequal(m_type, H5T_NATIVE_LONG))
- {
- long temp1_long;
- long temp2_long;
- assert(type_size==sizeof(long));
- for ( i = 0; i < tot_cnt; i++)
- {
- memcpy(&temp1_long, _buf1, sizeof(long));
- memcpy(&temp2_long, _buf2, sizeof(long));
- /* -d and !-p */
- if (opts.d && !opts.p)
- {
- if (labs(temp1_long-temp2_long) > (long)opts.delta)
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(LIFORMAT,temp1_long,temp2_long,labs(temp1_long-temp2_long));
- }
- nfound++;
- }
- }
- /* !-d and -p */
- else if (!opts.d && opts.p)
- {
- if ( temp1_long!=0 && labs(1-temp2_long/temp1_long) > (long)opts.percent )
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(LPIFORMAT,temp1_long,temp2_long,labs(temp1_long-temp2_long),
- labs(1-temp2_long/temp1_long));
- }
- nfound++;
- }
- }
- /* -d and -p */
- else if ( opts.d && opts.p)
- {
- if ( temp1_long!=0 && labs(1-temp2_long/temp1_long) > (long)opts.percent &&
- labs(temp1_long-temp2_long) > (long)opts.delta )
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(LPIFORMAT,temp1_long,temp2_long,labs(temp1_long-temp2_long),
- labs(1-temp2_long/temp1_long));
- }
- nfound++;
- }
- }
- else if (temp1_long != temp2_long)
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(LIFORMAT,temp1_long,temp2_long,labs(temp1_long-temp2_long));
- }
- nfound++;
- }
-
- _buf1+=sizeof(long);
- _buf2+=sizeof(long);
- }/* i */
-
- } /*H5T_NATIVE_LONG*/
-
-/*-------------------------------------------------------------------------
- * H5T_NATIVE_ULONG
- *-------------------------------------------------------------------------
- */
-
- else if (H5Tequal(m_type, H5T_NATIVE_ULONG))
- {
- unsigned long temp1_ulong;
- unsigned long temp2_ulong;
- assert(type_size==sizeof(unsigned long));
- for ( i = 0; i < tot_cnt; i++)
- {
- memcpy(&temp1_ulong, _buf1, sizeof(unsigned long));
- memcpy(&temp2_ulong, _buf2, sizeof(unsigned long));
- /* -d and !-p */
- if (opts.d && !opts.p)
- {
- if (labs((long)(temp1_ulong-temp2_ulong)) > (long)opts.delta)
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(ULIFORMAT,temp1_ulong,temp2_ulong,labs((long)(temp1_ulong-temp2_ulong)));
- }
- nfound++;
- }
- }
- /* !-d and -p */
- else if (!opts.d && opts.p)
- {
- if ( temp1_ulong!=0 && labs((long)(1-temp2_ulong/temp1_ulong)) > (long)opts.percent )
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(ULPIFORMAT,temp1_ulong,temp2_ulong,labs((long)(temp1_ulong-temp2_ulong)),
- labs((long)(1-temp2_ulong/temp1_ulong)));
- }
- nfound++;
- }
- }
- /* -d and -p */
- else if ( opts.d && opts.p)
- {
- if ( temp1_ulong!=0 && labs((long)(1-temp2_ulong/temp1_ulong)) > (long)opts.percent &&
- labs((long)(temp1_ulong-temp2_ulong)) > (long)opts.delta )
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(ULPIFORMAT,temp1_ulong,temp2_ulong,labs((long)(temp1_ulong-temp2_ulong)),
- labs((long)(1-temp2_ulong/temp1_ulong)));
- }
- nfound++;
- }
- }
- else if (temp1_ulong != temp2_ulong)
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(ULIFORMAT,temp1_ulong,temp2_ulong,labs((long)(temp1_ulong-temp2_ulong)));
- }
- nfound++;
- }
-
- _buf1+=sizeof(unsigned long);
- _buf2+=sizeof(unsigned long);
- }/* i */
-
- } /*H5T_NATIVE_ULONG*/
-
-/*-------------------------------------------------------------------------
- * H5T_NATIVE_LLONG
- *-------------------------------------------------------------------------
- */
-
- else if (H5Tequal(m_type, H5T_NATIVE_LLONG))
- {
- long_long temp1_llong;
- long_long temp2_llong;
- assert(type_size==sizeof(long_long));
- for ( i = 0; i < tot_cnt; i++)
- {
- memcpy(&temp1_llong, _buf1, sizeof(long_long));
- memcpy(&temp2_llong, _buf2, sizeof(long_long));
- /* -d and !-p */
- if (opts.d && !opts.p)
- {
- if (labs((long)(temp1_llong-temp2_llong)) > (long)opts.delta)
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(fmt_llong,temp1_llong,temp2_llong,(long_long)labs((long)(temp1_llong-temp2_llong)));
- }
- nfound++;
- }
- }
- /* !-d and -p */
- else if (!opts.d && opts.p)
- {
- if ( temp1_llong!=0 && labs((long)(1-temp2_llong/temp1_llong)) > (long)opts.percent )
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(fmt_llongp,temp1_llong,temp2_llong,(long_long)labs((long)(temp1_llong-temp2_llong)),
- (long_long)labs((long)(1-temp2_llong/temp1_llong)));
- }
- nfound++;
- }
- }
- /* -d and -p */
- else if ( opts.d && opts.p)
- {
- if ( temp1_llong!=0 && labs((long)(1-temp2_llong/temp1_llong)) > (long)opts.percent &&
- labs((long)(temp1_llong-temp2_llong)) > (long)opts.delta )
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(fmt_llongp,temp1_llong,temp2_llong,(long_long)labs((long)(temp1_llong-temp2_llong)),
- (long_long)labs((long)(1-temp2_llong/temp1_llong)));
- }
- nfound++;
- }
- }
- else if (temp1_llong != temp2_llong)
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(fmt_llong,temp1_llong,temp2_llong,(long_long)labs((long)(temp1_llong-temp2_llong)));
- }
- nfound++;
- }
-
- _buf1+=sizeof(long_long);
- _buf2+=sizeof(long_long);
- }/* i */
-
- } /*H5T_NATIVE_LLONG*/
-
-/*-------------------------------------------------------------------------
- * H5T_NATIVE_ULLONG
- *-------------------------------------------------------------------------
- */
-
- else if (H5Tequal(m_type, H5T_NATIVE_ULLONG))
- {
- unsigned long_long temp1_ullong;
- unsigned long_long temp2_ullong;
- assert(type_size==sizeof(unsigned long_long));
- for ( i = 0; i < tot_cnt; i++)
- {
- memcpy(&temp1_ullong, _buf1, sizeof(unsigned long_long));
- memcpy(&temp2_ullong, _buf2, sizeof(unsigned long_long));
- /* -d and !-p */
- if (opts.d && !opts.p)
- {
- if (labs((long)(temp1_ullong-temp2_ullong)) > (long)opts.delta)
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(fmt_ullong,temp1_ullong,temp2_ullong,
- (unsigned long_long)labs((long)(temp1_ullong-temp2_ullong)));
- }
- nfound++;
- }
- }
- /* !-d and -p */
- else if (!opts.d && opts.p)
- {
- if ( temp1_ullong!=0 && labs((long)(1-temp2_ullong/temp1_ullong)) > (long)opts.percent )
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(fmt_ullongp,temp1_ullong,temp2_ullong,
- (unsigned long_long)labs((long)(temp1_ullong-temp2_ullong)),
- (unsigned long_long)labs((long)(1-temp2_ullong/temp1_ullong)));
- }
- nfound++;
- }
- }
- /* -d and -p */
- else if ( opts.d && opts.p)
- {
- if ( temp1_ullong!=0 && labs((long)(1-temp2_ullong/temp1_ullong)) > (long)opts.percent &&
- labs((long)(temp1_ullong-temp2_ullong)) > (long)opts.delta )
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(fmt_ullongp,temp1_ullong,temp2_ullong,
- (unsigned long_long)labs((long)(temp1_ullong-temp2_ullong)),
- (unsigned long_long)labs((long)(1-temp2_ullong/temp1_ullong)));
- }
- nfound++;
- }
- }
- else if (temp1_ullong != temp2_ullong)
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(fmt_ullong,temp1_ullong,temp2_ullong,
- (unsigned long_long)labs((long)(temp1_ullong-temp2_ullong)));
- }
- nfound++;
- }
-
- _buf1+=sizeof(unsigned long_long);
- _buf2+=sizeof(unsigned long_long);
- }/* i */
-
- } /*H5T_NATIVE_ULLONG*/
-
-/*-------------------------------------------------------------------------
- * H5T_NATIVE_FLOAT
- *-------------------------------------------------------------------------
- */
-
- else if (H5Tequal(m_type, H5T_NATIVE_FLOAT))
- {
- float temp1_float;
- float temp2_float;
- assert(type_size==sizeof(float));
- for ( i = 0; i < tot_cnt; i++)
- {
- memcpy(&temp1_float, _buf1, sizeof(float));
- memcpy(&temp2_float, _buf2, sizeof(float));
- /* -d and !-p */
- if (opts.d && !opts.p)
- {
- if (fabs(temp1_float-temp2_float) > opts.delta)
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(FFORMAT,temp1_float,temp2_float,fabs(temp1_float-temp2_float));
- }
- nfound++;
- }
- }
- /* !-d and -p */
- else if (!opts.d && opts.p)
- {
- if ( temp1_float!=0 && fabs(1-temp2_float/temp1_float) > opts.percent )
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(FPFORMAT,temp1_float,temp2_float,fabs(temp1_float-temp2_float),
- fabs(1-temp2_float/temp1_float));
- }
- nfound++;
- }
- }
- /* -d and -p */
- else if ( opts.d && opts.p)
- {
- if ( temp1_float!=0 && fabs(1-temp2_float/temp1_float) > opts.percent &&
- fabs(temp1_float-temp2_float) > opts.delta )
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(FPFORMAT,temp1_float,temp2_float,fabs(temp1_float-temp2_float),
- fabs(1-temp2_float/temp1_float));
- }
- nfound++;
- }
- }
- else if (temp1_float != temp2_float)
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(FFORMAT,temp1_float,temp2_float,fabs(temp1_float-temp2_float));
- }
- nfound++;
- }
-
- _buf1+=sizeof(float);
- _buf2+=sizeof(float);
- }/* i */
-
- } /*H5T_NATIVE_FLOAT*/
-
-/*-------------------------------------------------------------------------
- * H5T_NATIVE_DOUBLE
- *-------------------------------------------------------------------------
- */
-
- else if (H5Tequal(m_type, H5T_NATIVE_DOUBLE))
- {
- double temp1_double;
- double temp2_double;
- assert(type_size==sizeof(double));
- for ( i = 0; i < tot_cnt; i++)
- {
- memcpy(&temp1_double, _buf1, sizeof(double));
- memcpy(&temp2_double, _buf2, sizeof(double));
- /* -d and !-p */
- if (opts.d && !opts.p)
- {
- if (fabs(temp1_double-temp2_double) > opts.delta)
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(FFORMAT,temp1_double,temp2_double,fabs(temp1_double-temp2_double));
- }
- nfound++;
- }
- }
- /* !-d and -p */
- else if (!opts.d && opts.p)
- {
- if ( temp1_double!=0 && fabs(1-temp2_double/temp1_double) > opts.percent )
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(FPFORMAT,temp1_double,temp2_double,fabs(temp1_double-temp2_double),
- fabs(1-temp2_double/temp1_double));
- }
- nfound++;
- }
- }
- /* -d and -p */
- else if ( opts.d && opts.p)
- {
- if ( temp1_double!=0 && fabs(1-temp2_double/temp1_double) > opts.percent &&
- fabs(temp1_double-temp2_double) > opts.delta )
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(FPFORMAT,temp1_double,temp2_double,fabs(temp1_double-temp2_double),
- fabs(1-temp2_double/temp1_double));
- }
- nfound++;
- }
- }
- else if (temp1_double != temp2_double)
- {
- if (opts.n && nfound>=opts.count)
- return nfound;
- if ( opts.r==0 )
- {
- print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
- printf(SPACES);
- printf(FFORMAT,temp1_double,temp2_double,fabs(temp1_double-temp2_double));
- }
- nfound++;
- }
-
- _buf1+=sizeof(double);
- _buf2+=sizeof(double);
- }/* i */
-
- } /*H5T_NATIVE_DOUBLE*/
-
-/*-------------------------------------------------------------------------
- * no more
- *-------------------------------------------------------------------------
- */
- else
- {
- assert(0);
- }
-
return nfound;
}
-
-
/*-------------------------------------------------------------------------
- * Function: h5diff_can_diff
- *
- * Purpose: Check if TYPE_ID is supported; only the listed types are
- * supported in the current version
- *
- *-------------------------------------------------------------------------
- */
-static
-int h5diff_can_diff(hid_t type_id)
-{
- int ret=0;
- if ( (H5Tequal(type_id, H5T_NATIVE_FLOAT)==1)||
- (H5Tequal(type_id, H5T_NATIVE_DOUBLE)==1)||
- (H5Tequal(type_id, H5T_NATIVE_INT)==1)||
- (H5Tequal(type_id, H5T_NATIVE_UINT)==1)||
- (H5Tequal(type_id, H5T_NATIVE_SCHAR)==1)||
- (H5Tequal(type_id, H5T_NATIVE_UCHAR)==1)||
- (H5Tequal(type_id, H5T_NATIVE_SHORT)==1)||
- (H5Tequal(type_id, H5T_NATIVE_USHORT)==1)||
- (H5Tequal(type_id, H5T_NATIVE_LONG)==1)||
- (H5Tequal(type_id, H5T_NATIVE_ULONG)==1)||
- (H5Tequal(type_id, H5T_NATIVE_LLONG)==1)||
- (H5Tequal(type_id, H5T_NATIVE_ULLONG)==1)
- )
- ret=1;
- return ret;
-}
-
-
-
-
-/*-------------------------------------------------------------------------
- * Function: print_pos
+ * Function: list
*
- * Purpose: convert an array index position to matrix notation
+ * Purpose: print list of objects in file
*
- * Return: pos matrix array
+ * Return: void
*
* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
*
@@ -2346,365 +383,38 @@ int h5diff_can_diff(hid_t type_id)
*
*-------------------------------------------------------------------------
*/
-static
-void print_pos( int *ph, int p, unsigned int curr_pos, int *acc,
- int *pos, int rank, const char *obj1, const char *obj2 )
+#ifdef NOT_YET
+void list( const char *filename, int nobjects, info_t *info )
{
int i;
- /* print header */
- if ( *ph==1 )
+ printf("File <%s>: # of entries = %d\n", filename, nobjects );
+ for ( i = 0; i < nobjects; i++)
{
- *ph=0;
- if (p)
- {
- printf("%-15s %-15s %-15s %-15s %-15s\n", "position", obj1, obj2, "difference",
- "relative");
- printf("------------------------------------------------------------------------\n");
- }
- else
+ switch ( info[i].type )
{
- printf("%-15s %-15s %-15s %-20s\n", "position", obj1, obj2, "difference");
- printf("------------------------------------------------------------\n");
+ case H5G_GROUP:
+ printf("%s %20s\n", info[i].name, "group" );
+ break;
+ case H5G_DATASET:
+ printf("%s %20s\n", info[i].name, "dataset" );
+ break;
+ case H5G_TYPE:
+ printf("%s %20s\n", info[i].name, "datatype" );
+ break;
+ case H5G_LINK:
+ printf("%s %20s\n", info[i].name, "link" );
+ break;
+ default:
+ printf("%s %20s\n", info[i].name, "User defined object" );
+ break;
}
}
- for ( i = 0; i < rank; i++)
- pos[i]=0;
-
- for ( i = 0; i < rank; i++)
- {
- pos[i] = curr_pos/acc[i];
- curr_pos -= acc[i]*pos[i];
- }
- assert( curr_pos == 0 );
-
- printf("[ " );
- for ( i = 0; i < rank; i++)
- {
- printf("%d ", pos[i] );
- }
- printf("]" );
-}
-
-/*-------------------------------------------------------------------------
- * Function: print_dims
- *
- * Purpose: print dimensions
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: May 9, 2003
- *
- * Comments:
- *
- *-------------------------------------------------------------------------
- */
-static
-void print_dims( int r, hsize_t *d )
-{
- int i;
- printf("[ " );
- for ( i=0; i<r; i++ )
- printf("%d ",(int)d[i] );
- printf("] " );
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: print_datatype
- *
- * Purpose: Print name of datatype
- *
- * Return:
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: May 9, 2003
- *
- * Comments: Adapted from h5dump for H5T_INTEGER and H5T_FLOAT classes only
- *
- *-------------------------------------------------------------------------
- */
-static
-void print_datatype(hid_t type)
-{
- switch (H5Tget_class(type))
- {
- default:
- return;
- case H5T_INTEGER:
- if (H5Tequal(type, H5T_STD_I8BE)) {
- printf("H5T_STD_I8BE");
- } else if (H5Tequal(type, H5T_STD_I8LE)) {
- printf("H5T_STD_I8LE");
- } else if (H5Tequal(type, H5T_STD_I16BE)) {
- printf("H5T_STD_I16BE");
- } else if (H5Tequal(type, H5T_STD_I16LE)) {
- printf("H5T_STD_I16LE");
- } else if (H5Tequal(type, H5T_STD_I32BE)) {
- printf("H5T_STD_I32BE");
- } else if (H5Tequal(type, H5T_STD_I32LE)) {
- printf("H5T_STD_I32LE");
- } else if (H5Tequal(type, H5T_STD_I64BE)) {
- printf("H5T_STD_I64BE");
- } else if (H5Tequal(type, H5T_STD_I64LE)) {
- printf("H5T_STD_I64LE");
- } else if (H5Tequal(type, H5T_STD_U8BE)) {
- printf("H5T_STD_U8BE");
- } else if (H5Tequal(type, H5T_STD_U8LE)) {
- printf("H5T_STD_U8LE");
- } else if (H5Tequal(type, H5T_STD_U16BE)) {
- printf("H5T_STD_U16BE");
- } else if (H5Tequal(type, H5T_STD_U16LE)) {
- printf("H5T_STD_U16LE");
- } else if (H5Tequal(type, H5T_STD_U32BE)) {
- printf("H5T_STD_U32BE");
- } else if (H5Tequal(type, H5T_STD_U32LE)) {
- printf("H5T_STD_U32LE");
- } else if (H5Tequal(type, H5T_STD_U64BE)) {
- printf("H5T_STD_U64BE");
- } else if (H5Tequal(type, H5T_STD_U64LE)) {
- printf("H5T_STD_U64LE");
- } else if (H5Tequal(type, H5T_NATIVE_SCHAR)) {
- printf("H5T_NATIVE_SCHAR");
- } else if (H5Tequal(type, H5T_NATIVE_UCHAR)) {
- printf("H5T_NATIVE_UCHAR");
- } else if (H5Tequal(type, H5T_NATIVE_SHORT)) {
- printf("H5T_NATIVE_SHORT");
- } else if (H5Tequal(type, H5T_NATIVE_USHORT)) {
- printf("H5T_NATIVE_USHORT");
- } else if (H5Tequal(type, H5T_NATIVE_INT)) {
- printf("H5T_NATIVE_INT");
- } else if (H5Tequal(type, H5T_NATIVE_UINT)) {
- printf("H5T_NATIVE_UINT");
- } else if (H5Tequal(type, H5T_NATIVE_LONG)) {
- printf("H5T_NATIVE_LONG");
- } else if (H5Tequal(type, H5T_NATIVE_ULONG)) {
- printf("H5T_NATIVE_ULONG");
- } else if (H5Tequal(type, H5T_NATIVE_LLONG)) {
- printf("H5T_NATIVE_LLONG");
- } else if (H5Tequal(type, H5T_NATIVE_ULLONG)) {
- printf("H5T_NATIVE_ULLONG");
- } else {
- printf("undefined integer");
- }
- break;
-
- case H5T_FLOAT:
- if (H5Tequal(type, H5T_IEEE_F32BE)) {
- printf("H5T_IEEE_F32BE");
- } else if (H5Tequal(type, H5T_IEEE_F32LE)) {
- printf("H5T_IEEE_F32LE");
- } else if (H5Tequal(type, H5T_IEEE_F64BE)) {
- printf("H5T_IEEE_F64BE");
- } else if (H5Tequal(type, H5T_IEEE_F64LE)) {
- printf("H5T_IEEE_F64LE");
- } else if (H5Tequal(type, H5T_NATIVE_FLOAT)) {
- printf("H5T_NATIVE_FLOAT");
- } else if (H5Tequal(type, H5T_NATIVE_DOUBLE)) {
- printf("H5T_NATIVE_DOUBLE");
- } else if (H5Tequal(type, H5T_NATIVE_LDOUBLE)) {
- printf("H5T_NATIVE_LDOUBLE");
- } else {
- printf("undefined float");
- }
- break;
-
- }/*switch*/
-}
-
-
-
-/*-------------------------------------------------------------------------
- * Function: h5diff_basename
- *
- * Purpose: Returns a pointer to the last component absolute name
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: May 9, 2003
- *
- * Comments:
- *
- *-------------------------------------------------------------------------
- */
-static
-const char*
-h5diff_basename(const char *name)
-{
- size_t i;
-
- /* Find the end of the base name */
- i = strlen(name);
- while (i>0 && '/'==name[i-1])
- --i;
-
- /* Skip backward over base name */
- while (i>0 && '/'!=name[i-1])
- --i;
-
- return(name+i);
-}
-
-/*-------------------------------------------------------------------------
- * Function: get_type
- *
- * Purpose: Returns the type as a string
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: May 9, 2003
- *
- * Comments:
- *
- *-------------------------------------------------------------------------
- */
-static
-const char*
-get_type(int type)
-{
- switch (type)
- {
- case H5G_DATASET:
- return("H5G_DATASET");
- case H5G_GROUP:
- return("H5G_GROUP");
- case H5G_TYPE:
- return("H5G_TYPE");
- case H5G_LINK:
- return("H5G_LINK");
- default:
- return("user defined type");
- }
}
+#endif
-/*-------------------------------------------------------------------------
- * Function: get_sign
- *
- * Purpose: Returns the sign as a string
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: May 9, 2003
- *
- * Comments:
- *
- *-------------------------------------------------------------------------
- */
-static
-const char*
-get_sign(H5T_sign_t sign)
-{
- switch (sign)
- {
- default:
- return("H5T_SGN_ERROR");
- case H5T_SGN_NONE:
- return("H5T_SGN_NONE");
- case H5T_SGN_2:
- return("H5T_SGN_2");
- }
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: get_class
- *
- * Purpose: Returns the class as a string
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: May 9, 2003
- *
- * Comments:
- *
- *-------------------------------------------------------------------------
- */
-static
-const char*
-get_class(H5T_class_t tclass)
-{
- switch (tclass)
- {
- default:
- return("Invalid class");
- case H5T_TIME:
- return("H5T_TIME");
- case H5T_INTEGER:
- return("H5T_INTEGER");
- case H5T_FLOAT:
- return("H5T_FLOAT");
- case H5T_STRING:
- return("H5T_STRING");
- case H5T_BITFIELD:
- return("H5T_BITFIELD");
- case H5T_OPAQUE:
- return("H5T_OPAQUE");
- case H5T_COMPOUND:
- return("H5T_COMPOUND");
- case H5T_REFERENCE:
- return("H5T_REFERENCE");
- case H5T_ENUM:
- return("H5T_ENUM");
- case H5T_VLEN:
- return("H5T_VLEN");
- case H5T_ARRAY:
- return("H5T_ARRAY");
- }
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: print_sizes
- *
- * Purpose: Print datatype sizes
- *
- *-------------------------------------------------------------------------
- */
-#if defined (H5DIFF_DEBUG)
-static
-void print_sizes( const char *obj1, const char *obj2,
- hid_t f_type1, hid_t f_type2,
- hid_t m_type1, hid_t m_type2 )
-{
- size_t f_size1, f_size2; /* size of type in file */
- size_t m_size1, m_size2; /* size of type in memory */
-
- f_size1 = H5Tget_size( f_type1 );
- f_size2 = H5Tget_size( f_type2 );
- m_size1 = H5Tget_size( m_type1 );
- m_size2 = H5Tget_size( m_type2 );
-
- printf("\n");
- printf("------------------\n");
- printf("sizeof(char) %u\n", sizeof(char) );
- printf("sizeof(short) %u\n", sizeof(short) );
- printf("sizeof(int) %u\n", sizeof(int) );
- printf("sizeof(long) %u\n", sizeof(long) );
- printf("<%s> ------------------\n", obj1);
- printf("type on file ");
- print_datatype(f_type1);
- printf("\n");
- printf("size on file %u\n", f_size1 );
-
- printf("type on memory ");
- print_datatype(m_type1);
- printf("\n");
- printf("size on memory %u\n", m_size1 );
- printf("<%s> ------------------\n", obj2);
- printf("type on file ");
- print_datatype(f_type2);
- printf("\n");
- printf("size on file %u\n", f_size2 );
- printf("type on memory ");
- print_datatype(m_type2);
- printf("\n");
- printf("size on memory %u\n", m_size2 );
- printf("\n");
-}
-#endif /* H5DIFF_DEBUG */
diff --git a/tools/h5diff/h5diff_array.c b/tools/h5diff/h5diff_array.c
new file mode 100644
index 0000000..807cecf
--- /dev/null
+++ b/tools/h5diff/h5diff_array.c
@@ -0,0 +1,1101 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * 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 "h5diff.h"
+#include "H5private.h"
+#include <assert.h>
+#include <math.h>
+
+
+
+/*-------------------------------------------------------------------------
+ * Function: array_diff
+ *
+ * Purpose: compare array;
+ * currenttly only the NATIVE types below are supported
+ *
+ * Return: number of differences found
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: May 30, 2003
+ *
+ *-------------------------------------------------------------------------
+ */
+int array_diff( void *buf1, void *buf2, hsize_t tot_cnt, int rank, hsize_t *dims,
+ options_t options, const char *obj1, const char *obj2,
+ hid_t m_type )
+{
+ char fmt_llong[255], fmt_ullong[255];
+ char fmt_llongp[255], fmt_ullongp[255];
+ size_t type_size;/* just check */
+ int nfound=0; /* number of differences found */
+ int ph=1; /* print header */
+ int acc[32]; /* accumulator and matrix position */
+ int pos[32];
+ unsigned i;
+ int j;
+ char *_buf1 = (char*)buf1;
+ char *_buf2 = (char*)buf2;
+
+
+ /* Build default formats for long long types */
+ sprintf(fmt_llong, "%%%sd %%%sd %%%sd\n",
+ H5_PRINTF_LL_WIDTH, H5_PRINTF_LL_WIDTH, H5_PRINTF_LL_WIDTH);
+ sprintf(fmt_ullong, "%%%su %%%su %%%su\n",
+ H5_PRINTF_LL_WIDTH, H5_PRINTF_LL_WIDTH, H5_PRINTF_LL_WIDTH);
+ sprintf(fmt_llongp, "%%%sd %%%sd %%%sd %%%sd\n",
+ H5_PRINTF_LL_WIDTH, H5_PRINTF_LL_WIDTH, H5_PRINTF_LL_WIDTH, H5_PRINTF_LL_WIDTH);
+ sprintf(fmt_ullongp, "%%%su %%%su %%%su %%%su\n",
+ H5_PRINTF_LL_WIDTH, H5_PRINTF_LL_WIDTH, H5_PRINTF_LL_WIDTH, H5_PRINTF_LL_WIDTH);
+
+
+ acc[rank-1]=1;
+ for(j=(rank-2); j>=0; j--)
+ {
+ acc[j]=acc[j+1]*(int)dims[j+1];
+ }
+
+ /* Get the size. */
+ type_size = H5Tget_size( m_type );
+
+/*-------------------------------------------------------------------------
+ * H5T_NATIVE_SCHAR
+ *-------------------------------------------------------------------------
+ */
+ if (H5Tequal(m_type, H5T_NATIVE_SCHAR))
+ {
+ char temp1_char;
+ char temp2_char;
+ assert(type_size==sizeof(char));
+ for ( i = 0; i < tot_cnt; i++)
+ {
+ memcpy(&temp1_char, _buf1, sizeof(char));
+ memcpy(&temp2_char, _buf2, sizeof(char));
+ /* -d and !-p */
+ if (options.d && !options.p)
+ {
+ if (abs(temp1_char-temp2_char) > options.delta)
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(IFORMAT,temp1_char,temp2_char,abs(temp1_char-temp2_char));
+ }
+ nfound++;
+ }
+ }
+ /* !-d and -p */
+ else if (!options.d && options.p)
+ {
+ if ( temp1_char!=0 && abs(1-temp2_char/temp1_char) > options.percent )
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(IPFORMAT,temp1_char,temp2_char,abs(temp1_char-temp2_char),
+ abs(1-temp2_char/temp1_char));
+ }
+ nfound++;
+ }
+ }
+ /* -d and -p */
+ else if ( options.d && options.p)
+ {
+ if ( temp1_char!=0 && abs(1-temp2_char/temp1_char) > options.percent &&
+ abs(temp1_char-temp2_char) > options.delta )
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(IPFORMAT,temp1_char,temp2_char,abs(temp1_char-temp2_char),
+ abs(1-temp2_char/temp1_char));
+ }
+ nfound++;
+ }
+ }
+ else if (temp1_char != temp2_char)
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(IFORMAT,temp1_char,temp2_char,abs(temp1_char-temp2_char));
+ }
+ nfound++;
+ }
+
+ _buf1+=sizeof(char);
+ _buf2+=sizeof(char);
+ }/* i */
+
+ } /*H5T_NATIVE_SCHAR*/
+
+
+/*-------------------------------------------------------------------------
+ * H5T_NATIVE_UCHAR
+ *-------------------------------------------------------------------------
+ */
+ else if (H5Tequal(m_type, H5T_NATIVE_UCHAR))
+ {
+ unsigned char temp1_uchar;
+ unsigned char temp2_uchar;
+ assert(type_size==sizeof(unsigned char));
+ for ( i = 0; i < tot_cnt; i++)
+ {
+ memcpy(&temp1_uchar, _buf1, sizeof(unsigned char));
+ memcpy(&temp2_uchar, _buf2, sizeof(unsigned char));
+ /* -d and !-p */
+ if (options.d && !options.p)
+ {
+ if (abs(temp1_uchar-temp2_uchar) > options.delta)
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(IFORMAT,temp1_uchar,temp2_uchar,abs(temp1_uchar-temp2_uchar));
+ }
+ nfound++;
+ }
+ }
+ /* !-d and -p */
+ else if (!options.d && options.p)
+ {
+ if ( temp1_uchar!=0 && abs(1-temp2_uchar/temp1_uchar) > options.percent )
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(IPFORMAT,temp1_uchar,temp2_uchar,abs(temp1_uchar-temp2_uchar),
+ abs(1-temp2_uchar/temp1_uchar));
+ }
+ nfound++;
+ }
+ }
+ /* -d and -p */
+ else if ( options.d && options.p)
+ {
+ if ( temp1_uchar!=0 && abs(1-temp2_uchar/temp1_uchar) > options.percent &&
+ abs(temp1_uchar-temp2_uchar) > options.delta )
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(IPFORMAT,temp1_uchar,temp2_uchar,abs(temp1_uchar-temp2_uchar),
+ abs(1-temp2_uchar/temp1_uchar));
+ }
+ nfound++;
+ }
+ }
+ else if (temp1_uchar != temp2_uchar)
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(IFORMAT,temp1_uchar,temp2_uchar,abs(temp1_uchar-temp2_uchar));
+ }
+ nfound++;
+ }
+
+ _buf1+=sizeof(unsigned char);
+ _buf2+=sizeof(unsigned char);
+ }/* i */
+
+ } /*H5T_NATIVE_UCHAR*/
+
+
+/*-------------------------------------------------------------------------
+ * H5T_NATIVE_SHORT
+ *-------------------------------------------------------------------------
+ */
+
+ else if (H5Tequal(m_type, H5T_NATIVE_SHORT))
+ {
+ short temp1_short;
+ short temp2_short;
+ assert(type_size==sizeof(short));
+ for ( i = 0; i < tot_cnt; i++)
+ {
+ memcpy(&temp1_short, _buf1, sizeof(short));
+ memcpy(&temp2_short, _buf2, sizeof(short));
+ /* -d and !-p */
+ if (options.d && !options.p)
+ {
+ if (abs(temp1_short-temp2_short) > options.delta)
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(IFORMAT,temp1_short,temp2_short,abs(temp1_short-temp2_short));
+ }
+ nfound++;
+ }
+ }
+ /* !-d and -p */
+ else if (!options.d && options.p)
+ {
+ if ( temp1_short!=0 && abs(1-temp2_short/temp1_short) > options.percent )
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(IPFORMAT,temp1_short,temp2_short,abs(temp1_short-temp2_short),
+ abs(1-temp2_short/temp1_short));
+ }
+ nfound++;
+ }
+ }
+ /* -d and -p */
+ else if ( options.d && options.p)
+ {
+ if ( temp1_short!=0 && abs(1-temp2_short/temp1_short) > options.percent &&
+ abs(temp1_short-temp2_short) > options.delta )
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(IPFORMAT,temp1_short,temp2_short,abs(temp1_short-temp2_short),
+ abs(1-temp2_short/temp1_short));
+ }
+ nfound++;
+ }
+ }
+ else if (temp1_short != temp2_short)
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(IFORMAT,temp1_short,temp2_short,abs(temp1_short-temp2_short));
+ }
+ nfound++;
+ }
+
+ _buf1+=sizeof(short);
+ _buf2+=sizeof(short);
+ }/* i */
+
+ } /*H5T_NATIVE_SHORT*/
+
+/*-------------------------------------------------------------------------
+ * H5T_NATIVE_USHORT
+ *-------------------------------------------------------------------------
+ */
+
+ else if (H5Tequal(m_type, H5T_NATIVE_USHORT))
+ {
+ unsigned short temp1_ushort;
+ unsigned short temp2_ushort;
+ assert(type_size==sizeof(short));
+ for ( i = 0; i < tot_cnt; i++)
+ {
+ memcpy(&temp1_ushort, _buf1, sizeof(unsigned short));
+ memcpy(&temp2_ushort, _buf2, sizeof(unsigned short));
+ /* -d and !-p */
+ if (options.d && !options.p)
+ {
+ if (abs(temp1_ushort-temp2_ushort) > options.delta)
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(IFORMAT,temp1_ushort,temp2_ushort,abs(temp1_ushort-temp2_ushort));
+ }
+ nfound++;
+ }
+ }
+ /* !-d and -p */
+ else if (!options.d && options.p)
+ {
+ if ( temp1_ushort!=0 && abs(1-temp2_ushort/temp1_ushort) > options.percent )
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(IPFORMAT,temp1_ushort,temp2_ushort,abs(temp1_ushort-temp2_ushort),
+ abs(1-temp2_ushort/temp1_ushort));
+ }
+ nfound++;
+ }
+ }
+ /* -d and -p */
+ else if ( options.d && options.p)
+ {
+ if ( temp1_ushort!=0 && abs(1-temp2_ushort/temp1_ushort) > options.percent &&
+ abs(temp1_ushort-temp2_ushort) > options.delta )
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(IPFORMAT,temp1_ushort,temp2_ushort,abs(temp1_ushort-temp2_ushort),
+ abs(1-temp2_ushort/temp1_ushort));
+ }
+ nfound++;
+ }
+ }
+ else if (temp1_ushort != temp2_ushort)
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(IFORMAT,temp1_ushort,temp2_ushort,abs(temp1_ushort-temp2_ushort));
+ }
+ nfound++;
+ }
+
+ _buf1+=sizeof(unsigned short);
+ _buf2+=sizeof(unsigned short);
+ }/* i */
+
+ } /*H5T_NATIVE_USHORT*/
+
+
+/*-------------------------------------------------------------------------
+ * H5T_NATIVE_INT
+ *-------------------------------------------------------------------------
+ */
+
+ else if (H5Tequal(m_type, H5T_NATIVE_INT))
+ {
+ int temp1_int;
+ int temp2_int;
+ assert(type_size==sizeof(int));
+ for ( i = 0; i < tot_cnt; i++)
+ {
+ memcpy(&temp1_int, _buf1, sizeof(int));
+ memcpy(&temp2_int, _buf2, sizeof(int));
+ /* -d and !-p */
+ if (options.d && !options.p)
+ {
+ if (abs(temp1_int-temp2_int) > options.delta)
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(IFORMAT,temp1_int,temp2_int,abs(temp1_int-temp2_int));
+ }
+ nfound++;
+ }
+ }
+ /* !-d and -p */
+ else if (!options.d && options.p)
+ {
+ if ( temp1_int!=0 && abs(1-temp2_int/temp1_int) > options.percent )
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(IPFORMAT,temp1_int,temp2_int,abs(temp1_int-temp2_int),
+ abs(1-temp2_int/temp1_int));
+ }
+ nfound++;
+ }
+ }
+ /* -d and -p */
+ else if ( options.d && options.p)
+ {
+ if ( temp1_int!=0 && abs(1-temp2_int/temp1_int) > options.percent &&
+ abs(temp1_int-temp2_int) > options.delta )
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(IPFORMAT,temp1_int,temp2_int,abs(temp1_int-temp2_int),
+ abs(1-temp2_int/temp1_int));
+ }
+ nfound++;
+ }
+ }
+ else if (temp1_int != temp2_int)
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(IFORMAT,temp1_int,temp2_int,abs(temp1_int-temp2_int));
+ }
+ nfound++;
+ }
+
+ _buf1+=sizeof(int);
+ _buf2+=sizeof(int);
+ }/* i */
+
+ } /*H5T_NATIVE_INT*/
+
+
+/*-------------------------------------------------------------------------
+ * H5T_NATIVE_UINT
+ *-------------------------------------------------------------------------
+ */
+
+ else if (H5Tequal(m_type, H5T_NATIVE_UINT))
+ {
+ unsigned int temp1_uint;
+ unsigned int temp2_uint;
+ assert(type_size==sizeof(int));
+ for ( i = 0; i < tot_cnt; i++)
+ {
+ memcpy(&temp1_uint, _buf1, sizeof(unsigned int));
+ memcpy(&temp2_uint, _buf2, sizeof(unsigned int));
+ /* -d and !-p */
+ if (options.d && !options.p)
+ {
+ if (abs((int)(temp1_uint-temp2_uint)) > options.delta)
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(UIFORMAT,temp1_uint,temp2_uint,abs((int)(temp1_uint-temp2_uint)));
+ }
+ nfound++;
+ }
+ }
+ /* !-d and -p */
+ else if (!options.d && options.p)
+ {
+ if ( temp1_uint!=0 && abs((int)(1-temp2_uint/temp1_uint)) > options.percent )
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(UIPFORMAT,temp1_uint,temp2_uint,abs((int)(temp1_uint-temp2_uint)),
+ abs((int)(1-temp2_uint/temp1_uint)));
+ }
+ nfound++;
+ }
+ }
+ /* -d and -p */
+ else if ( options.d && options.p)
+ {
+ if ( temp1_uint!=0 && abs((int)(1-temp2_uint/temp1_uint)) > options.percent &&
+ abs((int)(temp1_uint-temp2_uint)) > options.delta )
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(UIPFORMAT,temp1_uint,temp2_uint,abs((int)(temp1_uint-temp2_uint)),
+ abs((int)(1-temp2_uint/temp1_uint)));
+ }
+ nfound++;
+ }
+ }
+ else if (temp1_uint != temp2_uint)
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(UIFORMAT,temp1_uint,temp2_uint,abs((int)(temp1_uint-temp2_uint)));
+ }
+ nfound++;
+ }
+
+ _buf1+=sizeof(unsigned int);
+ _buf2+=sizeof(unsigned int);
+ }/* i */
+
+ } /*H5T_NATIVE_UINT*/
+
+
+/*-------------------------------------------------------------------------
+ * H5T_NATIVE_LONG
+ *-------------------------------------------------------------------------
+ */
+
+ else if (H5Tequal(m_type, H5T_NATIVE_LONG))
+ {
+ long temp1_long;
+ long temp2_long;
+ assert(type_size==sizeof(long));
+ for ( i = 0; i < tot_cnt; i++)
+ {
+ memcpy(&temp1_long, _buf1, sizeof(long));
+ memcpy(&temp2_long, _buf2, sizeof(long));
+ /* -d and !-p */
+ if (options.d && !options.p)
+ {
+ if (labs(temp1_long-temp2_long) > (long)options.delta)
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(LIFORMAT,temp1_long,temp2_long,labs(temp1_long-temp2_long));
+ }
+ nfound++;
+ }
+ }
+ /* !-d and -p */
+ else if (!options.d && options.p)
+ {
+ if ( temp1_long!=0 && labs(1-temp2_long/temp1_long) > (long)options.percent )
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(LPIFORMAT,temp1_long,temp2_long,labs(temp1_long-temp2_long),
+ labs(1-temp2_long/temp1_long));
+ }
+ nfound++;
+ }
+ }
+ /* -d and -p */
+ else if ( options.d && options.p)
+ {
+ if ( temp1_long!=0 && labs(1-temp2_long/temp1_long) > (long)options.percent &&
+ labs(temp1_long-temp2_long) > (long)options.delta )
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(LPIFORMAT,temp1_long,temp2_long,labs(temp1_long-temp2_long),
+ labs(1-temp2_long/temp1_long));
+ }
+ nfound++;
+ }
+ }
+ else if (temp1_long != temp2_long)
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(LIFORMAT,temp1_long,temp2_long,labs(temp1_long-temp2_long));
+ }
+ nfound++;
+ }
+
+ _buf1+=sizeof(long);
+ _buf2+=sizeof(long);
+ }/* i */
+
+ } /*H5T_NATIVE_LONG*/
+
+/*-------------------------------------------------------------------------
+ * H5T_NATIVE_ULONG
+ *-------------------------------------------------------------------------
+ */
+
+ else if (H5Tequal(m_type, H5T_NATIVE_ULONG))
+ {
+ unsigned long temp1_ulong;
+ unsigned long temp2_ulong;
+ assert(type_size==sizeof(unsigned long));
+ for ( i = 0; i < tot_cnt; i++)
+ {
+ memcpy(&temp1_ulong, _buf1, sizeof(unsigned long));
+ memcpy(&temp2_ulong, _buf2, sizeof(unsigned long));
+ /* -d and !-p */
+ if (options.d && !options.p)
+ {
+ if (labs((long)(temp1_ulong-temp2_ulong)) > (long)options.delta)
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(ULIFORMAT,temp1_ulong,temp2_ulong,labs((long)(temp1_ulong-temp2_ulong)));
+ }
+ nfound++;
+ }
+ }
+ /* !-d and -p */
+ else if (!options.d && options.p)
+ {
+ if ( temp1_ulong!=0 && labs((long)(1-temp2_ulong/temp1_ulong)) > (long)options.percent )
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(ULPIFORMAT,temp1_ulong,temp2_ulong,labs((long)(temp1_ulong-temp2_ulong)),
+ labs((long)(1-temp2_ulong/temp1_ulong)));
+ }
+ nfound++;
+ }
+ }
+ /* -d and -p */
+ else if ( options.d && options.p)
+ {
+ if ( temp1_ulong!=0 && labs((long)(1-temp2_ulong/temp1_ulong)) > (long)options.percent &&
+ labs((long)(temp1_ulong-temp2_ulong)) > (long)options.delta )
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(ULPIFORMAT,temp1_ulong,temp2_ulong,labs((long)(temp1_ulong-temp2_ulong)),
+ labs((long)(1-temp2_ulong/temp1_ulong)));
+ }
+ nfound++;
+ }
+ }
+ else if (temp1_ulong != temp2_ulong)
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(ULIFORMAT,temp1_ulong,temp2_ulong,labs((long)(temp1_ulong-temp2_ulong)));
+ }
+ nfound++;
+ }
+
+ _buf1+=sizeof(unsigned long);
+ _buf2+=sizeof(unsigned long);
+ }/* i */
+
+ } /*H5T_NATIVE_ULONG*/
+
+/*-------------------------------------------------------------------------
+ * H5T_NATIVE_LLONG
+ *-------------------------------------------------------------------------
+ */
+
+ else if (H5Tequal(m_type, H5T_NATIVE_LLONG))
+ {
+ long_long temp1_llong;
+ long_long temp2_llong;
+ assert(type_size==sizeof(long_long));
+ for ( i = 0; i < tot_cnt; i++)
+ {
+ memcpy(&temp1_llong, _buf1, sizeof(long_long));
+ memcpy(&temp2_llong, _buf2, sizeof(long_long));
+ /* -d and !-p */
+ if (options.d && !options.p)
+ {
+ if (labs((long)(temp1_llong-temp2_llong)) > (long)options.delta)
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(fmt_llong,temp1_llong,temp2_llong,(long_long)labs((long)(temp1_llong-temp2_llong)));
+ }
+ nfound++;
+ }
+ }
+ /* !-d and -p */
+ else if (!options.d && options.p)
+ {
+ if ( temp1_llong!=0 && labs((long)(1-temp2_llong/temp1_llong)) > (long)options.percent )
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(fmt_llongp,temp1_llong,temp2_llong,(long_long)labs((long)(temp1_llong-temp2_llong)),
+ (long_long)labs((long)(1-temp2_llong/temp1_llong)));
+ }
+ nfound++;
+ }
+ }
+ /* -d and -p */
+ else if ( options.d && options.p)
+ {
+ if ( temp1_llong!=0 && labs((long)(1-temp2_llong/temp1_llong)) > (long)options.percent &&
+ labs((long)(temp1_llong-temp2_llong)) > (long)options.delta )
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(fmt_llongp,temp1_llong,temp2_llong,(long_long)labs((long)(temp1_llong-temp2_llong)),
+ (long_long)labs((long)(1-temp2_llong/temp1_llong)));
+ }
+ nfound++;
+ }
+ }
+ else if (temp1_llong != temp2_llong)
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(fmt_llong,temp1_llong,temp2_llong,(long_long)labs((long)(temp1_llong-temp2_llong)));
+ }
+ nfound++;
+ }
+
+ _buf1+=sizeof(long_long);
+ _buf2+=sizeof(long_long);
+ }/* i */
+
+ } /*H5T_NATIVE_LLONG*/
+
+/*-------------------------------------------------------------------------
+ * H5T_NATIVE_ULLONG
+ *-------------------------------------------------------------------------
+ */
+
+ else if (H5Tequal(m_type, H5T_NATIVE_ULLONG))
+ {
+ unsigned long_long temp1_ullong;
+ unsigned long_long temp2_ullong;
+ assert(type_size==sizeof(unsigned long_long));
+ for ( i = 0; i < tot_cnt; i++)
+ {
+ memcpy(&temp1_ullong, _buf1, sizeof(unsigned long_long));
+ memcpy(&temp2_ullong, _buf2, sizeof(unsigned long_long));
+ /* -d and !-p */
+ if (options.d && !options.p)
+ {
+ if (labs((long)(temp1_ullong-temp2_ullong)) > (long)options.delta)
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(fmt_ullong,temp1_ullong,temp2_ullong,
+ (unsigned long_long)labs((long)(temp1_ullong-temp2_ullong)));
+ }
+ nfound++;
+ }
+ }
+ /* !-d and -p */
+ else if (!options.d && options.p)
+ {
+ if ( temp1_ullong!=0 && labs((long)(1-temp2_ullong/temp1_ullong)) > (long)options.percent )
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(fmt_ullongp,temp1_ullong,temp2_ullong,
+ (unsigned long_long)labs((long)(temp1_ullong-temp2_ullong)),
+ (unsigned long_long)labs((long)(1-temp2_ullong/temp1_ullong)));
+ }
+ nfound++;
+ }
+ }
+ /* -d and -p */
+ else if ( options.d && options.p)
+ {
+ if ( temp1_ullong!=0 && labs((long)(1-temp2_ullong/temp1_ullong)) > (long)options.percent &&
+ labs((long)(temp1_ullong-temp2_ullong)) > (long)options.delta )
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(fmt_ullongp,temp1_ullong,temp2_ullong,
+ (unsigned long_long)labs((long)(temp1_ullong-temp2_ullong)),
+ (unsigned long_long)labs((long)(1-temp2_ullong/temp1_ullong)));
+ }
+ nfound++;
+ }
+ }
+ else if (temp1_ullong != temp2_ullong)
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(fmt_ullong,temp1_ullong,temp2_ullong,
+ (unsigned long_long)labs((long)(temp1_ullong-temp2_ullong)));
+ }
+ nfound++;
+ }
+
+ _buf1+=sizeof(unsigned long_long);
+ _buf2+=sizeof(unsigned long_long);
+ }/* i */
+
+ } /*H5T_NATIVE_ULLONG*/
+
+/*-------------------------------------------------------------------------
+ * H5T_NATIVE_FLOAT
+ *-------------------------------------------------------------------------
+ */
+
+ else if (H5Tequal(m_type, H5T_NATIVE_FLOAT))
+ {
+ float temp1_float;
+ float temp2_float;
+ assert(type_size==sizeof(float));
+ for ( i = 0; i < tot_cnt; i++)
+ {
+ memcpy(&temp1_float, _buf1, sizeof(float));
+ memcpy(&temp2_float, _buf2, sizeof(float));
+ /* -d and !-p */
+ if (options.d && !options.p)
+ {
+ if (fabs(temp1_float-temp2_float) > options.delta)
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(FFORMAT,temp1_float,temp2_float,fabs(temp1_float-temp2_float));
+ }
+ nfound++;
+ }
+ }
+ /* !-d and -p */
+ else if (!options.d && options.p)
+ {
+ if ( temp1_float!=0 && fabs(1-temp2_float/temp1_float) > options.percent )
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(FPFORMAT,temp1_float,temp2_float,fabs(temp1_float-temp2_float),
+ fabs(1-temp2_float/temp1_float));
+ }
+ nfound++;
+ }
+ }
+ /* -d and -p */
+ else if ( options.d && options.p)
+ {
+ if ( temp1_float!=0 && fabs(1-temp2_float/temp1_float) > options.percent &&
+ fabs(temp1_float-temp2_float) > options.delta )
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(FPFORMAT,temp1_float,temp2_float,fabs(temp1_float-temp2_float),
+ fabs(1-temp2_float/temp1_float));
+ }
+ nfound++;
+ }
+ }
+ else if (temp1_float != temp2_float)
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(FFORMAT,temp1_float,temp2_float,fabs(temp1_float-temp2_float));
+ }
+ nfound++;
+ }
+
+ _buf1+=sizeof(float);
+ _buf2+=sizeof(float);
+ }/* i */
+
+ } /*H5T_NATIVE_FLOAT*/
+
+/*-------------------------------------------------------------------------
+ * H5T_NATIVE_DOUBLE
+ *-------------------------------------------------------------------------
+ */
+
+ else if (H5Tequal(m_type, H5T_NATIVE_DOUBLE))
+ {
+ double temp1_double;
+ double temp2_double;
+ assert(type_size==sizeof(double));
+ for ( i = 0; i < tot_cnt; i++)
+ {
+ memcpy(&temp1_double, _buf1, sizeof(double));
+ memcpy(&temp2_double, _buf2, sizeof(double));
+ /* -d and !-p */
+ if (options.d && !options.p)
+ {
+ if (fabs(temp1_double-temp2_double) > options.delta)
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(FFORMAT,temp1_double,temp2_double,fabs(temp1_double-temp2_double));
+ }
+ nfound++;
+ }
+ }
+ /* !-d and -p */
+ else if (!options.d && options.p)
+ {
+ if ( temp1_double!=0 && fabs(1-temp2_double/temp1_double) > options.percent )
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(FPFORMAT,temp1_double,temp2_double,fabs(temp1_double-temp2_double),
+ fabs(1-temp2_double/temp1_double));
+ }
+ nfound++;
+ }
+ }
+ /* -d and -p */
+ else if ( options.d && options.p)
+ {
+ if ( temp1_double!=0 && fabs(1-temp2_double/temp1_double) > options.percent &&
+ fabs(temp1_double-temp2_double) > options.delta )
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,1,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(FPFORMAT,temp1_double,temp2_double,fabs(temp1_double-temp2_double),
+ fabs(1-temp2_double/temp1_double));
+ }
+ nfound++;
+ }
+ }
+ else if (temp1_double != temp2_double)
+ {
+ if (options.n && nfound>=options.count)
+ return nfound;
+ if ( options.r==0 )
+ {
+ print_pos(&ph,0,i,acc,pos,rank,obj1,obj2);
+ printf(SPACES);
+ printf(FFORMAT,temp1_double,temp2_double,fabs(temp1_double-temp2_double));
+ }
+ nfound++;
+ }
+
+ _buf1+=sizeof(double);
+ _buf2+=sizeof(double);
+ }/* i */
+
+ } /*H5T_NATIVE_DOUBLE*/
+
+/*-------------------------------------------------------------------------
+ * no more
+ *-------------------------------------------------------------------------
+ */
+ else
+ {
+ assert(0);
+ }
+
+ return nfound;
+}
+
+
diff --git a/tools/h5diff/h5diff_dset.c b/tools/h5diff/h5diff_dset.c
new file mode 100644
index 0000000..1ecfb2a
--- /dev/null
+++ b/tools/h5diff/h5diff_dset.c
@@ -0,0 +1,405 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * 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 "h5diff.h"
+#include "H5private.h"
+#include <assert.h>
+
+
+
+/*-------------------------------------------------------------------------
+ * Function: diff_dataset
+ *
+ * Purpose: check for comparable datasets and read into a compatible
+ * memory type
+ *
+ * Return: Number of differences found
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: May 9, 2003
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+int diff_dataset( hid_t file1_id, hid_t file2_id, const char *obj1_name,
+ const char *obj2_name, options_t options )
+{
+ hid_t dset1_id =-1;
+ hid_t dset2_id =-1;
+ hid_t space1_id =-1;
+ hid_t space2_id =-1;
+ hid_t f_type1=-1, f_type2=-1; /* file data type */
+ hid_t m_type1=-1, m_type2=-1; /* memory data type */
+ size_t m_size1, m_size2; /* size of type in memory */
+ H5T_sign_t sign1, sign2; /* sign of type */
+ int rank1, rank2;
+ void *buf1=NULL, *buf2=NULL;
+ hsize_t tot_cnt1, tot_cnt2;
+ hsize_t dims1[32], dims2[32];
+ hsize_t maxdim1[32], maxdim2[32];
+ H5T_class_t tclass1;
+ H5T_class_t tclass2;
+ int nfound=0; /* number of differences found */
+ const char *name1=NULL; /* relative names */
+ const char *name2=NULL;
+ int maxdim_diff=0; /* maximum dimensions are different */
+ int dim_diff=0; /* current dimensions are different */
+ int can1, can2; /* supported diff */
+ int i;
+
+
+ /* disable error reporting */
+ H5E_BEGIN_TRY {
+
+/*-------------------------------------------------------------------------
+ * open the handles
+ *-------------------------------------------------------------------------
+ */
+
+ /* Open the datasets */
+ if ( (dset1_id = H5Dopen(file1_id,obj1_name)) < 0 )
+ {
+ printf("Cannot open dataset <%s>\n", obj1_name );
+ goto out;
+ }
+ if ( (dset2_id = H5Dopen(file2_id,obj2_name)) < 0 )
+ {
+ printf("Cannot open dataset <%s>\n", obj2_name );
+ goto out;
+ }
+ /* enable error reporting */
+ } H5E_END_TRY;
+
+ /* Get the dataspace handle */
+ if ( (space1_id = H5Dget_space(dset1_id)) < 0 )
+ goto out;
+
+ /* Get rank */
+ if ( (rank1 = H5Sget_simple_extent_ndims(space1_id)) < 0 )
+ goto out;
+
+ /* Get the dataspace handle */
+ if ( (space2_id = H5Dget_space(dset2_id)) < 0 )
+ goto out;
+
+ /* Get rank */
+ if ( (rank2 = H5Sget_simple_extent_ndims(space2_id)) < 0 )
+ goto out;
+
+ /* Get dimensions */
+ if ( H5Sget_simple_extent_dims(space1_id,dims1,maxdim1) < 0 )
+ goto out;
+
+ /* Get dimensions */
+ if ( H5Sget_simple_extent_dims(space2_id,dims2,maxdim2) < 0 )
+ goto out;
+
+/*-------------------------------------------------------------------------
+ * Get the file data type
+ *-------------------------------------------------------------------------
+ */
+
+ /* Get the data type */
+ if ( (f_type1 = H5Dget_type(dset1_id)) < 0 )
+ goto out;
+
+ /* Get the data type */
+ if ( (f_type2 = H5Dget_type(dset2_id)) < 0 )
+ goto out;
+
+
+/*-------------------------------------------------------------------------
+ * check for the same class
+ *-------------------------------------------------------------------------
+ */
+
+ if ((tclass1=H5Tget_class(f_type1))<0)
+ goto out;
+
+ if ((tclass2=H5Tget_class(f_type2))<0)
+ goto out;
+
+ if ( tclass1 != tclass2 )
+ {
+ printf("Comparison not supported\n");
+ printf("<%s> is of class %s and <%s> is of class %s\n",
+ obj1_name, get_class(tclass1),
+ obj2_name, get_class(tclass2) );
+ goto out;
+ }
+
+/*-------------------------------------------------------------------------
+ * check for non supported classes
+ *-------------------------------------------------------------------------
+ */
+
+ assert(tclass1==tclass2);
+ switch (tclass1)
+ {
+ case H5T_TIME:
+ case H5T_STRING:
+ case H5T_BITFIELD:
+ case H5T_OPAQUE:
+ case H5T_COMPOUND:
+ case H5T_REFERENCE:
+ case H5T_ENUM:
+ case H5T_VLEN:
+ case H5T_ARRAY:
+ printf("Comparison not supported\n");
+ printf("<%s> is of class %s and <%s> is of class %s\n",
+ obj1_name, get_class(tclass1),
+ obj2_name, get_class(tclass2) );
+ goto out;
+ default:
+ break;
+ }
+
+/*-------------------------------------------------------------------------
+ * check for the same rank
+ *-------------------------------------------------------------------------
+ */
+
+ if ( rank1 != rank2 )
+ {
+ printf("Comparison not supported\n");
+ printf("<%s> has rank %d, dimensions ", obj1_name, rank1);
+ print_dims(rank1,dims1);
+ printf(", max dimensions ");
+ print_dims(rank1,maxdim1);
+ printf("\n" );
+ printf("<%s> has rank %d, dimensions ", obj2_name, rank2);
+ print_dims(rank2,dims2);
+ printf(", max dimensions ");
+ print_dims(rank2,maxdim2);
+ goto out;
+ }
+
+/*-------------------------------------------------------------------------
+ * check for different dimensions
+ *-------------------------------------------------------------------------
+ */
+
+ assert(rank1==rank2);
+ for ( i=0; i<rank1; i++)
+ {
+ if ( maxdim1[i] != maxdim2[i] )
+ maxdim_diff=1;
+ if ( dims1[i] != dims2[i] )
+ dim_diff=1;
+ }
+
+/*-------------------------------------------------------------------------
+ * current dimensions
+ *-------------------------------------------------------------------------
+ */
+
+ if (dim_diff==1)
+ {
+ printf("Comparison not supported\n");
+ printf("<%s> has rank %d, dimensions ", obj1_name, rank1);
+ print_dims(rank1,dims1);
+ printf(", max dimensions ");
+ print_dims(rank1,maxdim1);
+ printf("\n" );
+ printf("<%s> has rank %d, dimensions ", obj2_name, rank2);
+ print_dims(rank2,dims2);
+ printf(", max dimensions ");
+ print_dims(rank2,maxdim2);
+ goto out;
+ }
+
+/*-------------------------------------------------------------------------
+ * maximum dimensions; just give a warning
+ *-------------------------------------------------------------------------
+ */
+ if (maxdim_diff==1)
+ {
+ printf( "Warning: Different maximum dimensions\n");
+ printf("<%s> has max dimensions ", obj1_name);
+ print_dims(rank1,maxdim1);
+ printf("\n");
+ printf("<%s> has max dimensions ", obj2_name);
+ print_dims(rank2,maxdim2);
+ printf("\n");
+ }
+
+/*-------------------------------------------------------------------------
+ * get number of elements
+ *-------------------------------------------------------------------------
+ */
+
+ tot_cnt1 = 1;
+ for (i = 0; i < rank1; i++)
+ {
+ tot_cnt1 *= dims1[i];
+ }
+
+ tot_cnt2 = 1;
+ for (i = 0; i < rank2; i++)
+ {
+ tot_cnt2 *= dims2[i];
+ }
+
+ assert(tot_cnt1==tot_cnt2);
+
+/*-------------------------------------------------------------------------
+ * check for equal file datatype; warning only
+ *-------------------------------------------------------------------------
+ */
+
+ if ( (H5Tequal(f_type1, f_type2)==0) )
+ {
+ printf("Warning: Different storage datatype\n");
+ printf("<%s> has file datatype ", obj1_name);
+ print_datatype(f_type1);
+ printf("\n");
+ printf("<%s> has file datatype ", obj2_name);
+ print_datatype(f_type2);
+ printf("\n");
+ }
+
+/*-------------------------------------------------------------------------
+ * memory type and sizes
+ *-------------------------------------------------------------------------
+ */
+
+ m_type1 = H5Tget_native_type( f_type1 , H5T_DIR_DEFAULT);
+ m_type2 = H5Tget_native_type( f_type2 , H5T_DIR_DEFAULT);
+
+ m_size1 = H5Tget_size( m_type1 );
+ m_size2 = H5Tget_size( m_type2 );
+
+#if defined (H5DIFF_DEBUG)
+ print_sizes(obj1_name,obj2_name,f_type1,f_type2,m_type1,m_type2);
+#endif
+
+/*-------------------------------------------------------------------------
+ * check for the comparable types in array_diff
+ *-------------------------------------------------------------------------
+ */
+
+ can1=h5diff_can_diff(m_type1);
+ can2=h5diff_can_diff(m_type2);
+ if ( can1==0 || can2==0 )
+ {
+ printf("Comparison not supported\n");
+ if ( can1==0 )
+ printf("<%s> type is not supported\n", obj1_name);
+ if ( can2==0 )
+ printf("<%s> type is not supported\n", obj2_name);
+ goto out;
+ }
+
+/*-------------------------------------------------------------------------
+ * check for different signed/unsigned types
+ *-------------------------------------------------------------------------
+ */
+
+ sign1=H5Tget_sign(m_type1);
+ sign2=H5Tget_sign(m_type2);
+ if ( sign1 != sign2 )
+ {
+ printf("Comparison not supported\n");
+ printf("<%s> has sign %s\n", obj1_name, get_sign(sign1));
+ printf("<%s> has sign %s", obj2_name, get_sign(sign2));
+ goto out;
+ }
+
+
+/*-------------------------------------------------------------------------
+ * "upgrade" the smaller memory size
+ *-------------------------------------------------------------------------
+ */
+
+ if ( m_size1 != m_size2 )
+ {
+ if ( m_size1 < m_size2 )
+ {
+ assert( (H5Tclose(m_type1)) >=0);
+ m_type1 = H5Tget_native_type( f_type2 , H5T_DIR_DEFAULT);
+ m_size1 = H5Tget_size( m_type1 );
+ }
+ else
+ {
+ assert( (H5Tclose(m_type2)) >=0);
+ m_type2 = H5Tget_native_type( f_type1 , H5T_DIR_DEFAULT);
+ m_size2 = H5Tget_size( m_type2 );
+ }
+#if defined (H5DIFF_DEBUG)
+ printf("WARNING: Size was upgraded\n");
+ print_sizes(obj1_name,obj2_name,f_type1,f_type2,m_type1,m_type2);
+#endif
+ }
+ assert(m_size1==m_size2);
+
+ buf1 = (void *) HDmalloc((unsigned) (tot_cnt1*m_size1));
+ buf2 = (void *) HDmalloc((unsigned) (tot_cnt2*m_size2));
+
+ if ( buf1 == NULL || buf2 == NULL )
+ {
+ printf( "cannot read into memory\n" );
+ goto out;
+ }
+
+/*-------------------------------------------------------------------------
+ * read
+ *-------------------------------------------------------------------------
+ */
+
+ if ( H5Dread(dset1_id,m_type1,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf1) < 0 )
+ goto out;
+
+ if ( H5Dread(dset2_id,m_type2,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf2) < 0 )
+ goto out;
+
+/*-------------------------------------------------------------------------
+ * array compare
+ *-------------------------------------------------------------------------
+ */
+ if (options.verbose)
+ printf( "Comparing <%s> with <%s>\n", obj1_name, obj2_name );
+ name1=h5diff_basename(obj1_name);
+ name2=h5diff_basename(obj2_name);
+ nfound = array_diff(buf1,buf2,tot_cnt1,rank1,dims1,options,name1,name2,m_type1);
+ if (options.verbose)
+ printf("%d differences found\n", nfound );
+
+/*-------------------------------------------------------------------------
+ * close
+ *-------------------------------------------------------------------------
+ */
+
+out:
+
+ if ( buf1) HDfree(buf1);
+ if ( buf2) HDfree(buf2);
+
+ /* Close */
+ if ( dset1_id!=-1 ) assert( (H5Dclose(dset1_id)) >=0);
+ if ( dset2_id!=-1 ) assert( (H5Dclose(dset2_id)) >=0);
+ if ( space1_id!=-1 ) assert( (H5Sclose(space1_id)) >=0);
+ if ( space2_id!=-1 ) assert( (H5Sclose(space2_id)) >=0);
+ if ( f_type1!=-1 ) assert( (H5Tclose(f_type1)) >=0);
+ if ( f_type2!=-1 ) assert( (H5Tclose(f_type2)) >=0);
+ if ( m_type1!=-1 ) assert( (H5Tclose(m_type1)) >=0);
+ if ( m_type2!=-1 ) assert( (H5Tclose(m_type2)) >=0);
+
+ return nfound;
+
+}
+
diff --git a/tools/h5diff/h5diff_main.c b/tools/h5diff/h5diff_main.c
new file mode 100644
index 0000000..87ae592
--- /dev/null
+++ b/tools/h5diff/h5diff_main.c
@@ -0,0 +1,328 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * 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 "h5diff.h"
+#include <stdlib.h>
+#include <assert.h>
+
+/* Due to alignment issue in Alpha clusters, options must be declared here
+ * not as a local variable in main().
+ */
+options_t options = {0,0,0,0,0,0,0,1};
+
+static void usage(void);
+static int check_n_input( const char* );
+static int check_f_input( const char* );
+
+
+/*-------------------------------------------------------------------------
+ * Function: main
+ *
+ * Purpose: H5diff main program
+ *
+ * Return: An exit status of 0 means no differences were found, 1 means some
+ * differences were found.
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: May 9, 2003
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+int main(int argc, const char *argv[])
+{
+ int i;
+ const char *s = NULL;
+ const char *fname1 = NULL;
+ const char *fname2 = NULL;
+ const char *objname1 = NULL;
+ const char *objname2 = NULL;
+ int nfound=0, ret;
+
+/*-------------------------------------------------------------------------
+ * print the command line options
+ *-------------------------------------------------------------------------
+ */
+
+ printf("$h5diff");
+ for (i=1; i<argc ; i++)
+ {
+ printf(" %s", argv[i] );
+ }
+ printf("\n");
+
+
+/*-------------------------------------------------------------------------
+ * initial check of command line options
+ *-------------------------------------------------------------------------
+ */
+
+ if ( argc==2 && (strcmp("-h",argv[1])==0) )
+ usage();
+
+ if ( argc<3 )
+ {
+ printf("Number of arguments is only %d\n", argc );
+ usage();
+ }
+
+/*-------------------------------------------------------------------------
+ * file names are first
+ *-------------------------------------------------------------------------
+ */
+
+ if ( argc>=3 )
+ {
+ fname1 = argv[1];
+ fname2 = argv[2];
+ }
+
+
+/*-------------------------------------------------------------------------
+ * parse command line options
+ *-------------------------------------------------------------------------
+ */
+ for (i=3; i<argc ; i++)
+ {
+ /* get the single-letter switches */
+ if ( '-'==argv[i][0] )
+ {
+ for (s=argv[i]+1; *s; s++)
+ {
+ switch (*s) {
+ default:
+ printf("-%s is an invalid option\n", s );
+ usage();
+ break;
+ case 'h':
+ usage();
+ case 'r':
+ options.r = 1;
+ break;
+ case 'd':
+ /* if it is not another option */
+ if ( i<argc-1 &&'-' != argv[i+1][0] )
+ {
+ options.d=1;
+ if ( check_f_input(argv[i+1])==-1)
+ {
+ printf("<-d %s> is not a valid option\n", argv[i+1] );
+ usage();
+ }
+ options.delta = atof(argv[i+1]);
+ }
+ else
+ {
+ printf("<-d %s> is not a valid option\n", argv[i+1] );
+ usage();
+ }
+ break;
+ case 'p':
+ if ( i<argc-1 &&'-' !=argv[i+1][0] )
+ {
+ options.p=1;
+ if ( check_f_input(argv[i+1])==-1)
+ {
+ printf("<-p %s> is not a valid option\n", argv[i+1] );
+ usage();
+ }
+ options.percent = atof(argv[i+1]);
+ }
+ break;
+ case 'n':
+ if ( i<argc-1 && '-' !=argv[i+1][0] )
+ {
+ options.n=1;
+ if ( check_n_input(argv[i+1])==-1)
+ {
+ printf("<-n %s> is not a valid option\n", argv[i+1] );
+ usage();
+ }
+ options.count = atoi(argv[i+1]);
+ }
+ break;
+ } /*switch*/
+ } /*for*/
+ } /*if*/
+
+ else /* not single-letter switches */
+
+ {
+ /* check if it is not a -d, -p parameter */
+ if ( '-' !=argv[i-1][0] )
+ {
+ if ( objname1==NULL )
+ objname1 = argv[i];
+ if ( objname2==NULL )
+ {
+ /* check if we have a second object name */
+ if ( i+1<argc && '-' !=argv[i+1][0] )
+ /* yes */
+ objname2 = argv[i+1];
+ else
+ /* no */
+ objname2 = objname1;
+ }
+ }
+ }
+
+ }/*for*/
+
+
+ nfound = h5diff(fname1,fname2,objname1,objname2,options);
+ printf("\n");
+ ret= (nfound==0 ? 0 : 1 );
+ return ret;
+
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function: check_n_input
+ *
+ * Purpose: check for valid input
+ *
+ * Return: 1 for ok, -1 for fail
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: May 9, 2003
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static
+int check_n_input( const char *str )
+{
+ unsigned i;
+ char c;
+
+ for ( i = 0; i < strlen(str); i++)
+ {
+ c = str[i];
+ if ( i==0 )
+ {
+ if ( c < 49 || c > 57 ) /* ascii values between 1 and 9 */
+ return -1;
+ }
+ else
+ if ( c < 48 || c > 57 ) /* 0 also */
+ return -1;
+ }
+ return 1;
+}
+
+/*-------------------------------------------------------------------------
+ * Function: check_f_input
+ *
+ * Purpose: check for valid input
+ *
+ * Return: 1 for ok, -1 for fail
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: May 9, 2003
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static
+int check_f_input( const char *str )
+{
+ unsigned i;
+ char c;
+
+ /* '0' values not allowed */
+ if ( strlen(str)==1 && str[0]=='0' )
+ return -1;
+
+ for ( i = 0; i < strlen(str); i++)
+ {
+ c = str[i];
+ if ( c < 48 || c > 57 ) /* ascii values between 0 and 9 */
+ if ( c!= 46) /* . */
+ return -1;
+ }
+ return 1;
+}
+
+
+
+
+/*-------------------------------------------------------------------------
+ * Function: usage
+ *
+ * Purpose: print a usage message
+ *
+ * Return: void
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: May 9, 2003
+ *
+ *-------------------------------------------------------------------------
+ */
+static
+void usage(void)
+{
+ printf("Usage: h5diff file1 file2 [OPTIONS] [obj1[obj2]] \n");
+ printf("\n");
+ printf("file1 File name of the first HDF5 file\n");
+ printf("file2 File name of the second HDF5 file\n");
+ printf("[obj1] Name of an HDF5 object, in absolute path\n");
+ printf("[obj2] Name of an HDF5 object, in absolute path\n");
+ printf("[OPTIONS] are:\n");
+ printf("[-h] Print out this information\n");
+ printf("[-r] Print only what objects differ, not the differences\n");
+ printf("[-n count] Print difference up to count number\n");
+ printf("[-d delta] Print difference when it is greater than limit delta\n");
+ printf("[-p relative] Print difference when it is greater than a relative limit\n");
+ printf("\n");
+ printf("Items in [] are optional\n");
+ printf("[obj1] and [obj2] are HDF5 objects (datasets, groups or datatypes)\n");
+ printf("The 'count' value must be a positive integer\n");
+ printf("The 'delta' and 'relative' values must be positive numbers\n");
+ printf("The -d compare criteria is |a - b| > delta\n");
+ printf("The -p compare criteria is |1 - b/a| > relative\n");
+ printf("\n");
+ printf("Examples:\n");
+ printf("\n");
+ printf("1) h5diff file1 file2 /a/b /a/c\n");
+ printf("\n");
+ printf(" Compares object '/a/b' in file1 with '/a/c' in file2\n");
+ printf("\n");
+ printf("2) h5diff file1 file2 /a/b\n");
+ printf("\n");
+ printf(" Compares object '/a/b' in both files\n");
+ printf("\n");
+ printf("3) h5diff file1 file2\n");
+ printf("\n");
+ printf(" Compares all objects in both files\n");
+ printf("\n");
+ exit(0);
+}
+
+
+
diff --git a/tools/h5diff/h5diff_util.c b/tools/h5diff/h5diff_util.c
new file mode 100644
index 0000000..6ecd988
--- /dev/null
+++ b/tools/h5diff/h5diff_util.c
@@ -0,0 +1,421 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * 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 "h5diff.h"
+#include <assert.h>
+
+
+
+/*-------------------------------------------------------------------------
+ * Function: h5diff_can_diff
+ *
+ * Purpose: Check if TYPE_ID is supported; only the listed types are
+ * supported in the current version
+ *
+ *-------------------------------------------------------------------------
+ */
+int h5diff_can_diff(hid_t type_id)
+{
+ int ret=0;
+ if ( (H5Tequal(type_id, H5T_NATIVE_FLOAT)==1)||
+ (H5Tequal(type_id, H5T_NATIVE_DOUBLE)==1)||
+ (H5Tequal(type_id, H5T_NATIVE_INT)==1)||
+ (H5Tequal(type_id, H5T_NATIVE_UINT)==1)||
+ (H5Tequal(type_id, H5T_NATIVE_SCHAR)==1)||
+ (H5Tequal(type_id, H5T_NATIVE_UCHAR)==1)||
+ (H5Tequal(type_id, H5T_NATIVE_SHORT)==1)||
+ (H5Tequal(type_id, H5T_NATIVE_USHORT)==1)||
+ (H5Tequal(type_id, H5T_NATIVE_LONG)==1)||
+ (H5Tequal(type_id, H5T_NATIVE_ULONG)==1)||
+ (H5Tequal(type_id, H5T_NATIVE_LLONG)==1)||
+ (H5Tequal(type_id, H5T_NATIVE_ULLONG)==1)
+ )
+ ret=1;
+ return ret;
+}
+
+
+
+
+/*-------------------------------------------------------------------------
+ * Function: print_pos
+ *
+ * Purpose: convert an array index position to matrix notation
+ *
+ * Return: pos matrix array
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: May 9, 2003
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+void print_pos( int *ph, int p, unsigned int curr_pos, int *acc,
+ int *pos, int rank, const char *obj1, const char *obj2 )
+{
+ int i;
+
+ /* print header */
+ if ( *ph==1 )
+ {
+ *ph=0;
+ if (p)
+ {
+ printf("%-15s %-15s %-15s %-15s %-15s\n", "position", obj1, obj2, "difference",
+ "relative");
+ printf("------------------------------------------------------------------------\n");
+ }
+ else
+ {
+ printf("%-15s %-15s %-15s %-20s\n", "position", obj1, obj2, "difference");
+ printf("------------------------------------------------------------\n");
+ }
+ }
+
+ for ( i = 0; i < rank; i++)
+ pos[i]=0;
+
+ for ( i = 0; i < rank; i++)
+ {
+ pos[i] = curr_pos/acc[i];
+ curr_pos -= acc[i]*pos[i];
+ }
+ assert( curr_pos == 0 );
+
+ printf("[ " );
+ for ( i = 0; i < rank; i++)
+ {
+ printf("%d ", pos[i] );
+ }
+ printf("]" );
+}
+
+/*-------------------------------------------------------------------------
+ * Function: print_dims
+ *
+ * Purpose: print dimensions
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: May 9, 2003
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
+void print_dims( int r, hsize_t *d )
+{
+ int i;
+ printf("[ " );
+ for ( i=0; i<r; i++ )
+ printf("%d ",(int)d[i] );
+ printf("] " );
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function: print_datatype
+ *
+ * Purpose: Print name of datatype
+ *
+ * Return:
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: May 9, 2003
+ *
+ * Comments: Adapted from h5dump for H5T_INTEGER and H5T_FLOAT classes only
+ *
+ *-------------------------------------------------------------------------
+ */
+void print_datatype(hid_t type)
+{
+ switch (H5Tget_class(type))
+ {
+ default:
+ return;
+ case H5T_INTEGER:
+ if (H5Tequal(type, H5T_STD_I8BE)) {
+ printf("H5T_STD_I8BE");
+ } else if (H5Tequal(type, H5T_STD_I8LE)) {
+ printf("H5T_STD_I8LE");
+ } else if (H5Tequal(type, H5T_STD_I16BE)) {
+ printf("H5T_STD_I16BE");
+ } else if (H5Tequal(type, H5T_STD_I16LE)) {
+ printf("H5T_STD_I16LE");
+ } else if (H5Tequal(type, H5T_STD_I32BE)) {
+ printf("H5T_STD_I32BE");
+ } else if (H5Tequal(type, H5T_STD_I32LE)) {
+ printf("H5T_STD_I32LE");
+ } else if (H5Tequal(type, H5T_STD_I64BE)) {
+ printf("H5T_STD_I64BE");
+ } else if (H5Tequal(type, H5T_STD_I64LE)) {
+ printf("H5T_STD_I64LE");
+ } else if (H5Tequal(type, H5T_STD_U8BE)) {
+ printf("H5T_STD_U8BE");
+ } else if (H5Tequal(type, H5T_STD_U8LE)) {
+ printf("H5T_STD_U8LE");
+ } else if (H5Tequal(type, H5T_STD_U16BE)) {
+ printf("H5T_STD_U16BE");
+ } else if (H5Tequal(type, H5T_STD_U16LE)) {
+ printf("H5T_STD_U16LE");
+ } else if (H5Tequal(type, H5T_STD_U32BE)) {
+ printf("H5T_STD_U32BE");
+ } else if (H5Tequal(type, H5T_STD_U32LE)) {
+ printf("H5T_STD_U32LE");
+ } else if (H5Tequal(type, H5T_STD_U64BE)) {
+ printf("H5T_STD_U64BE");
+ } else if (H5Tequal(type, H5T_STD_U64LE)) {
+ printf("H5T_STD_U64LE");
+ } else if (H5Tequal(type, H5T_NATIVE_SCHAR)) {
+ printf("H5T_NATIVE_SCHAR");
+ } else if (H5Tequal(type, H5T_NATIVE_UCHAR)) {
+ printf("H5T_NATIVE_UCHAR");
+ } else if (H5Tequal(type, H5T_NATIVE_SHORT)) {
+ printf("H5T_NATIVE_SHORT");
+ } else if (H5Tequal(type, H5T_NATIVE_USHORT)) {
+ printf("H5T_NATIVE_USHORT");
+ } else if (H5Tequal(type, H5T_NATIVE_INT)) {
+ printf("H5T_NATIVE_INT");
+ } else if (H5Tequal(type, H5T_NATIVE_UINT)) {
+ printf("H5T_NATIVE_UINT");
+ } else if (H5Tequal(type, H5T_NATIVE_LONG)) {
+ printf("H5T_NATIVE_LONG");
+ } else if (H5Tequal(type, H5T_NATIVE_ULONG)) {
+ printf("H5T_NATIVE_ULONG");
+ } else if (H5Tequal(type, H5T_NATIVE_LLONG)) {
+ printf("H5T_NATIVE_LLONG");
+ } else if (H5Tequal(type, H5T_NATIVE_ULLONG)) {
+ printf("H5T_NATIVE_ULLONG");
+ } else {
+ printf("undefined integer");
+ }
+ break;
+
+ case H5T_FLOAT:
+ if (H5Tequal(type, H5T_IEEE_F32BE)) {
+ printf("H5T_IEEE_F32BE");
+ } else if (H5Tequal(type, H5T_IEEE_F32LE)) {
+ printf("H5T_IEEE_F32LE");
+ } else if (H5Tequal(type, H5T_IEEE_F64BE)) {
+ printf("H5T_IEEE_F64BE");
+ } else if (H5Tequal(type, H5T_IEEE_F64LE)) {
+ printf("H5T_IEEE_F64LE");
+ } else if (H5Tequal(type, H5T_NATIVE_FLOAT)) {
+ printf("H5T_NATIVE_FLOAT");
+ } else if (H5Tequal(type, H5T_NATIVE_DOUBLE)) {
+ printf("H5T_NATIVE_DOUBLE");
+ } else if (H5Tequal(type, H5T_NATIVE_LDOUBLE)) {
+ printf("H5T_NATIVE_LDOUBLE");
+ } else {
+ printf("undefined float");
+ }
+ break;
+
+ }/*switch*/
+}
+
+
+
+/*-------------------------------------------------------------------------
+ * Function: h5diff_basename
+ *
+ * Purpose: Returns a pointer to the last component absolute name
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: May 9, 2003
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
+const char*
+h5diff_basename(const char *name)
+{
+ size_t i;
+
+ /* Find the end of the base name */
+ i = strlen(name);
+ while (i>0 && '/'==name[i-1])
+ --i;
+
+ /* Skip backward over base name */
+ while (i>0 && '/'!=name[i-1])
+ --i;
+
+ return(name+i);
+}
+
+/*-------------------------------------------------------------------------
+ * Function: get_type
+ *
+ * Purpose: Returns the type as a string
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: May 9, 2003
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
+const char*
+get_type(int type)
+{
+ switch (type)
+ {
+ case H5G_DATASET:
+ return("H5G_DATASET");
+ case H5G_GROUP:
+ return("H5G_GROUP");
+ case H5G_TYPE:
+ return("H5G_TYPE");
+ case H5G_LINK:
+ return("H5G_LINK");
+ default:
+ return("user defined type");
+ }
+}
+
+/*-------------------------------------------------------------------------
+ * Function: get_sign
+ *
+ * Purpose: Returns the sign as a string
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: May 9, 2003
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
+const char*
+get_sign(H5T_sign_t sign)
+{
+ switch (sign)
+ {
+ default:
+ return("H5T_SGN_ERROR");
+ case H5T_SGN_NONE:
+ return("H5T_SGN_NONE");
+ case H5T_SGN_2:
+ return("H5T_SGN_2");
+ }
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function: get_class
+ *
+ * Purpose: Returns the class as a string
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: May 9, 2003
+ *
+ * Comments:
+ *
+ *-------------------------------------------------------------------------
+ */
+const char*
+get_class(H5T_class_t tclass)
+{
+ switch (tclass)
+ {
+ default:
+ return("Invalid class");
+ case H5T_TIME:
+ return("H5T_TIME");
+ case H5T_INTEGER:
+ return("H5T_INTEGER");
+ case H5T_FLOAT:
+ return("H5T_FLOAT");
+ case H5T_STRING:
+ return("H5T_STRING");
+ case H5T_BITFIELD:
+ return("H5T_BITFIELD");
+ case H5T_OPAQUE:
+ return("H5T_OPAQUE");
+ case H5T_COMPOUND:
+ return("H5T_COMPOUND");
+ case H5T_REFERENCE:
+ return("H5T_REFERENCE");
+ case H5T_ENUM:
+ return("H5T_ENUM");
+ case H5T_VLEN:
+ return("H5T_VLEN");
+ case H5T_ARRAY:
+ return("H5T_ARRAY");
+ }
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function: print_sizes
+ *
+ * Purpose: Print datatype sizes
+ *
+ *-------------------------------------------------------------------------
+ */
+#if defined (H5DIFF_DEBUG)
+void print_sizes( const char *obj1, const char *obj2,
+ hid_t f_type1, hid_t f_type2,
+ hid_t m_type1, hid_t m_type2 )
+{
+ size_t f_size1, f_size2; /* size of type in file */
+ size_t m_size1, m_size2; /* size of type in memory */
+
+ f_size1 = H5Tget_size( f_type1 );
+ f_size2 = H5Tget_size( f_type2 );
+ m_size1 = H5Tget_size( m_type1 );
+ m_size2 = H5Tget_size( m_type2 );
+
+ printf("\n");
+ printf("------------------\n");
+ printf("sizeof(char) %u\n", sizeof(char) );
+ printf("sizeof(short) %u\n", sizeof(short) );
+ printf("sizeof(int) %u\n", sizeof(int) );
+ printf("sizeof(long) %u\n", sizeof(long) );
+ printf("<%s> ------------------\n", obj1);
+ printf("type on file ");
+ print_datatype(f_type1);
+ printf("\n");
+ printf("size on file %u\n", f_size1 );
+
+ printf("type on memory ");
+ print_datatype(m_type1);
+ printf("\n");
+ printf("size on memory %u\n", m_size1 );
+
+ printf("<%s> ------------------\n", obj2);
+ printf("type on file ");
+ print_datatype(f_type2);
+ printf("\n");
+ printf("size on file %u\n", f_size2 );
+
+ printf("type on memory ");
+ print_datatype(m_type2);
+ printf("\n");
+ printf("size on memory %u\n", m_size2 );
+ printf("\n");
+}
+#endif /* H5DIFF_DEBUG */
+
+
diff --git a/tools/h5diff/h5trav.c b/tools/h5diff/h5trav.c
index b804746..f64bd37 100644
--- a/tools/h5diff/h5trav.c
+++ b/tools/h5diff/h5trav.c
@@ -12,24 +12,11 @@
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include <stdio.h>
-#include <stdlib.h>
-#include "hdf5.h"
#include "h5trav.h"
-#include "H5private.h"
+#include "H5private.h"
-#ifndef FALSE
-#define FALSE 0
-#endif
-#ifndef TRUE
-#define TRUE 1
-#endif
-
-#ifndef FAIL
-#define FAIL -1
-#endif
/* functions for traversal */
int traverse( hid_t loc_id, const char *group_name, table_t *table, info_t *info, int *idx );
@@ -74,6 +61,71 @@ int H5get_object_info( hid_t file_id, info_t *info )
}
+
+/*-------------------------------------------------------------------------
+ * Function: info_getindex
+ *
+ * Purpose: get index of OBJ in list
+ *
+ * Return: index, -1 if not found
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: May 9, 2003
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+int info_getindex( const char *obj, int nobjs, info_t *info )
+{
+ char *pdest;
+ int result;
+ int i;
+
+ for ( i = 0; i < nobjs; i++)
+ {
+ if ( strcmp(obj,info[i].name)==0 )
+ return i;
+
+ pdest = strstr( info[i].name, obj );
+ result = (int)(pdest - info[i].name);
+
+ /* found at position 1, meaning without '/' */
+ if( pdest != NULL && result==1 )
+ return i;
+ }
+ return -1;
+}
+
+
+
+/*-------------------------------------------------------------------------
+ * Function: info_free
+ *
+ * Purpose: free info memory
+ *
+ *-------------------------------------------------------------------------
+ */
+
+void info_free( info_t *info, int nobjs )
+{
+ int i;
+ if ( info )
+ {
+ for ( i = 0; i < nobjs; i++)
+ {
+ if (info[i].name)
+ HDfree( info[i].name );
+ }
+ HDfree(info);
+ }
+}
+
+
/*-------------------------------------------------------------------------
* Function: count_objects
*
@@ -95,7 +147,7 @@ static herr_t count_objects( hid_t loc_id, const char *name, void *op_data)
H5G_stat_t statbuf;
- if (H5Gget_objinfo( loc_id, name, FALSE, &statbuf) < 0 )
+ if (H5Gget_objinfo( loc_id, name, 0, &statbuf) < 0 )
return 1;
(*(int *)op_data)++;
@@ -158,7 +210,7 @@ static herr_t opget_info( hid_t loc_id, const char *name, void *op_data)
H5G_stat_t statbuf;
- if (H5Gget_objinfo( loc_id, name, FALSE, &statbuf) < 0 )
+ if (H5Gget_objinfo( loc_id, name, 0, &statbuf) < 0 )
return -1;
((info_t *)op_data)->type = statbuf.type;
@@ -244,7 +296,7 @@ int traverse( hid_t loc_id, const char *group_name, table_t *table, info_t *info
return -1;
/* allocate path buffer */
- path = (char*) malloc(strlen(group_name) + strlen(name) + 2);
+ path = (char*) HDmalloc(strlen(group_name) + strlen(name) + 2);
/* initialize path */
strcpy( path, group_name );
@@ -256,7 +308,7 @@ int traverse( hid_t loc_id, const char *group_name, table_t *table, info_t *info
H5E_BEGIN_TRY {
/* get info */
- H5Gget_objinfo( loc_id, path, TRUE, &statbuf);
+ H5Gget_objinfo( loc_id, path, 1, &statbuf);
} H5E_END_TRY;
/* add to array */
@@ -282,7 +334,7 @@ int traverse( hid_t loc_id, const char *group_name, table_t *table, info_t *info
inserted_objs++;
/* nlink is number of hard links to object */
- if (statbuf.nlink > 0 && table_search_obj(statbuf.objno, table ) == FAIL)
+ if (statbuf.nlink > 0 && table_search_obj(statbuf.objno, table ) == -1)
{
/* add object to table */
table_add_obj(statbuf.objno, path, H5G_GROUP, table );
@@ -322,7 +374,7 @@ int traverse( hid_t loc_id, const char *group_name, table_t *table, info_t *info
inserted_objs++;
/* nlink is number of hard links to object */
- if (statbuf.nlink > 0 && table_search_obj(statbuf.objno, table ) == FAIL)
+ if (statbuf.nlink > 0 && table_search_obj(statbuf.objno, table ) == -1)
{
/* add object to table */
table_add_obj(statbuf.objno, path, H5G_DATASET, table );
@@ -360,7 +412,7 @@ int traverse( hid_t loc_id, const char *group_name, table_t *table, info_t *info
inserted_objs++;
/* nlink is number of hard links to object */
- if (statbuf.nlink > 0 && table_search_obj(statbuf.objno, table ) == FAIL)
+ if (statbuf.nlink > 0 && table_search_obj(statbuf.objno, table ) == -1)
{
/* add object to table */
table_add_obj(statbuf.objno, path, H5G_TYPE, table );
@@ -393,10 +445,10 @@ int traverse( hid_t loc_id, const char *group_name, table_t *table, info_t *info
*/
if ( name )
- free( name );
+ HDfree( name );
if ( path )
- free( path );
+ HDfree( path );
} /* i */
@@ -405,220 +457,3 @@ int traverse( hid_t loc_id, const char *group_name, table_t *table, info_t *info
return inserted_objs;
}
-
-
-/*-------------------------------------------------------------------------
- * Function: table_search_obj
- *
- * Purpose:
- *
- * Return:
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: November 4, 2002
- *
- * Comments:
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-
-int table_search_obj(haddr_t objno, table_t *table )
-{
- int i;
-
- for (i = 0; i < table->nobjs; i++)
- if (table->objs[i].objno == objno)
- return i;
-
- return FAIL;
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: table_add_obj
- *
- * Purpose:
- *
- * Return:
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: November 4, 2002
- *
- * Comments:
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-
-void
-table_add_obj(haddr_t objno, char *objname, int type, table_t *table)
-{
- int i;
-
- if (table->nobjs == table->size) {
- table->size *= 2;
- table->objs = (obj_t*)realloc(table->objs, table->size * sizeof(obj_t));
-
- for (i = table->nobjs; i < table->size; i++) {
- table->objs[i].objno = 0;
- table->objs[i].flags[0] = table->objs[i].flags[1] = 0;
- table->objs[i].displayed = 0;
- table->objs[i].type = H5G_UNKNOWN;
- table->objs[i].objname = NULL;
- }
- }
-
- i = table->nobjs++;
- table->objs[i].objno = objno;
- table->objs[i].flags[0] = table->objs[i].flags[1] = 0;
- free(table->objs[i].objname);
- table->objs[i].objname = (char *)HDstrdup(objname);
- table->objs[i].type = type;
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: table_add_flags
- *
- * Purpose:
- *
- * Return:
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: November 4, 2002
- *
- * Comments:
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-
-void
-table_add_flags(unsigned *flags, char *objname, int type, table_t *table)
-{
- int i;
-
- if (table->nobjs == table->size) {
- table->size *= 2;
- table->objs = (obj_t*)realloc(table->objs, table->size * sizeof(obj_t));
-
- for (i = table->nobjs; i < table->size; i++) {
- table->objs[i].objno = 0;
- table->objs[i].flags[0] = table->objs[i].flags[1] = 0;
- table->objs[i].displayed = 0;
- table->objs[i].type = H5G_UNKNOWN;
- table->objs[i].objname = NULL;
- }
- }
-
- i = table->nobjs++;
- table->objs[i].objno = 0;
- table->objs[i].flags[0] = flags[0];
- table->objs[i].flags[1] = flags[1];
- free(table->objs[i].objname);
- table->objs[i].objname = (char *)HDstrdup(objname);
- table->objs[i].type = type;
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: table_init
- *
- * Purpose:
- *
- * Return:
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: November 4, 2002
- *
- * Comments:
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-
-void table_init( table_t **tbl )
-{
- int i;
- table_t* table = (table_t*) malloc(sizeof(table_t));
-
- table->size = 20;
- table->nobjs = 0;
- table->objs = (obj_t*) malloc(table->size * sizeof(obj_t));
-
- for (i = 0; i < table->size; i++) {
- table->objs[i].objno = 0;
- table->objs[i].flags[0] = table->objs[i].flags[1] = 0;
- table->objs[i].displayed = 0;
- table->objs[i].type = H5G_UNKNOWN;
- table->objs[i].objname = NULL;
- }
-
- *tbl = table;
-}
-
-
-
-/*-------------------------------------------------------------------------
- * Function: table_free
- *
- * Purpose: free table memory
- *
- * Return:
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: November 4, 2002
- *
- * Comments:
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-
-void table_free( table_t *table )
-{
- int i;
-
- for ( i = 0; i < table->nobjs; i++)
- free( table->objs[i].objname );
-
- free(table->objs);
- free(table);
-
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: info_free
- *
- * Purpose: free info memory
- *
- *-------------------------------------------------------------------------
- */
-
-void info_free( info_t *info, int nobjs )
-{
- int i;
- if ( info )
- {
- for ( i = 0; i < nobjs; i++)
- {
- if (info[i].name)
- free( info[i].name );
- }
- free(info);
- }
-
-}
-
diff --git a/tools/h5diff/h5trav.h b/tools/h5diff/h5trav.h
index 9eac307..250e0c3 100644
--- a/tools/h5diff/h5trav.h
+++ b/tools/h5diff/h5trav.h
@@ -12,27 +12,29 @@
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/*
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- * Monday, 4. November 2002
- */
#ifndef H5TRAV_H__
#define H5TRAV_H__
+#include "hdf5.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
+/*-------------------------------------------------------------------------
+ * struct to store name and type of an object
+ *-------------------------------------------------------------------------
+ */
-/*struct to store name and type of an object */
typedef struct info_t {
char *name;
int type;
} info_t;
-/*struct to store basic info about an object */
+
+/*-------------------------------------------------------------------------
+ * struct to store basic info about an object
+ *-------------------------------------------------------------------------
+ */
+
typedef struct obj_t {
haddr_t objno;
unsigned flags[2];
@@ -41,7 +43,12 @@ typedef struct obj_t {
int type;
} obj_t;
-/*struct that stores all objects, excluding shared objects */
+
+/*-------------------------------------------------------------------------
+ * struct that stores all objects, excluding shared objects
+ *-------------------------------------------------------------------------
+ */
+
typedef struct table_t {
int size;
int nobjs;
@@ -49,23 +56,34 @@ typedef struct table_t {
} table_t;
-/* public methods */
+/*-------------------------------------------------------------------------
+ * "info" public functions
+ *-------------------------------------------------------------------------
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
int H5get_object_info( hid_t file_id, info_t *info );
+int info_getindex( const char *obj, int nobjs, info_t *info );
+void info_free(info_t *info, int nobjs);
+
+#ifdef __cplusplus
+}
+#endif
+
+/*-------------------------------------------------------------------------
+ * table private functions
+ *-------------------------------------------------------------------------
+ */
-/* table methods */
void table_init(table_t **table);
void table_free(table_t *table);
int table_search_obj(haddr_t objno, table_t *table );
void table_add_obj(haddr_t objno, char *objname, int type, table_t *table);
void table_add_flags(unsigned *flags, char *objname, int type, table_t *table);
-void info_free(info_t *info, int nobjs);
-
-
-
-#ifdef __cplusplus
-}
-#endif
#endif /* H5TRAV_H__ */
diff --git a/tools/h5diff/h5trav_table.c b/tools/h5diff/h5trav_table.c
new file mode 100644
index 0000000..a6943bc
--- /dev/null
+++ b/tools/h5diff/h5trav_table.c
@@ -0,0 +1,210 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * 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 "h5diff.h"
+#include "H5private.h"
+
+/*-------------------------------------------------------------------------
+ * Function: table_search_obj
+ *
+ * Purpose:
+ *
+ * Return:
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 4, 2002
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+int table_search_obj(haddr_t objno, table_t *table )
+{
+ int i;
+
+ for (i = 0; i < table->nobjs; i++)
+ if (table->objs[i].objno == objno)
+ return i;
+
+ return -1;
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function: table_add_obj
+ *
+ * Purpose:
+ *
+ * Return:
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 4, 2002
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+void
+table_add_obj(haddr_t objno, char *objname, int type, table_t *table)
+{
+ int i;
+
+ if (table->nobjs == table->size) {
+ table->size *= 2;
+ table->objs = (obj_t*)HDrealloc(table->objs, table->size * sizeof(obj_t));
+
+ for (i = table->nobjs; i < table->size; i++) {
+ table->objs[i].objno = 0;
+ table->objs[i].flags[0] = table->objs[i].flags[1] = 0;
+ table->objs[i].displayed = 0;
+ table->objs[i].type = H5G_UNKNOWN;
+ table->objs[i].objname = NULL;
+ }
+ }
+
+ i = table->nobjs++;
+ table->objs[i].objno = objno;
+ table->objs[i].flags[0] = table->objs[i].flags[1] = 0;
+ HDfree(table->objs[i].objname);
+ table->objs[i].objname = (char *)HDstrdup(objname);
+ table->objs[i].type = type;
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function: table_add_flags
+ *
+ * Purpose:
+ *
+ * Return:
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 4, 2002
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+void
+table_add_flags(unsigned *flags, char *objname, int type, table_t *table)
+{
+ int i;
+
+ if (table->nobjs == table->size) {
+ table->size *= 2;
+ table->objs = (obj_t*)HDrealloc(table->objs, table->size * sizeof(obj_t));
+
+ for (i = table->nobjs; i < table->size; i++) {
+ table->objs[i].objno = 0;
+ table->objs[i].flags[0] = table->objs[i].flags[1] = 0;
+ table->objs[i].displayed = 0;
+ table->objs[i].type = H5G_UNKNOWN;
+ table->objs[i].objname = NULL;
+ }
+ }
+
+ i = table->nobjs++;
+ table->objs[i].objno = 0;
+ table->objs[i].flags[0] = flags[0];
+ table->objs[i].flags[1] = flags[1];
+ HDfree(table->objs[i].objname);
+ table->objs[i].objname = (char *)HDstrdup(objname);
+ table->objs[i].type = type;
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function: table_init
+ *
+ * Purpose:
+ *
+ * Return:
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 4, 2002
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+void table_init( table_t **tbl )
+{
+ int i;
+ table_t* table = (table_t*) HDmalloc(sizeof(table_t));
+
+ table->size = 20;
+ table->nobjs = 0;
+ table->objs = (obj_t*) HDmalloc(table->size * sizeof(obj_t));
+
+ for (i = 0; i < table->size; i++) {
+ table->objs[i].objno = 0;
+ table->objs[i].flags[0] = table->objs[i].flags[1] = 0;
+ table->objs[i].displayed = 0;
+ table->objs[i].type = H5G_UNKNOWN;
+ table->objs[i].objname = NULL;
+ }
+
+ *tbl = table;
+}
+
+
+
+/*-------------------------------------------------------------------------
+ * Function: table_free
+ *
+ * Purpose: free table memory
+ *
+ * Return:
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 4, 2002
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+void table_free( table_t *table )
+{
+ int i;
+
+ for ( i = 0; i < table->nobjs; i++)
+ HDfree( table->objs[i].objname );
+
+ HDfree(table->objs);
+ HDfree(table);
+
+}
+
+
diff --git a/tools/h5diff/h5difftst.c b/tools/h5diff/test_h5diff.c
index 783eb42..783eb42 100644
--- a/tools/h5diff/h5difftst.c
+++ b/tools/h5diff/test_h5diff.c