summaryrefslogtreecommitdiffstats
path: root/tools/lib
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2012-08-06 20:08:12 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2012-08-06 20:08:12 (GMT)
commit9c547117ece94acacbbdd804166f32b6208596da (patch)
tree4aa8a3fecd3f450c42d417bb996e25dc361648f6 /tools/lib
parente7896ce1ceb74c9c6df3f380d6872a9d6d5ee59c (diff)
downloadhdf5-9c547117ece94acacbbdd804166f32b6208596da.zip
hdf5-9c547117ece94acacbbdd804166f32b6208596da.tar.gz
hdf5-9c547117ece94acacbbdd804166f32b6208596da.tar.bz2
[svn-r22637] Remove legacy command to kill MPI processes on obj to obj testing.
Tested: Windows, jam, koala
Diffstat (limited to 'tools/lib')
-rw-r--r--tools/lib/h5diff.c27
1 files changed, 9 insertions, 18 deletions
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index 48e82bb..f2eb3ab 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -1013,27 +1013,18 @@ hsize_t h5diff(const char *fname1,
#ifdef H5_HAVE_PARALLEL
if(g_Parallel)
{
- /* if both obj1 and obj2 are group */
- if (both_objs_grp)
+ if((HDstrlen(fname1) > MAX_FILENAME) || (HDstrlen(fname2) > MAX_FILENAME))
{
- if((HDstrlen(fname1) > MAX_FILENAME) || (HDstrlen(fname2) > MAX_FILENAME))
- {
- HDfprintf(stderr, "The parallel diff only supports path names up to %d characters\n", MAX_FILENAME);
- MPI_Abort(MPI_COMM_WORLD, 0);
- } /* end if */
+ HDfprintf(stderr, "The parallel diff only supports path names up to %d characters\n", MAX_FILENAME);
+ MPI_Abort(MPI_COMM_WORLD, 0);
+ } /* end if */
- HDstrcpy(filenames[0], fname1);
- HDstrcpy(filenames[1], fname2);
+ HDstrcpy(filenames[0], fname1);
+ HDstrcpy(filenames[1], fname2);
- /* 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);
- }
- else
- {
- /* Only single object diff, parallel workers won't be needed */
- phdiff_dismiss_workers();
- }
+ /* 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);
} /* end if */
#endif