summaryrefslogtreecommitdiffstats
path: root/tools/lib/h5diff.c
diff options
context:
space:
mode:
Diffstat (limited to 'tools/lib/h5diff.c')
-rw-r--r--tools/lib/h5diff.c219
1 files changed, 123 insertions, 96 deletions
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index b275ab8..20b5136 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -5,12 +5,10 @@
* *
* 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://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have *
- * access to either file, you may request a copy from help@hdfgroup.org. *
+ * the COPYING file, which can be found at the root of the source code *
+ * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. *
+ * If you do not have access to either file, you may request a copy from *
+ * help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include <stdlib.h>
@@ -30,7 +28,8 @@
* 2) when diff was found (normal mode)
*-------------------------------------------------------------------------
*/
-int print_objname (diff_opt_t * options, hsize_t nfound)
+int
+print_objname (diff_opt_t * options, hsize_t nfound)
{
return ((options->m_verbose || nfound) && !options->m_quiet) ? 1 : 0;
}
@@ -46,7 +45,7 @@ void do_print_objname (const char *OBJ, const char *path1, const char *path2, di
{
/* if verbose level is higher than 0, put space line before
* displaying any object or symbolic links. This improves
- * readability of the output.
+ * readability of the output.
*/
if (opts->m_verbose_level >= 1)
parallel_print("\n");
@@ -70,7 +69,7 @@ do_print_attrname (const char *attr, const char *path1, const char *path2)
* Function: print_warn
*
* Purpose: check print warning condition.
- * Return:
+ * Return:
* 1 if verbose mode
* 0 if not verbos mode
* Programmer: Jonathan Kim
@@ -145,7 +144,7 @@ static void print_incoming_data(void)
*
* Purpose: check if options are valid
*
- * Return:
+ * Return:
* 1 : Valid
* 0 : Not valid
*
@@ -188,10 +187,10 @@ out:
*
* Purpose: check if 'paths' are part of exclude path list
*
- * Return:
+ * Return:
* 1 - excluded path
* 0 - not excluded path
- *
+ *
* Programmer: Jonathan Kim
* Date: Aug 23, 2010
*------------------------------------------------------------------------*/
@@ -220,11 +219,11 @@ static int is_exclude_path (char * path, h5trav_type_t type, diff_opt_t *options
{
size_t len_grp;
- /* check if given path belong to an excluding group, if so
+ /* check if given path belong to an excluding group, if so
* exclude it as well.
* This verifies if “/grp1/dset1” is only under “/grp1”, but
- * not under “/grp1xxx/” group.
- */
+ * not under “/grp1xxx/” group.
+ */
len_grp = HDstrlen(exclude_path_ptr->obj_path);
if (path[len_grp] == '/')
{
@@ -235,15 +234,15 @@ static int is_exclude_path (char * path, h5trav_type_t type, diff_opt_t *options
}
}
/* exclude target is not group, just exclude the object */
- else
+ else
{
ret_cmp = HDstrcmp(exclude_path_ptr->obj_path, path);
if (ret_cmp == 0) /* found matching object */
{
/* excluded non-group object */
ret = 1;
- /* remember the type of this maching object.
- * if it's group, it can be used for excluding its member
+ /* remember the type of this maching object.
+ * if it's group, it can be used for excluding its member
* objects in this while() loop */
exclude_path_ptr->obj_type = type;
break; /* while */
@@ -311,6 +310,7 @@ static void build_match_list (const char *objname1, trav_info_t *info1, const ch
trav_table_t *table;
size_t idx;
+ h5difftrace("build_match_list start\n");
/* init */
trav_table_init( &table );
@@ -337,7 +337,7 @@ static void build_match_list (const char *objname1, trav_info_t *info1, const ch
path2_lp = (info2->paths[curr2].path) + path2_offset;
type1_l = info1->paths[curr1].type;
type2_l = info2->paths[curr2].type;
-
+
/* criteria is string compare */
cmp = HDstrcmp(path1_lp, path2_lp);
@@ -408,21 +408,22 @@ static void build_match_list (const char *objname1, trav_info_t *info1, const ch
if (!is_exclude_path(path2_lp, type2_l, options))
{
trav_table_addflags(infile, path2_lp, info2->paths[curr2].type, table);
- }
+ }
curr2++;
} /* end while */
free_exclude_path_list (options);
*table_out = table;
+ h5difftrace("build_match_list finish\n");
}
/*-------------------------------------------------------------------------
* Function: trav_grp_objs
*
- * Purpose:
- * Call back function from h5trav_visit().
+ * Purpose:
+ * Call back function from h5trav_visit().
*
* Programmer: Jonathan Kim
*
@@ -434,22 +435,22 @@ static herr_t trav_grp_objs(const char *path, const H5O_info_t *oinfo,
trav_info_visit_obj(path, oinfo, already_visited, udata);
return 0;
-}
+}
/*-------------------------------------------------------------------------
* Function: trav_grp_symlinks
*
- * Purpose:
- * Call back function from h5trav_visit().
+ * Purpose:
+ * Call back function from h5trav_visit().
* Track and extra checkings while visiting all symbolic-links.
*
* Programmer: Jonathan Kim
*
* Date: Aug 16, 2010
*------------------------------------------------------------------------*/
-static herr_t trav_grp_symlinks(const char *path, const H5L_info_t *linfo,
+static herr_t trav_grp_symlinks(const char *path, const H5L_info_t *linfo,
void *udata)
-{
+{
trav_info_t *tinfo = (trav_info_t *)udata;
diff_opt_t *opts = (diff_opt_t *)tinfo->opts;
int ret;
@@ -483,14 +484,14 @@ static herr_t trav_grp_symlinks(const char *path, const H5L_info_t *linfo,
goto done;
}
- /* check if already visit the target object */
- if(symlink_is_visited( &(tinfo->symlink_visited), linfo->type, NULL, lnk_info.trg_path))
+ /* check if already visit the target object */
+ if(symlink_is_visited( &(tinfo->symlink_visited), linfo->type, NULL, lnk_info.trg_path))
goto done;
/* add this link as visited link */
- if(symlink_visit_add( &(tinfo->symlink_visited), linfo->type, NULL, lnk_info.trg_path) < 0)
+ if(symlink_visit_add( &(tinfo->symlink_visited), linfo->type, NULL, lnk_info.trg_path) < 0)
goto done;
-
+
if(h5trav_visit(tinfo->fid, path, TRUE, TRUE,
trav_grp_objs,trav_grp_symlinks, tinfo) < 0)
{
@@ -499,8 +500,8 @@ static herr_t trav_grp_symlinks(const char *path, const H5L_info_t *linfo,
goto done;
}
break;
-
- case H5L_TYPE_EXTERNAL:
+
+ case H5L_TYPE_EXTERNAL:
ret = H5tools_get_symlink_info(tinfo->fid, path, &lnk_info, opts->follow_links);
/* error */
if (ret < 0)
@@ -515,17 +516,17 @@ static herr_t trav_grp_symlinks(const char *path, const H5L_info_t *linfo,
goto done;
}
- if(H5Lunpack_elink_val(lnk_info.trg_path, linfo->u.val_size, NULL, &ext_fname, &ext_path) < 0)
+ if(H5Lunpack_elink_val(lnk_info.trg_path, linfo->u.val_size, NULL, &ext_fname, &ext_path) < 0)
goto done;
- /* check if already visit the target object */
- if(symlink_is_visited( &(tinfo->symlink_visited), linfo->type, ext_fname, ext_path))
+ /* check if already visit the target object */
+ if(symlink_is_visited( &(tinfo->symlink_visited), linfo->type, ext_fname, ext_path))
goto done;
/* add this link as visited link */
- if(symlink_visit_add( &(tinfo->symlink_visited), linfo->type, ext_fname, ext_path) < 0)
+ if(symlink_visit_add( &(tinfo->symlink_visited), linfo->type, ext_fname, ext_path) < 0)
goto done;
-
+
if(h5trav_visit(tinfo->fid, path, TRUE, TRUE,
trav_grp_objs,trav_grp_symlinks, tinfo) < 0)
{
@@ -545,11 +546,11 @@ static herr_t trav_grp_symlinks(const char *path, const H5L_info_t *linfo,
break;
} /* end of switch */
-done:
+done:
if (lnk_info.trg_path)
- HDfree((char *)lnk_info.trg_path);
+ HDfree(lnk_info.trg_path);
return 0;
-}
+}
/*-------------------------------------------------------------------------
@@ -603,6 +604,7 @@ hsize_t h5diff(const char *fname1,
/* list for common objects */
trav_table_t *match_list = NULL;
+ h5difftrace("h5diff start\n");
/* init filenames */
HDmemset(filenames, 0, MAX_FILENAME * 2);
/* init link info struct */
@@ -626,7 +628,7 @@ hsize_t h5diff(const char *fname1,
H5E_BEGIN_TRY
{
/* open file 1 */
- if((file1_id = h5tools_fopen(fname1, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0)
+ if((file1_id = h5tools_fopen(fname1, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0)
{
parallel_print("h5diff: <%s>: unable to open file\n", fname1);
options->err_stat = 1;
@@ -635,7 +637,7 @@ hsize_t h5diff(const char *fname1,
/* open file 2 */
- if((file2_id = h5tools_fopen(fname2, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0)
+ if((file2_id = h5tools_fopen(fname2, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0)
{
parallel_print("h5diff: <%s>: unable to open file\n", fname2);
options->err_stat = 1;
@@ -651,6 +653,7 @@ hsize_t h5diff(const char *fname1,
trav_info_init(fname1, file1_id, &info1_obj);
trav_info_init(fname2, file2_id, &info2_obj);
+ h5difftrace("trav_info_init initialized\n");
/* if any object is specified */
if (objname1)
{
@@ -676,7 +679,8 @@ hsize_t h5diff(const char *fname1,
{
#ifdef H5_HAVE_ASPRINTF
/* Use the asprintf() routine, since it does what we're trying to do below */
- HDasprintf(&obj2fullname, "/%s", objname2);
+ if(HDasprintf(&obj2fullname, "/%s", objname2) < 0)
+ goto out;
#else /* H5_HAVE_ASPRINTF */
/* (malloc 2 more for "/" and end-of-line) */
obj2fullname = (char*)HDmalloc(HDstrlen(objname2) + 2);
@@ -690,6 +694,7 @@ hsize_t h5diff(const char *fname1,
/*----------------------------------------------------------
* check if obj1 is root, group, single object or symlink
*/
+ h5difftrace("h5diff check if obj1 is root, group, single object or symlink\n");
if(!HDstrcmp(obj1fullname, "/"))
{
obj1type = H5TRAV_TYPE_GROUP;
@@ -697,14 +702,14 @@ hsize_t h5diff(const char *fname1,
else
{
/* check if link itself exist */
- if(H5Lexists(file1_id, obj1fullname, H5P_DEFAULT) <= 0)
+ if(H5Lexists(file1_id, obj1fullname, H5P_DEFAULT) <= 0)
{
parallel_print ("Object <%s> could not be found in <%s>\n", obj1fullname, fname1);
options->err_stat = 1;
goto out;
}
/* get info from link */
- if(H5Lget_info(file1_id, obj1fullname, &src_linfo1, H5P_DEFAULT) < 0)
+ if(H5Lget_info(file1_id, obj1fullname, &src_linfo1, H5P_DEFAULT) < 0)
{
parallel_print("Unable to get link info from <%s>\n", obj1fullname);
goto out;
@@ -712,7 +717,7 @@ hsize_t h5diff(const char *fname1,
info1_lp = info1_obj;
- /*
+ /*
* check the type of specified path for hard and symbolic links
*/
if(src_linfo1.type == H5L_TYPE_HARD)
@@ -749,6 +754,7 @@ hsize_t h5diff(const char *fname1,
/*----------------------------------------------------------
* check if obj2 is root, group, single object or symlink
*/
+ h5difftrace("h5diff check if obj2 is root, group, single object or symlink\n");
if(!HDstrcmp(obj2fullname, "/"))
{
obj2type = H5TRAV_TYPE_GROUP;
@@ -756,14 +762,14 @@ hsize_t h5diff(const char *fname1,
else
{
/* check if link itself exist */
- if(H5Lexists(file2_id, obj2fullname, H5P_DEFAULT) <= 0)
+ if(H5Lexists(file2_id, obj2fullname, H5P_DEFAULT) <= 0)
{
parallel_print ("Object <%s> could not be found in <%s>\n", obj2fullname, fname2);
options->err_stat = 1;
goto out;
}
/* get info from link */
- if(H5Lget_info(file2_id, obj2fullname, &src_linfo2, H5P_DEFAULT) < 0)
+ if(H5Lget_info(file2_id, obj2fullname, &src_linfo2, H5P_DEFAULT) < 0)
{
parallel_print("Unable to get link info from <%s>\n", obj2fullname);
goto out;
@@ -771,7 +777,7 @@ hsize_t h5diff(const char *fname1,
info2_lp = info2_obj;
- /*
+ /*
* check the type of specified path for hard and symbolic links
*/
if(src_linfo2.type == H5L_TYPE_HARD)
@@ -803,11 +809,12 @@ hsize_t h5diff(const char *fname1,
obj2type = H5TRAV_TYPE_UDLINK;
trav_info_add(info2_obj, obj2fullname, obj2type);
}
- }
+ }
}
/* if no object specified */
else
{
+ h5difftrace("h5diff no object specified\n");
/* set root group */
obj1fullname = (char*)HDstrdup("/");
obj1type = H5TRAV_TYPE_GROUP;
@@ -821,7 +828,7 @@ hsize_t h5diff(const char *fname1,
l_ret2 = H5tools_get_symlink_info(file2_id, obj2fullname, &trg_linfo2, options->follow_links);
/*---------------------------------------------
- * check for following symlinks
+ * check for following symlinks
*/
if (options->follow_links)
{
@@ -832,9 +839,11 @@ hsize_t h5diff(const char *fname1,
/*-------------------------------
* check symbolic link (object1)
*/
+ h5difftrace("h5diff check symbolic link (object1)\n");
/* dangling link */
if (l_ret1 == 0)
{
+ h5difftrace("h5diff ... dangling link\n");
if (options->no_dangle_links)
{
/* treat dangling link is error */
@@ -864,22 +873,26 @@ hsize_t h5diff(const char *fname1,
else if(l_ret1 != 2) /* symbolic link */
{
obj1type = (h5trav_type_t)trg_linfo1.trg_type;
+ h5difftrace("h5diff ... ... trg_linfo1.trg_type == H5L_TYPE_HARD\n");
if (info1_lp != NULL) {
size_t idx = info1_lp->nused - 1;
+ h5difftrace("h5diff ... ... ... info1_obj not null\n");
info1_lp->paths[idx].type = (h5trav_type_t)trg_linfo1.trg_type;
info1_lp->paths[idx].objno = trg_linfo1.objno;
info1_lp->paths[idx].fileno = trg_linfo1.fileno;
}
+ h5difftrace("h5diff check symbolic link (object1) finished\n");
}
/*-------------------------------
* check symbolic link (object2)
*/
-
+ h5difftrace("h5diff check symbolic link (object2)\n");
/* dangling link */
if (l_ret2 == 0)
{
+ h5difftrace("h5diff ... dangling link\n");
if (options->no_dangle_links)
{
/* treat dangling link is error */
@@ -900,7 +913,7 @@ hsize_t h5diff(const char *fname1,
}
}
}
- else if(l_ret2 < 0) /* fail */
+ else if(l_ret2 < 0) /* fail */
{
parallel_print ("Object <%s> could not be found in <%s>\n", obj2fullname, fname2);
options->err_stat = 1;
@@ -912,22 +925,25 @@ hsize_t h5diff(const char *fname1,
if (info2_lp != NULL) {
size_t idx = info2_lp->nused - 1;
+ h5difftrace("h5diff ... ... ... info2_obj not null\n");
info2_lp->paths[idx].type = (h5trav_type_t)trg_linfo2.trg_type;
info2_lp->paths[idx].objno = trg_linfo2.objno;
info2_lp->paths[idx].fileno = trg_linfo2.fileno;
}
+ h5difftrace("h5diff check symbolic link (object1) finished\n");
}
} /* end of if follow symlinks */
- /*
+ /*
* If verbose options is not used, don't need to traverse through the list
* of objects in the group to display objects information,
- * So use h5tools_is_obj_same() to improve performance by skipping
- * comparing details of same objects.
+ * So use h5tools_is_obj_same() to improve performance by skipping
+ * comparing details of same objects.
*/
if(!(options->m_verbose || options->m_report))
{
+ h5difftrace("h5diff NOT (options->m_verbose || options->m_report)\n");
/* if no danglink links */
if ( l_ret1 > 0 && l_ret2 > 0 )
if (h5tools_is_obj_same(file1_id, obj1fullname, file2_id, obj2fullname)!=0)
@@ -937,6 +953,7 @@ hsize_t h5diff(const char *fname1,
both_objs_grp = (obj1type == H5TRAV_TYPE_GROUP && obj2type == H5TRAV_TYPE_GROUP);
if (both_objs_grp)
{
+ h5difftrace("h5diff both_objs_grp TRUE\n");
/*
* traverse group1
*/
@@ -1048,9 +1065,9 @@ out:
/* free link info buffer */
if (trg_linfo1.trg_path)
- HDfree((char *)trg_linfo1.trg_path);
+ HDfree(trg_linfo1.trg_path);
if (trg_linfo2.trg_path)
- HDfree((char *)trg_linfo2.trg_path);
+ HDfree(trg_linfo2.trg_path);
/* close */
H5E_BEGIN_TRY
@@ -1058,6 +1075,7 @@ out:
H5Fclose(file1_id);
H5Fclose(file2_id);
} H5E_END_TRY;
+ h5difftrace("h5diff finish\n");
return nfound;
}
@@ -1067,10 +1085,10 @@ out:
/*-------------------------------------------------------------------------
* Function: diff_match
*
- * Purpose:
- * Compare common objects in given groups according to table structure.
- * The table structure has flags which can be used to find common objects
- * and will be compared.
+ * Purpose:
+ * Compare common objects in given groups according to table structure.
+ * The table structure has flags which can be used to find common objects
+ * and will be compared.
* Common object means same name (absolute path) objects in both location.
*
* Return: Number of differences found
@@ -1105,7 +1123,8 @@ hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
size_t idx2 = 0;
- /*
+ h5difftrace("diff_match start\n");
+ /*
* if not root, prepare object name to be pre-appended to group path to
* make full path
*/
@@ -1120,8 +1139,8 @@ hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
* 2) the graph must match, i.e same names (absolute path)
* 3) objects with the same name must be of the same type
*-------------------------------------------------------------------------
- */
-
+ */
+
/* not valid compare used when --exclude-path option is used */
if (!options->exclude_path)
{
@@ -1131,7 +1150,7 @@ hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
options->contents = 0;
}
}
-
+
/* objects in one file and not the other */
for( i = 0; i < table->nobjs; i++)
{
@@ -1188,7 +1207,7 @@ hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
#endif /* H5_HAVE_ASPRINTF */
/* get index to figure out type of the object in file1 */
- while(info1->paths[idx1].path &&
+ while(info1->paths[idx1].path &&
(HDstrcmp(obj1_fullpath, info1->paths[idx1].path) != 0))
idx1++;
/* get index to figure out type of the object in file2 */
@@ -1205,7 +1224,7 @@ hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
if(!g_Parallel)
{
nfound += diff(file1_id, obj1_fullpath,
- file2_id, obj2_fullpath,
+ file2_id, obj2_fullpath,
options, &argdata);
} /* end if */
#ifdef H5_HAVE_PARALLEL
@@ -1213,6 +1232,7 @@ hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
{
int workerFound = 0;
+ h5difftrace("Beginning of big else block\n");
/* We're in parallel mode */
/* Since the data type of diff value is hsize_t which can
* be arbitary large such that there is no MPI type that
@@ -1222,7 +1242,7 @@ hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
*/
/*Set up args to pass to worker task. */
- if(HDstrlen(obj1_fullpath) > 255 ||
+ if(HDstrlen(obj1_fullpath) > 255 ||
HDstrlen(obj2_fullpath) > 255)
{
printf("The parallel diff only supports object names up to 255 characters\n");
@@ -1379,10 +1399,11 @@ hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
#endif /* H5_HAVE_PARALLEL */
if(obj1_fullpath)
HDfree(obj1_fullpath);
- if(obj2_fullpath)
+ if(obj2_fullpath)
HDfree(obj2_fullpath);
} /* end if */
} /* end for */
+ h5difftrace("done with for loop\n");
#ifdef H5_HAVE_PARALLEL
if(g_Parallel)
@@ -1469,6 +1490,7 @@ hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
/* Print any final data waiting in our queue */
print_incoming_data();
} /* end if */
+ h5difftrace("done with if block\n");
HDfree(workerTasks);
}
@@ -1478,6 +1500,7 @@ out:
/* free table */
if (table)
trav_table_free(table);
+ h5difftrace("diff_match finish\n");
return nfound;
}
@@ -1533,6 +1556,8 @@ hsize_t diff(hid_t file1_id,
h5tool_link_info_t linkinfo1;
h5tool_link_info_t linkinfo2;
+ h5difftrace("diff start\n");
+
/*init link info struct */
HDmemset(&linkinfo1,0,sizeof(h5tool_link_info_t));
HDmemset(&linkinfo2,0,sizeof(h5tool_link_info_t));
@@ -1541,14 +1566,14 @@ hsize_t diff(hid_t file1_id,
if(print_warn(options))
linkinfo1.opt.msg_mode = linkinfo2.opt.msg_mode = 1;
- /* for symbolic links, take care follow symlink and no dangling link
+ /* for symbolic links, take care follow symlink and no dangling link
* options */
- if (argdata->type[0] == H5TRAV_TYPE_LINK ||
+ if (argdata->type[0] == H5TRAV_TYPE_LINK ||
argdata->type[0] == H5TRAV_TYPE_UDLINK ||
- argdata->type[1] == H5TRAV_TYPE_LINK ||
+ argdata->type[1] == H5TRAV_TYPE_LINK ||
argdata->type[1] == H5TRAV_TYPE_UDLINK )
{
- /*
+ /*
* check dangling links for path1 and path2
*/
@@ -1587,7 +1612,7 @@ hsize_t diff(hid_t file1_id,
}
else if (ret < 0)
goto out;
-
+
/* found dangling link */
if (is_dangle_link1 || is_dangle_link2)
goto out2;
@@ -1610,7 +1635,7 @@ hsize_t diff(hid_t file1_id,
if (options->m_verbose||options->m_list_not_cmp)
{
parallel_print("Not comparable: <%s> is of type %s and <%s> is of type %s\n",
- path1, get_type(argdata->type[0]),
+ path1, get_type(argdata->type[0]),
path2, get_type(argdata->type[1]));
}
options->not_cmp=1;
@@ -1621,17 +1646,18 @@ hsize_t diff(hid_t file1_id,
}
else /* now both object types are same */
object_type = argdata->type[0];
-
- /*
+
+ /*
* If both points to the same target object, skip comparing details inside
* of the objects to improve performance.
- * Always check for the hard links, otherwise if follow symlink option is
+ * Always check for the hard links, otherwise if follow symlink option is
* specified.
*
* Perform this to match the outputs as bypassing.
*/
if (argdata->is_same_trgobj)
{
+ h5difftrace("argdata->is_same_trgobj\n");
is_hard_link = (object_type == H5TRAV_TYPE_DATASET ||
object_type == H5TRAV_TYPE_NAMED_DATATYPE ||
object_type == H5TRAV_TYPE_GROUP);
@@ -1644,7 +1670,7 @@ hsize_t diff(hid_t file1_id,
{
case H5TRAV_TYPE_DATASET:
do_print_objname("dataset", path1, path2, options);
- break;
+ break;
case H5TRAV_TYPE_NAMED_DATATYPE:
do_print_objname("datatype", path1, path2, options);
break;
@@ -1659,7 +1685,7 @@ hsize_t diff(hid_t file1_id,
do_print_objname("external link", path1, path2, options);
else
do_print_objname ("user defined link", path1, path2, options);
- break;
+ break;
case H5TRAV_TYPE_UNKNOWN:
default:
parallel_print("Comparison not supported: <%s> and <%s> are of type %s\n",
@@ -1707,14 +1733,14 @@ hsize_t diff(hid_t file1_id,
if (nfound)
{
do_print_objname("dataset", path1, path2, options);
- print_found(nfound);
+ print_found(nfound);
}
}
/*---------------------------------------------------------
* compare attributes
- * if condition refers to cases when the dataset is a
+ * if condition refers to cases when the dataset is a
* referenced object
*---------------------------------------------------------
*/
@@ -1753,7 +1779,7 @@ hsize_t diff(hid_t file1_id,
/*-----------------------------------------------------------------
* compare attributes
- * the if condition refers to cases when the dataset is a
+ * the if condition refers to cases when the dataset is a
* referenced object
*-----------------------------------------------------------------
*/
@@ -1785,7 +1811,7 @@ hsize_t diff(hid_t file1_id,
/*-----------------------------------------------------------------
* compare attributes
- * the if condition refers to cases when the dataset is a
+ * the if condition refers to cases when the dataset is a
* referenced object
*-----------------------------------------------------------------
*/
@@ -1827,10 +1853,10 @@ hsize_t diff(hid_t file1_id,
case H5TRAV_TYPE_UDLINK:
{
/* Only external links will have a query function registered */
- if(linkinfo1.linfo.type == H5L_TYPE_EXTERNAL && linkinfo2.linfo.type == H5L_TYPE_EXTERNAL)
+ if(linkinfo1.linfo.type == H5L_TYPE_EXTERNAL && linkinfo2.linfo.type == H5L_TYPE_EXTERNAL)
{
/* If the buffers are the same size, compare them */
- if(linkinfo1.linfo.u.val_size == linkinfo2.linfo.u.val_size)
+ if(linkinfo1.linfo.u.val_size == linkinfo2.linfo.u.val_size)
{
ret = HDmemcmp(linkinfo1.trg_path, linkinfo2.trg_path, linkinfo1.linfo.u.val_size);
}
@@ -1838,7 +1864,7 @@ hsize_t diff(hid_t file1_id,
ret = 1;
/* if "linkinfo1.trg_path" != "linkinfo2.trg_path" then the links
- * are "different" extlinkinfo#.path is combination string of
+ * are "different" extlinkinfo#.path is combination string of
* file_name and obj_name
*/
nfound = (ret != 0) ? 1 : 0;
@@ -1847,7 +1873,7 @@ hsize_t diff(hid_t file1_id,
do_print_objname("external link", path1, path2, options);
} /* end if */
- else
+ else
{
/* If one or both of these links isn't an external link, we can only
* compare information from H5Lget_info since we don't have a query
@@ -1856,7 +1882,7 @@ hsize_t diff(hid_t file1_id,
* If the link classes or the buffer length are not the
* same, the links are "different"
*/
- if((linkinfo1.linfo.type != linkinfo2.linfo.type) ||
+ if((linkinfo1.linfo.type != linkinfo2.linfo.type) ||
(linkinfo1.linfo.u.val_size != linkinfo2.linfo.u.val_size))
nfound = 1;
else
@@ -1883,9 +1909,9 @@ hsize_t diff(hid_t file1_id,
/* free link info buffer */
if (linkinfo1.trg_path)
- HDfree((char *)linkinfo1.trg_path);
+ HDfree(linkinfo1.trg_path);
if (linkinfo2.trg_path)
- HDfree((char *)linkinfo2.trg_path);
+ HDfree(linkinfo2.trg_path);
return nfound;
@@ -1894,7 +1920,7 @@ out:
out2:
/*-----------------------------------
- * handle dangling link(s)
+ * handle dangling link(s)
*/
/* both path1 and path2 are dangling links */
if(is_dangle_link1 && is_dangle_link2)
@@ -1926,9 +1952,9 @@ out2:
/* free link info buffer */
if (linkinfo1.trg_path)
- HDfree((char *)linkinfo1.trg_path);
+ HDfree(linkinfo1.trg_path);
if (linkinfo2.trg_path)
- HDfree((char *)linkinfo2.trg_path);
+ HDfree(linkinfo2.trg_path);
/* close */
/* disable error reporting */
@@ -1939,6 +1965,7 @@ out2:
H5Tclose(grp2_id);
/* enable error reporting */
} H5E_END_TRY;
+ h5difftrace("diff finish\n");
return nfound;
}
generated by cgit v0.12 at 2024-08-22 05:48:43 (GMT)