summaryrefslogtreecommitdiffstats
path: root/tools/lib
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2013-11-30 18:10:36 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2013-11-30 18:10:36 (GMT)
commit2d79ba29ed420980883adc67436c9b2bfb9c3331 (patch)
tree9db1d87fe4f5f0914017ecbf965d0de1e35cb171 /tools/lib
parent0a506a625b6ce09bf8b87944384e3617f8df5fa7 (diff)
downloadhdf5-2d79ba29ed420980883adc67436c9b2bfb9c3331.zip
hdf5-2d79ba29ed420980883adc67436c9b2bfb9c3331.tar.gz
hdf5-2d79ba29ed420980883adc67436c9b2bfb9c3331.tar.bz2
[svn-r24480] Description:
Bring r24479 from 1.8 branch to trunk: Fix ph5diff worker command handling so it can correctly respond to situations where there's no work to perform. Also, a few minor code cleanups. Tested on: Mac OSX/64 10.9.0 (amazon) w/parallel (too minor to require h5committest)
Diffstat (limited to 'tools/lib')
-rw-r--r--tools/lib/h5diff.c41
-rw-r--r--tools/lib/ph5diff.h16
2 files changed, 8 insertions, 49 deletions
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index 541525d..ab21bfd 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -106,47 +106,6 @@ void phdiff_dismiss_workers(void)
/*-------------------------------------------------------------------------
- * Function: print_manager_output
- *
- * Purpose: special function that prints any output accumulated by the
- * manager task.
- *
- * Return: none
- *
- * Programmer: Leon Arber
- *
- * Date: Feb 7, 2005
- *
- *-------------------------------------------------------------------------
- */
-void print_manager_output(void)
-{
- /* If there was something we buffered, let's print it now */
- if( (outBuffOffset>0) && g_Parallel)
- {
- printf("%s", outBuff);
-
- if(overflow_file)
- {
- int tmp;
- rewind(overflow_file);
- while((tmp = getc(overflow_file)) >= 0)
- putchar(tmp);
- fclose(overflow_file);
- overflow_file = NULL;
- }
-
- HDfflush(stdout);
- HDmemset(outBuff, 0, OUTBUFF_SIZE);
- outBuffOffset = 0;
- }
- else if( (outBuffOffset>0) && !g_Parallel)
- {
- HDfprintf(stderr, "h5diff error: outBuffOffset>0, but we're not in parallel!\n");
- }
-}
-
-/*-------------------------------------------------------------------------
* Function: print_incoming_data
*
* Purpose: special function that prints any output that has been sent to the manager
diff --git a/tools/lib/ph5diff.h b/tools/lib/ph5diff.h
index becbd6c..2a75228 100644
--- a/tools/lib/ph5diff.h
+++ b/tools/lib/ph5diff.h
@@ -17,18 +17,18 @@
#define _PH5DIFF_H__
/* Send from manager to workers */
-#define MPI_TAG_ARGS 1
-#define MPI_TAG_PRINT_TOK 2
+#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
+#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
+#define MPI_TAG_END 7
+#define MPI_TAG_PARALLEL 8
struct diff_mpi_args
{