[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1.1-128-gb300792

18 Jul 2014

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  b3007925c402c97bc5a799c4b630f6114a795146 (commit)
       via  07a301681491fe5f42a7aae8edfcf9a9d9937ee4 (commit)
       via  2d947bf57e2fe57f59c28c5dc941bb47221d2c06 (commit)
       via  fab604e6aa6d35b762872477ec3794d386b0f99a (commit)
       via  c10e084137b9b4e98ca8edf607cd2d8c6ce17ae8 (commit)
       via  4f32752683ba72b1e7e36f2009779d1dd3d7eafc (commit)
       via  5e800079ecd53177a6be21824a06db248451c78e (commit)
       via  56feb347d6eae5901fa8bfb0de8197cdaad1b3fd (commit)
      from  60cf2c24ec303404ebf60def0a6e9c8a9bd22f64 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/b3007925c402c97bc5a799c4b630f6114a...

commit b3007925c402c97bc5a799c4b630f6114a795146
Author: Rob Latham <[email protected]>
Date:   Fri Jul 18 15:02:12 2014 -0500

    warning fixes with --enable-strict
    
    another round of strict warning cleanups before the release:  missing
    prototypes and shadowed declarations

diff --git a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_aggrs.c b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_aggrs.c
index 48f98b8..350a336 100644
--- a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_aggrs.c
+++ b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_aggrs.c
@@ -16,6 +16,7 @@
 #include "adio.h"
 #include "adio_cb_config_list.h"
 #include "ad_gpfs.h"
+#include "ad_gpfs_aggrs.h"
 
 #ifdef AGGREGATION_PROFILE
 #include "mpe.h"
diff --git a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_close.c b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_close.c
index fbb03b7..f8a4167 100644
--- a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_close.c
+++ b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_close.c
@@ -12,6 +12,7 @@
  *   See COPYRIGHT notice in top-level directory.
  */
 
+#include "ad_gpfs.h"
 #include "ad_gpfs_tuning.h"
 #include <unistd.h>
 
diff --git a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_open.c b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_open.c
index d4e7466..31ba04b 100644
--- a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_open.c
+++ b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_open.c
@@ -12,6 +12,7 @@
  *   See COPYRIGHT notice in top-level directory.
  */
 
+#include "ad_gpfs.h"
 #include "ad_gpfs_tuning.h"
 
 #include <sys/types.h>
@@ -28,7 +29,7 @@
 #endif
 
 #ifdef HAVE_GPFS_FCNTL_H
-void gpfs_free_all_locks(int fd)
+static void gpfs_free_all_locks(int fd)
 {
     int rc;
     struct {
diff --git a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_rdcoll.c b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_rdcoll.c
index 71ddb9a..2172702 100644
--- a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_rdcoll.c
+++ b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_rdcoll.c
@@ -279,9 +279,9 @@ void ADIOI_GPFS_ReadStridedColl(ADIO_File fd, void *buf, int count,
 	 *
 	 * First verify that the filetype is contig and the offsets are
 	 * increasing in rank order*/
-	int i, inOrderAndNoGaps = 1;
-	for (i=0;i<(nprocs-1);i++) {
-	    if (end_offsets[i] != (st_offsets[i+1]-1))
+	int x, inOrderAndNoGaps = 1;
+	for (x=0;x<(nprocs-1);x++) {
+	    if (end_offsets[x] != (st_offsets[x+1]-1))
 		inOrderAndNoGaps = 0;
 	}
 	if (inOrderAndNoGaps && buftype_is_contig) {
diff --git a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_tuning.h b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_tuning.h
index 16ce7cc..b82c642 100644
--- a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_tuning.h
+++ b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_tuning.h
@@ -85,7 +85,7 @@ extern int     gpfsmpio_bg_nagg_pset;
 
 
 /* set internal variables for tuning environment variables */
-void ad_gpfs_get_env_vars();
+void ad_gpfs_get_env_vars(void);
 
 /* report timing breakdown for MPI I/O collective call */
 void ad_gpfs_timing_crw_report( int rw, ADIO_File fd, int myrank, int nprocs );
@@ -96,9 +96,9 @@ void ad_gpfs_timing_crw_report( int rw, ADIO_File fd, int myrank, int nprocs );
  */
 #define GPFSMPIO_T_CIO_RESET( RW ) \
 	{ \
-	  int i; \
-	  for ( i = 0; i < GPFSMPIO_CIO_LAST; i ++ ) \
-	    gpfsmpio_prof_c##RW [ i ] = 0; \
+	  int _i; \
+	  for ( _i = 0; _i < GPFSMPIO_CIO_LAST; _i ++ ) \
+	    gpfsmpio_prof_c##RW [ _i ] = 0; \
 	}
 
 #define GPFSMPIO_T_CIO_REPORT( RW, FD, MYRANK, NPROCS ) \
diff --git a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c
index 436d01d..17299f2 100644
--- a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c
+++ b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c
@@ -386,7 +386,7 @@ void ADIOI_GPFS_WriteStridedColl(ADIO_File fd, const void *buf, int count,
 #endif
 }
 
-void gpfs_wr_access_start(int fd, ADIO_Offset offset, ADIO_Offset length)
+static void gpfs_wr_access_start(int fd, ADIO_Offset offset, ADIO_Offset length)
 {
         int rc=0;
 #ifdef HAVE_GPFS_FCNTL_H
@@ -410,7 +410,7 @@ void gpfs_wr_access_start(int fd, ADIO_Offset offset, ADIO_Offset length)
         ADIOI_Assert(rc == 0);
 }
 
-void gpfs_wr_access_end(int fd, ADIO_Offset offset, ADIO_Offset length)
+static void gpfs_wr_access_end(int fd, ADIO_Offset offset, ADIO_Offset length)
 {
         int rc=0;
 #ifdef HAVE_GPFS_FCNTL_H
@@ -437,7 +437,7 @@ void gpfs_wr_access_end(int fd, ADIO_Offset offset, ADIO_Offset length)
 #ifdef BGQPLATFORM
 /* my_start, my_end: this processes file domain.  coudd be -1,-1 for "no i/o"
  * fd_start, fd_end: arrays of length fd->hints->cb_nodes specifying all file domains */
-int gpfs_find_access_for_ion(ADIO_File fd,
+static int gpfs_find_access_for_ion(ADIO_File fd,
 	ADIO_Offset my_start, ADIO_Offset my_end,
 	ADIO_Offset *fd_start, ADIO_Offset *fd_end,
 	ADIO_Offset *start, ADIO_Offset *end)
@@ -987,7 +987,7 @@ static void ADIOI_W_Exchange_data(ADIO_File fd, const void *buf, char *write_buf
 
     if (nprocs_recv) {
 	if (*hole) {
-	    char * stuff = "data-sieve-in-two-phase";
+	    const char * stuff = "data-sieve-in-two-phase";
 	    setenv("LIBIOLOG_EXTRA_INFO", stuff, 1);
 	    ADIO_ReadContig(fd, write_buf, size, MPI_BYTE, 
 			    ADIO_EXPLICIT_OFFSET, off, &status, &err);
diff --git a/src/mpi/romio/adio/ad_gpfs/bg/ad_bg_aggrs.c b/src/mpi/romio/adio/ad_gpfs/bg/ad_bg_aggrs.c
index 6cadb8f..1141bab 100644
--- a/src/mpi/romio/adio/ad_gpfs/bg/ad_bg_aggrs.c
+++ b/src/mpi/romio/adio/ad_gpfs/bg/ad_bg_aggrs.c
@@ -494,7 +494,6 @@ ADIOI_BG_compute_agg_ranklist_serial ( ADIO_File fd,
 
 	int numbridges = 0;
 
-	int i;
 	for (i=0;i<naggs;i++)
 	    bridgelistnum[i] = 0;
 
@@ -580,7 +579,6 @@ ADIOI_BG_compute_agg_ranklist_serial ( ADIO_File fd,
 	    while (ionlist[currentBridgeIndex] == currentIonId)
 		  currentBridgeIndex++;
 	    endSortIndex = currentBridgeIndex-1;
-	    int x;
 	    for (x=startSortIndex;x<=endSortIndex;x++) {
 		  for (i=startSortIndex;i<endSortIndex;i++) {
 		    if (bridgelist[i] > bridgelist[i+1]) {
@@ -613,7 +611,6 @@ ADIOI_BG_compute_agg_ranklist_serial ( ADIO_File fd,
 	    }
 
 	    // sort thisBridgeAggList
-	    int x;
 	    for (x=0;x<numAggsForThisBridge;x++) {
 		int n;
 		for (n=0;n<(numAggsForThisBridge-1);n++) {

http://git.mpich.org/mpich.git/commitdiff/07a301681491fe5f42a7aae8edfcf9a9d9...

commit 07a301681491fe5f42a7aae8edfcf9a9d9937ee4
Author: Rob Latham <[email protected]>
Date:   Thu Jul 17 14:20:11 2014 -0500

    optionally display ROMIO hints
    
    We often have a pretty good idea what hints are in use but it's not a
    big deal to dump to stdout a list of the key-value pairs to confirm.
    
    Signed-off-by: Paul Coffman <[email protected]>

diff --git a/src/mpi/romio/adio/common/ad_open.c b/src/mpi/romio/adio/common/ad_open.c
index 1e37bf3..e6b96c4 100644
--- a/src/mpi/romio/adio/common/ad_open.c
+++ b/src/mpi/romio/adio/common/ad_open.c
@@ -126,7 +126,12 @@ MPI_File ADIO_Open(MPI_Comm orig_comm,
 	if (*error_code != MPI_SUCCESS) 
 	    goto fn_exit;
     }
-    
+    /* for debugging, it can be helpful to see the hints selected */
+    char *p = getenv("ROMIO_PRINT_HINTS");
+    if (rank == 0 && p != NULL ) {
+	ADIOI_Info_print_keyvals(fd->info);
+    }
+
      /* deferred open: if we are an aggregator, create a new communicator.
       * we'll use this aggregator communicator for opens and closes.
       * otherwise, we have a NULL communicator until we try to do independent
diff --git a/src/mpi/romio/adio/common/system_hints.c b/src/mpi/romio/adio/common/system_hints.c
index 546b9d4..665c79e 100644
--- a/src/mpi/romio/adio/common/system_hints.c
+++ b/src/mpi/romio/adio/common/system_hints.c
@@ -40,24 +40,23 @@
 #define ROMIO_HINT_DEFAULT_CFG "/etc/romio-hints"
 #define ROMIO_HINT_ENV_VAR "ROMIO_HINTS"
 
- /* should suppress unused warnings on GCC */
-static void dump_keys(MPI_Info info) ATTRIBUTE((unused, used));
-
 /* debug function: a routine I want in the library to make my life easier when
- * using a source debugger. please ignore any "defined but not used" warnings
- */
-static void dump_keys(MPI_Info info)
+ * using a source debugger.  Now optionally used in ADIO_Open. */
+void ADIOI_Info_print_keyvals(MPI_Info info)
 {
     int i, nkeys, flag;
     char key[MPI_MAX_INFO_KEY];
     char value[MPI_MAX_INFO_VAL];
 
+    if (info == MPI_INFO_NULL)
+	return;
+
     MPI_Info_get_nkeys(info, &nkeys);
 
     for (i=0; i<nkeys; i++) {
 	MPI_Info_get_nthkey(info, i, key);
 	ADIOI_Info_get(info, key, MPI_MAX_INFO_VAL-1, value, &flag);
-	printf("key = %s, value = %s\n", key, value);
+	printf("key = %-25s value = %-10s\n", key, value);
     }
     return;
 }
diff --git a/src/mpi/romio/adio/include/adioi.h b/src/mpi/romio/adio/include/adioi.h
index 83dc1e8..944e099 100644
--- a/src/mpi/romio/adio/include/adioi.h
+++ b/src/mpi/romio/adio/include/adioi.h
@@ -345,6 +345,7 @@ void ADIOI_Get_byte_offset(ADIO_File fd, ADIO_Offset offset,
 void ADIOI_process_system_hints(MPI_Info info);
 void ADIOI_incorporate_system_hints(MPI_Info info, MPI_Info sysinfo, 
 		MPI_Info *new_info);
+void ADIOI_Info_print_keyvals(MPI_Info info);
 
 
 void ADIOI_GEN_Fcntl(ADIO_File fd, int flag, ADIO_Fcntl_t *fcntl_struct,

http://git.mpich.org/mpich.git/commitdiff/2d947bf57e2fe57f59c28c5dc941bb4722...

commit 2d947bf57e2fe57f59c28c5dc941bb47221d2c06
Author: Rob Latham <[email protected]>
Date:   Wed Jul 16 16:28:23 2014 -0500

    fix unsigned arithmetic yielding unsigned
    
    clang finds a spot where we took the abs() of two unsigned numbers.
    result can never be negative (could be surprisingly large).
    
    Signed-off-by: Paul Coffman <[email protected]>

diff --git a/src/mpi/romio/adio/ad_gpfs/bg/ad_bg_pset.c b/src/mpi/romio/adio/ad_gpfs/bg/ad_bg_pset.c
index e3a66a7..59f2219 100644
--- a/src/mpi/romio/adio/ad_gpfs/bg/ad_bg_pset.c
+++ b/src/mpi/romio/adio/ad_gpfs/bg/ad_bg_pset.c
@@ -92,7 +92,7 @@ static unsigned procManhattanDistance(unsigned *aggCoords, unsigned *bridgeCoord
   unsigned totalDistance = 0;
   int i;
   for (i=0;i<MPIX_TORUS_MAX_DIMS;i++) {
-    unsigned dimDistance = abs(aggCoords[i] - bridgeCoords[i]);
+    unsigned dimDistance = abs((int)aggCoords[i] - (int)bridgeCoords[i]);
     if (dimDistance > 0) { // could torus make it closer?
       if (dimTorus[i]) {
         if (aggCoords[i] == torusSize[i]) { // is wrap-around closer
@@ -104,7 +104,8 @@ static unsigned procManhattanDistance(unsigned *aggCoords, unsigned *bridgeCoord
             dimDistance = aggCoords[i]+1;
         }
       }
-    }
+    } /* else: dimDistance == 0, meaning aggCoords[i] and bridgeCoords[i] are
+	 the same and there's no closer point to pick */
     totalDistance += dimDistance;
   }
   return totalDistance;

http://git.mpich.org/mpich.git/commitdiff/fab604e6aa6d35b762872477ec3794d386...

commit fab604e6aa6d35b762872477ec3794d386b0f99a
Author: Rob Latham <[email protected]>
Date:   Wed Jul 16 14:31:41 2014 -0500

    ROMIO debugging: environment var to select fs type
    
    introduce the environment variable ROMIO_FSTYPE_FORCE which one can set
    to forcibly override ROMIO's file system detection logic when the
    "prepend a prefix" approach is infeasable.

diff --git a/src/mpi/romio/adio/common/ad_fstype.c b/src/mpi/romio/adio/common/ad_fstype.c
index f3f59e2..cd7e6c5 100644
--- a/src/mpi/romio/adio/common/ad_fstype.c
+++ b/src/mpi/romio/adio/common/ad_fstype.c
@@ -689,6 +689,22 @@ void ADIO_ResolveFileType(MPI_Comm comm, const char *filename, int *fstype,
 	}
     }
 
+    /* lastly, there may be situations where one cannot override the file
+     * system detection with a prefix -- maybe the file name is passed to both
+     * posix and MPI-IO routines, or maybe the file name is hard-coded into an
+     * application.
+     * Assumes all processes set the same environment varialble.
+     * Values: the same prefix you would stick on a file path. e.g. pvfs2: --
+     * including the colon! */
+    char * p = getenv("ROMIO_FSTYPE_FORCE");
+    if (p != NULL) {
+	ADIO_FileSysType_prefix(p, &file_system, &myerrcode);
+	if (myerrcode != MPI_SUCCESS) {
+	    *error_code = myerrcode;
+	    return;
+	}
+    }
+
     /* verify that we support this file system type and set ops pointer */
     if (file_system == ADIO_PFS) {
 #ifndef ROMIO_PFS

http://git.mpich.org/mpich.git/commitdiff/c10e084137b9b4e98ca8edf607cd2d8c6c...

commit c10e084137b9b4e98ca8edf607cd2d8c6ce17ae8
Author: Rob Latham <[email protected]>
Date:   Wed Jul 16 11:48:41 2014 -0500

    use 'long' for blocksize
    
    there's no pre-defined MPI datatype for blksize_t, and we are still sort
    of trying to avoid int64_t and related explicitly sized types for
    maximum portability.  'long' should be big enough to hold a blocksize:
    it's an int on many, a long int on some.
    
    Closes #2123 (type mismatch in ad_opencoll.c)

diff --git a/src/mpi/romio/adio/include/adio.h b/src/mpi/romio/adio/include/adio.h
index fb1b22b..8c33bea 100644
--- a/src/mpi/romio/adio/include/adio.h
+++ b/src/mpi/romio/adio/include/adio.h
@@ -196,7 +196,7 @@ typedef struct ADIOI_FileD {
     unsigned d_mem;          /* data buffer memory alignment */
     unsigned d_miniosz;      /* min xfer size, xfer size multiple,
                                 and file seek offset alignment */
-    blksize_t blksize;       /* some optimizations benefit from knowing
+    long blksize;            /* some optimizations benefit from knowing
 				underlying block size */
     ADIO_Offset fp_ind;      /* individual file pointer in MPI-IO (in bytes)*/
     ADIO_Offset fp_sys_posn; /* current location of the system file-pointer

http://git.mpich.org/mpich.git/commitdiff/4f32752683ba72b1e7e36f2009779d1dd3...

commit 4f32752683ba72b1e7e36f2009779d1dd3d7eafc
Author: Rob Latham <[email protected]>
Date:   Mon Jul 7 16:12:51 2014 -0500

    ROMIO: report which ranks are aggregators
    
    ROMIO will pick some number of ranks P to be I/O aggregators, but had no
    means to report that selection back to the user.  Now someone can query
    this hint after opening a file to find out which ranks were selected.

diff --git a/src/mpi/romio/adio/common/cb_config_list.c b/src/mpi/romio/adio/common/cb_config_list.c
index cfd29f7..64ad7ed 100644
--- a/src/mpi/romio/adio/common/cb_config_list.c
+++ b/src/mpi/romio/adio/common/cb_config_list.c
@@ -92,6 +92,13 @@ int ADIOI_cb_bcast_rank_map(ADIO_File fd)
     value = (char *) ADIOI_Malloc((MPI_MAX_INFO_VAL+1)*sizeof(char));
     ADIOI_Snprintf(value, MPI_MAX_INFO_VAL+1, "%d", fd->hints->cb_nodes);
     ADIOI_Info_set(fd->info, "cb_nodes", value);
+    char *p = value;
+    int i;
+    for (i=0; i< fd->hints->cb_nodes; i++) {
+	p += ADIOI_Snprintf(p, MPI_MAX_INFO_VAL+1, "%d ", fd->hints->ranklist[i]);
+	if (p - value > MPI_MAX_INFO_VAL+1) break;
+    }
+    ADIOI_Info_set(fd->info, "romio_aggregator_list", value);
     ADIOI_Free(value);
 
     return 0;

http://git.mpich.org/mpich.git/commitdiff/5e800079ecd53177a6be21824a06db2484...

commit 5e800079ecd53177a6be21824a06db248451c78e
Author: Rob Latham <[email protected]>
Date:   Mon Jul 7 14:23:34 2014 -0500

    set an MPI Info key with the type of file system
    
    Based on stat() or a user-provided prefix, the actual low-level file
    system routines ROMIO uses might differ.  the info object provides a
    simple portable way to report that back.

diff --git a/src/mpi/romio/adio/common/ad_open.c b/src/mpi/romio/adio/common/ad_open.c
index 4a965cf..1e37bf3 100644
--- a/src/mpi/romio/adio/common/ad_open.c
+++ b/src/mpi/romio/adio/common/ad_open.c
@@ -95,6 +95,8 @@ MPI_File ADIO_Open(MPI_Comm orig_comm,
 	if (*error_code != MPI_SUCCESS)
 	    goto fn_exit;
     }
+    ADIOI_Info_set(fd->info, "romio_filesystem_type", fd->fns->fsname);
+
     /* Instead of repeatedly allocating this buffer in collective read/write,
      * allocating up-front might make memory management on small platforms
      * (e.g. Blue Gene) more efficent */

http://git.mpich.org/mpich.git/commitdiff/56feb347d6eae5901fa8bfb0de8197cdaa...

commit 56feb347d6eae5901fa8bfb0de8197cdaad1b3fd
Author: Rob Latham <[email protected]>
Date:   Mon Jul 7 13:45:05 2014 -0500

    add a descriptive string to function table

diff --git a/src/mpi/romio/adio/ad_gpfs/ad_gpfs.c b/src/mpi/romio/adio/ad_gpfs/ad_gpfs.c
index 73a4b58..4be147f 100644
--- a/src/mpi/romio/adio/ad_gpfs/ad_gpfs.c
+++ b/src/mpi/romio/adio/ad_gpfs/ad_gpfs.c
@@ -51,4 +51,11 @@ struct ADIOI_Fns_struct ADIO_GPFS_operations = {
     ADIOI_GEN_Resize, /* Resize */
     ADIOI_GEN_Delete, /* Delete */
     ADIOI_GEN_Feature, /* Features */
+#ifdef BGQPLATFORM
+    "GPFS+BGQ: IBM GPFS for Blue Gene",
+#elif PEPLATFORM
+    "GPFS+PE: IBM GPFS for PE",
+#else
+    "GPFS: IBM GPFS"
+#endif
 };
diff --git a/src/mpi/romio/adio/ad_lustre/ad_lustre.c b/src/mpi/romio/adio/ad_lustre/ad_lustre.c
index f5a81b4..d524dd8 100644
--- a/src/mpi/romio/adio/ad_lustre/ad_lustre.c
+++ b/src/mpi/romio/adio/ad_lustre/ad_lustre.c
@@ -40,4 +40,5 @@ struct ADIOI_Fns_struct ADIO_LUSTRE_operations = {
     ADIOI_GEN_Resize, /* Resize */
     ADIOI_GEN_Delete, /* Delete */
     ADIOI_GEN_Feature, /* Features */
+    "LUSTRE:",
 };
diff --git a/src/mpi/romio/adio/ad_nfs/ad_nfs.c b/src/mpi/romio/adio/ad_nfs/ad_nfs.c
index 8f323b8..725c4d1 100644
--- a/src/mpi/romio/adio/ad_nfs/ad_nfs.c
+++ b/src/mpi/romio/adio/ad_nfs/ad_nfs.c
@@ -37,4 +37,5 @@ struct ADIOI_Fns_struct ADIO_NFS_operations = {
     ADIOI_NFS_Resize, /* Resize */
     ADIOI_GEN_Delete, /* Delete */
     ADIOI_NFS_Feature, /* Features */
+    "NFS:"  /* fsname: just a string */
 };
diff --git a/src/mpi/romio/adio/ad_panfs/ad_panfs.c b/src/mpi/romio/adio/ad_panfs/ad_panfs.c
index b3ce0fb..fd9cd93 100644
--- a/src/mpi/romio/adio/ad_panfs/ad_panfs.c
+++ b/src/mpi/romio/adio/ad_panfs/ad_panfs.c
@@ -41,4 +41,5 @@ struct ADIOI_Fns_struct ADIO_PANFS_operations = {
     ADIOI_PANFS_Resize, /* Resize */
     ADIOI_GEN_Delete, /* Delete */
     ADIOI_GEN_Feature,
+    "PANFS: Panasas PanFS"
 };
diff --git a/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2.c b/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2.c
index e2b8b0f..a55c3c8 100644
--- a/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2.c
+++ b/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2.c
@@ -38,7 +38,8 @@ struct ADIOI_Fns_struct ADIO_PVFS2_operations = {
     ADIOI_PVFS2_Flush, /* Flush */
     ADIOI_PVFS2_Resize, /* Resize */
     ADIOI_PVFS2_Delete, /* Delete */
-    ADIOI_PVFS2_Feature, 
+    ADIOI_PVFS2_Feature,
+    "PVFS2: the PVFS v2 or OrangeFS file systems"
 };
 
 /* 
diff --git a/src/mpi/romio/adio/ad_testfs/ad_testfs.c b/src/mpi/romio/adio/ad_testfs/ad_testfs.c
index c315a24..6823468 100644
--- a/src/mpi/romio/adio/ad_testfs/ad_testfs.c
+++ b/src/mpi/romio/adio/ad_testfs/ad_testfs.c
@@ -35,4 +35,5 @@ struct ADIOI_Fns_struct ADIO_TESTFS_operations = {
     ADIOI_TESTFS_Resize, /* Resize */
     ADIOI_TESTFS_Delete, /* Delete */
     ADIOI_GEN_Feature, /* Features */
+    "TESTFS: the logging-only file system"
 };
diff --git a/src/mpi/romio/adio/ad_ufs/ad_ufs.c b/src/mpi/romio/adio/ad_ufs/ad_ufs.c
index 75488da..66b183e 100644
--- a/src/mpi/romio/adio/ad_ufs/ad_ufs.c
+++ b/src/mpi/romio/adio/ad_ufs/ad_ufs.c
@@ -40,4 +40,5 @@ struct ADIOI_Fns_struct ADIO_UFS_operations = {
     ADIOI_GEN_Resize, /* Resize */
     ADIOI_GEN_Delete, /* Delete */
     ADIOI_GEN_Feature, /* Features */
+    "UFS: Generic ROMIO driver for all UNIX-like file systems",
 };
diff --git a/src/mpi/romio/adio/ad_xfs/ad_xfs.c b/src/mpi/romio/adio/ad_xfs/ad_xfs.c
index 2b96347..b748a8a 100644
--- a/src/mpi/romio/adio/ad_xfs/ad_xfs.c
+++ b/src/mpi/romio/adio/ad_xfs/ad_xfs.c
@@ -40,4 +40,5 @@ struct ADIOI_Fns_struct ADIO_XFS_operations = {
     ADIOI_XFS_Resize, /* Resize */
     ADIOI_GEN_Delete, /* Delete */
     ADIOI_GEN_Feature, /* Features */
+    "XFS: SGI XFS"
 };
diff --git a/src/mpi/romio/adio/include/adioi.h b/src/mpi/romio/adio/include/adioi.h
index f600b77..83dc1e8 100644
--- a/src/mpi/romio/adio/include/adioi.h
+++ b/src/mpi/romio/adio/include/adioi.h
@@ -196,6 +196,7 @@ struct ADIOI_Fns_struct {
     void (*ADIOI_xxx_Resize) (ADIO_File fd, ADIO_Offset size, int *error_code);
     void (*ADIOI_xxx_Delete) (const char *filename, int *error_code);
     int  (*ADIOI_xxx_Feature) (ADIO_File fd, int flag);
+    const char *fsname;
 };
 
 /* optypes for ADIO_RequestD */

-----------------------------------------------------------------------

Summary of changes:
 src/mpi/romio/adio/ad_gpfs/ad_gpfs.c        |    7 +++++++
 src/mpi/romio/adio/ad_gpfs/ad_gpfs_aggrs.c  |    1 +
 src/mpi/romio/adio/ad_gpfs/ad_gpfs_close.c  |    1 +
 src/mpi/romio/adio/ad_gpfs/ad_gpfs_open.c   |    3 ++-
 src/mpi/romio/adio/ad_gpfs/ad_gpfs_rdcoll.c |    6 +++---
 src/mpi/romio/adio/ad_gpfs/ad_gpfs_tuning.h |    8 ++++----
 src/mpi/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c |    8 ++++----
 src/mpi/romio/adio/ad_gpfs/bg/ad_bg_aggrs.c |    3 ---
 src/mpi/romio/adio/ad_gpfs/bg/ad_bg_pset.c  |    5 +++--
 src/mpi/romio/adio/ad_lustre/ad_lustre.c    |    1 +
 src/mpi/romio/adio/ad_nfs/ad_nfs.c          |    1 +
 src/mpi/romio/adio/ad_panfs/ad_panfs.c      |    1 +
 src/mpi/romio/adio/ad_pvfs2/ad_pvfs2.c      |    3 ++-
 src/mpi/romio/adio/ad_testfs/ad_testfs.c    |    1 +
 src/mpi/romio/adio/ad_ufs/ad_ufs.c          |    1 +
 src/mpi/romio/adio/ad_xfs/ad_xfs.c          |    1 +
 src/mpi/romio/adio/common/ad_fstype.c       |   16 ++++++++++++++++
 src/mpi/romio/adio/common/ad_open.c         |    9 ++++++++-
 src/mpi/romio/adio/common/cb_config_list.c  |    7 +++++++
 src/mpi/romio/adio/common/system_hints.c    |   13 ++++++-------
 src/mpi/romio/adio/include/adio.h           |    2 +-
 src/mpi/romio/adio/include/adioi.h          |    2 ++
 22 files changed, 73 insertions(+), 27 deletions(-)


hooks/post-receive
-- 
MPICH primary repository

    

[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1.1-128-gb300792

noreply＠mpich.org