From 42ae237370de4828e242c5c0085e2af67d7a53c8 Mon Sep 17 00:00:00 2001
From: MuQun Yang <ymuqun@hdfgroup.org>
Date: Sat, 3 Jun 2006 13:39:09 -0500
Subject: [svn-r12400] Purpose: Some collective chunk IO macro names are
 confusing, change them to more meaningful names.

Description:
H5Pset_dxpl_mpio_chunk_opt will set a flag so that the library can do one linked IO or multi-chunk IO with collective in chunking storage directly. That is, the library won't do analyses to determine this.

The flags for the enum type we used before are:
H5FD_MPIO_OPT_ONE_IO
H5FD_MPIO_OPT_MULTI_IO

They are not good names because of the following two reasons:

1. It doesn't reflect chunking storage
2. OPT is kind of redundant and misleading,


Solution:
We change the names to
H5FD_MPIO_CHUNK_ONE_IO
H5FD_MPIO_CHUNK_MULTI_IO

Platforms tested:
Since only macro names are changed, no need to test with h5committest.

heping(mpich 1.2.6)

Misc. update:
---
 src/H5Dmpio.c    | 6 +++---
 src/H5Dprivate.h | 2 +-
 src/H5FDmpi.h    | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c
index c290f9c..7ad8e50 100644
--- a/src/H5Dmpio.c
+++ b/src/H5Dmpio.c
@@ -673,8 +673,8 @@ H5D_chunk_collective_io(H5D_io_info_t *io_info,fm_map *fm,const void *buf, hbool
     printf("chunk_opt_mode = %d\n",chunk_opt_mode);
 #endif
     
-    if(chunk_opt_mode == H5FD_MPIO_OPT_ONE_IO) io_option = H5D_ONE_LINK_CHUNK_IO;/*no opt*/
-    else if(chunk_opt_mode == H5FD_MPIO_OPT_MULTI_IO) io_option = H5D_MULTI_CHUNK_IO;/*no opt */
+    if(chunk_opt_mode == H5FD_MPIO_CHUNK_ONE_IO) io_option = H5D_ONE_LINK_CHUNK_IO;/*no opt*/
+    else if(chunk_opt_mode == H5FD_MPIO_CHUNK_MULTI_IO) io_option = H5D_MULTI_CHUNK_IO;/*no opt */
     else {
        if(H5D_mpio_get_sum_chunk(io_info,fm,&sum_chunk)<0)   
   	       HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSWAP, FAIL, "unable to obtain the total chunk number of all processes"); 
@@ -1710,7 +1710,7 @@ H5D_obtain_mpio_mode(H5D_io_info_t* io_info,
    
   chunk_opt_mode=(H5FD_mpio_chunk_opt_t)H5P_peek_unsigned(plist,H5D_XFER_MPIO_CHUNK_OPT_HARD_NAME);
 
-  if((chunk_opt_mode == H5FD_MPIO_OPT_MULTI_IO) || (percent_nproc_per_chunk == 0)){
+  if((chunk_opt_mode == H5FD_MPIO_CHUNK_MULTI_IO) || (percent_nproc_per_chunk == 0)){
     if(H5D_istore_chunkmap(io_info,total_chunks,chunk_addr,fm->down_chunks)<0)
        HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk address");    
     for(ic = 0; ic<total_chunks;ic++)
diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h
index f465c49..a026162 100644
--- a/src/H5Dprivate.h
+++ b/src/H5Dprivate.h
@@ -144,7 +144,7 @@
 /* Definitions for optimization of MPI-IO transfer mode property */
 #define H5D_XFER_MPIO_CHUNK_OPT_HARD_NAME      "mpio_chunk_opt_hard"
 #define H5D_XFER_MPIO_CHUNK_OPT_HARD_SIZE       sizeof(H5FD_mpio_chunk_opt_t)
-#define H5D_XFER_MPIO_CHUNK_OPT_HARD_DEF        H5FD_MPIO_OPT_IGNORE
+#define H5D_XFER_MPIO_CHUNK_OPT_HARD_DEF        H5FD_MPIO_CHUNK_DEFAULT
 
 #define H5D_XFER_MPIO_CHUNK_OPT_NUM_NAME       "mpio_chunk_opt_num"
 #define H5D_XFER_MPIO_CHUNK_OPT_NUM_SIZE        sizeof(unsigned)
diff --git a/src/H5FDmpi.h b/src/H5FDmpi.h
index 480e7f7..b7b4162 100644
--- a/src/H5FDmpi.h
+++ b/src/H5FDmpi.h
@@ -43,9 +43,9 @@ typedef enum H5FD_mpio_xfer_t {
 
 /* Type of I/O for data transfer properties */
 typedef enum H5FD_mpio_chunk_opt_t {
-    H5FD_MPIO_OPT_IGNORE = 0,
-    H5FD_MPIO_OPT_ONE_IO,  		/*zero is the default*/
-    H5FD_MPIO_OPT_MULTI_IO
+    H5FD_MPIO_CHUNK_DEFAULT = 0,
+    H5FD_MPIO_CHUNK_ONE_IO,  		/*zero is the default*/
+    H5FD_MPIO_CHUNK_MULTI_IO
 } H5FD_mpio_chunk_opt_t;
 
 
-- 
cgit v0.12