[svn-r12844] Description:

    Fix parallel build failure for property list class initialization refactor.

Tested on:
    AIX (copper) w/parallel

4 files changed, 81 insertions, 104 deletions

diff --git a/src/H5Dio.c b/src/H5Dio.c
index dbaae38..269161f 100644
--- a/src/H5Dio.c
+++ b/src/H5Dio.c
@@ -3023,27 +3023,6 @@ H5D_ioinfo_init(H5D_t *dset, const H5D_dxpl_cache_t *dxpl_cache, hid_t dxpl_id,
                  */
                 io_info->xfer_mode_changed = TRUE;
             } /* end if */
-
-#ifdef H5_HAVE_INSTRUMENTED_LIBRARY
-            /**** Test for collective chunk IO
-                  notice the following code should be removed after
-                  a more general collective chunk IO algorithm is applied.
-                  (This property is only reset for independent I/O)
-            */
-            if(dset->shared->layout.type == H5D_CHUNKED) { /*only check for chunking storage */
-                htri_t check_prop;
-
-                check_prop = H5Pexist(dxpl_id,H5D_XFER_COLL_CHUNK_NAME);
-                if(check_prop < 0)
-                    HGOTO_ERROR(H5E_PLIST, H5E_UNSUPPORTED, FAIL, "unable to check property list");
-                if(check_prop > 0) {
-                    int prop_value = 0;
-
-                    if(H5Pset(dxpl_id,H5D_XFER_COLL_CHUNK_NAME,&prop_value) < 0)
-                        HGOTO_ERROR(H5E_PLIST, H5E_UNSUPPORTED, FAIL, "unable to set property value");
-                } /* end if */
-            } /* end if */
-#endif /* H5_HAVE_INSTRUMENTED_LIBRARY */
         } /* end else */
     } /* end if */
     else {
diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h
index 9a4b024..15fced5 100644
--- a/src/H5Dprivate.h
+++ b/src/H5Dprivate.h
@@ -77,13 +77,16 @@
 #define H5D_XFER_CONV_CB_NAME           "type_conv_cb"  /* Type conversion callback function */
 #define H5D_XFER_XFORM_NAME             "data_transform" /* Data transform */
 #ifdef H5_HAVE_INSTRUMENTED_LIBRARY
-#define H5D_XFER_COLL_CHUNK_NAME        "coll_chunk"    /* Collective chunk I/O */
+/* Collective chunk instrumentation properties */
 #define H5D_XFER_COLL_CHUNK_LINK_HARD_NAME "coll_chunk_link_hard"
 #define H5D_XFER_COLL_CHUNK_MULTI_HARD_NAME "coll_chunk_multi_hard"
 #define H5D_XFER_COLL_CHUNK_LINK_NUM_TRUE_NAME "coll_chunk_link_true"
 #define H5D_XFER_COLL_CHUNK_LINK_NUM_FALSE_NAME "coll_chunk_link_false"
 #define H5D_XFER_COLL_CHUNK_MULTI_RATIO_COLL_NAME "coll_chunk_multi_coll"
 #define H5D_XFER_COLL_CHUNK_MULTI_RATIO_IND_NAME "coll_chunk_multi_ind"
+/* Definitions for all collective chunk instrumentation properties */
+#define H5D_XFER_COLL_CHUNK_SIZE        sizeof(unsigned)
+#define H5D_XFER_COLL_CHUNK_DEF         1
 #endif /* H5_HAVE_INSTRUMENTED_LIBRARY */
 
 /* Default temporary buffer size */
diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c
index ea5a6bd..3350658 100644
--- a/src/H5Pdxpl.c
+++ b/src/H5Pdxpl.c
@@ -116,11 +116,6 @@
 #define H5D_XFER_XFORM_DEL          H5P_dxfr_xform_del
 #define H5D_XFER_XFORM_COPY         H5P_dxfr_xform_copy
 #define H5D_XFER_XFORM_CLOSE        H5P_dxfr_xform_close
-#ifdef H5_HAVE_INSTRUMENTED_LIBRARY
-/* Definitions for collective chunk I/O property */
-#define H5D_XFER_COLL_CHUNK_SIZE       sizeof(unsigned)
-#define H5D_XFER_COLL_CHUNK_DEF        1
-#endif /* H5_HAVE_INSTRUMENTED_LIBRARY */
 
 
 /******************/
diff --git a/testpar/t_coll_chunk.c b/testpar/t_coll_chunk.c
index 087f8bd..d9f2995 100644
--- a/testpar/t_coll_chunk.c
+++ b/testpar/t_coll_chunk.c
@@ -679,49 +679,49 @@ coll_chunktest(const char* filename,
    
 #ifdef H5_HAVE_INSTRUMENTED_LIBRARY
   if(facc_type == FACC_MPIO) {
-  switch(api_option){
-	case API_LINK_HARD:
-           prop_value = H5D_XFER_COLL_CHUNK_DEF;
-           status = H5Pinsert(xfer_plist,H5D_XFER_COLL_CHUNK_LINK_HARD_NAME,H5D_XFER_COLL_CHUNK_SIZE,&prop_value,
-                       NULL,NULL,NULL,NULL,NULL,NULL);
-           VRFY((status >= 0),"testing property list inserted succeeded");
-	break;
-	case API_MULTI_HARD:
-           prop_value = H5D_XFER_COLL_CHUNK_DEF;   
-           status = H5Pinsert(xfer_plist,H5D_XFER_COLL_CHUNK_MULTI_HARD_NAME,H5D_XFER_COLL_CHUNK_SIZE,&prop_value,
-                       NULL,NULL,NULL,NULL,NULL,NULL);
-           VRFY((status >= 0),"testing property list inserted succeeded");
-	break;
-	case API_LINK_TRUE:
-           prop_value = H5D_XFER_COLL_CHUNK_DEF;   
-           status = H5Pinsert(xfer_plist,H5D_XFER_COLL_CHUNK_LINK_NUM_TRUE_NAME,H5D_XFER_COLL_CHUNK_SIZE,&prop_value,
-                       NULL,NULL,NULL,NULL,NULL,NULL);
-           VRFY((status >= 0),"testing property list inserted succeeded");
-	break;
-	case API_LINK_FALSE:
-           prop_value = H5D_XFER_COLL_CHUNK_DEF;   
-           status = H5Pinsert(xfer_plist,H5D_XFER_COLL_CHUNK_LINK_NUM_FALSE_NAME,H5D_XFER_COLL_CHUNK_SIZE,&prop_value,
-                       NULL,NULL,NULL,NULL,NULL,NULL);
-           VRFY((status >= 0),"testing property list inserted succeeded");
-	
-	break;
-	case API_MULTI_COLL:
-           prop_value = H5D_XFER_COLL_CHUNK_DEF;   
-           status = H5Pinsert(xfer_plist,H5D_XFER_COLL_CHUNK_MULTI_RATIO_COLL_NAME,H5D_XFER_COLL_CHUNK_SIZE,&prop_value,
-                       NULL,NULL,NULL,NULL,NULL,NULL);
-           VRFY((status >= 0),"testing property list inserted succeeded");
-	
-	break;
-	case API_MULTI_IND:
-           prop_value = H5D_XFER_COLL_CHUNK_DEF;   
-           status = H5Pinsert(xfer_plist,H5D_XFER_COLL_CHUNK_MULTI_RATIO_IND_NAME,H5D_XFER_COLL_CHUNK_SIZE,&prop_value,
-                       NULL,NULL,NULL,NULL,NULL,NULL);
-           VRFY((status >= 0),"testing property list inserted succeeded");
-	
-	break;
-	default:
-	;
-   } 
+      switch(api_option){
+            case API_LINK_HARD:
+               prop_value = H5D_XFER_COLL_CHUNK_DEF;
+               status = H5Pinsert(xfer_plist,H5D_XFER_COLL_CHUNK_LINK_HARD_NAME,H5D_XFER_COLL_CHUNK_SIZE,&prop_value,
+                           NULL,NULL,NULL,NULL,NULL,NULL);
+               VRFY((status >= 0),"testing property list inserted succeeded");
+            break;
+            case API_MULTI_HARD:
+               prop_value = H5D_XFER_COLL_CHUNK_DEF;   
+               status = H5Pinsert(xfer_plist,H5D_XFER_COLL_CHUNK_MULTI_HARD_NAME,H5D_XFER_COLL_CHUNK_SIZE,&prop_value,
+                           NULL,NULL,NULL,NULL,NULL,NULL);
+               VRFY((status >= 0),"testing property list inserted succeeded");
+            break;
+            case API_LINK_TRUE:
+               prop_value = H5D_XFER_COLL_CHUNK_DEF;   
+               status = H5Pinsert(xfer_plist,H5D_XFER_COLL_CHUNK_LINK_NUM_TRUE_NAME,H5D_XFER_COLL_CHUNK_SIZE,&prop_value,
+                           NULL,NULL,NULL,NULL,NULL,NULL);
+               VRFY((status >= 0),"testing property list inserted succeeded");
+            break;
+            case API_LINK_FALSE:
+               prop_value = H5D_XFER_COLL_CHUNK_DEF;   
+               status = H5Pinsert(xfer_plist,H5D_XFER_COLL_CHUNK_LINK_NUM_FALSE_NAME,H5D_XFER_COLL_CHUNK_SIZE,&prop_value,
+                           NULL,NULL,NULL,NULL,NULL,NULL);
+               VRFY((status >= 0),"testing property list inserted succeeded");
+            
+            break;
+            case API_MULTI_COLL:
+               prop_value = H5D_XFER_COLL_CHUNK_DEF;   
+               status = H5Pinsert(xfer_plist,H5D_XFER_COLL_CHUNK_MULTI_RATIO_COLL_NAME,H5D_XFER_COLL_CHUNK_SIZE,&prop_value,
+                           NULL,NULL,NULL,NULL,NULL,NULL);
+               VRFY((status >= 0),"testing property list inserted succeeded");
+            
+            break;
+            case API_MULTI_IND:
+               prop_value = H5D_XFER_COLL_CHUNK_DEF;   
+               status = H5Pinsert(xfer_plist,H5D_XFER_COLL_CHUNK_MULTI_RATIO_IND_NAME,H5D_XFER_COLL_CHUNK_SIZE,&prop_value,
+                           NULL,NULL,NULL,NULL,NULL,NULL);
+               VRFY((status >= 0),"testing property list inserted succeeded");
+            
+            break;
+            default:
+            ;
+       } 
    }
 #endif
   
@@ -732,40 +732,40 @@ coll_chunktest(const char* filename,
 
 #ifdef H5_HAVE_INSTRUMENTED_LIBRARY
   if(facc_type == FACC_MPIO) {
-  switch(api_option){
-	case API_LINK_HARD:
-           status = H5Pget(xfer_plist,H5D_XFER_COLL_CHUNK_LINK_HARD_NAME,&prop_value);
-           VRFY((status >= 0),"testing property list get succeeded");
-           VRFY((prop_value == 0),"API to set LINK COLLECTIVE IO without optimization succeeded");
-	break;
-	case API_MULTI_HARD:
-           status = H5Pget(xfer_plist,H5D_XFER_COLL_CHUNK_MULTI_HARD_NAME,&prop_value);
-           VRFY((status >= 0),"testing property list get succeeded");
-           VRFY((prop_value == 0),"API to set MULTI-CHUNK COLLECTIVE IO without optimization succeeded");
-	break;
-	case API_LINK_TRUE:
-           status = H5Pget(xfer_plist,H5D_XFER_COLL_CHUNK_LINK_NUM_TRUE_NAME,&prop_value);
-           VRFY((status >= 0),"testing property list get succeeded");
-           VRFY((prop_value == 0),"API to set LINK COLLECTIVE IO with true optimization succeeded");
-	break;
-	case API_LINK_FALSE:
-           status = H5Pget(xfer_plist,H5D_XFER_COLL_CHUNK_LINK_NUM_FALSE_NAME,&prop_value);
-           VRFY((status >= 0),"testing property list get succeeded");
-           VRFY((prop_value == 0),"API to set LINK IO transferring to multi-chunk IO succeeded");
-	break;
-	case API_MULTI_COLL:
-           status = H5Pget(xfer_plist,H5D_XFER_COLL_CHUNK_MULTI_RATIO_COLL_NAME,&prop_value);
-           VRFY((status >= 0),"testing property list get succeeded");
-           VRFY((prop_value == 0),"API to set MULTI-CHUNK COLLECTIVE IO with optimization succeeded");
-	break;
-	case API_MULTI_IND:
-           status = H5Pget(xfer_plist,H5D_XFER_COLL_CHUNK_MULTI_RATIO_IND_NAME,&prop_value);
-           VRFY((status >= 0),"testing property list get succeeded");
-           VRFY((prop_value == 0),"API to set MULTI-CHUNK IO transferring to independent IO  succeeded");
-	break;
-	default:
-	;
-   } 
+      switch(api_option){
+            case API_LINK_HARD:
+               status = H5Pget(xfer_plist,H5D_XFER_COLL_CHUNK_LINK_HARD_NAME,&prop_value);
+               VRFY((status >= 0),"testing property list get succeeded");
+               VRFY((prop_value == 0),"API to set LINK COLLECTIVE IO without optimization succeeded");
+            break;
+            case API_MULTI_HARD:
+               status = H5Pget(xfer_plist,H5D_XFER_COLL_CHUNK_MULTI_HARD_NAME,&prop_value);
+               VRFY((status >= 0),"testing property list get succeeded");
+               VRFY((prop_value == 0),"API to set MULTI-CHUNK COLLECTIVE IO without optimization succeeded");
+            break;
+            case API_LINK_TRUE:
+               status = H5Pget(xfer_plist,H5D_XFER_COLL_CHUNK_LINK_NUM_TRUE_NAME,&prop_value);
+               VRFY((status >= 0),"testing property list get succeeded");
+               VRFY((prop_value == 0),"API to set LINK COLLECTIVE IO with true optimization succeeded");
+            break;
+            case API_LINK_FALSE:
+               status = H5Pget(xfer_plist,H5D_XFER_COLL_CHUNK_LINK_NUM_FALSE_NAME,&prop_value);
+               VRFY((status >= 0),"testing property list get succeeded");
+               VRFY((prop_value == 0),"API to set LINK IO transferring to multi-chunk IO succeeded");
+            break;
+            case API_MULTI_COLL:
+               status = H5Pget(xfer_plist,H5D_XFER_COLL_CHUNK_MULTI_RATIO_COLL_NAME,&prop_value);
+               VRFY((status >= 0),"testing property list get succeeded");
+               VRFY((prop_value == 0),"API to set MULTI-CHUNK COLLECTIVE IO with optimization succeeded");
+            break;
+            case API_MULTI_IND:
+               status = H5Pget(xfer_plist,H5D_XFER_COLL_CHUNK_MULTI_RATIO_IND_NAME,&prop_value);
+               VRFY((status >= 0),"testing property list get succeeded");
+               VRFY((prop_value == 0),"API to set MULTI-CHUNK IO transferring to independent IO  succeeded");
+            break;
+            default:
+            ;
+       } 
    }
 #endif