[svn-r8932] Purpose:

    Code cleanup

Description:
    Clean up collective chunking code a bit.

    Also, add '--enable-instrument' configure flag to have a mechanism for
determining that optimized operations happened correctly in the library (instead
of just the "normal" way) by allowing 'flag' properties to be set outside the
library and set when the "right" thing happens.  This is mainly for debugging
and regression checks, so we make certain we don't break optimized I/O by
accident.  It's enabled by default when --enable-debug is on (which is on by
default in the development branch and off by default in the release branch),
but can also be independently controlled with its own configure flag.

Platforms tested:
    FreeBSD 4.10 (sleipnir) w/parallel
    IBM p690 (copper) w/parallel

1 files changed, 4 insertions, 18 deletions

diff --git a/testpar/testphdf5.h b/testpar/testphdf5.h
index e0e9001..379fd1e 100644
--- a/testpar/testphdf5.h
+++ b/testpar/testphdf5.h
@@ -12,8 +12,6 @@
  * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-/* $Id$ */
-
 #ifndef PHDF5TEST_H
 #define PHDF5TEST_H
 
@@ -129,7 +127,6 @@
 #define BYROW_CONT 1
 #define BYROW_DISCONT 2
 #define DSET_COLLECTIVE_CHUNK_NAME "coll_chunk_name"
-#define PROP_NAME    "__test__ccfoo___"
 /* type definitions */
 typedef struct H5Ptest_param_t  /* holds extra test parameters */
 {
@@ -170,22 +167,11 @@ void compact_dataset(void);
 void null_dataset(void);
 void big_dataset(void);
 void dataset_fillvalue(void);
+void coll_chunk1(void);
+void coll_chunk2(void);
+void coll_chunk3(void);
+void coll_chunk4(void);
 
-void coll_chunk1();
-void coll_chunk2();
-void coll_chunk3();
-void coll_chunk4();
-/* some commonly used routines for collective chunk IO tests*/
-void ccslab_set(int mpi_rank,int mpi_size,hssize_t start[],hsize_t count[],
-		hsize_t stride[],hsize_t block[],int mode);
-
-void ccdataset_fill(hssize_t start[],hsize_t count[],             
-                 hsize_t stride[],hsize_t block[],DATATYPE*dataset);    
-
-void ccdataset_print(hssize_t start[],hsize_t block[],DATATYPE*dataset);
-
-int ccdataset_vrfy(hssize_t start[], hsize_t count[], hsize_t stride[],     
-                 hsize_t block[], DATATYPE *dataset, DATATYPE *original); 
 /* commonly used prototypes */
 hid_t create_faccess_plist(MPI_Comm comm, MPI_Info info, int l_facc_type, hbool_t use_gpfs);
 MPI_Offset h5_mpi_get_file_size(const char *filename, MPI_Comm comm, MPI_Info info);