mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-02-11 16:01:00 +08:00
ac2e0d548e
Bug fix for parallel case for new "Some objects were not comparable" patch to h5diff. Description: The parallel h5diff wouldn't print out "Some objects were not comparable" because the worker tasks were not communicating the not_cmp flag of the diff_opt_t struct back to the manager, who ultimately prints everything. Also, some miscellaneous fixes for error printing. Some errors were printed out with printf instead of fprintf(stderr,...). In parallel environments, this can result in output getting lost. Solution: Had the worker tasks pass along the not_cmp flag to the manager when they sent along the number of differences they found. Platforms tested: heping (pp), sol (pp) Misc. update:
59 lines
1.8 KiB
C
59 lines
1.8 KiB
C
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
|
* Copyright by the Board of Trustees of the University of Illinois. *
|
|
* All rights reserved. *
|
|
* *
|
|
* This file is part of HDF5. The full HDF5 copyright notice, including *
|
|
* terms governing use, modification, and redistribution, is contained in *
|
|
* the files COPYING and Copyright.html. COPYING can be found at the root *
|
|
* of the source code distribution tree; Copyright.html can be found at the *
|
|
* root level of an installed copy of the electronic HDF5 document set and *
|
|
* is linked from the top-level documents page. It can also be found at *
|
|
* http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have *
|
|
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
|
|
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
|
|
|
#ifndef _PH5DIFF_H__
|
|
#define _PH5DIFF_H__
|
|
|
|
#define PRINT_DATA_MAX_SIZE 512
|
|
#define OUTBUFF_SIZE PRINT_DATA_MAX_SIZE*4
|
|
/* Send from manager to workers */
|
|
#define MPI_TAG_ARGS 1
|
|
#define MPI_TAG_PRINT_TOK 2
|
|
|
|
/*Sent from workers to manager */
|
|
#define MPI_TAG_TOK_REQUEST 3
|
|
#define MPI_TAG_DONE 4
|
|
#define MPI_TAG_TOK_RETURN 5
|
|
#define MPI_TAG_PRINT_DATA 6
|
|
|
|
/* Operational tags used to init and complete diff */
|
|
#define MPI_TAG_END 7
|
|
#define MPI_TAG_PARALLEL 8
|
|
|
|
extern int g_nTasks;
|
|
extern unsigned char g_Parallel;
|
|
extern char outBuff[];
|
|
extern unsigned int outBuffOffset;
|
|
extern FILE* overflow_file;
|
|
|
|
struct diff_args
|
|
{
|
|
char name[256];
|
|
H5G_obj_t type;
|
|
diff_opt_t options;
|
|
};
|
|
|
|
struct diffs_found
|
|
{
|
|
hsize_t nfound;
|
|
int not_cmp;
|
|
};
|
|
|
|
#ifdef H5_HAVE_PARALLEL
|
|
#include <mpi.h>
|
|
#endif
|
|
|
|
|
|
#endif /* _PH5DIFF_H__ */
|