diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2011-08-30 16:51:32 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2011-08-30 16:51:32 (GMT) |
commit | 26f47610b1900111fe0919c3bcaa835639dfe462 (patch) | |
tree | fc4e730c0b598017b81ce340f0241730050655fd /tools/lib/ph5diff.h | |
parent | 40480c8a72af7753d5586b8af648d96b91c34813 (diff) | |
download | hdf5-26f47610b1900111fe0919c3bcaa835639dfe462.zip hdf5-26f47610b1900111fe0919c3bcaa835639dfe462.tar.gz hdf5-26f47610b1900111fe0919c3bcaa835639dfe462.tar.bz2 |
[svn-r21337] Synchronize cmake files with tested commits from trunk, windows parallel diff
Diffstat (limited to 'tools/lib/ph5diff.h')
-rw-r--r-- | tools/lib/ph5diff.h | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/tools/lib/ph5diff.h b/tools/lib/ph5diff.h index 9476a71..becbd6c 100644 --- a/tools/lib/ph5diff.h +++ b/tools/lib/ph5diff.h @@ -17,37 +17,31 @@ #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 - -H5TOOLS_DLLVAR int g_nTasks; -H5TOOLS_DLLVAR unsigned char g_Parallel; -H5TOOLS_DLLVAR char outBuff[]; -H5TOOLS_DLLVAR int outBuffOffset; -H5TOOLS_DLLVAR FILE * overflow_file; +#define MPI_TAG_END 7 +#define MPI_TAG_PARALLEL 8 struct diff_mpi_args { - char name1[256]; - char name2[256]; - diff_opt_t options; + char name1[256]; + char name2[256]; + diff_opt_t options; diff_args_t argdata; /* rest args */ }; struct diffs_found { hsize_t nfound; - int not_cmp; + int not_cmp; }; #ifdef H5_HAVE_PARALLEL |