diff options
| author | Jonathan Kim <jkm@hdfgroup.org> | 2011-05-10 23:05:28 (GMT) |
|---|---|---|
| committer | Jonathan Kim <jkm@hdfgroup.org> | 2011-05-10 23:05:28 (GMT) |
| commit | a396f8dd7f882c1eddab91e1b7fa3c02bec5e06e (patch) | |
| tree | d9567c8f20e5a4cfa68fe35539471319883227d2 /tools/h5diff | |
| parent | 30db3befb22fc8ec5b38b0a8ddc8ce544a63fa56 (diff) | |
| download | hdf5-a396f8dd7f882c1eddab91e1b7fa3c02bec5e06e.zip hdf5-a396f8dd7f882c1eddab91e1b7fa3c02bec5e06e.tar.gz hdf5-a396f8dd7f882c1eddab91e1b7fa3c02bec5e06e.tar.bz2 | |
[svn-r20794] Purpose:
HDFFV-5928 - GMQS: h5diff problem and improvement on comparsing the same objects
Description:
Merged from HDF5 trunk r20767.
Improved performance by eliminating duplicated action for getting object
information in half from the previous fixe when comparing group vs group.
This is addition to the previous commit r20706.
Tested:
jam (linux32-LE), koala (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE)
Diffstat (limited to 'tools/h5diff')
| -rw-r--r-- | tools/h5diff/ph5diff_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/h5diff/ph5diff_main.c b/tools/h5diff/ph5diff_main.c index bac1086..871b93b 100644 --- a/tools/h5diff/ph5diff_main.c +++ b/tools/h5diff/ph5diff_main.c @@ -136,7 +136,7 @@ int main(int argc, const char *argv[]) static void ph5diff_worker(int nID) { - struct diff_args args; + struct diff_mpi_args args; hid_t file1_id, file2_id; char filenames[2][MAX_FILENAME]; char out_data[PRINT_DATA_MAX_SIZE] = {0}; @@ -177,7 +177,7 @@ ph5diff_worker(int nID) /*Recv parameters for diff from manager task */ MPI_Recv(&args, sizeof(args), MPI_BYTE, 0, MPI_TAG_ARGS, MPI_COMM_WORLD, &Status); /*Do the diff */ - diffs.nfound = diff(file1_id, args.name1, file2_id, args.name2, &(args.options), args.type); + diffs.nfound = diff(file1_id, args.name1, file2_id, args.name2, &(args.options), &(args.argdata)); diffs.not_cmp = args.options.not_cmp; /*If print buffer has something in it, request print token.*/ |