summaryrefslogtreecommitdiffstats
path: root/tools/h5diff/h5diff_common.c
diff options
context:
space:
mode:
authorLeon Arber <larber@ncsa.uiuc.edu>2005-06-28 19:20:56 (GMT)
committerLeon Arber <larber@ncsa.uiuc.edu>2005-06-28 19:20:56 (GMT)
commitac2e0d548eaab1cb3c3875ed4cd842de8aed6b41 (patch)
treedbadb82fbd2a675da7aa4afc9441b3a7cfc89691 /tools/h5diff/h5diff_common.c
parent92723c7e02110865a393547e942e53cdefd2315a (diff)
downloadhdf5-ac2e0d548eaab1cb3c3875ed4cd842de8aed6b41.zip
hdf5-ac2e0d548eaab1cb3c3875ed4cd842de8aed6b41.tar.gz
hdf5-ac2e0d548eaab1cb3c3875ed4cd842de8aed6b41.tar.bz2
[svn-r10996] Purpose:
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:
Diffstat (limited to 'tools/h5diff/h5diff_common.c')
-rw-r--r--tools/h5diff/h5diff_common.c62
1 files changed, 29 insertions, 33 deletions
diff --git a/tools/h5diff/h5diff_common.c b/tools/h5diff/h5diff_common.c
index 48bcedb..5387f2a 100644
--- a/tools/h5diff/h5diff_common.c
+++ b/tools/h5diff/h5diff_common.c
@@ -17,9 +17,6 @@
#include "h5diff.h"
#include "h5diff_common.h"
-extern int g_Parallel;
-extern int g_nTasks;
-
/*-------------------------------------------------------------------------
* Function: parse_input
*
@@ -185,36 +182,35 @@ void parse_input(int argc, const char* argv[], const char** fname1, const char**
void print_results(hsize_t nfound, diff_opt_t* options)
{
-/*-------------------------------------------------------------------------
- * print how many differences were found
- *-------------------------------------------------------------------------
- */
- if (!options->m_quiet)
- {
- printf("----------------------------------------------------\n");
- printf("Summary\n");
- printf("----------------------------------------------------\n");
-
- if (options->cmn_objs==0 && !options->err_stat)
- {
- printf("No common objects found. Files are not comparable.\n");
- if (!options->m_verbose)
- printf("Use -v for a list of objects.\n");
- }
- else
- {
- /* no errors found */
- if (!options->err_stat)
- {
- /* objects were not compared */
- if (options->not_cmp==1)
- printf("Some objects are not comparable\n");
- else
- /* objects were compared, print the number of differences */
- print_found(nfound);
- }
- }
- }
+ /*-------------------------------------------------------------------------
+ * print how many differences were found
+ *-------------------------------------------------------------------------
+ */
+ if (!options->m_quiet)
+ {
+ printf("----------------------------------------------------\n");
+ printf("Summary\n");
+ printf("----------------------------------------------------\n");
+ if (options->cmn_objs==0 && !options->err_stat)
+ {
+ printf("No common objects found. Files are not comparable.\n");
+ if (!options->m_verbose)
+ printf("Use -v for a list of objects.\n");
+ }
+ else
+ {
+ /* no errors found */
+ if (!options->err_stat)
+ {
+ /* objects were not compared */
+ if (options->not_cmp==1)
+ printf("Some objects are not comparable\n");
+ else
+ /* objects were compared, print the number of differences */
+ print_found(nfound);
+ }
+ }
+ }
}
/*-------------------------------------------------------------------------