2003-04-03 02:44:12 +08:00
|
|
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
2007-02-07 22:56:24 +08:00
|
|
|
* Copyright by The HDF Group. *
|
2003-04-03 02:44:12 +08:00
|
|
|
* 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 *
|
2007-02-07 22:56:24 +08:00
|
|
|
* 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. *
|
2003-04-03 02:44:12 +08:00
|
|
|
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
|
|
|
|
2004-04-18 12:10:09 +08:00
|
|
|
#include <stdlib.h>
|
2011-02-09 05:35:54 +08:00
|
|
|
|
2005-01-27 07:03:29 +08:00
|
|
|
#include "H5private.h"
|
2009-06-16 03:05:42 +08:00
|
|
|
#include "h5tools.h"
|
|
|
|
#include "h5tools_utils.h"
|
2011-02-09 05:35:54 +08:00
|
|
|
#include "h5diff.h"
|
|
|
|
#include "ph5diff.h"
|
2002-10-10 00:33:05 +08:00
|
|
|
|
2005-06-29 00:25:42 +08:00
|
|
|
|
2004-07-21 03:21:03 +08:00
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
* Function: print_objname
|
|
|
|
*
|
2007-02-20 04:21:09 +08:00
|
|
|
* Purpose: check if object name is to be printed, only when:
|
2004-07-21 03:21:03 +08:00
|
|
|
* 1) verbose mode
|
|
|
|
* 2) when diff was found (normal mode)
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
*/
|
2011-03-22 23:47:07 +08:00
|
|
|
int print_objname (diff_opt_t * options, hsize_t nfound)
|
2004-07-21 03:21:03 +08:00
|
|
|
{
|
2008-05-01 03:51:13 +08:00
|
|
|
return ((options->m_verbose || nfound) && !options->m_quiet) ? 1 : 0;
|
2004-07-21 03:21:03 +08:00
|
|
|
}
|
|
|
|
|
2007-02-20 04:21:09 +08:00
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
* Function: do_print_objname
|
|
|
|
*
|
2008-09-16 23:52:51 +08:00
|
|
|
* Purpose: print object name
|
2007-02-20 04:21:09 +08:00
|
|
|
*
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
*/
|
2011-03-22 23:47:07 +08:00
|
|
|
void do_print_objname (const char *OBJ, const char *path1, const char *path2, diff_opt_t * opts)
|
2007-02-20 04:21:09 +08:00
|
|
|
{
|
2011-03-22 23:47:07 +08:00
|
|
|
/* if verbose level is higher than 0, put space line before
|
|
|
|
* displaying any object or symbolic links. This improves
|
|
|
|
* readability of the output.
|
|
|
|
*/
|
|
|
|
if (opts->m_verbose_level >= 1)
|
|
|
|
parallel_print("\n");
|
2007-02-22 04:05:04 +08:00
|
|
|
parallel_print("%-7s: <%s> and <%s>\n", OBJ, path1, path2);
|
2007-02-20 04:21:09 +08:00
|
|
|
}
|
|
|
|
|
2011-03-22 23:47:07 +08:00
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
* Function: do_print_attrname
|
|
|
|
*
|
|
|
|
* Purpose: print attribute name
|
|
|
|
*
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
do_print_attrname (const char *attr, const char *path1, const char *path2)
|
|
|
|
{
|
|
|
|
parallel_print("%-7s: <%s> and <%s>\n", attr, path1, path2);
|
|
|
|
}
|
|
|
|
|
2010-02-17 03:43:05 +08:00
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
* Function: print_warn
|
|
|
|
*
|
|
|
|
* Purpose: check print warning condition.
|
|
|
|
* Return:
|
|
|
|
* 1 if verbose mode
|
|
|
|
* 0 if not verbos mode
|
|
|
|
* Programmer: Jonathan Kim
|
|
|
|
* Date: Feb 4, 2010
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
*/
|
|
|
|
static int print_warn(diff_opt_t *options)
|
|
|
|
{
|
|
|
|
return ((options->m_verbose))?1:0;
|
|
|
|
}
|
2007-02-20 04:21:09 +08:00
|
|
|
|
|
|
|
|
2005-02-08 13:42:49 +08:00
|
|
|
#ifdef H5_HAVE_PARALLEL
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
* Function: phdiff_dismiss_workers
|
|
|
|
*
|
|
|
|
* Purpose: tell all workers to end.
|
|
|
|
*
|
|
|
|
* Return: none
|
|
|
|
*
|
|
|
|
* Programmer: Albert Cheng
|
|
|
|
*
|
|
|
|
* Date: Feb 6, 2005
|
|
|
|
*
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
*/
|
|
|
|
void phdiff_dismiss_workers(void)
|
|
|
|
{
|
2010-02-17 03:43:05 +08:00
|
|
|
int i;
|
|
|
|
for(i=1; i<g_nTasks; i++)
|
|
|
|
MPI_Send(NULL, 0, MPI_BYTE, i, MPI_TAG_END, MPI_COMM_WORLD);
|
2005-02-08 13:42:49 +08:00
|
|
|
}
|
|
|
|
|
2005-02-08 21:42:46 +08:00
|
|
|
|
[svn-r10170] Purpose:
Bug Fixes
Description:
Fixes for several bugs, including dumping of excess output to a temporary file, fix for printing
hsize_t datatype, and the long awaited fix for intermixed output.
Solution:
Fix 1: Overflow file
Previously, any output that a worker task made was buffered locally in memory, up to a point. Any
output beyond the size of the buffer (used to be 10k) was discarded. Now, the memory buffer size has been
changed to 1k and any output beyond this amount is sent a temporary file. This way, no output is lost
and memory usage is kept under control. The temporary file is deleted as soon as a worker task finishes
sending its contents to the manager.
Fix 2: hsize_t printing
Printing of the hsize_t datatype used to be handled by %Hu passed to HDfprintf. However, there is no corresponding HDvsnprintf that
is able to print hsize_t types. These are now printed with the aid of H5_PRINTF_LL_WIDTH.
Fix 3: Intermixed output fix
Intermixed output would occur on some machines (although I haven't seen it happen for a while) due to the unpredictability of the underlying network
and the speed at which various message would travel. This has been fixed by having all output send to the manager
for printing. The worker tasks no longer print the output themselves upon receipt of a token, but instead
send that data to the manager.
Platforms tested:
heping, eirene, tg-login (the only place that seems to still experience intermixed output every now and then)
Misc. update:
2005-03-10 02:38:36 +08:00
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
* Function: print_incoming_data
|
|
|
|
*
|
|
|
|
* Purpose: special function that prints any output that has been sent to the manager
|
2005-06-29 00:25:42 +08:00
|
|
|
* and is currently sitting in the incoming message queue
|
[svn-r10170] Purpose:
Bug Fixes
Description:
Fixes for several bugs, including dumping of excess output to a temporary file, fix for printing
hsize_t datatype, and the long awaited fix for intermixed output.
Solution:
Fix 1: Overflow file
Previously, any output that a worker task made was buffered locally in memory, up to a point. Any
output beyond the size of the buffer (used to be 10k) was discarded. Now, the memory buffer size has been
changed to 1k and any output beyond this amount is sent a temporary file. This way, no output is lost
and memory usage is kept under control. The temporary file is deleted as soon as a worker task finishes
sending its contents to the manager.
Fix 2: hsize_t printing
Printing of the hsize_t datatype used to be handled by %Hu passed to HDfprintf. However, there is no corresponding HDvsnprintf that
is able to print hsize_t types. These are now printed with the aid of H5_PRINTF_LL_WIDTH.
Fix 3: Intermixed output fix
Intermixed output would occur on some machines (although I haven't seen it happen for a while) due to the unpredictability of the underlying network
and the speed at which various message would travel. This has been fixed by having all output send to the manager
for printing. The worker tasks no longer print the output themselves upon receipt of a token, but instead
send that data to the manager.
Platforms tested:
heping, eirene, tg-login (the only place that seems to still experience intermixed output every now and then)
Misc. update:
2005-03-10 02:38:36 +08:00
|
|
|
*
|
|
|
|
* Return: none
|
|
|
|
*
|
|
|
|
* Programmer: Leon Arber
|
|
|
|
*
|
|
|
|
* Date: March 7, 2005
|
|
|
|
*
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void print_incoming_data(void)
|
|
|
|
{
|
2010-02-17 03:43:05 +08:00
|
|
|
char data[PRINT_DATA_MAX_SIZE+1];
|
|
|
|
int incomingMessage;
|
|
|
|
MPI_Status Status;
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
|
|
|
MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_PRINT_DATA, MPI_COMM_WORLD, &incomingMessage, &Status);
|
|
|
|
if(incomingMessage)
|
|
|
|
{
|
2012-02-24 03:08:09 +08:00
|
|
|
HDmemset(data, 0, PRINT_DATA_MAX_SIZE+1);
|
2010-02-17 03:43:05 +08:00
|
|
|
MPI_Recv(data, PRINT_DATA_MAX_SIZE, MPI_CHAR, Status.MPI_SOURCE, MPI_TAG_PRINT_DATA, MPI_COMM_WORLD, &Status);
|
|
|
|
|
|
|
|
printf("%s", data);
|
|
|
|
}
|
|
|
|
} while(incomingMessage);
|
[svn-r10170] Purpose:
Bug Fixes
Description:
Fixes for several bugs, including dumping of excess output to a temporary file, fix for printing
hsize_t datatype, and the long awaited fix for intermixed output.
Solution:
Fix 1: Overflow file
Previously, any output that a worker task made was buffered locally in memory, up to a point. Any
output beyond the size of the buffer (used to be 10k) was discarded. Now, the memory buffer size has been
changed to 1k and any output beyond this amount is sent a temporary file. This way, no output is lost
and memory usage is kept under control. The temporary file is deleted as soon as a worker task finishes
sending its contents to the manager.
Fix 2: hsize_t printing
Printing of the hsize_t datatype used to be handled by %Hu passed to HDfprintf. However, there is no corresponding HDvsnprintf that
is able to print hsize_t types. These are now printed with the aid of H5_PRINTF_LL_WIDTH.
Fix 3: Intermixed output fix
Intermixed output would occur on some machines (although I haven't seen it happen for a while) due to the unpredictability of the underlying network
and the speed at which various message would travel. This has been fixed by having all output send to the manager
for printing. The worker tasks no longer print the output themselves upon receipt of a token, but instead
send that data to the manager.
Platforms tested:
heping, eirene, tg-login (the only place that seems to still experience intermixed output every now and then)
Misc. update:
2005-03-10 02:38:36 +08:00
|
|
|
}
|
2005-02-10 02:19:54 +08:00
|
|
|
#endif
|
|
|
|
|
2010-02-19 00:51:12 +08:00
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
* Function: is_valid_options
|
|
|
|
*
|
|
|
|
* Purpose: check if options are valid
|
|
|
|
*
|
|
|
|
* Return:
|
|
|
|
* 1 : Valid
|
|
|
|
* 0 : Not valid
|
|
|
|
*
|
|
|
|
* Programmer: Jonathan Kim
|
|
|
|
*
|
|
|
|
* Date: Feb 17, 2010
|
|
|
|
*
|
|
|
|
*------------------------------------------------------------------------*/
|
|
|
|
static int is_valid_options(diff_opt_t *options)
|
|
|
|
{
|
|
|
|
int ret=1; /* init to valid */
|
|
|
|
|
|
|
|
/*-----------------------------------------------
|
|
|
|
* no -q(quiet) with -v (verbose) or -r (report) */
|
|
|
|
if(options->m_quiet && (options->m_verbose || options->m_report))
|
|
|
|
{
|
|
|
|
parallel_print("Error: -q (quiet mode) cannot be added to verbose or report modes\n");
|
|
|
|
options->err_stat=1;
|
|
|
|
ret = 0;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* -------------------------------------------------------
|
2010-05-22 04:12:22 +08:00
|
|
|
* only allow --no-dangling-links along with --follow-symlinks */
|
2010-02-19 00:51:12 +08:00
|
|
|
if(options->no_dangle_links && !options->follow_links)
|
|
|
|
{
|
2010-05-22 04:12:22 +08:00
|
|
|
parallel_print("Error: --no-dangling-links must be used along with --follow-symlinks option.\n");
|
2010-02-19 00:51:12 +08:00
|
|
|
options->err_stat=1;
|
|
|
|
ret = 0;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2010-09-17 05:46:16 +08:00
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
* Function: is_exclude_path
|
|
|
|
*
|
|
|
|
* Purpose: check if 'paths' are part of exclude path list
|
|
|
|
*
|
|
|
|
* Return:
|
|
|
|
* 1 - excluded path
|
|
|
|
* 0 - not excluded path
|
|
|
|
*
|
|
|
|
* Programmer: Jonathan Kim
|
|
|
|
* Date: Aug 23, 2010
|
|
|
|
*------------------------------------------------------------------------*/
|
2010-09-21 06:11:50 +08:00
|
|
|
static int is_exclude_path (char * path, h5trav_type_t type, diff_opt_t *options)
|
2010-09-17 05:46:16 +08:00
|
|
|
{
|
|
|
|
struct exclude_path_list * exclude_path_ptr;
|
|
|
|
int ret_cmp;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
/* check if exclude path option is given */
|
|
|
|
if (!options->exclude_path)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* assign to local exclude list pointer */
|
|
|
|
exclude_path_ptr = options->exclude;
|
|
|
|
|
|
|
|
/* search objects in exclude list */
|
|
|
|
while (NULL != exclude_path_ptr)
|
|
|
|
{
|
2012-03-22 05:00:15 +08:00
|
|
|
/* if exclude path is is group, exclude its members as well */
|
2010-09-17 05:46:16 +08:00
|
|
|
if (exclude_path_ptr->obj_type == H5TRAV_TYPE_GROUP)
|
|
|
|
{
|
2010-09-21 06:11:50 +08:00
|
|
|
ret_cmp = HDstrncmp(exclude_path_ptr->obj_path, path,
|
2012-02-24 22:27:57 +08:00
|
|
|
HDstrlen(exclude_path_ptr->obj_path));
|
2012-03-22 05:00:15 +08:00
|
|
|
if (ret_cmp == 0) /* found matching members */
|
2010-09-17 05:46:16 +08:00
|
|
|
{
|
[svn-r23395] Description:
Bring Coverity changes from branch to trunk:
r20682:
fixed coverity:
76, 77, 635, 636, 1164, 1165, 1166, 1121, 1122, 1117, 1343
Tested on:
Mac OSX/64 10.8.3 (amazon) w/C++ & FORTRAN
(too minor to require h5committest)
2013-03-20 11:44:28 +08:00
|
|
|
size_t len_grp;
|
|
|
|
|
2010-09-17 05:46:16 +08:00
|
|
|
/* 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.
|
|
|
|
*/
|
|
|
|
len_grp = HDstrlen(exclude_path_ptr->obj_path);
|
2010-09-21 06:11:50 +08:00
|
|
|
if (path[len_grp] == '/')
|
2010-09-17 05:46:16 +08:00
|
|
|
{
|
|
|
|
/* belong to excluded group! */
|
|
|
|
ret = 1;
|
|
|
|
break; /* while */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* exclude target is not group, just exclude the object */
|
|
|
|
else
|
|
|
|
{
|
2010-09-21 06:11:50 +08:00
|
|
|
ret_cmp = HDstrcmp(exclude_path_ptr->obj_path, path);
|
2012-03-22 05:00:15 +08:00
|
|
|
if (ret_cmp == 0) /* found matching object */
|
2010-09-17 05:46:16 +08:00
|
|
|
{
|
|
|
|
/* excluded non-group object */
|
|
|
|
ret = 1;
|
2012-03-22 05:00:15 +08:00
|
|
|
/* remember the type of this maching object.
|
|
|
|
* if it's group, it can be used for excluding its member
|
|
|
|
* objects in this while() loop */
|
2010-09-21 06:11:50 +08:00
|
|
|
exclude_path_ptr->obj_type = type;
|
2010-09-17 05:46:16 +08:00
|
|
|
break; /* while */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
exclude_path_ptr = exclude_path_ptr->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
* Function: free_exclude_path_list
|
|
|
|
*
|
|
|
|
* Purpose: free exclud object list from diff options
|
|
|
|
*
|
|
|
|
* Programmer: Jonathan Kim
|
|
|
|
* Date: Aug 23, 2010
|
|
|
|
*------------------------------------------------------------------------*/
|
|
|
|
static void free_exclude_path_list(diff_opt_t *options)
|
|
|
|
{
|
|
|
|
struct exclude_path_list * curr = options->exclude;
|
|
|
|
struct exclude_path_list * next;
|
|
|
|
|
|
|
|
while (NULL != curr)
|
|
|
|
{
|
|
|
|
next = curr->next;
|
|
|
|
HDfree(curr);
|
|
|
|
curr = next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-09-17 01:48:06 +08:00
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
* Function: build_match_list
|
|
|
|
*
|
|
|
|
* Purpose: get list of matching path_name from info1 and info2
|
|
|
|
*
|
|
|
|
* Note:
|
|
|
|
* Find common objects; the algorithm used for this search is the
|
|
|
|
* cosequential match algorithm and is described in
|
|
|
|
* Folk, Michael; Zoellick, Bill. (1992). File Structures. Addison-Wesley.
|
|
|
|
* Moved out from diff_match() to make code more flexible.
|
|
|
|
*
|
|
|
|
* Parameter:
|
|
|
|
* table_out [OUT] : return the list
|
|
|
|
*
|
|
|
|
* Programmer: Jonathan Kim
|
|
|
|
*
|
|
|
|
* Date: Aug 18, 2010
|
|
|
|
*------------------------------------------------------------------------*/
|
|
|
|
static void build_match_list (const char *objname1, trav_info_t *info1, const char *objname2, trav_info_t *info2, trav_table_t ** table_out, diff_opt_t *options)
|
|
|
|
{
|
|
|
|
size_t curr1 = 0;
|
|
|
|
size_t curr2 = 0;
|
|
|
|
unsigned infile[2];
|
|
|
|
char * path1_lp;
|
|
|
|
char * path2_lp;
|
2010-09-21 06:11:50 +08:00
|
|
|
h5trav_type_t type1_l;
|
|
|
|
h5trav_type_t type2_l;
|
[svn-r23395] Description:
Bring Coverity changes from branch to trunk:
r20682:
fixed coverity:
76, 77, 635, 636, 1164, 1165, 1166, 1121, 1122, 1117, 1343
Tested on:
Mac OSX/64 10.8.3 (amazon) w/C++ & FORTRAN
(too minor to require h5committest)
2013-03-20 11:44:28 +08:00
|
|
|
size_t path1_offset = 0;
|
|
|
|
size_t path2_offset = 0;
|
2010-09-17 01:48:06 +08:00
|
|
|
int cmp;
|
|
|
|
trav_table_t *table;
|
2011-05-07 06:02:24 +08:00
|
|
|
size_t idx;
|
2010-09-17 01:48:06 +08:00
|
|
|
|
2012-08-04 04:11:36 +08:00
|
|
|
h5difftrace("build_match_list start\n");
|
2010-09-17 01:48:06 +08:00
|
|
|
/* init */
|
|
|
|
trav_table_init( &table );
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This is necessary for the case that given objects are group and
|
|
|
|
* have different names (ex: obj1 is /grp1 and obj2 is /grp5).
|
|
|
|
* All the objects belong to given groups are the cadidates.
|
|
|
|
* So prepare to compare paths without the group names.
|
|
|
|
*/
|
2012-08-04 04:11:36 +08:00
|
|
|
|
2010-09-17 01:48:06 +08:00
|
|
|
/* if obj1 is not root */
|
|
|
|
if (HDstrcmp (objname1,"/") != 0)
|
|
|
|
path1_offset = HDstrlen(objname1);
|
|
|
|
/* if obj2 is not root */
|
|
|
|
if (HDstrcmp (objname2,"/") != 0)
|
|
|
|
path2_offset = HDstrlen(objname2);
|
|
|
|
|
|
|
|
/*--------------------------------------------------
|
|
|
|
* build the list
|
|
|
|
*/
|
|
|
|
while(curr1 < info1->nused && curr2 < info2->nused)
|
|
|
|
{
|
|
|
|
path1_lp = (info1->paths[curr1].path) + path1_offset;
|
|
|
|
path2_lp = (info2->paths[curr2].path) + path2_offset;
|
2010-09-21 06:11:50 +08:00
|
|
|
type1_l = info1->paths[curr1].type;
|
|
|
|
type2_l = info2->paths[curr2].type;
|
2010-09-17 01:48:06 +08:00
|
|
|
|
|
|
|
/* criteria is string compare */
|
|
|
|
cmp = HDstrcmp(path1_lp, path2_lp);
|
|
|
|
|
2012-08-04 04:11:36 +08:00
|
|
|
if(cmp == 0)
|
|
|
|
{
|
2010-09-21 06:11:50 +08:00
|
|
|
if(!is_exclude_path(path1_lp, type1_l, options))
|
2010-09-17 05:46:16 +08:00
|
|
|
{
|
|
|
|
infile[0] = 1;
|
|
|
|
infile[1] = 1;
|
|
|
|
trav_table_addflags(infile, path1_lp, info1->paths[curr1].type, table);
|
2011-05-07 06:02:24 +08:00
|
|
|
/* if the two point to the same target object,
|
|
|
|
* mark that in table */
|
|
|
|
if (info1->paths[curr1].fileno == info2->paths[curr2].fileno &&
|
|
|
|
info1->paths[curr1].objno == info2->paths[curr2].objno )
|
|
|
|
{
|
|
|
|
idx = table->nobjs - 1;
|
|
|
|
table->objs[idx].is_same_trgobj = 1;
|
|
|
|
}
|
2010-09-17 05:46:16 +08:00
|
|
|
}
|
2010-09-17 01:48:06 +08:00
|
|
|
curr1++;
|
|
|
|
curr2++;
|
|
|
|
} /* end if */
|
|
|
|
else if(cmp < 0)
|
|
|
|
{
|
2010-09-21 06:11:50 +08:00
|
|
|
if(!is_exclude_path(path1_lp, type1_l, options))
|
2010-09-17 05:46:16 +08:00
|
|
|
{
|
|
|
|
infile[0] = 1;
|
|
|
|
infile[1] = 0;
|
|
|
|
trav_table_addflags(infile, path1_lp, info1->paths[curr1].type, table);
|
|
|
|
}
|
2010-09-17 01:48:06 +08:00
|
|
|
curr1++;
|
|
|
|
} /* end else-if */
|
|
|
|
else
|
|
|
|
{
|
2010-09-21 06:11:50 +08:00
|
|
|
if (!is_exclude_path(path2_lp, type2_l, options))
|
2010-09-17 05:46:16 +08:00
|
|
|
{
|
|
|
|
infile[0] = 0;
|
|
|
|
infile[1] = 1;
|
|
|
|
trav_table_addflags(infile, path2_lp, info2->paths[curr2].type, table);
|
|
|
|
}
|
2010-09-17 01:48:06 +08:00
|
|
|
curr2++;
|
|
|
|
} /* end else */
|
|
|
|
} /* end while */
|
|
|
|
|
|
|
|
/* list1 did not end */
|
|
|
|
infile[0] = 1;
|
|
|
|
infile[1] = 0;
|
|
|
|
while(curr1 < info1->nused)
|
|
|
|
{
|
2012-03-22 05:00:15 +08:00
|
|
|
path1_lp = (info1->paths[curr1].path) + path1_offset;
|
|
|
|
type1_l = info1->paths[curr1].type;
|
|
|
|
|
2010-09-21 06:11:50 +08:00
|
|
|
if(!is_exclude_path(path1_lp, type1_l, options))
|
2010-09-17 05:46:16 +08:00
|
|
|
{
|
|
|
|
trav_table_addflags(infile, path1_lp, info1->paths[curr1].type, table);
|
|
|
|
}
|
2010-09-17 01:48:06 +08:00
|
|
|
curr1++;
|
|
|
|
} /* end while */
|
|
|
|
|
|
|
|
/* list2 did not end */
|
|
|
|
infile[0] = 0;
|
|
|
|
infile[1] = 1;
|
|
|
|
while(curr2 < info2->nused)
|
|
|
|
{
|
2012-03-22 05:00:15 +08:00
|
|
|
path2_lp = (info2->paths[curr2].path) + path2_offset;
|
|
|
|
type2_l = info2->paths[curr2].type;
|
|
|
|
|
2010-09-21 06:11:50 +08:00
|
|
|
if (!is_exclude_path(path2_lp, type2_l, options))
|
2010-09-17 05:46:16 +08:00
|
|
|
{
|
|
|
|
trav_table_addflags(infile, path2_lp, info2->paths[curr2].type, table);
|
|
|
|
}
|
2010-09-17 01:48:06 +08:00
|
|
|
curr2++;
|
|
|
|
} /* end while */
|
|
|
|
|
2010-09-17 05:46:16 +08:00
|
|
|
free_exclude_path_list (options);
|
2010-09-17 01:48:06 +08:00
|
|
|
|
|
|
|
*table_out = table;
|
2012-08-04 04:11:36 +08:00
|
|
|
h5difftrace("build_match_list finish\n");
|
2010-09-17 01:48:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
* Function: trav_grp_objs
|
|
|
|
*
|
|
|
|
* Purpose:
|
|
|
|
* Call back function from h5trav_visit().
|
|
|
|
*
|
|
|
|
* Programmer: Jonathan Kim
|
|
|
|
*
|
|
|
|
* Date: Aug 16, 2010
|
|
|
|
*------------------------------------------------------------------------*/
|
|
|
|
static herr_t trav_grp_objs(const char *path, const H5O_info_t *oinfo,
|
|
|
|
const char *already_visited, void *udata)
|
|
|
|
{
|
|
|
|
trav_info_visit_obj(path, oinfo, already_visited, udata);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
* Function: trav_grp_symlinks
|
|
|
|
*
|
|
|
|
* 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,
|
|
|
|
void *udata)
|
|
|
|
{
|
|
|
|
trav_info_t *tinfo = (trav_info_t *)udata;
|
|
|
|
diff_opt_t *opts = (diff_opt_t *)tinfo->opts;
|
|
|
|
int ret;
|
|
|
|
h5tool_link_info_t lnk_info;
|
|
|
|
const char *ext_fname;
|
|
|
|
const char *ext_path;
|
|
|
|
|
|
|
|
/* init linkinfo struct */
|
2012-02-24 03:08:09 +08:00
|
|
|
HDmemset(&lnk_info, 0, sizeof(h5tool_link_info_t));
|
2010-09-17 01:48:06 +08:00
|
|
|
|
|
|
|
if (!opts->follow_links)
|
|
|
|
{
|
|
|
|
trav_info_visit_lnk(path, linfo, tinfo);
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch(linfo->type)
|
|
|
|
{
|
|
|
|
case H5L_TYPE_SOFT:
|
|
|
|
ret = H5tools_get_symlink_info(tinfo->fid, path, &lnk_info, opts->follow_links);
|
|
|
|
/* error */
|
|
|
|
if (ret < 0)
|
|
|
|
goto done;
|
|
|
|
/* no dangling link option given and detect dangling link */
|
|
|
|
else if (ret == 0)
|
|
|
|
{
|
|
|
|
tinfo->symlink_visited.dangle_link = TRUE;
|
|
|
|
trav_info_visit_lnk(path, linfo, tinfo);
|
|
|
|
if (opts->no_dangle_links)
|
|
|
|
opts->err_stat = 1; /* make dgangling link is error */
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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)
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
if(h5trav_visit(tinfo->fid, path, TRUE, TRUE,
|
|
|
|
trav_grp_objs,trav_grp_symlinks, tinfo) < 0)
|
|
|
|
{
|
|
|
|
parallel_print("Error: Could not get file contents\n");
|
|
|
|
opts->err_stat = 1;
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case H5L_TYPE_EXTERNAL:
|
|
|
|
ret = H5tools_get_symlink_info(tinfo->fid, path, &lnk_info, opts->follow_links);
|
|
|
|
/* error */
|
|
|
|
if (ret < 0)
|
|
|
|
goto done;
|
|
|
|
/* no dangling link option given and detect dangling link */
|
|
|
|
else if (ret == 0)
|
|
|
|
{
|
|
|
|
tinfo->symlink_visited.dangle_link = TRUE;
|
|
|
|
trav_info_visit_lnk(path, linfo, tinfo);
|
|
|
|
if (opts->no_dangle_links)
|
|
|
|
opts->err_stat = 1; /* make dgangling link is error */
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
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))
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
/* add this link as visited link */
|
|
|
|
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)
|
|
|
|
{
|
|
|
|
parallel_print("Error: Could not get file contents\n");
|
|
|
|
opts->err_stat = 1;
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
;
|
|
|
|
break;
|
|
|
|
} /* end of switch */
|
|
|
|
|
|
|
|
done:
|
|
|
|
if (lnk_info.trg_path)
|
2012-02-29 02:26:34 +08:00
|
|
|
HDfree((char *)lnk_info.trg_path);
|
2010-09-17 01:48:06 +08:00
|
|
|
return 0;
|
|
|
|
}
|
2010-02-19 00:51:12 +08:00
|
|
|
|
2010-02-17 03:43:05 +08:00
|
|
|
|
2002-10-10 00:33:05 +08:00
|
|
|
/*-------------------------------------------------------------------------
|
2003-10-23 05:30:19 +08:00
|
|
|
* Function: h5diff
|
2002-10-10 00:33:05 +08:00
|
|
|
*
|
2004-07-21 03:21:03 +08:00
|
|
|
* Purpose: public function, can be called in an application program.
|
2003-10-23 05:30:19 +08:00
|
|
|
* return differences between 2 HDF5 files
|
2002-10-10 00:33:05 +08:00
|
|
|
*
|
2004-07-21 03:21:03 +08:00
|
|
|
* Return: Number of differences found.
|
2002-10-10 00:33:05 +08:00
|
|
|
*
|
|
|
|
* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
|
|
|
|
*
|
2003-10-23 05:30:19 +08:00
|
|
|
* Date: October 22, 2003
|
2002-10-10 00:33:05 +08:00
|
|
|
*
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
*/
|
2006-01-24 04:46:34 +08:00
|
|
|
hsize_t h5diff(const char *fname1,
|
|
|
|
const char *fname2,
|
|
|
|
const char *objname1,
|
|
|
|
const char *objname2,
|
|
|
|
diff_opt_t *options)
|
2002-10-10 00:33:05 +08:00
|
|
|
{
|
2008-05-01 03:51:13 +08:00
|
|
|
hid_t file1_id = (-1);
|
|
|
|
hid_t file2_id = (-1);
|
2010-09-17 01:48:06 +08:00
|
|
|
char filenames[2][MAX_FILENAME];
|
2007-09-06 23:54:22 +08:00
|
|
|
hsize_t nfound = 0;
|
2010-09-17 01:48:06 +08:00
|
|
|
int i;
|
2012-03-10 04:34:37 +08:00
|
|
|
int l_ret1 = -1;
|
|
|
|
int l_ret2 = -1;
|
[svn-r23395] Description:
Bring Coverity changes from branch to trunk:
r20682:
fixed coverity:
76, 77, 635, 636, 1164, 1165, 1166, 1121, 1122, 1117, 1343
Tested on:
Mac OSX/64 10.8.3 (amazon) w/C++ & FORTRAN
(too minor to require h5committest)
2013-03-20 11:44:28 +08:00
|
|
|
char * obj1fullname = NULL;
|
|
|
|
char * obj2fullname = NULL;
|
2012-08-04 04:11:36 +08:00
|
|
|
int both_objs_grp = 0;
|
2010-09-17 01:48:06 +08:00
|
|
|
/* init to group type */
|
|
|
|
h5trav_type_t obj1type = H5TRAV_TYPE_GROUP;
|
|
|
|
h5trav_type_t obj2type = H5TRAV_TYPE_GROUP;
|
|
|
|
/* for single object */
|
|
|
|
H5O_info_t oinfo1, oinfo2; /* object info */
|
|
|
|
trav_info_t *info1_obj = NULL;
|
|
|
|
trav_info_t *info2_obj = NULL;
|
|
|
|
/* for group object */
|
|
|
|
trav_info_t *info1_grp = NULL;
|
|
|
|
trav_info_t *info2_grp = NULL;
|
|
|
|
/* local pointer */
|
|
|
|
trav_info_t *info1_lp;
|
|
|
|
trav_info_t *info2_lp;
|
|
|
|
/* link info from specified object */
|
|
|
|
H5L_info_t src_linfo1;
|
|
|
|
H5L_info_t src_linfo2;
|
|
|
|
/* link info from member object */
|
|
|
|
h5tool_link_info_t trg_linfo1;
|
|
|
|
h5tool_link_info_t trg_linfo2;
|
|
|
|
/* list for common objects */
|
|
|
|
trav_table_t *match_list = NULL;
|
|
|
|
|
2012-08-04 04:11:36 +08:00
|
|
|
h5difftrace("h5diff start\n");
|
2010-09-17 01:48:06 +08:00
|
|
|
/* init filenames */
|
|
|
|
HDmemset(filenames, 0, MAX_FILENAME * 2);
|
|
|
|
/* init link info struct */
|
|
|
|
HDmemset(&trg_linfo1, 0, sizeof(h5tool_link_info_t));
|
|
|
|
HDmemset(&trg_linfo2, 0, sizeof(h5tool_link_info_t));
|
2006-06-27 22:45:06 +08:00
|
|
|
|
2010-02-19 00:51:12 +08:00
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
* check invalid combination of options
|
|
|
|
*-----------------------------------------------------------------------*/
|
|
|
|
if(!is_valid_options(options))
|
|
|
|
goto out;
|
|
|
|
|
2011-05-07 06:02:24 +08:00
|
|
|
options->cmn_objs = 1; /* eliminate warning */
|
|
|
|
|
2007-09-06 23:54:22 +08:00
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
* open the files first; if they are not valid, no point in continuing
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
*/
|
2006-06-27 22:45:06 +08:00
|
|
|
|
2007-09-06 23:54:22 +08:00
|
|
|
/* disable error reporting */
|
2008-09-16 23:52:51 +08:00
|
|
|
H5E_BEGIN_TRY
|
2008-05-01 03:51:13 +08:00
|
|
|
{
|
2009-06-16 03:05:42 +08:00
|
|
|
/* open file 1 */
|
2010-02-17 03:43:05 +08:00
|
|
|
if((file1_id = h5tools_fopen(fname1, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0)
|
2008-05-01 03:51:13 +08:00
|
|
|
{
|
2009-01-30 02:58:36 +08:00
|
|
|
parallel_print("h5diff: <%s>: unable to open file\n", fname1);
|
2007-09-06 23:54:22 +08:00
|
|
|
options->err_stat = 1;
|
|
|
|
goto out;
|
2007-09-13 23:44:56 +08:00
|
|
|
} /* end if */
|
2009-06-16 03:05:42 +08:00
|
|
|
|
|
|
|
|
|
|
|
/* open file 2 */
|
2010-02-17 03:43:05 +08:00
|
|
|
if((file2_id = h5tools_fopen(fname2, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0)
|
2008-05-01 03:51:13 +08:00
|
|
|
{
|
2009-01-30 02:58:36 +08:00
|
|
|
parallel_print("h5diff: <%s>: unable to open file\n", fname2);
|
2007-09-06 23:54:22 +08:00
|
|
|
options->err_stat = 1;
|
|
|
|
goto out;
|
2007-09-13 23:44:56 +08:00
|
|
|
} /* end if */
|
2007-09-06 23:54:22 +08:00
|
|
|
/* enable error reporting */
|
2007-09-13 23:44:56 +08:00
|
|
|
} H5E_END_TRY;
|
2007-09-06 23:54:22 +08:00
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
* Initialize the info structs
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
*/
|
2010-09-17 01:48:06 +08:00
|
|
|
trav_info_init(fname1, file1_id, &info1_obj);
|
|
|
|
trav_info_init(fname2, file2_id, &info2_obj);
|
2007-09-06 23:54:22 +08:00
|
|
|
|
2012-08-04 04:11:36 +08:00
|
|
|
h5difftrace("trav_info_init initialized\n");
|
2010-09-17 01:48:06 +08:00
|
|
|
/* if any object is specified */
|
|
|
|
if (objname1)
|
2008-05-01 03:51:13 +08:00
|
|
|
{
|
2010-09-17 01:48:06 +08:00
|
|
|
/* malloc 2 more for "/" and end-of-line */
|
|
|
|
obj1fullname = (char*)HDcalloc(HDstrlen(objname1) + 2, sizeof(char));
|
|
|
|
obj2fullname = (char*)HDcalloc(HDstrlen(objname2) + 2, sizeof(char));
|
|
|
|
|
|
|
|
/* make the given object1 fullpath, start with "/" */
|
|
|
|
if (HDstrncmp(objname1, "/", 1))
|
|
|
|
{
|
[svn-r23395] Description:
Bring Coverity changes from branch to trunk:
r20682:
fixed coverity:
76, 77, 635, 636, 1164, 1165, 1166, 1121, 1122, 1117, 1343
Tested on:
Mac OSX/64 10.8.3 (amazon) w/C++ & FORTRAN
(too minor to require h5committest)
2013-03-20 11:44:28 +08:00
|
|
|
HDstrcpy(obj1fullname, "/");
|
|
|
|
HDstrcat(obj1fullname, objname1);
|
2010-09-17 01:48:06 +08:00
|
|
|
}
|
|
|
|
else
|
[svn-r23395] Description:
Bring Coverity changes from branch to trunk:
r20682:
fixed coverity:
76, 77, 635, 636, 1164, 1165, 1166, 1121, 1122, 1117, 1343
Tested on:
Mac OSX/64 10.8.3 (amazon) w/C++ & FORTRAN
(too minor to require h5committest)
2013-03-20 11:44:28 +08:00
|
|
|
HDstrcpy(obj1fullname, objname1);
|
2010-09-17 01:48:06 +08:00
|
|
|
|
|
|
|
/* make the given object2 fullpath, start with "/" */
|
|
|
|
if (HDstrncmp(objname2, "/", 1))
|
|
|
|
{
|
[svn-r23395] Description:
Bring Coverity changes from branch to trunk:
r20682:
fixed coverity:
76, 77, 635, 636, 1164, 1165, 1166, 1121, 1122, 1117, 1343
Tested on:
Mac OSX/64 10.8.3 (amazon) w/C++ & FORTRAN
(too minor to require h5committest)
2013-03-20 11:44:28 +08:00
|
|
|
HDstrcpy(obj2fullname, "/");
|
|
|
|
HDstrcat(obj2fullname, objname2);
|
2010-09-17 01:48:06 +08:00
|
|
|
}
|
|
|
|
else
|
[svn-r23395] Description:
Bring Coverity changes from branch to trunk:
r20682:
fixed coverity:
76, 77, 635, 636, 1164, 1165, 1166, 1121, 1122, 1117, 1343
Tested on:
Mac OSX/64 10.8.3 (amazon) w/C++ & FORTRAN
(too minor to require h5committest)
2013-03-20 11:44:28 +08:00
|
|
|
HDstrcpy(obj2fullname, objname2);
|
2010-09-17 01:48:06 +08:00
|
|
|
|
|
|
|
/*----------------------------------------------------------
|
|
|
|
* check if obj1 is root, group, single object or symlink
|
|
|
|
*/
|
2012-08-04 04:11:36 +08:00
|
|
|
h5difftrace("h5diff check if obj1 is root, group, single object or symlink\n");
|
[svn-r23395] Description:
Bring Coverity changes from branch to trunk:
r20682:
fixed coverity:
76, 77, 635, 636, 1164, 1165, 1166, 1121, 1122, 1117, 1343
Tested on:
Mac OSX/64 10.8.3 (amazon) w/C++ & FORTRAN
(too minor to require h5committest)
2013-03-20 11:44:28 +08:00
|
|
|
if(!HDstrcmp(obj1fullname, "/"))
|
2010-09-17 01:48:06 +08:00
|
|
|
{
|
|
|
|
obj1type = H5TRAV_TYPE_GROUP;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* check if link itself exist */
|
|
|
|
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)
|
|
|
|
{
|
|
|
|
parallel_print("Unable to get link info from <%s>\n", obj1fullname);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
info1_lp = info1_obj;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* check the type of specified path for hard and symbolic links
|
|
|
|
*/
|
|
|
|
if(src_linfo1.type == H5L_TYPE_HARD)
|
|
|
|
{
|
2012-08-04 04:11:36 +08:00
|
|
|
int idx = 0;
|
2010-09-17 01:48:06 +08:00
|
|
|
/* optional data pass */
|
|
|
|
info1_obj->opts = (diff_opt_t*)options;
|
|
|
|
|
|
|
|
if(H5Oget_info_by_name(file1_id, obj1fullname, &oinfo1, H5P_DEFAULT) < 0)
|
|
|
|
{
|
|
|
|
parallel_print("Error: Could not get file contents\n");
|
|
|
|
options->err_stat = 1;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
obj1type = oinfo1.type;
|
|
|
|
trav_info_add(info1_obj, obj1fullname, obj1type);
|
2012-08-04 04:11:36 +08:00
|
|
|
idx = info1_obj->nused - 1;
|
|
|
|
info1_obj->paths[idx].objno = oinfo1.addr;
|
|
|
|
info1_obj->paths[idx].fileno = oinfo1.fileno;
|
2010-09-17 01:48:06 +08:00
|
|
|
}
|
|
|
|
else if (src_linfo1.type == H5L_TYPE_SOFT)
|
|
|
|
{
|
|
|
|
obj1type = H5TRAV_TYPE_LINK;
|
|
|
|
trav_info_add(info1_obj, obj1fullname, obj1type);
|
|
|
|
}
|
|
|
|
else if (src_linfo1.type == H5L_TYPE_EXTERNAL)
|
|
|
|
{
|
|
|
|
obj1type = H5TRAV_TYPE_UDLINK;
|
|
|
|
trav_info_add(info1_obj, obj1fullname, obj1type);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*----------------------------------------------------------
|
|
|
|
* check if obj2 is root, group, single object or symlink
|
|
|
|
*/
|
2012-08-04 04:11:36 +08:00
|
|
|
h5difftrace("h5diff check if obj2 is root, group, single object or symlink\n");
|
2010-09-17 01:48:06 +08:00
|
|
|
if(!HDstrcmp(obj2fullname, "/"))
|
|
|
|
{
|
|
|
|
obj2type = H5TRAV_TYPE_GROUP;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* check if link itself exist */
|
|
|
|
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)
|
|
|
|
{
|
|
|
|
parallel_print("Unable to get link info from <%s>\n", obj2fullname);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
info2_lp = info2_obj;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* check the type of specified path for hard and symbolic links
|
|
|
|
*/
|
|
|
|
if(src_linfo2.type == H5L_TYPE_HARD)
|
|
|
|
{
|
2012-08-04 04:11:36 +08:00
|
|
|
int idx = 0;
|
2010-09-17 01:48:06 +08:00
|
|
|
/* optional data pass */
|
|
|
|
info2_obj->opts = (diff_opt_t*)options;
|
|
|
|
|
|
|
|
if(H5Oget_info_by_name(file2_id, obj2fullname, &oinfo2, H5P_DEFAULT) < 0)
|
|
|
|
{
|
|
|
|
parallel_print("Error: Could not get file contents\n");
|
|
|
|
options->err_stat = 1;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
obj2type = oinfo2.type;
|
|
|
|
trav_info_add(info2_obj, obj2fullname, obj2type);
|
2012-08-04 04:11:36 +08:00
|
|
|
idx = info2_obj->nused - 1;
|
|
|
|
info2_obj->paths[idx].objno = oinfo2.addr;
|
|
|
|
info2_obj->paths[idx].fileno = oinfo2.fileno;
|
2010-09-17 01:48:06 +08:00
|
|
|
}
|
|
|
|
else if (src_linfo2.type == H5L_TYPE_SOFT)
|
|
|
|
{
|
|
|
|
obj2type = H5TRAV_TYPE_LINK;
|
|
|
|
trav_info_add(info2_obj, obj2fullname, obj2type);
|
|
|
|
}
|
|
|
|
else if (src_linfo2.type == H5L_TYPE_EXTERNAL)
|
|
|
|
{
|
|
|
|
obj2type = H5TRAV_TYPE_UDLINK;
|
|
|
|
trav_info_add(info2_obj, obj2fullname, obj2type);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* if no object specified */
|
2008-09-16 23:52:51 +08:00
|
|
|
else
|
2008-05-01 03:51:13 +08:00
|
|
|
{
|
2012-08-04 04:11:36 +08:00
|
|
|
h5difftrace("h5diff no object specified\n");
|
2010-09-17 01:48:06 +08:00
|
|
|
/* set root group */
|
2013-09-14 05:11:30 +08:00
|
|
|
obj1fullname = (char*)HDcalloc((size_t)2, sizeof(char));
|
[svn-r23395] Description:
Bring Coverity changes from branch to trunk:
r20682:
fixed coverity:
76, 77, 635, 636, 1164, 1165, 1166, 1121, 1122, 1117, 1343
Tested on:
Mac OSX/64 10.8.3 (amazon) w/C++ & FORTRAN
(too minor to require h5committest)
2013-03-20 11:44:28 +08:00
|
|
|
HDstrcat(obj1fullname, "/");
|
2012-08-04 04:11:36 +08:00
|
|
|
obj1type = H5TRAV_TYPE_GROUP;
|
2013-09-14 05:11:30 +08:00
|
|
|
obj2fullname = (char*)HDcalloc((size_t)2, sizeof(char));
|
[svn-r23395] Description:
Bring Coverity changes from branch to trunk:
r20682:
fixed coverity:
76, 77, 635, 636, 1164, 1165, 1166, 1121, 1122, 1117, 1343
Tested on:
Mac OSX/64 10.8.3 (amazon) w/C++ & FORTRAN
(too minor to require h5committest)
2013-03-20 11:44:28 +08:00
|
|
|
HDstrcat(obj2fullname, "/");
|
2012-08-04 04:11:36 +08:00
|
|
|
obj2type = H5TRAV_TYPE_GROUP;
|
2010-09-17 01:48:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-03-10 04:34:37 +08:00
|
|
|
/* get any symbolic links info */
|
2012-04-26 23:56:16 +08:00
|
|
|
l_ret1 = H5tools_get_symlink_info(file1_id, obj1fullname, &trg_linfo1, options->follow_links);
|
|
|
|
l_ret2 = H5tools_get_symlink_info(file2_id, obj2fullname, &trg_linfo2, options->follow_links);
|
2012-03-10 04:34:37 +08:00
|
|
|
|
2010-09-17 01:48:06 +08:00
|
|
|
/*---------------------------------------------
|
|
|
|
* check for following symlinks
|
|
|
|
*/
|
|
|
|
if (options->follow_links)
|
|
|
|
{
|
|
|
|
/* pass how to handle printing warning to linkinfo option */
|
|
|
|
if(print_warn(options))
|
|
|
|
trg_linfo1.opt.msg_mode = trg_linfo2.opt.msg_mode = 1;
|
|
|
|
|
|
|
|
/*-------------------------------
|
|
|
|
* check symbolic link (object1)
|
|
|
|
*/
|
2012-08-04 04:11:36 +08:00
|
|
|
h5difftrace("h5diff check symbolic link (object1)\n");
|
2010-09-17 01:48:06 +08:00
|
|
|
/* dangling link */
|
2012-03-10 04:34:37 +08:00
|
|
|
if (l_ret1 == 0)
|
2010-09-17 01:48:06 +08:00
|
|
|
{
|
2012-08-04 04:11:36 +08:00
|
|
|
h5difftrace("h5diff ... dangling link\n");
|
2010-09-17 01:48:06 +08:00
|
|
|
if (options->no_dangle_links)
|
|
|
|
{
|
2012-03-10 04:34:37 +08:00
|
|
|
/* treat dangling link is error */
|
2010-09-17 01:48:06 +08:00
|
|
|
if(options->m_verbose)
|
|
|
|
parallel_print("Warning: <%s> is a dangling link.\n", obj1fullname);
|
|
|
|
options->err_stat = 1;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if(options->m_verbose)
|
|
|
|
parallel_print("obj1 <%s> is a dangling link.\n", obj1fullname);
|
2012-03-10 04:34:37 +08:00
|
|
|
if (l_ret1 != 0 || l_ret2 != 0)
|
|
|
|
{
|
|
|
|
nfound++;
|
|
|
|
print_found(nfound);
|
|
|
|
goto out;
|
|
|
|
}
|
2010-09-17 01:48:06 +08:00
|
|
|
}
|
|
|
|
}
|
2012-03-10 04:34:37 +08:00
|
|
|
else if(l_ret1 < 0) /* fail */
|
2010-09-17 01:48:06 +08:00
|
|
|
{
|
|
|
|
parallel_print ("Object <%s> could not be found in <%s>\n", obj1fullname, fname1);
|
|
|
|
options->err_stat = 1;
|
|
|
|
goto out;
|
|
|
|
}
|
2012-03-10 04:34:37 +08:00
|
|
|
else if(l_ret1 != 2) /* symbolic link */
|
2012-08-04 04:11:36 +08:00
|
|
|
{
|
2010-09-17 01:48:06 +08:00
|
|
|
obj1type = trg_linfo1.trg_type;
|
2012-08-04 04:11:36 +08:00
|
|
|
h5difftrace("h5diff ... ... trg_linfo1.trg_type == H5L_TYPE_HARD\n");
|
|
|
|
if (info1_lp != NULL) {
|
|
|
|
int idx = info1_lp->nused - 1;
|
|
|
|
h5difftrace("h5diff ... ... ... info1_obj not null\n");
|
|
|
|
info1_lp->paths[idx].type = 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");
|
|
|
|
}
|
2010-09-17 01:48:06 +08:00
|
|
|
|
|
|
|
/*-------------------------------
|
|
|
|
* check symbolic link (object2)
|
|
|
|
*/
|
2012-08-04 04:11:36 +08:00
|
|
|
h5difftrace("h5diff check symbolic link (object2)\n");
|
2010-09-17 01:48:06 +08:00
|
|
|
/* dangling link */
|
2012-03-10 04:34:37 +08:00
|
|
|
if (l_ret2 == 0)
|
2010-09-17 01:48:06 +08:00
|
|
|
{
|
2012-08-04 04:11:36 +08:00
|
|
|
h5difftrace("h5diff ... dangling link\n");
|
2010-09-17 01:48:06 +08:00
|
|
|
if (options->no_dangle_links)
|
|
|
|
{
|
2012-03-10 04:34:37 +08:00
|
|
|
/* treat dangling link is error */
|
2010-09-17 01:48:06 +08:00
|
|
|
if(options->m_verbose)
|
|
|
|
parallel_print("Warning: <%s> is a dangling link.\n", obj2fullname);
|
|
|
|
options->err_stat = 1;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if(options->m_verbose)
|
|
|
|
parallel_print("obj2 <%s> is a dangling link.\n", obj2fullname);
|
2012-03-10 04:34:37 +08:00
|
|
|
if (l_ret1 != 0 || l_ret2 != 0)
|
|
|
|
{
|
|
|
|
nfound++;
|
|
|
|
print_found(nfound);
|
|
|
|
goto out;
|
|
|
|
}
|
2010-09-17 01:48:06 +08:00
|
|
|
}
|
|
|
|
}
|
2012-03-10 04:34:37 +08:00
|
|
|
else if(l_ret2 < 0) /* fail */
|
2010-09-17 01:48:06 +08:00
|
|
|
{
|
|
|
|
parallel_print ("Object <%s> could not be found in <%s>\n", obj2fullname, fname2);
|
|
|
|
options->err_stat = 1;
|
|
|
|
goto out;
|
|
|
|
}
|
2012-03-10 04:34:37 +08:00
|
|
|
else if(l_ret2 != 2) /* symbolic link */
|
2012-08-04 04:11:36 +08:00
|
|
|
{
|
2010-09-17 01:48:06 +08:00
|
|
|
obj2type = trg_linfo2.trg_type;
|
2012-08-04 04:11:36 +08:00
|
|
|
if (info2_lp != NULL) {
|
|
|
|
int idx = info2_lp->nused - 1;
|
|
|
|
h5difftrace("h5diff ... ... ... info2_obj not null\n");
|
|
|
|
info2_lp->paths[idx].type = 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");
|
|
|
|
}
|
2010-09-17 01:48:06 +08:00
|
|
|
} /* end of if follow symlinks */
|
|
|
|
|
2012-01-25 04:39:59 +08:00
|
|
|
/*
|
2012-08-04 04:11:36 +08:00
|
|
|
* If verbose options is not used, don't need to traverse through the list
|
2012-01-25 04:39:59 +08:00
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if(!(options->m_verbose || options->m_report))
|
|
|
|
{
|
2012-08-04 04:11:36 +08:00
|
|
|
h5difftrace("h5diff NOT (options->m_verbose || options->m_report)\n");
|
2012-03-10 04:34:37 +08:00
|
|
|
/* if no danglink links */
|
|
|
|
if ( l_ret1 > 0 && l_ret2 > 0 )
|
2012-08-04 04:11:36 +08:00
|
|
|
if (h5tools_is_obj_same(file1_id, obj1fullname, file2_id, obj2fullname)!=0)
|
2012-03-10 04:34:37 +08:00
|
|
|
goto out;
|
2012-01-25 04:39:59 +08:00
|
|
|
}
|
|
|
|
|
2012-08-04 04:11:36 +08:00
|
|
|
both_objs_grp = (obj1type == H5TRAV_TYPE_GROUP && obj2type == H5TRAV_TYPE_GROUP);
|
|
|
|
if (both_objs_grp)
|
2010-09-17 01:48:06 +08:00
|
|
|
{
|
2012-08-04 04:11:36 +08:00
|
|
|
h5difftrace("h5diff both_objs_grp TRUE\n");
|
|
|
|
/*
|
|
|
|
* traverse group1
|
2010-09-17 01:48:06 +08:00
|
|
|
*/
|
|
|
|
trav_info_init(fname1, file1_id, &info1_grp);
|
|
|
|
/* optional data pass */
|
|
|
|
info1_grp->opts = (diff_opt_t*)options;
|
|
|
|
|
2012-08-04 04:11:36 +08:00
|
|
|
if(h5trav_visit(file1_id, obj1fullname, TRUE, TRUE,
|
|
|
|
trav_grp_objs, trav_grp_symlinks, info1_grp) < 0)
|
2010-09-17 01:48:06 +08:00
|
|
|
{
|
|
|
|
parallel_print("Error: Could not get file contents\n");
|
|
|
|
options->err_stat = 1;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
info1_lp = info1_grp;
|
|
|
|
|
2012-08-04 04:11:36 +08:00
|
|
|
/*
|
|
|
|
* traverse group2
|
2010-09-17 01:48:06 +08:00
|
|
|
*/
|
|
|
|
trav_info_init(fname2, file2_id, &info2_grp);
|
|
|
|
/* optional data pass */
|
|
|
|
info2_grp->opts = (diff_opt_t*)options;
|
|
|
|
|
2012-08-04 04:11:36 +08:00
|
|
|
if(h5trav_visit(file2_id, obj2fullname, TRUE, TRUE,
|
|
|
|
trav_grp_objs, trav_grp_symlinks, info2_grp) < 0)
|
2010-09-17 01:48:06 +08:00
|
|
|
{
|
|
|
|
parallel_print("Error: Could not get file contents\n");
|
|
|
|
options->err_stat = 1;
|
|
|
|
goto out;
|
|
|
|
} /* end if */
|
|
|
|
info2_lp = info2_grp;
|
2012-08-04 04:11:36 +08:00
|
|
|
}
|
2010-09-17 01:48:06 +08:00
|
|
|
|
2005-02-03 07:01:42 +08:00
|
|
|
#ifdef H5_HAVE_PARALLEL
|
2012-08-04 04:11:36 +08:00
|
|
|
if(g_Parallel)
|
|
|
|
{
|
2012-08-07 04:08:12 +08:00
|
|
|
if((HDstrlen(fname1) > MAX_FILENAME) || (HDstrlen(fname2) > MAX_FILENAME))
|
2008-05-01 03:51:13 +08:00
|
|
|
{
|
2012-08-07 04:08:12 +08:00
|
|
|
HDfprintf(stderr, "The parallel diff only supports path names up to %d characters\n", MAX_FILENAME);
|
|
|
|
MPI_Abort(MPI_COMM_WORLD, 0);
|
|
|
|
} /* end if */
|
2006-06-27 22:45:06 +08:00
|
|
|
|
2012-08-07 04:08:12 +08:00
|
|
|
HDstrcpy(filenames[0], fname1);
|
|
|
|
HDstrcpy(filenames[1], fname2);
|
2006-06-27 22:45:06 +08:00
|
|
|
|
2012-08-07 04:08:12 +08:00
|
|
|
/* Alert the worker tasks that there's going to be work. */
|
|
|
|
for(i = 1; i < g_nTasks; i++)
|
|
|
|
MPI_Send(filenames, (MAX_FILENAME * 2), MPI_CHAR, i, MPI_TAG_PARALLEL, MPI_COMM_WORLD);
|
2012-08-04 04:11:36 +08:00
|
|
|
} /* end if */
|
2010-09-17 01:48:06 +08:00
|
|
|
#endif
|
2008-05-01 03:51:13 +08:00
|
|
|
|
2012-08-04 04:11:36 +08:00
|
|
|
/* process the objects */
|
|
|
|
build_match_list (obj1fullname, info1_lp, obj2fullname, info2_lp,
|
|
|
|
&match_list, options);
|
|
|
|
if (both_objs_grp)
|
|
|
|
{
|
|
|
|
/*------------------------------------------------------
|
|
|
|
* print the list
|
|
|
|
*/
|
|
|
|
if(options->m_verbose)
|
|
|
|
{
|
|
|
|
parallel_print("\n");
|
|
|
|
/* if given objects is group under root */
|
|
|
|
if (HDstrcmp (obj1fullname,"/") || HDstrcmp (obj2fullname,"/"))
|
|
|
|
parallel_print("group1 group2\n");
|
|
|
|
else
|
|
|
|
parallel_print("file1 file2\n");
|
|
|
|
parallel_print("---------------------------------------\n");
|
|
|
|
for(i = 0; i < match_list->nobjs; i++)
|
|
|
|
{
|
|
|
|
char c1, c2;
|
|
|
|
c1 = (match_list->objs[i].flags[0]) ? 'x' : ' ';
|
|
|
|
c2 = (match_list->objs[i].flags[1]) ? 'x' : ' ';
|
|
|
|
parallel_print("%5c %6c %-15s\n", c1, c2, match_list->objs[i].name);
|
|
|
|
} /* end for */
|
|
|
|
parallel_print ("\n");
|
|
|
|
} /* end if */
|
2010-09-17 01:48:06 +08:00
|
|
|
}
|
2012-08-04 04:11:36 +08:00
|
|
|
nfound = diff_match(file1_id, obj1fullname, info1_lp,
|
|
|
|
file2_id, obj2fullname, info2_lp,
|
|
|
|
match_list, options);
|
2006-06-27 22:45:06 +08:00
|
|
|
|
2005-01-27 07:03:29 +08:00
|
|
|
out:
|
2010-09-17 01:48:06 +08:00
|
|
|
#ifdef H5_HAVE_PARALLEL
|
|
|
|
if(g_Parallel)
|
|
|
|
/* All done at this point, let tasks know that they won't be needed */
|
|
|
|
phdiff_dismiss_workers();
|
|
|
|
#endif
|
|
|
|
/* free buffers in trav_info structures */
|
|
|
|
if (info1_obj)
|
|
|
|
trav_info_free(info1_obj);
|
|
|
|
if (info2_obj)
|
|
|
|
trav_info_free(info2_obj);
|
|
|
|
|
|
|
|
if (info1_grp)
|
|
|
|
trav_info_free(info1_grp);
|
|
|
|
if (info2_grp)
|
|
|
|
trav_info_free(info2_grp);
|
|
|
|
|
|
|
|
/* free buffers */
|
|
|
|
if (obj1fullname)
|
[svn-r23395] Description:
Bring Coverity changes from branch to trunk:
r20682:
fixed coverity:
76, 77, 635, 636, 1164, 1165, 1166, 1121, 1122, 1117, 1343
Tested on:
Mac OSX/64 10.8.3 (amazon) w/C++ & FORTRAN
(too minor to require h5committest)
2013-03-20 11:44:28 +08:00
|
|
|
HDfree(obj1fullname);
|
2010-09-17 01:48:06 +08:00
|
|
|
if (obj2fullname)
|
[svn-r23395] Description:
Bring Coverity changes from branch to trunk:
r20682:
fixed coverity:
76, 77, 635, 636, 1164, 1165, 1166, 1121, 1122, 1117, 1343
Tested on:
Mac OSX/64 10.8.3 (amazon) w/C++ & FORTRAN
(too minor to require h5committest)
2013-03-20 11:44:28 +08:00
|
|
|
HDfree(obj2fullname);
|
2010-09-17 01:48:06 +08:00
|
|
|
|
|
|
|
/* free link info buffer */
|
|
|
|
if (trg_linfo1.trg_path)
|
2012-02-29 02:26:34 +08:00
|
|
|
HDfree((char *)trg_linfo1.trg_path);
|
2010-09-17 01:48:06 +08:00
|
|
|
if (trg_linfo2.trg_path)
|
2012-02-29 02:26:34 +08:00
|
|
|
HDfree((char *)trg_linfo2.trg_path);
|
2010-09-17 01:48:06 +08:00
|
|
|
|
2007-09-06 23:54:22 +08:00
|
|
|
/* close */
|
2008-09-16 23:52:51 +08:00
|
|
|
H5E_BEGIN_TRY
|
2008-05-01 03:51:13 +08:00
|
|
|
{
|
2007-09-06 23:54:22 +08:00
|
|
|
H5Fclose(file1_id);
|
|
|
|
H5Fclose(file2_id);
|
2007-09-13 23:44:56 +08:00
|
|
|
} H5E_END_TRY;
|
2012-08-04 04:11:36 +08:00
|
|
|
h5difftrace("h5diff finish\n");
|
2006-06-27 22:45:06 +08:00
|
|
|
|
2007-09-06 23:54:22 +08:00
|
|
|
return nfound;
|
2003-03-26 22:23:48 +08:00
|
|
|
}
|
2003-05-19 13:09:08 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
2005-02-03 07:01:42 +08:00
|
|
|
* Function: diff_match
|
2003-05-19 13:09:08 +08:00
|
|
|
*
|
2010-09-17 01:48:06 +08:00
|
|
|
* 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.
|
2003-05-19 13:09:08 +08:00
|
|
|
*
|
2003-05-20 00:14:26 +08:00
|
|
|
* Return: Number of differences found
|
2003-05-19 13:09:08 +08:00
|
|
|
*
|
|
|
|
* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
|
|
|
|
*
|
|
|
|
* Date: May 9, 2003
|
2005-08-14 04:53:35 +08:00
|
|
|
*
|
2008-11-05 05:11:45 +08:00
|
|
|
* Modifications: Jan 2005 Leon Arber, larber@uiuc.edu
|
2005-06-29 00:25:42 +08:00
|
|
|
* Added support for parallel diffing
|
2003-05-19 13:09:08 +08:00
|
|
|
*
|
2008-11-05 05:11:45 +08:00
|
|
|
* Pedro Vicente, pvn@hdfgroup.org, Nov 4, 2008
|
|
|
|
* Compare the graph and make h5diff return 1 for difference if
|
|
|
|
* 1) the number of objects in file1 is not the same as in file2
|
|
|
|
* 2) the graph does not match, i.e same names (absolute path)
|
|
|
|
* 3) objects with the same name are not of the same type
|
2003-05-19 13:09:08 +08:00
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
*/
|
2010-09-17 01:48:06 +08:00
|
|
|
hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
|
|
|
|
hid_t file2_id, const char *grp2, trav_info_t *info2,
|
|
|
|
trav_table_t *table, diff_opt_t *options)
|
2003-05-19 13:09:08 +08:00
|
|
|
{
|
2008-05-01 03:51:13 +08:00
|
|
|
hsize_t nfound = 0;
|
|
|
|
unsigned i;
|
2006-06-27 22:45:06 +08:00
|
|
|
|
2010-09-17 01:48:06 +08:00
|
|
|
char * grp1_path = "";
|
|
|
|
char * grp2_path = "";
|
|
|
|
char * obj1_fullpath = NULL;
|
|
|
|
char * obj2_fullpath = NULL;
|
2011-05-07 06:02:24 +08:00
|
|
|
diff_args_t argdata;
|
[svn-r22176] Purpose:
Fix for HDFFV-7644 GMQS: h5diff - incorrect behaviors when comparing HDF5 files with different type of objects (dataset, group, type) as common objects
Description:
Fixed failure for comparing same named object with different object types in comparing groups. (common object comparison)
Prior to the fix, h5diff resulted in error. After the fix, h5diff detects such case as non-comparable and display messages accordingly.
Test cases were added and tagged with jira#.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE cmake), Cmake (jam)
2012-03-29 06:09:38 +08:00
|
|
|
size_t idx1 = 0;
|
|
|
|
size_t idx2 = 0;
|
2006-06-27 22:45:06 +08:00
|
|
|
|
|
|
|
|
2012-08-04 04:11:36 +08:00
|
|
|
h5difftrace("diff_match start\n");
|
2010-09-17 01:48:06 +08:00
|
|
|
/*
|
|
|
|
* if not root, prepare object name to be pre-appended to group path to
|
|
|
|
* make full path
|
|
|
|
*/
|
|
|
|
if (HDstrcmp (grp1, "/"))
|
2012-02-29 02:26:34 +08:00
|
|
|
grp1_path = (char *)grp1;
|
2010-09-17 01:48:06 +08:00
|
|
|
if (HDstrcmp (grp2, "/"))
|
2012-02-29 02:26:34 +08:00
|
|
|
grp2_path = (char *)grp2;
|
2008-08-05 05:13:16 +08:00
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
2008-10-30 04:01:38 +08:00
|
|
|
* regarding the return value of h5diff (0, no difference in files, 1 difference )
|
|
|
|
* 1) the number of objects in file1 must be the same as in file2
|
|
|
|
* 2) the graph must match, i.e same names (absolute path)
|
|
|
|
* 3) objects with the same name must be of the same type
|
2008-08-05 05:13:16 +08:00
|
|
|
*-------------------------------------------------------------------------
|
2010-02-17 03:43:05 +08:00
|
|
|
*/
|
|
|
|
|
2012-08-04 04:11:36 +08:00
|
|
|
/* not valid compare used when --exclude-path option is used */
|
2010-09-17 05:46:16 +08:00
|
|
|
if (!options->exclude_path)
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2010-09-17 05:46:16 +08:00
|
|
|
/* number of different objects */
|
|
|
|
if ( info1->nused != info2->nused )
|
|
|
|
{
|
|
|
|
options->contents = 0;
|
|
|
|
}
|
2008-10-30 03:29:25 +08:00
|
|
|
}
|
2010-02-17 03:43:05 +08:00
|
|
|
|
2008-10-30 04:01:38 +08:00
|
|
|
/* objects in one file and not the other */
|
2008-10-30 03:29:25 +08:00
|
|
|
for( i = 0; i < table->nobjs; i++)
|
|
|
|
{
|
|
|
|
if( table->objs[i].flags[0] != table->objs[i].flags[1] )
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
|
|
|
options->contents = 0;
|
2010-09-17 05:46:16 +08:00
|
|
|
break;
|
2008-08-05 05:13:16 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-10-30 04:01:38 +08:00
|
|
|
|
2007-09-13 23:44:56 +08:00
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
* do the diff for common objects
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
*/
|
2005-02-03 07:01:42 +08:00
|
|
|
#ifdef H5_HAVE_PARALLEL
|
2010-02-17 03:43:05 +08:00
|
|
|
{
|
|
|
|
char *workerTasks = (char*)HDmalloc((g_nTasks - 1) * sizeof(char));
|
2007-09-13 23:44:56 +08:00
|
|
|
int n;
|
|
|
|
int busyTasks = 0;
|
|
|
|
struct diffs_found nFoundbyWorker;
|
2011-05-07 06:02:24 +08:00
|
|
|
struct diff_mpi_args args;
|
2007-09-13 23:44:56 +08:00
|
|
|
int havePrintToken = 1;
|
|
|
|
MPI_Status Status;
|
|
|
|
|
|
|
|
/*set all tasks as free */
|
|
|
|
HDmemset(workerTasks, 1, (g_nTasks - 1));
|
2005-01-27 07:03:29 +08:00
|
|
|
#endif
|
2006-06-27 22:45:06 +08:00
|
|
|
|
2008-09-16 23:52:51 +08:00
|
|
|
for(i = 0; i < table->nobjs; i++)
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2008-09-16 23:52:51 +08:00
|
|
|
if( table->objs[i].flags[0] && table->objs[i].flags[1])
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2010-09-17 01:48:06 +08:00
|
|
|
/* make full path for obj1 */
|
2012-02-24 22:27:57 +08:00
|
|
|
obj1_fullpath = (char*)HDcalloc (HDstrlen(grp1_path) + strlen (table->objs[i].name) + 1, sizeof (char));
|
2010-09-17 01:48:06 +08:00
|
|
|
HDstrcpy(obj1_fullpath, grp1_path);
|
|
|
|
HDstrcat(obj1_fullpath, table->objs[i].name);
|
|
|
|
|
|
|
|
/* make full path for obj2 */
|
2012-02-24 22:27:57 +08:00
|
|
|
obj2_fullpath = (char*)HDcalloc (HDstrlen(grp2_path) + strlen (table->objs[i].name) + 1, sizeof (char));
|
2010-09-17 01:48:06 +08:00
|
|
|
HDstrcpy(obj2_fullpath, grp2_path);
|
|
|
|
HDstrcat(obj2_fullpath, table->objs[i].name);
|
|
|
|
|
[svn-r22176] Purpose:
Fix for HDFFV-7644 GMQS: h5diff - incorrect behaviors when comparing HDF5 files with different type of objects (dataset, group, type) as common objects
Description:
Fixed failure for comparing same named object with different object types in comparing groups. (common object comparison)
Prior to the fix, h5diff resulted in error. After the fix, h5diff detects such case as non-comparable and display messages accordingly.
Test cases were added and tagged with jira#.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE cmake), Cmake (jam)
2012-03-29 06:09:38 +08:00
|
|
|
/* get index to figure out type of the object in file1 */
|
|
|
|
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 */
|
|
|
|
while ( info2->paths[idx2].path &&
|
|
|
|
(HDstrcmp (obj2_fullpath, info2->paths[idx2].path) != 0) )
|
|
|
|
idx2++;
|
|
|
|
|
2011-05-07 06:02:24 +08:00
|
|
|
/* Set argdata to pass other args into diff() */
|
[svn-r22176] Purpose:
Fix for HDFFV-7644 GMQS: h5diff - incorrect behaviors when comparing HDF5 files with different type of objects (dataset, group, type) as common objects
Description:
Fixed failure for comparing same named object with different object types in comparing groups. (common object comparison)
Prior to the fix, h5diff resulted in error. After the fix, h5diff detects such case as non-comparable and display messages accordingly.
Test cases were added and tagged with jira#.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE cmake), Cmake (jam)
2012-03-29 06:09:38 +08:00
|
|
|
argdata.type[0] = info1->paths[idx1].type;
|
|
|
|
argdata.type[1] = info2->paths[idx2].type;
|
2011-05-07 06:02:24 +08:00
|
|
|
argdata.is_same_trgobj = table->objs[i].is_same_trgobj;
|
|
|
|
|
2007-09-13 23:44:56 +08:00
|
|
|
options->cmn_objs = 1;
|
2008-09-16 23:52:51 +08:00
|
|
|
if(!g_Parallel)
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2010-09-17 01:48:06 +08:00
|
|
|
nfound += diff(file1_id, obj1_fullpath,
|
|
|
|
file2_id, obj2_fullpath,
|
2011-05-07 06:02:24 +08:00
|
|
|
options, &argdata);
|
2007-09-13 23:44:56 +08:00
|
|
|
} /* end if */
|
2005-05-08 03:37:48 +08:00
|
|
|
#ifdef H5_HAVE_PARALLEL
|
2008-09-16 23:52:51 +08:00
|
|
|
else
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2007-09-13 23:44:56 +08:00
|
|
|
int workerFound = 0;
|
|
|
|
|
2012-08-04 04:11:36 +08:00
|
|
|
h5difftrace("Beginning of big else block\n");
|
2007-09-13 23:44:56 +08:00
|
|
|
/* 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
|
|
|
|
* matches it, the value is passed between processes as
|
|
|
|
* an array of bytes in order to be portable. But this
|
|
|
|
* may not work in non-homogeneous MPI environments.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*Set up args to pass to worker task. */
|
2010-09-17 01:48:06 +08:00
|
|
|
if(HDstrlen(obj1_fullpath) > 255 ||
|
|
|
|
HDstrlen(obj2_fullpath) > 255)
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2007-09-13 23:44:56 +08:00
|
|
|
printf("The parallel diff only supports object names up to 255 characters\n");
|
|
|
|
MPI_Abort(MPI_COMM_WORLD, 0);
|
|
|
|
} /* end if */
|
|
|
|
|
2011-05-07 06:02:24 +08:00
|
|
|
/* set args struct to pass */
|
2010-09-17 01:48:06 +08:00
|
|
|
HDstrcpy(args.name1, obj1_fullpath);
|
|
|
|
HDstrcpy(args.name2, obj2_fullpath);
|
2007-09-13 23:44:56 +08:00
|
|
|
args.options = *options;
|
[svn-r22176] Purpose:
Fix for HDFFV-7644 GMQS: h5diff - incorrect behaviors when comparing HDF5 files with different type of objects (dataset, group, type) as common objects
Description:
Fixed failure for comparing same named object with different object types in comparing groups. (common object comparison)
Prior to the fix, h5diff resulted in error. After the fix, h5diff detects such case as non-comparable and display messages accordingly.
Test cases were added and tagged with jira#.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE cmake), Cmake (jam)
2012-03-29 06:09:38 +08:00
|
|
|
args.argdata.type[0] = info1->paths[idx1].type;
|
|
|
|
args.argdata.type[1] = info2->paths[idx2].type;
|
2011-05-07 06:02:24 +08:00
|
|
|
args.argdata.is_same_trgobj = table->objs[i].is_same_trgobj;
|
2007-09-13 23:44:56 +08:00
|
|
|
|
|
|
|
/* if there are any outstanding print requests, let's handle one. */
|
2008-09-16 23:52:51 +08:00
|
|
|
if(busyTasks > 0)
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2007-09-13 23:44:56 +08:00
|
|
|
int incomingMessage;
|
|
|
|
|
|
|
|
/* check if any tasks freed up, and didn't need to print. */
|
|
|
|
MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_DONE, MPI_COMM_WORLD, &incomingMessage, &Status);
|
|
|
|
|
|
|
|
/* first block*/
|
2008-09-16 23:52:51 +08:00
|
|
|
if(incomingMessage)
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2007-09-13 23:44:56 +08:00
|
|
|
workerTasks[Status.MPI_SOURCE - 1] = 1;
|
|
|
|
MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_DONE, MPI_COMM_WORLD, &Status);
|
|
|
|
nfound += nFoundbyWorker.nfound;
|
|
|
|
options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
|
|
|
|
busyTasks--;
|
|
|
|
} /* end if */
|
|
|
|
|
|
|
|
/* check to see if the print token was returned. */
|
2008-09-16 23:52:51 +08:00
|
|
|
if(!havePrintToken)
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2007-09-13 23:44:56 +08:00
|
|
|
/* If we don't have the token, someone is probably sending us output */
|
|
|
|
print_incoming_data();
|
|
|
|
|
|
|
|
/* check incoming queue for token */
|
|
|
|
MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &incomingMessage, &Status);
|
|
|
|
|
|
|
|
/* incoming token implies free task. */
|
|
|
|
if(incomingMessage) {
|
|
|
|
workerTasks[Status.MPI_SOURCE - 1] = 1;
|
|
|
|
MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &Status);
|
|
|
|
nfound += nFoundbyWorker.nfound;
|
|
|
|
options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
|
|
|
|
busyTasks--;
|
|
|
|
havePrintToken = 1;
|
|
|
|
} /* end if */
|
|
|
|
} /* end if */
|
|
|
|
|
|
|
|
/* check to see if anyone needs the print token. */
|
2008-09-16 23:52:51 +08:00
|
|
|
if(havePrintToken)
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2007-09-13 23:44:56 +08:00
|
|
|
/* check incoming queue for print token requests */
|
|
|
|
MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_TOK_REQUEST, MPI_COMM_WORLD, &incomingMessage, &Status);
|
2008-09-16 23:52:51 +08:00
|
|
|
if(incomingMessage)
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2007-09-13 23:44:56 +08:00
|
|
|
MPI_Recv(NULL, 0, MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_TOK_REQUEST, MPI_COMM_WORLD, &Status);
|
|
|
|
MPI_Send(NULL, 0, MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_PRINT_TOK, MPI_COMM_WORLD);
|
|
|
|
havePrintToken = 0;
|
|
|
|
} /* end if */
|
|
|
|
} /* end if */
|
|
|
|
} /* end if */
|
|
|
|
|
|
|
|
/* check array of tasks to see which ones are free.
|
|
|
|
* Manager task never does work, so freeTasks[0] is really
|
|
|
|
* worker task 0. */
|
2008-09-16 23:52:51 +08:00
|
|
|
for(n = 1; (n < g_nTasks) && !workerFound; n++)
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2008-09-16 23:52:51 +08:00
|
|
|
if(workerTasks[n-1])
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2007-09-13 23:44:56 +08:00
|
|
|
/* send file id's and names to first free worker */
|
[svn-r14154] Description:
Finish deprecating last H5G symbol (H5G_obj_t) - yay!
Lots of misc. library fixes to remove confusion between links and
objects. The tools could still use another pass, to remove h5trav_type_t type
and make the correct distinction between links & objects.
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
AIX/32 5.3 (copper) w/FORTRAN, w/parallel, in production mode
Mac OS X/32 10.4.10 (amazon) in debug mode
2007-09-26 06:18:33 +08:00
|
|
|
MPI_Send(&args, sizeof(args), MPI_BYTE, n, MPI_TAG_ARGS, MPI_COMM_WORLD);
|
2007-09-13 23:44:56 +08:00
|
|
|
|
|
|
|
/* increment counter for total number of prints. */
|
|
|
|
busyTasks++;
|
|
|
|
|
|
|
|
/* mark worker as busy */
|
|
|
|
workerTasks[n - 1] = 0;
|
|
|
|
workerFound = 1;
|
|
|
|
} /* end if */
|
|
|
|
} /* end for */
|
|
|
|
|
2008-09-16 23:52:51 +08:00
|
|
|
if(!workerFound)
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2007-09-13 23:44:56 +08:00
|
|
|
/* if they were all busy, we've got to wait for one free up
|
|
|
|
* before we can move on. If we don't have the token, some
|
|
|
|
* task is currently printing so we'll wait for that task to
|
|
|
|
* return it.
|
|
|
|
*/
|
|
|
|
|
2008-09-16 23:52:51 +08:00
|
|
|
if(!havePrintToken)
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2008-09-16 23:52:51 +08:00
|
|
|
while(!havePrintToken)
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2007-09-13 23:44:56 +08:00
|
|
|
int incomingMessage;
|
|
|
|
|
|
|
|
print_incoming_data();
|
|
|
|
MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &incomingMessage, &Status);
|
2008-09-16 23:52:51 +08:00
|
|
|
if(incomingMessage)
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2007-09-13 23:44:56 +08:00
|
|
|
MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, MPI_ANY_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &Status);
|
|
|
|
havePrintToken = 1;
|
|
|
|
nfound += nFoundbyWorker.nfound;
|
|
|
|
options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
|
|
|
|
/* send this task the work unit. */
|
[svn-r14154] Description:
Finish deprecating last H5G symbol (H5G_obj_t) - yay!
Lots of misc. library fixes to remove confusion between links and
objects. The tools could still use another pass, to remove h5trav_type_t type
and make the correct distinction between links & objects.
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
AIX/32 5.3 (copper) w/FORTRAN, w/parallel, in production mode
Mac OS X/32 10.4.10 (amazon) in debug mode
2007-09-26 06:18:33 +08:00
|
|
|
MPI_Send(&args, sizeof(args), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_ARGS, MPI_COMM_WORLD);
|
2007-09-13 23:44:56 +08:00
|
|
|
} /* end if */
|
|
|
|
} /* end while */
|
|
|
|
} /* end if */
|
|
|
|
/* if we do have the token, check for task to free up, or wait for a task to request it */
|
2008-09-16 23:52:51 +08:00
|
|
|
else
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2007-09-13 23:44:56 +08:00
|
|
|
/* But first print all the data in our incoming queue */
|
|
|
|
print_incoming_data();
|
|
|
|
MPI_Probe(MPI_ANY_SOURCE, MPI_ANY_TAG, MPI_COMM_WORLD, &Status);
|
2008-09-16 23:52:51 +08:00
|
|
|
if(Status.MPI_TAG == MPI_TAG_DONE)
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2007-09-13 23:44:56 +08:00
|
|
|
MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_DONE, MPI_COMM_WORLD, &Status);
|
|
|
|
nfound += nFoundbyWorker.nfound;
|
|
|
|
options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
|
[svn-r14154] Description:
Finish deprecating last H5G symbol (H5G_obj_t) - yay!
Lots of misc. library fixes to remove confusion between links and
objects. The tools could still use another pass, to remove h5trav_type_t type
and make the correct distinction between links & objects.
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
AIX/32 5.3 (copper) w/FORTRAN, w/parallel, in production mode
Mac OS X/32 10.4.10 (amazon) in debug mode
2007-09-26 06:18:33 +08:00
|
|
|
MPI_Send(&args, sizeof(args), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_ARGS, MPI_COMM_WORLD);
|
2007-09-13 23:44:56 +08:00
|
|
|
} /* end if */
|
2008-09-16 23:52:51 +08:00
|
|
|
else if(Status.MPI_TAG == MPI_TAG_TOK_REQUEST)
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2007-09-13 23:44:56 +08:00
|
|
|
int incomingMessage;
|
|
|
|
|
|
|
|
MPI_Recv(NULL, 0, MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_TOK_REQUEST, MPI_COMM_WORLD, &Status);
|
|
|
|
MPI_Send(NULL, 0, MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_PRINT_TOK, MPI_COMM_WORLD);
|
|
|
|
|
2008-09-16 23:52:51 +08:00
|
|
|
do
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2007-09-13 23:44:56 +08:00
|
|
|
MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &incomingMessage, &Status);
|
|
|
|
|
|
|
|
print_incoming_data();
|
|
|
|
} while(!incomingMessage);
|
|
|
|
|
|
|
|
MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &Status);
|
|
|
|
nfound += nFoundbyWorker.nfound;
|
|
|
|
options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
|
[svn-r14154] Description:
Finish deprecating last H5G symbol (H5G_obj_t) - yay!
Lots of misc. library fixes to remove confusion between links and
objects. The tools could still use another pass, to remove h5trav_type_t type
and make the correct distinction between links & objects.
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
AIX/32 5.3 (copper) w/FORTRAN, w/parallel, in production mode
Mac OS X/32 10.4.10 (amazon) in debug mode
2007-09-26 06:18:33 +08:00
|
|
|
MPI_Send(&args, sizeof(args), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_ARGS, MPI_COMM_WORLD);
|
2007-09-13 23:44:56 +08:00
|
|
|
} /* end else-if */
|
2008-09-16 23:52:51 +08:00
|
|
|
else
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2007-09-13 23:44:56 +08:00
|
|
|
printf("ERROR: Invalid tag (%d) received \n", Status.MPI_TAG);
|
|
|
|
MPI_Abort(MPI_COMM_WORLD, 0);
|
|
|
|
MPI_Finalize();
|
|
|
|
} /* end else */
|
|
|
|
} /* end else */
|
|
|
|
} /* end if */
|
|
|
|
} /* end else */
|
2005-05-08 03:37:48 +08:00
|
|
|
#endif /* H5_HAVE_PARALLEL */
|
2010-09-17 01:48:06 +08:00
|
|
|
if (obj1_fullpath)
|
|
|
|
HDfree (obj1_fullpath);
|
|
|
|
if (obj2_fullpath)
|
|
|
|
HDfree (obj2_fullpath);
|
2007-09-13 23:44:56 +08:00
|
|
|
} /* end if */
|
|
|
|
} /* end for */
|
2012-08-04 04:11:36 +08:00
|
|
|
h5difftrace("done with for loop\n");
|
2006-06-27 22:45:06 +08:00
|
|
|
|
2007-09-13 23:44:56 +08:00
|
|
|
#ifdef H5_HAVE_PARALLEL
|
2008-09-16 23:52:51 +08:00
|
|
|
if(g_Parallel)
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2007-09-13 23:44:56 +08:00
|
|
|
/* make sure all tasks are done */
|
2008-09-16 23:52:51 +08:00
|
|
|
while(busyTasks > 0)
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2007-09-13 23:44:56 +08:00
|
|
|
MPI_Probe(MPI_ANY_SOURCE, MPI_ANY_TAG, MPI_COMM_WORLD, &Status);
|
2008-09-16 23:52:51 +08:00
|
|
|
if(Status.MPI_TAG == MPI_TAG_DONE)
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2007-09-13 23:44:56 +08:00
|
|
|
MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_DONE, MPI_COMM_WORLD, &Status);
|
|
|
|
nfound += nFoundbyWorker.nfound;
|
|
|
|
options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
|
|
|
|
busyTasks--;
|
|
|
|
} /* end if */
|
2008-09-16 23:52:51 +08:00
|
|
|
else if(Status.MPI_TAG == MPI_TAG_TOK_REQUEST)
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2007-09-13 23:44:56 +08:00
|
|
|
MPI_Recv(NULL, 0, MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_TOK_REQUEST, MPI_COMM_WORLD, &Status);
|
2008-09-16 23:52:51 +08:00
|
|
|
if(havePrintToken)
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2007-09-13 23:44:56 +08:00
|
|
|
int incomingMessage;
|
|
|
|
|
|
|
|
MPI_Send(NULL, 0, MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_PRINT_TOK, MPI_COMM_WORLD);
|
|
|
|
|
|
|
|
do {
|
|
|
|
MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &incomingMessage, &Status);
|
|
|
|
|
|
|
|
print_incoming_data();
|
|
|
|
} while(!incomingMessage);
|
|
|
|
|
|
|
|
MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &Status);
|
|
|
|
nfound += nFoundbyWorker.nfound;
|
|
|
|
options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
|
|
|
|
busyTasks--;
|
|
|
|
} /* end if */
|
|
|
|
/* someone else must have it...wait for them to return it, then give it to the task that just asked for it. */
|
2008-09-16 23:52:51 +08:00
|
|
|
else
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2007-09-13 23:44:56 +08:00
|
|
|
int source = Status.MPI_SOURCE;
|
|
|
|
int incomingMessage;
|
|
|
|
|
2008-09-16 23:52:51 +08:00
|
|
|
do
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2007-09-13 23:44:56 +08:00
|
|
|
MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &incomingMessage, &Status);
|
|
|
|
|
|
|
|
print_incoming_data();
|
|
|
|
} while(!incomingMessage);
|
|
|
|
|
|
|
|
|
|
|
|
MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, MPI_ANY_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &Status);
|
|
|
|
nfound += nFoundbyWorker.nfound;
|
|
|
|
options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
|
|
|
|
busyTasks--;
|
|
|
|
MPI_Send(NULL, 0, MPI_BYTE, source, MPI_TAG_PRINT_TOK, MPI_COMM_WORLD);
|
|
|
|
} /* end else */
|
|
|
|
} /* end else-if */
|
2008-09-16 23:52:51 +08:00
|
|
|
else if(Status.MPI_TAG == MPI_TAG_TOK_RETURN)
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2007-09-13 23:44:56 +08:00
|
|
|
MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &Status);
|
|
|
|
nfound += nFoundbyWorker.nfound;
|
|
|
|
options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
|
|
|
|
busyTasks--;
|
|
|
|
havePrintToken = 1;
|
|
|
|
} /* end else-if */
|
|
|
|
else if(Status.MPI_TAG == MPI_TAG_PRINT_DATA)
|
|
|
|
{
|
|
|
|
char data[PRINT_DATA_MAX_SIZE + 1];
|
|
|
|
HDmemset(data, 0, PRINT_DATA_MAX_SIZE + 1);
|
2006-06-27 22:45:06 +08:00
|
|
|
|
2007-09-13 23:44:56 +08:00
|
|
|
MPI_Recv(data, PRINT_DATA_MAX_SIZE, MPI_CHAR, Status.MPI_SOURCE, MPI_TAG_PRINT_DATA, MPI_COMM_WORLD, &Status);
|
2006-06-27 22:45:06 +08:00
|
|
|
|
2007-09-13 23:44:56 +08:00
|
|
|
printf("%s", data);
|
|
|
|
} /* end else-if */
|
2008-09-16 23:52:51 +08:00
|
|
|
else
|
2008-08-05 05:13:16 +08:00
|
|
|
{
|
2007-09-13 23:44:56 +08:00
|
|
|
printf("ph5diff-manager: ERROR!! Invalid tag (%d) received \n", Status.MPI_TAG);
|
|
|
|
MPI_Abort(MPI_COMM_WORLD, 0);
|
|
|
|
} /* end else */
|
|
|
|
} /* end while */
|
2006-06-27 22:45:06 +08:00
|
|
|
|
2007-09-13 23:44:56 +08:00
|
|
|
for(i = 1; i < g_nTasks; i++)
|
|
|
|
MPI_Send(NULL, 0, MPI_BYTE, i, MPI_TAG_END, MPI_COMM_WORLD);
|
2006-06-27 22:45:06 +08:00
|
|
|
|
2007-09-13 23:44:56 +08:00
|
|
|
/* Print any final data waiting in our queue */
|
2006-03-23 04:53:05 +08:00
|
|
|
print_incoming_data();
|
2007-09-13 23:44:56 +08:00
|
|
|
} /* end if */
|
2012-08-04 04:11:36 +08:00
|
|
|
h5difftrace("done with if block\n");
|
2006-06-27 22:45:06 +08:00
|
|
|
|
2012-02-24 03:08:09 +08:00
|
|
|
HDfree(workerTasks);
|
2010-02-17 03:43:05 +08:00
|
|
|
}
|
2005-08-19 03:37:32 +08:00
|
|
|
#endif /* H5_HAVE_PARALLEL */
|
2006-06-27 22:45:06 +08:00
|
|
|
|
2007-09-13 23:44:56 +08:00
|
|
|
/* free table */
|
2010-09-17 01:48:06 +08:00
|
|
|
if (table)
|
|
|
|
trav_table_free(table);
|
2012-08-04 04:11:36 +08:00
|
|
|
h5difftrace("diff_match finish\n");
|
2008-09-16 23:52:51 +08:00
|
|
|
|
2008-05-01 03:51:13 +08:00
|
|
|
return nfound;
|
2003-03-26 22:23:48 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
* Function: diff
|
|
|
|
*
|
2003-05-11 03:38:57 +08:00
|
|
|
* Purpose: switch between types and choose the diff function
|
2003-12-03 07:13:27 +08:00
|
|
|
* TYPE is either
|
2007-03-06 00:26:50 +08:00
|
|
|
* H5G_GROUP Object is a group
|
|
|
|
* H5G_DATASET Object is a dataset
|
|
|
|
* H5G_TYPE Object is a named data type
|
|
|
|
* H5G_LINK Object is a symbolic link
|
2003-03-26 22:23:48 +08:00
|
|
|
*
|
2003-05-20 00:14:26 +08:00
|
|
|
* Return: Number of differences found
|
2003-03-26 22:23:48 +08:00
|
|
|
*
|
2010-02-17 03:43:05 +08:00
|
|
|
* Programmer: Jonathan Kim
|
[svn-r22176] Purpose:
Fix for HDFFV-7644 GMQS: h5diff - incorrect behaviors when comparing HDF5 files with different type of objects (dataset, group, type) as common objects
Description:
Fixed failure for comparing same named object with different object types in comparing groups. (common object comparison)
Prior to the fix, h5diff resulted in error. After the fix, h5diff detects such case as non-comparable and display messages accordingly.
Test cases were added and tagged with jira#.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE cmake), Cmake (jam)
2012-03-29 06:09:38 +08:00
|
|
|
* - Move follow symlinks code toward top. (March 2812)
|
|
|
|
* - Add following symlinks feature (Feb 11,2010)
|
2011-05-07 06:02:24 +08:00
|
|
|
* - Change to use diff_args_t to pass the rest of args.
|
|
|
|
* Passing through it instead of individual args provides smoother
|
|
|
|
* extensibility through its members along with MPI code update for ph5diff
|
|
|
|
* as it doesn't require interface change.
|
|
|
|
* (May 6,2011)
|
|
|
|
*
|
|
|
|
* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
|
|
|
|
* Date: May 9, 2003
|
2003-03-26 22:23:48 +08:00
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
*/
|
|
|
|
|
2007-09-13 23:44:56 +08:00
|
|
|
hsize_t diff(hid_t file1_id,
|
2006-03-23 04:53:05 +08:00
|
|
|
const char *path1,
|
2008-09-16 23:52:51 +08:00
|
|
|
hid_t file2_id,
|
|
|
|
const char *path2,
|
|
|
|
diff_opt_t * options,
|
2011-05-07 06:02:24 +08:00
|
|
|
diff_args_t *argdata)
|
2003-03-26 22:23:48 +08:00
|
|
|
{
|
2012-09-11 05:40:47 +08:00
|
|
|
hid_t dset1_id = (-1);
|
|
|
|
hid_t dset2_id = (-1);
|
2008-05-01 03:51:13 +08:00
|
|
|
hid_t type1_id = (-1);
|
|
|
|
hid_t type2_id = (-1);
|
|
|
|
hid_t grp1_id = (-1);
|
|
|
|
hid_t grp2_id = (-1);
|
|
|
|
int ret;
|
2013-09-14 05:11:30 +08:00
|
|
|
hbool_t is_dangle_link1 = FALSE;
|
|
|
|
hbool_t is_dangle_link2 = FALSE;
|
|
|
|
hbool_t is_hard_link = FALSE;
|
2007-03-06 00:26:50 +08:00
|
|
|
hsize_t nfound = 0;
|
[svn-r22176] Purpose:
Fix for HDFFV-7644 GMQS: h5diff - incorrect behaviors when comparing HDF5 files with different type of objects (dataset, group, type) as common objects
Description:
Fixed failure for comparing same named object with different object types in comparing groups. (common object comparison)
Prior to the fix, h5diff resulted in error. After the fix, h5diff detects such case as non-comparable and display messages accordingly.
Test cases were added and tagged with jira#.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE cmake), Cmake (jam)
2012-03-29 06:09:38 +08:00
|
|
|
h5trav_type_t object_type;
|
2008-09-16 23:52:51 +08:00
|
|
|
|
2010-02-17 03:43:05 +08:00
|
|
|
/* to get link info */
|
|
|
|
h5tool_link_info_t linkinfo1;
|
|
|
|
h5tool_link_info_t linkinfo2;
|
|
|
|
|
2012-08-06 10:48:11 +08:00
|
|
|
h5difftrace("diff start\n");
|
|
|
|
|
2010-02-17 03:43:05 +08:00
|
|
|
/*init link info struct */
|
|
|
|
HDmemset(&linkinfo1,0,sizeof(h5tool_link_info_t));
|
|
|
|
HDmemset(&linkinfo2,0,sizeof(h5tool_link_info_t));
|
2010-01-30 12:29:13 +08:00
|
|
|
|
2010-02-17 03:43:05 +08:00
|
|
|
/* pass how to handle printing warnings to linkinfo option */
|
|
|
|
if(print_warn(options))
|
|
|
|
linkinfo1.opt.msg_mode = linkinfo2.opt.msg_mode = 1;
|
2010-01-26 05:43:48 +08:00
|
|
|
|
[svn-r22176] Purpose:
Fix for HDFFV-7644 GMQS: h5diff - incorrect behaviors when comparing HDF5 files with different type of objects (dataset, group, type) as common objects
Description:
Fixed failure for comparing same named object with different object types in comparing groups. (common object comparison)
Prior to the fix, h5diff resulted in error. After the fix, h5diff detects such case as non-comparable and display messages accordingly.
Test cases were added and tagged with jira#.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE cmake), Cmake (jam)
2012-03-29 06:09:38 +08:00
|
|
|
/* for symbolic links, take care follow symlink and no dangling link
|
|
|
|
* options */
|
|
|
|
if (argdata->type[0] == H5TRAV_TYPE_LINK ||
|
|
|
|
argdata->type[0] == H5TRAV_TYPE_UDLINK ||
|
|
|
|
argdata->type[1] == H5TRAV_TYPE_LINK ||
|
|
|
|
argdata->type[1] == H5TRAV_TYPE_UDLINK )
|
2010-09-17 01:48:06 +08:00
|
|
|
{
|
[svn-r22176] Purpose:
Fix for HDFFV-7644 GMQS: h5diff - incorrect behaviors when comparing HDF5 files with different type of objects (dataset, group, type) as common objects
Description:
Fixed failure for comparing same named object with different object types in comparing groups. (common object comparison)
Prior to the fix, h5diff resulted in error. After the fix, h5diff detects such case as non-comparable and display messages accordingly.
Test cases were added and tagged with jira#.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE cmake), Cmake (jam)
2012-03-29 06:09:38 +08:00
|
|
|
/*
|
|
|
|
* check dangling links for path1 and path2
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* target object1 - get type and name */
|
2012-04-26 23:56:16 +08:00
|
|
|
ret = H5tools_get_symlink_info(file1_id, path1, &linkinfo1, options->follow_links);
|
[svn-r22176] Purpose:
Fix for HDFFV-7644 GMQS: h5diff - incorrect behaviors when comparing HDF5 files with different type of objects (dataset, group, type) as common objects
Description:
Fixed failure for comparing same named object with different object types in comparing groups. (common object comparison)
Prior to the fix, h5diff resulted in error. After the fix, h5diff detects such case as non-comparable and display messages accordingly.
Test cases were added and tagged with jira#.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE cmake), Cmake (jam)
2012-03-29 06:09:38 +08:00
|
|
|
/* dangling link */
|
|
|
|
if (ret == 0)
|
2010-09-17 01:48:06 +08:00
|
|
|
{
|
[svn-r22176] Purpose:
Fix for HDFFV-7644 GMQS: h5diff - incorrect behaviors when comparing HDF5 files with different type of objects (dataset, group, type) as common objects
Description:
Fixed failure for comparing same named object with different object types in comparing groups. (common object comparison)
Prior to the fix, h5diff resulted in error. After the fix, h5diff detects such case as non-comparable and display messages accordingly.
Test cases were added and tagged with jira#.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE cmake), Cmake (jam)
2012-03-29 06:09:38 +08:00
|
|
|
if (options->no_dangle_links)
|
|
|
|
{
|
|
|
|
/* gangling link is error */
|
|
|
|
if(options->m_verbose)
|
|
|
|
parallel_print("Warning: <%s> is a dangling link.\n", path1);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
else
|
2013-09-14 05:11:30 +08:00
|
|
|
is_dangle_link1 = TRUE;
|
2010-09-17 01:48:06 +08:00
|
|
|
}
|
[svn-r22176] Purpose:
Fix for HDFFV-7644 GMQS: h5diff - incorrect behaviors when comparing HDF5 files with different type of objects (dataset, group, type) as common objects
Description:
Fixed failure for comparing same named object with different object types in comparing groups. (common object comparison)
Prior to the fix, h5diff resulted in error. After the fix, h5diff detects such case as non-comparable and display messages accordingly.
Test cases were added and tagged with jira#.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE cmake), Cmake (jam)
2012-03-29 06:09:38 +08:00
|
|
|
else if (ret < 0)
|
|
|
|
goto out;
|
2010-09-17 01:48:06 +08:00
|
|
|
|
[svn-r22176] Purpose:
Fix for HDFFV-7644 GMQS: h5diff - incorrect behaviors when comparing HDF5 files with different type of objects (dataset, group, type) as common objects
Description:
Fixed failure for comparing same named object with different object types in comparing groups. (common object comparison)
Prior to the fix, h5diff resulted in error. After the fix, h5diff detects such case as non-comparable and display messages accordingly.
Test cases were added and tagged with jira#.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE cmake), Cmake (jam)
2012-03-29 06:09:38 +08:00
|
|
|
/* target object2 - get type and name */
|
2012-04-26 23:56:16 +08:00
|
|
|
ret = H5tools_get_symlink_info(file2_id, path2, &linkinfo2, options->follow_links );
|
[svn-r22176] Purpose:
Fix for HDFFV-7644 GMQS: h5diff - incorrect behaviors when comparing HDF5 files with different type of objects (dataset, group, type) as common objects
Description:
Fixed failure for comparing same named object with different object types in comparing groups. (common object comparison)
Prior to the fix, h5diff resulted in error. After the fix, h5diff detects such case as non-comparable and display messages accordingly.
Test cases were added and tagged with jira#.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE cmake), Cmake (jam)
2012-03-29 06:09:38 +08:00
|
|
|
/* dangling link */
|
|
|
|
if (ret == 0)
|
2010-09-17 01:48:06 +08:00
|
|
|
{
|
[svn-r22176] Purpose:
Fix for HDFFV-7644 GMQS: h5diff - incorrect behaviors when comparing HDF5 files with different type of objects (dataset, group, type) as common objects
Description:
Fixed failure for comparing same named object with different object types in comparing groups. (common object comparison)
Prior to the fix, h5diff resulted in error. After the fix, h5diff detects such case as non-comparable and display messages accordingly.
Test cases were added and tagged with jira#.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE cmake), Cmake (jam)
2012-03-29 06:09:38 +08:00
|
|
|
if (options->no_dangle_links)
|
|
|
|
{
|
|
|
|
/* gangling link is error */
|
|
|
|
if(options->m_verbose)
|
|
|
|
parallel_print("Warning: <%s> is a dangling link.\n", path2);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
else
|
2013-09-14 05:11:30 +08:00
|
|
|
is_dangle_link2 = TRUE;
|
[svn-r22176] Purpose:
Fix for HDFFV-7644 GMQS: h5diff - incorrect behaviors when comparing HDF5 files with different type of objects (dataset, group, type) as common objects
Description:
Fixed failure for comparing same named object with different object types in comparing groups. (common object comparison)
Prior to the fix, h5diff resulted in error. After the fix, h5diff detects such case as non-comparable and display messages accordingly.
Test cases were added and tagged with jira#.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE cmake), Cmake (jam)
2012-03-29 06:09:38 +08:00
|
|
|
}
|
|
|
|
else if (ret < 0)
|
2010-09-17 01:48:06 +08:00
|
|
|
goto out;
|
[svn-r22176] Purpose:
Fix for HDFFV-7644 GMQS: h5diff - incorrect behaviors when comparing HDF5 files with different type of objects (dataset, group, type) as common objects
Description:
Fixed failure for comparing same named object with different object types in comparing groups. (common object comparison)
Prior to the fix, h5diff resulted in error. After the fix, h5diff detects such case as non-comparable and display messages accordingly.
Test cases were added and tagged with jira#.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE cmake), Cmake (jam)
2012-03-29 06:09:38 +08:00
|
|
|
|
|
|
|
/* found dangling link */
|
|
|
|
if (is_dangle_link1 || is_dangle_link2)
|
|
|
|
goto out2;
|
|
|
|
|
|
|
|
/* follow symbolic link option */
|
|
|
|
if (options->follow_links)
|
|
|
|
{
|
|
|
|
if (linkinfo1.linfo.type == H5L_TYPE_SOFT ||
|
|
|
|
linkinfo1.linfo.type == H5L_TYPE_EXTERNAL)
|
|
|
|
argdata->type[0] = linkinfo1.trg_type;
|
|
|
|
|
|
|
|
if (linkinfo2.linfo.type == H5L_TYPE_SOFT ||
|
|
|
|
linkinfo2.linfo.type == H5L_TYPE_EXTERNAL)
|
|
|
|
argdata->type[1] = linkinfo2.trg_type;
|
2010-09-17 01:48:06 +08:00
|
|
|
}
|
|
|
|
}
|
[svn-r22176] Purpose:
Fix for HDFFV-7644 GMQS: h5diff - incorrect behaviors when comparing HDF5 files with different type of objects (dataset, group, type) as common objects
Description:
Fixed failure for comparing same named object with different object types in comparing groups. (common object comparison)
Prior to the fix, h5diff resulted in error. After the fix, h5diff detects such case as non-comparable and display messages accordingly.
Test cases were added and tagged with jira#.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE cmake), Cmake (jam)
2012-03-29 06:09:38 +08:00
|
|
|
/* if objects are not the same type */
|
|
|
|
if (argdata->type[0] != argdata->type[1])
|
|
|
|
{
|
|
|
|
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]),
|
|
|
|
path2, get_type(argdata->type[1]));
|
|
|
|
}
|
|
|
|
options->not_cmp=1;
|
|
|
|
/* TODO: will need to update non-comparable is different
|
|
|
|
* options->contents = 0;
|
|
|
|
*/
|
2010-09-17 01:48:06 +08:00
|
|
|
goto out2;
|
[svn-r22176] Purpose:
Fix for HDFFV-7644 GMQS: h5diff - incorrect behaviors when comparing HDF5 files with different type of objects (dataset, group, type) as common objects
Description:
Fixed failure for comparing same named object with different object types in comparing groups. (common object comparison)
Prior to the fix, h5diff resulted in error. After the fix, h5diff detects such case as non-comparable and display messages accordingly.
Test cases were added and tagged with jira#.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE cmake), Cmake (jam)
2012-03-29 06:09:38 +08:00
|
|
|
}
|
|
|
|
else /* now both object types are same */
|
|
|
|
object_type = argdata->type[0];
|
[svn-r20676] Purpose:
- HDFFV-5928 - GMQS: h5diff problem and improvement on comparsing the same objects
Description:
Fixed:
1) adding h5tools_is_obj_same() function to check if two given IDs or paths point to the same object. This function can be very useful for other tools and applications.
2) using h5tools_is_obj_same() at h5diff() and diff() in h5diff.c. If two paths point to the same object, there is no need to check the details of the object since we know there is no difference. The fix will increase the performance by skipping the content comparison. It also fixed the problem of reporting difference for some cases of comparing the same file, e.g. empty files or files with incomparable objects the same file.
Test update:
Updat prvious test cases (171, 172, 530) affected by this fix, so they
still perfrom originally intended testing without bypassing.
Tested:
jam (linux32-LE), koala (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), cmake
2011-04-30 01:02:31 +08:00
|
|
|
|
|
|
|
/*
|
2011-05-07 06:02:24 +08:00
|
|
|
* 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
|
|
|
|
* specified.
|
|
|
|
*
|
|
|
|
* Perform this to match the outputs as bypassing.
|
[svn-r20676] Purpose:
- HDFFV-5928 - GMQS: h5diff problem and improvement on comparsing the same objects
Description:
Fixed:
1) adding h5tools_is_obj_same() function to check if two given IDs or paths point to the same object. This function can be very useful for other tools and applications.
2) using h5tools_is_obj_same() at h5diff() and diff() in h5diff.c. If two paths point to the same object, there is no need to check the details of the object since we know there is no difference. The fix will increase the performance by skipping the content comparison. It also fixed the problem of reporting difference for some cases of comparing the same file, e.g. empty files or files with incomparable objects the same file.
Test update:
Updat prvious test cases (171, 172, 530) affected by this fix, so they
still perfrom originally intended testing without bypassing.
Tested:
jam (linux32-LE), koala (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), cmake
2011-04-30 01:02:31 +08:00
|
|
|
*/
|
[svn-r22176] Purpose:
Fix for HDFFV-7644 GMQS: h5diff - incorrect behaviors when comparing HDF5 files with different type of objects (dataset, group, type) as common objects
Description:
Fixed failure for comparing same named object with different object types in comparing groups. (common object comparison)
Prior to the fix, h5diff resulted in error. After the fix, h5diff detects such case as non-comparable and display messages accordingly.
Test cases were added and tagged with jira#.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE cmake), Cmake (jam)
2012-03-29 06:09:38 +08:00
|
|
|
if (argdata->is_same_trgobj)
|
[svn-r20676] Purpose:
- HDFFV-5928 - GMQS: h5diff problem and improvement on comparsing the same objects
Description:
Fixed:
1) adding h5tools_is_obj_same() function to check if two given IDs or paths point to the same object. This function can be very useful for other tools and applications.
2) using h5tools_is_obj_same() at h5diff() and diff() in h5diff.c. If two paths point to the same object, there is no need to check the details of the object since we know there is no difference. The fix will increase the performance by skipping the content comparison. It also fixed the problem of reporting difference for some cases of comparing the same file, e.g. empty files or files with incomparable objects the same file.
Test update:
Updat prvious test cases (171, 172, 530) affected by this fix, so they
still perfrom originally intended testing without bypassing.
Tested:
jam (linux32-LE), koala (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), cmake
2011-04-30 01:02:31 +08:00
|
|
|
{
|
2012-08-04 04:11:36 +08:00
|
|
|
h5difftrace("argdata->is_same_trgobj\n");
|
[svn-r22176] Purpose:
Fix for HDFFV-7644 GMQS: h5diff - incorrect behaviors when comparing HDF5 files with different type of objects (dataset, group, type) as common objects
Description:
Fixed failure for comparing same named object with different object types in comparing groups. (common object comparison)
Prior to the fix, h5diff resulted in error. After the fix, h5diff detects such case as non-comparable and display messages accordingly.
Test cases were added and tagged with jira#.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE cmake), Cmake (jam)
2012-03-29 06:09:38 +08:00
|
|
|
is_hard_link = (object_type == H5TRAV_TYPE_DATASET ||
|
|
|
|
object_type == H5TRAV_TYPE_NAMED_DATATYPE ||
|
|
|
|
object_type == H5TRAV_TYPE_GROUP);
|
|
|
|
if (options->follow_links || is_hard_link)
|
[svn-r20676] Purpose:
- HDFFV-5928 - GMQS: h5diff problem and improvement on comparsing the same objects
Description:
Fixed:
1) adding h5tools_is_obj_same() function to check if two given IDs or paths point to the same object. This function can be very useful for other tools and applications.
2) using h5tools_is_obj_same() at h5diff() and diff() in h5diff.c. If two paths point to the same object, there is no need to check the details of the object since we know there is no difference. The fix will increase the performance by skipping the content comparison. It also fixed the problem of reporting difference for some cases of comparing the same file, e.g. empty files or files with incomparable objects the same file.
Test update:
Updat prvious test cases (171, 172, 530) affected by this fix, so they
still perfrom originally intended testing without bypassing.
Tested:
jam (linux32-LE), koala (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), cmake
2011-04-30 01:02:31 +08:00
|
|
|
{
|
|
|
|
/* print information is only verbose option is used */
|
|
|
|
if(options->m_verbose || options->m_report)
|
|
|
|
{
|
[svn-r22176] Purpose:
Fix for HDFFV-7644 GMQS: h5diff - incorrect behaviors when comparing HDF5 files with different type of objects (dataset, group, type) as common objects
Description:
Fixed failure for comparing same named object with different object types in comparing groups. (common object comparison)
Prior to the fix, h5diff resulted in error. After the fix, h5diff detects such case as non-comparable and display messages accordingly.
Test cases were added and tagged with jira#.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE cmake), Cmake (jam)
2012-03-29 06:09:38 +08:00
|
|
|
switch(object_type)
|
[svn-r20676] Purpose:
- HDFFV-5928 - GMQS: h5diff problem and improvement on comparsing the same objects
Description:
Fixed:
1) adding h5tools_is_obj_same() function to check if two given IDs or paths point to the same object. This function can be very useful for other tools and applications.
2) using h5tools_is_obj_same() at h5diff() and diff() in h5diff.c. If two paths point to the same object, there is no need to check the details of the object since we know there is no difference. The fix will increase the performance by skipping the content comparison. It also fixed the problem of reporting difference for some cases of comparing the same file, e.g. empty files or files with incomparable objects the same file.
Test update:
Updat prvious test cases (171, 172, 530) affected by this fix, so they
still perfrom originally intended testing without bypassing.
Tested:
jam (linux32-LE), koala (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), cmake
2011-04-30 01:02:31 +08:00
|
|
|
{
|
|
|
|
case H5TRAV_TYPE_DATASET:
|
|
|
|
do_print_objname("dataset", path1, path2, options);
|
|
|
|
break;
|
|
|
|
case H5TRAV_TYPE_NAMED_DATATYPE:
|
|
|
|
do_print_objname("datatype", path1, path2, options);
|
|
|
|
break;
|
|
|
|
case H5TRAV_TYPE_GROUP:
|
|
|
|
do_print_objname("group", path1, path2, options);
|
|
|
|
break;
|
|
|
|
case H5TRAV_TYPE_LINK:
|
|
|
|
do_print_objname("link", path1, path2, options);
|
|
|
|
break;
|
|
|
|
case H5TRAV_TYPE_UDLINK:
|
|
|
|
if(linkinfo1.linfo.type == H5L_TYPE_EXTERNAL && linkinfo2.linfo.type == H5L_TYPE_EXTERNAL)
|
|
|
|
do_print_objname("external link", path1, path2, options);
|
|
|
|
else
|
|
|
|
do_print_objname ("user defined link", path1, path2, options);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
parallel_print("Comparison not supported: <%s> and <%s> are of type %s\n",
|
[svn-r22176] Purpose:
Fix for HDFFV-7644 GMQS: h5diff - incorrect behaviors when comparing HDF5 files with different type of objects (dataset, group, type) as common objects
Description:
Fixed failure for comparing same named object with different object types in comparing groups. (common object comparison)
Prior to the fix, h5diff resulted in error. After the fix, h5diff detects such case as non-comparable and display messages accordingly.
Test cases were added and tagged with jira#.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE cmake), Cmake (jam)
2012-03-29 06:09:38 +08:00
|
|
|
path1, path2, get_type(object_type) );
|
[svn-r20676] Purpose:
- HDFFV-5928 - GMQS: h5diff problem and improvement on comparsing the same objects
Description:
Fixed:
1) adding h5tools_is_obj_same() function to check if two given IDs or paths point to the same object. This function can be very useful for other tools and applications.
2) using h5tools_is_obj_same() at h5diff() and diff() in h5diff.c. If two paths point to the same object, there is no need to check the details of the object since we know there is no difference. The fix will increase the performance by skipping the content comparison. It also fixed the problem of reporting difference for some cases of comparing the same file, e.g. empty files or files with incomparable objects the same file.
Test update:
Updat prvious test cases (171, 172, 530) affected by this fix, so they
still perfrom originally intended testing without bypassing.
Tested:
jam (linux32-LE), koala (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), cmake
2011-04-30 01:02:31 +08:00
|
|
|
options->not_cmp = 1;
|
|
|
|
break;
|
|
|
|
} /* switch(type)*/
|
|
|
|
|
|
|
|
print_found(nfound);
|
|
|
|
} /* if(options->m_verbose || options->m_report) */
|
|
|
|
|
[svn-r22176] Purpose:
Fix for HDFFV-7644 GMQS: h5diff - incorrect behaviors when comparing HDF5 files with different type of objects (dataset, group, type) as common objects
Description:
Fixed failure for comparing same named object with different object types in comparing groups. (common object comparison)
Prior to the fix, h5diff resulted in error. After the fix, h5diff detects such case as non-comparable and display messages accordingly.
Test cases were added and tagged with jira#.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE cmake), Cmake (jam)
2012-03-29 06:09:38 +08:00
|
|
|
/* exact same, so comparison is done */
|
[svn-r20676] Purpose:
- HDFFV-5928 - GMQS: h5diff problem and improvement on comparsing the same objects
Description:
Fixed:
1) adding h5tools_is_obj_same() function to check if two given IDs or paths point to the same object. This function can be very useful for other tools and applications.
2) using h5tools_is_obj_same() at h5diff() and diff() in h5diff.c. If two paths point to the same object, there is no need to check the details of the object since we know there is no difference. The fix will increase the performance by skipping the content comparison. It also fixed the problem of reporting difference for some cases of comparing the same file, e.g. empty files or files with incomparable objects the same file.
Test update:
Updat prvious test cases (171, 172, 530) affected by this fix, so they
still perfrom originally intended testing without bypassing.
Tested:
jam (linux32-LE), koala (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), cmake
2011-04-30 01:02:31 +08:00
|
|
|
goto out2;
|
2011-05-07 06:02:24 +08:00
|
|
|
}
|
[svn-r20676] Purpose:
- HDFFV-5928 - GMQS: h5diff problem and improvement on comparsing the same objects
Description:
Fixed:
1) adding h5tools_is_obj_same() function to check if two given IDs or paths point to the same object. This function can be very useful for other tools and applications.
2) using h5tools_is_obj_same() at h5diff() and diff() in h5diff.c. If two paths point to the same object, there is no need to check the details of the object since we know there is no difference. The fix will increase the performance by skipping the content comparison. It also fixed the problem of reporting difference for some cases of comparing the same file, e.g. empty files or files with incomparable objects the same file.
Test update:
Updat prvious test cases (171, 172, 530) affected by this fix, so they
still perfrom originally intended testing without bypassing.
Tested:
jam (linux32-LE), koala (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), cmake
2011-04-30 01:02:31 +08:00
|
|
|
}
|
2010-09-17 01:48:06 +08:00
|
|
|
|
[svn-r22176] Purpose:
Fix for HDFFV-7644 GMQS: h5diff - incorrect behaviors when comparing HDF5 files with different type of objects (dataset, group, type) as common objects
Description:
Fixed failure for comparing same named object with different object types in comparing groups. (common object comparison)
Prior to the fix, h5diff resulted in error. After the fix, h5diff detects such case as non-comparable and display messages accordingly.
Test cases were added and tagged with jira#.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE cmake), Cmake (jam)
2012-03-29 06:09:38 +08:00
|
|
|
switch(object_type)
|
2008-05-01 03:51:13 +08:00
|
|
|
{
|
2010-02-17 03:43:05 +08:00
|
|
|
/*----------------------------------------------------------------------
|
2007-09-13 23:44:56 +08:00
|
|
|
* H5TRAV_TYPE_DATASET
|
2010-02-17 03:43:05 +08:00
|
|
|
*----------------------------------------------------------------------
|
2007-03-06 00:26:50 +08:00
|
|
|
*/
|
2007-09-13 23:44:56 +08:00
|
|
|
case H5TRAV_TYPE_DATASET:
|
2012-09-11 05:40:47 +08:00
|
|
|
if((dset1_id = H5Dopen2(file1_id, path1, H5P_DEFAULT)) < 0)
|
|
|
|
goto out;
|
|
|
|
if((dset2_id = H5Dopen2(file2_id, path2, H5P_DEFAULT)) < 0)
|
|
|
|
goto out;
|
2012-02-24 03:08:09 +08:00
|
|
|
/* verbose (-v) and report (-r) mode */
|
2009-11-21 02:56:01 +08:00
|
|
|
if(options->m_verbose || options->m_report)
|
2008-05-01 03:51:13 +08:00
|
|
|
{
|
2011-03-22 23:47:07 +08:00
|
|
|
do_print_objname("dataset", path1, path2, options);
|
2007-09-13 23:44:56 +08:00
|
|
|
nfound = diff_dataset(file1_id, file2_id, path1, path2, options);
|
|
|
|
print_found(nfound);
|
2009-11-21 02:56:01 +08:00
|
|
|
}
|
|
|
|
/* quiet mode (-q), just count differences */
|
|
|
|
else if(options->m_quiet)
|
|
|
|
{
|
|
|
|
nfound = diff_dataset(file1_id, file2_id, path1, path2, options);
|
|
|
|
}
|
2012-02-24 03:08:09 +08:00
|
|
|
/* the rest (-c, none, ...) */
|
2008-09-16 23:52:51 +08:00
|
|
|
else
|
2008-05-01 03:51:13 +08:00
|
|
|
{
|
2009-11-21 02:56:01 +08:00
|
|
|
nfound = diff_dataset(file1_id, file2_id, path1, path2, options);
|
2011-09-17 03:29:03 +08:00
|
|
|
/* print info if difference found */
|
|
|
|
if (nfound)
|
2010-01-22 04:01:42 +08:00
|
|
|
{
|
2011-03-22 23:47:07 +08:00
|
|
|
do_print_objname("dataset", path1, path2, options);
|
2012-02-24 03:08:09 +08:00
|
|
|
print_found(nfound);
|
2010-01-22 04:01:42 +08:00
|
|
|
}
|
2009-11-21 02:56:01 +08:00
|
|
|
}
|
2012-09-11 05:40:47 +08:00
|
|
|
|
|
|
|
|
|
|
|
/*---------------------------------------------------------
|
|
|
|
* compare attributes
|
|
|
|
* if condition refers to cases when the dataset is a
|
|
|
|
* referenced object
|
|
|
|
*---------------------------------------------------------
|
|
|
|
*/
|
|
|
|
if(path1)
|
|
|
|
nfound += diff_attr(dset1_id, dset2_id, path1, path2, options);
|
|
|
|
|
|
|
|
|
|
|
|
if(H5Dclose(dset1_id) < 0)
|
|
|
|
goto out;
|
|
|
|
if(H5Dclose(dset2_id) < 0)
|
|
|
|
goto out;
|
2007-09-13 23:44:56 +08:00
|
|
|
break;
|
2008-09-16 23:52:51 +08:00
|
|
|
|
2010-02-17 03:43:05 +08:00
|
|
|
/*----------------------------------------------------------------------
|
2007-09-13 23:44:56 +08:00
|
|
|
* H5TRAV_TYPE_NAMED_DATATYPE
|
2010-02-17 03:43:05 +08:00
|
|
|
*----------------------------------------------------------------------
|
2007-03-06 00:26:50 +08:00
|
|
|
*/
|
2007-09-13 23:44:56 +08:00
|
|
|
case H5TRAV_TYPE_NAMED_DATATYPE:
|
[svn-r14160] Description:
Make H5Topen versioned, and add regression test for H5Topen1.
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
AIX/32 5.3 (copper) w/FORTRAN, w/parallel, in production mode
Mac OS X/32 10.4.10 (amazon) in debug mode
2007-09-28 04:28:27 +08:00
|
|
|
if((type1_id = H5Topen2(file1_id, path1, H5P_DEFAULT)) < 0)
|
2007-09-13 23:44:56 +08:00
|
|
|
goto out;
|
[svn-r14160] Description:
Make H5Topen versioned, and add regression test for H5Topen1.
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
AIX/32 5.3 (copper) w/FORTRAN, w/parallel, in production mode
Mac OS X/32 10.4.10 (amazon) in debug mode
2007-09-28 04:28:27 +08:00
|
|
|
if((type2_id = H5Topen2(file2_id, path2, H5P_DEFAULT)) < 0)
|
2007-09-13 23:44:56 +08:00
|
|
|
goto out;
|
2008-09-16 23:52:51 +08:00
|
|
|
|
2007-09-13 23:44:56 +08:00
|
|
|
if((ret = H5Tequal(type1_id, type2_id)) < 0)
|
|
|
|
goto out;
|
2008-09-16 23:52:51 +08:00
|
|
|
|
2007-09-13 23:44:56 +08:00
|
|
|
/* if H5Tequal is > 0 then the datatypes refer to the same datatype */
|
|
|
|
nfound = (ret > 0) ? 0 : 1;
|
2008-09-16 23:52:51 +08:00
|
|
|
|
2007-09-13 23:44:56 +08:00
|
|
|
if(print_objname(options,nfound))
|
2011-03-22 23:47:07 +08:00
|
|
|
do_print_objname("datatype", path1, path2, options);
|
2007-03-06 00:26:50 +08:00
|
|
|
|
2007-09-13 23:44:56 +08:00
|
|
|
/* always print the number of differences found in verbose mode */
|
|
|
|
if(options->m_verbose)
|
|
|
|
print_found(nfound);
|
2008-09-16 23:52:51 +08:00
|
|
|
|
2010-02-17 03:43:05 +08:00
|
|
|
/*-----------------------------------------------------------------
|
2007-09-13 23:44:56 +08:00
|
|
|
* compare attributes
|
2010-02-17 03:43:05 +08:00
|
|
|
* the if condition refers to cases when the dataset is a
|
|
|
|
* referenced object
|
|
|
|
*-----------------------------------------------------------------
|
2007-09-13 23:44:56 +08:00
|
|
|
*/
|
|
|
|
if(path1)
|
|
|
|
nfound += diff_attr(type1_id, type2_id, path1, path2, options);
|
2008-09-16 23:52:51 +08:00
|
|
|
|
2007-09-13 23:44:56 +08:00
|
|
|
if(H5Tclose(type1_id) < 0)
|
|
|
|
goto out;
|
|
|
|
if(H5Tclose(type2_id) < 0)
|
|
|
|
goto out;
|
|
|
|
break;
|
2008-09-16 23:52:51 +08:00
|
|
|
|
2010-02-17 03:43:05 +08:00
|
|
|
/*----------------------------------------------------------------------
|
2007-09-13 23:44:56 +08:00
|
|
|
* H5TRAV_TYPE_GROUP
|
2010-02-17 03:43:05 +08:00
|
|
|
*----------------------------------------------------------------------
|
2007-09-13 23:44:56 +08:00
|
|
|
*/
|
|
|
|
case H5TRAV_TYPE_GROUP:
|
|
|
|
if(print_objname(options, nfound))
|
2011-03-22 23:47:07 +08:00
|
|
|
do_print_objname("group", path1, path2, options);
|
2007-03-06 00:26:50 +08:00
|
|
|
|
2007-09-13 23:44:56 +08:00
|
|
|
/* always print the number of differences found in verbose mode */
|
|
|
|
if(options->m_verbose)
|
|
|
|
print_found(nfound);
|
2008-09-16 23:52:51 +08:00
|
|
|
|
2007-09-13 23:44:56 +08:00
|
|
|
if((grp1_id = H5Gopen2(file1_id, path1, H5P_DEFAULT)) < 0)
|
|
|
|
goto out;
|
|
|
|
if((grp2_id = H5Gopen2(file2_id, path2, H5P_DEFAULT)) < 0)
|
|
|
|
goto out;
|
2007-08-28 23:02:54 +08:00
|
|
|
|
2010-02-17 03:43:05 +08:00
|
|
|
/*-----------------------------------------------------------------
|
2007-09-13 23:44:56 +08:00
|
|
|
* compare attributes
|
2010-02-17 03:43:05 +08:00
|
|
|
* the if condition refers to cases when the dataset is a
|
|
|
|
* referenced object
|
|
|
|
*-----------------------------------------------------------------
|
2007-09-13 23:44:56 +08:00
|
|
|
*/
|
|
|
|
if(path1)
|
|
|
|
nfound += diff_attr(grp1_id, grp2_id, path1, path2, options);
|
2008-09-16 23:52:51 +08:00
|
|
|
|
2007-09-13 23:44:56 +08:00
|
|
|
if(H5Gclose(grp1_id) < 0)
|
|
|
|
goto out;
|
|
|
|
if(H5Gclose(grp2_id) < 0)
|
|
|
|
goto out;
|
|
|
|
break;
|
2008-09-16 23:52:51 +08:00
|
|
|
|
|
|
|
|
2010-02-17 03:43:05 +08:00
|
|
|
/*----------------------------------------------------------------------
|
2007-09-13 23:44:56 +08:00
|
|
|
* H5TRAV_TYPE_LINK
|
2010-02-17 03:43:05 +08:00
|
|
|
*----------------------------------------------------------------------
|
2007-09-13 23:44:56 +08:00
|
|
|
*/
|
|
|
|
case H5TRAV_TYPE_LINK:
|
|
|
|
{
|
2010-02-17 03:43:05 +08:00
|
|
|
ret = HDstrcmp(linkinfo1.trg_path, linkinfo2.trg_path);
|
2008-09-16 23:52:51 +08:00
|
|
|
|
2010-01-26 05:43:48 +08:00
|
|
|
/* if the target link name is not same then the links are "different" */
|
2007-03-06 00:26:50 +08:00
|
|
|
nfound = (ret != 0) ? 1 : 0;
|
2008-09-16 23:52:51 +08:00
|
|
|
|
2007-08-30 07:37:41 +08:00
|
|
|
if(print_objname(options, nfound))
|
2011-03-22 23:47:07 +08:00
|
|
|
do_print_objname("link", path1, path2, options);
|
2007-03-06 00:26:50 +08:00
|
|
|
|
|
|
|
/* always print the number of differences found in verbose mode */
|
2007-08-30 07:37:41 +08:00
|
|
|
if(options->m_verbose)
|
2007-03-06 00:26:50 +08:00
|
|
|
print_found(nfound);
|
2008-09-16 23:52:51 +08:00
|
|
|
|
2007-09-13 23:44:56 +08:00
|
|
|
}
|
|
|
|
break;
|
2008-09-16 23:52:51 +08:00
|
|
|
|
2010-02-17 03:43:05 +08:00
|
|
|
/*----------------------------------------------------------------------
|
2007-09-13 23:44:56 +08:00
|
|
|
* H5TRAV_TYPE_UDLINK
|
2010-02-17 03:43:05 +08:00
|
|
|
*----------------------------------------------------------------------
|
2007-09-13 23:44:56 +08:00
|
|
|
*/
|
|
|
|
case H5TRAV_TYPE_UDLINK:
|
|
|
|
{
|
2010-02-17 03:43:05 +08:00
|
|
|
/* Only external links will have a query function registered */
|
|
|
|
if(linkinfo1.linfo.type == H5L_TYPE_EXTERNAL && linkinfo2.linfo.type == H5L_TYPE_EXTERNAL)
|
|
|
|
{
|
2007-03-06 00:26:50 +08:00
|
|
|
/* If the buffers are the same size, compare them */
|
2010-02-17 03:43:05 +08:00
|
|
|
if(linkinfo1.linfo.u.val_size == linkinfo2.linfo.u.val_size)
|
2010-01-26 05:43:48 +08:00
|
|
|
{
|
2010-02-17 03:43:05 +08:00
|
|
|
ret = HDmemcmp(linkinfo1.trg_path, linkinfo2.trg_path, linkinfo1.linfo.u.val_size);
|
2007-03-06 00:26:50 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
ret = 1;
|
2008-09-16 23:52:51 +08:00
|
|
|
|
2010-02-17 03:43:05 +08:00
|
|
|
/* if "linkinfo1.trg_path" != "linkinfo2.trg_path" then the links
|
|
|
|
* are "different" extlinkinfo#.path is combination string of
|
|
|
|
* file_name and obj_name
|
|
|
|
*/
|
2007-03-06 00:26:50 +08:00
|
|
|
nfound = (ret != 0) ? 1 : 0;
|
2008-09-16 23:52:51 +08:00
|
|
|
|
2007-09-13 23:44:56 +08:00
|
|
|
if(print_objname(options, nfound))
|
2011-03-22 23:47:07 +08:00
|
|
|
do_print_objname("external link", path1, path2, options);
|
2008-09-16 23:52:51 +08:00
|
|
|
|
2007-09-13 23:44:56 +08:00
|
|
|
} /* end if */
|
2010-02-17 03:43:05 +08:00
|
|
|
else
|
2010-01-26 05:43:48 +08:00
|
|
|
{
|
2007-09-13 23:44:56 +08:00
|
|
|
/* 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
|
2008-09-16 23:52:51 +08:00
|
|
|
* function registered for them.
|
2007-09-13 23:44:56 +08:00
|
|
|
*
|
|
|
|
* If the link classes or the buffer length are not the
|
|
|
|
* same, the links are "different"
|
|
|
|
*/
|
2010-02-17 03:43:05 +08:00
|
|
|
if((linkinfo1.linfo.type != linkinfo2.linfo.type) ||
|
|
|
|
(linkinfo1.linfo.u.val_size != linkinfo2.linfo.u.val_size))
|
2007-03-06 00:26:50 +08:00
|
|
|
nfound = 1;
|
|
|
|
else
|
|
|
|
nfound = 0;
|
2008-09-16 23:52:51 +08:00
|
|
|
|
2007-03-06 00:26:50 +08:00
|
|
|
if (print_objname (options, nfound))
|
2011-03-22 23:47:07 +08:00
|
|
|
do_print_objname ("user defined link", path1, path2, options);
|
2007-09-13 23:44:56 +08:00
|
|
|
} /* end else */
|
2008-09-16 23:52:51 +08:00
|
|
|
|
2007-03-06 00:26:50 +08:00
|
|
|
/* always print the number of differences found in verbose mode */
|
2007-09-13 23:44:56 +08:00
|
|
|
if(options->m_verbose)
|
2007-03-06 00:26:50 +08:00
|
|
|
print_found(nfound);
|
2007-09-13 23:44:56 +08:00
|
|
|
}
|
|
|
|
break;
|
2008-09-16 23:52:51 +08:00
|
|
|
|
2007-09-13 23:44:56 +08:00
|
|
|
default:
|
|
|
|
if(options->m_verbose)
|
2009-01-30 02:58:36 +08:00
|
|
|
parallel_print("Comparison not supported: <%s> and <%s> are of type %s\n",
|
[svn-r22176] Purpose:
Fix for HDFFV-7644 GMQS: h5diff - incorrect behaviors when comparing HDF5 files with different type of objects (dataset, group, type) as common objects
Description:
Fixed failure for comparing same named object with different object types in comparing groups. (common object comparison)
Prior to the fix, h5diff resulted in error. After the fix, h5diff detects such case as non-comparable and display messages accordingly.
Test cases were added and tagged with jira#.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE cmake), Cmake (jam)
2012-03-29 06:09:38 +08:00
|
|
|
path1, path2, get_type(object_type) );
|
2007-09-13 23:44:56 +08:00
|
|
|
options->not_cmp = 1;
|
|
|
|
break;
|
|
|
|
}
|
2008-09-16 23:52:51 +08:00
|
|
|
|
2011-03-19 04:13:16 +08:00
|
|
|
/* free link info buffer */
|
|
|
|
if (linkinfo1.trg_path)
|
2012-02-29 02:26:34 +08:00
|
|
|
HDfree((char *)linkinfo1.trg_path);
|
2011-03-19 04:13:16 +08:00
|
|
|
if (linkinfo2.trg_path)
|
2012-02-29 02:26:34 +08:00
|
|
|
HDfree((char *)linkinfo2.trg_path);
|
2011-03-19 04:13:16 +08:00
|
|
|
|
2007-09-13 23:44:56 +08:00
|
|
|
return nfound;
|
2008-09-16 23:52:51 +08:00
|
|
|
|
2005-01-27 07:03:29 +08:00
|
|
|
out:
|
2007-09-13 23:44:56 +08:00
|
|
|
options->err_stat = 1;
|
2006-06-27 22:45:06 +08:00
|
|
|
|
2010-02-17 03:43:05 +08:00
|
|
|
out2:
|
|
|
|
/*-----------------------------------
|
|
|
|
* handle dangling link(s)
|
|
|
|
*/
|
|
|
|
/* both path1 and path2 are dangling links */
|
|
|
|
if(is_dangle_link1 && is_dangle_link2)
|
|
|
|
{
|
|
|
|
if(print_objname(options, nfound))
|
|
|
|
{
|
2011-03-22 23:47:07 +08:00
|
|
|
do_print_objname("dangling link", path1, path2, options);
|
2010-02-17 03:43:05 +08:00
|
|
|
print_found(nfound);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* path1 is dangling link */
|
|
|
|
else if (is_dangle_link1)
|
|
|
|
{
|
|
|
|
if(options->m_verbose)
|
|
|
|
parallel_print("obj1 <%s> is a dangling link.\n", path1);
|
|
|
|
nfound++;
|
|
|
|
if(print_objname(options, nfound))
|
|
|
|
print_found(nfound);
|
|
|
|
}
|
|
|
|
/* path2 is dangling link */
|
|
|
|
else if (is_dangle_link2)
|
|
|
|
{
|
|
|
|
if(options->m_verbose)
|
|
|
|
parallel_print("obj2 <%s> is a dangling link.\n", path2);
|
|
|
|
nfound++;
|
|
|
|
if(print_objname(options, nfound))
|
|
|
|
print_found(nfound);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* free link info buffer */
|
|
|
|
if (linkinfo1.trg_path)
|
2012-02-29 02:26:34 +08:00
|
|
|
HDfree((char *)linkinfo1.trg_path);
|
2010-02-17 03:43:05 +08:00
|
|
|
if (linkinfo2.trg_path)
|
2012-02-29 02:26:34 +08:00
|
|
|
HDfree((char *)linkinfo2.trg_path);
|
2010-01-26 05:43:48 +08:00
|
|
|
|
2007-09-13 23:44:56 +08:00
|
|
|
/* close */
|
|
|
|
/* disable error reporting */
|
|
|
|
H5E_BEGIN_TRY {
|
|
|
|
H5Tclose(type1_id);
|
|
|
|
H5Tclose(type2_id);
|
|
|
|
H5Gclose(grp1_id);
|
|
|
|
H5Tclose(grp2_id);
|
|
|
|
/* enable error reporting */
|
|
|
|
} H5E_END_TRY;
|
2012-08-04 04:11:36 +08:00
|
|
|
h5difftrace("diff finish\n");
|
2005-02-07 07:45:15 +08:00
|
|
|
|
2007-09-13 23:44:56 +08:00
|
|
|
return nfound;
|
|
|
|
}
|
2005-02-07 07:45:15 +08:00
|
|
|
|