diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2014-03-21 23:02:24 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2014-03-21 23:02:24 (GMT) |
| commit | 2e4302818ab260604ffa26e90dab159cf28079d4 (patch) | |
| tree | 311af94353763d9664b716be63c1280115ec0c1f /tools/h5dump | |
| parent | c4f982abf147f1050251ddd6ec4fe9515d01f67c (diff) | |
| download | hdf5-2e4302818ab260604ffa26e90dab159cf28079d4.zip hdf5-2e4302818ab260604ffa26e90dab159cf28079d4.tar.gz hdf5-2e4302818ab260604ffa26e90dab159cf28079d4.tar.bz2 | |
[svn-r24864] Description:
Remove all traces of MPI-POSIX VFD and GPFS detection/code.
Remove remaining traces of stream VFD.
Remove testpar/t_posix_compliant test (it's not actually verifying anything).
Clean up H5D__mpio_opt_possible() further.
Moved environment variable that disables MPI collective operations into
MPI-IO VFD (instead of it being in src/H5S.c).
A few other small code cleanups.
Tested on:
Mac OSX/64 10.9.2 (amazon) w/parallel & serial
Diffstat (limited to 'tools/h5dump')
| -rw-r--r-- | tools/h5dump/Makefile.in | 1 | ||||
| -rw-r--r-- | tools/h5dump/h5dump_ddl.c | 33 |
2 files changed, 12 insertions, 22 deletions
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index 21a622d..7770b93 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -226,7 +226,6 @@ FC_VERSION = @FC_VERSION@ FGREP = @FGREP@ FILTERS = @FILTERS@ FSEARCH_DIRS = @FSEARCH_DIRS@ -GPFS = @GPFS@ GREP = @GREP@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ diff --git a/tools/h5dump/h5dump_ddl.c b/tools/h5dump/h5dump_ddl.c index d714f39..e38b93b 100644 --- a/tools/h5dump/h5dump_ddl.c +++ b/tools/h5dump/h5dump_ddl.c @@ -1203,28 +1203,24 @@ dump_fcpl(hid_t fid) PRINTSTREAM(rawoutstream, "%s %d\n","BTREE_LEAF", sym_lk); #ifdef SHOW_FILE_DRIVER - if (H5FD_CORE==fdriver) + if(H5FD_CORE==fdriver) HDstrcpy(dname,"H5FD_CORE"); #ifdef H5_HAVE_DIRECT - else if (H5FD_DIRECT==fdriver) + else if(H5FD_DIRECT==fdriver) HDstrcpy(dname,"H5FD_DIRECT"); #endif - else if (H5FD_FAMILY==fdriver) + else if(H5FD_FAMILY==fdriver) HDstrcpy(dname,"H5FD_FAMILY"); - else if (H5FD_LOG==fdriver) + else if(H5FD_LOG==fdriver) HDstrcpy(dname,"H5FD_LOG"); - else if (H5FD_MPIO==fdriver) + else if(H5FD_MPIO==fdriver) HDstrcpy(dname,"H5FD_MPIO"); - else if (H5FD_MULTI==fdriver) + else if(H5FD_MULTI==fdriver) HDstrcpy(dname,"H5FD_MULTI"); - else if (H5FD_SEC2==fdriver) + else if(H5FD_SEC2==fdriver) HDstrcpy(dname,"H5FD_SEC2"); - else if (H5FD_STDIO==fdriver) + else if(H5FD_STDIO==fdriver) HDstrcpy(dname,"H5FD_STDIO"); -#ifdef H5_HAVE_STREAM - else if (H5FD_STREAM==fdriver) - HDstrcpy(dname,"H5FD_STREAM"); -#endif else HDstrcpy(dname,"Unknown driver"); @@ -1239,19 +1235,14 @@ dump_fcpl(hid_t fid) indentation(dump_indent + COL); if(fs_strategy == H5F_FILE_SPACE_ALL_PERSIST) { PRINTSTREAM(rawoutstream, "%s %s\n", "FILE_SPACE_STRATEGY", "H5F_FILE_SPACE_ALL_PERSIST"); - } - else if(fs_strategy == H5F_FILE_SPACE_ALL) { + } else if(fs_strategy == H5F_FILE_SPACE_ALL) { PRINTSTREAM(rawoutstream, "%s %s\n", "FILE_SPACE_STRATEGY", "H5F_FILE_SPACE_ALL"); - } - else if(fs_strategy == H5F_FILE_SPACE_AGGR_VFD) { + } else if(fs_strategy == H5F_FILE_SPACE_AGGR_VFD) { PRINTSTREAM(rawoutstream, "%s %s\n", "FILE_SPACE_STRATEGY", "H5F_FILE_SPACE_AGGR_VFD"); - } - else if(fs_strategy == H5F_FILE_SPACE_VFD) { + } else if(fs_strategy == H5F_FILE_SPACE_VFD) { PRINTSTREAM(rawoutstream, "%s %s\n", "FILE_SPACE_STRATEGY", "H5F_FILE_SPACE_VFD"); - } - else { + } else PRINTSTREAM(rawoutstream, "%s %s\n", "FILE_SPACE_STRATEGY", "Unknown strategy"); - } indentation(dump_indent + COL); PRINTSTREAM(rawoutstream, "%s %Hu\n","FREE_SPACE_THRESHOLD", fs_threshold); |