diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2013-12-26 15:34:33 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2013-12-26 15:34:33 (GMT) |
| commit | 8965bb188cab6e82eb3ac1ad1909f2ab4089c20b (patch) | |
| tree | db6dd26968b5c314e67ecc0410d63e9a46747615 /tools/lib | |
| parent | 3c9424e67dc113ba89c281953f21d37ef3739fe2 (diff) | |
| parent | 928d398be4143546e57c50788b429095328cb3ba (diff) | |
| download | hdf5-8965bb188cab6e82eb3ac1ad1909f2ab4089c20b.zip hdf5-8965bb188cab6e82eb3ac1ad1909f2ab4089c20b.tar.gz hdf5-8965bb188cab6e82eb3ac1ad1909f2ab4089c20b.tar.bz2 | |
[svn-r24594] Merge from VOL branch.
Update plist encode/decode pre-generated files for newly added properties.
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/h5diff.c | 41 | ||||
| -rw-r--r-- | tools/lib/ph5diff.h | 16 |
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 { |