[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1-152-gd7de532
Service Account
noreply at mpich.org
Mon Apr 14 13:10:26 CDT 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 d7de532de5e6a24217fe34005552c165f1f8ee2c (commit)
via c0b1427748378f0469f42232cdcf58b32db11c2b (commit)
via 74a3e759e004e87a00212fbefa2d3d7455174ebf (commit)
from b9ce079a6621faed2a8ac560af2fd8e0ab09a242 (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/d7de532de5e6a24217fe34005552c165f1f8ee2c
commit d7de532de5e6a24217fe34005552c165f1f8ee2c
Author: Rob Latham <robl at mcs.anl.gov>
Date: Mon Apr 14 13:40:34 2014 +0000
Bugfix: detected any fs as gpfs
if GPFS enabled, we were declaring all file systems GPFS. This holdover
from the old BlueGene-specific days does not belong here.
Signed-off-by: Paul Coffman <pkcoff at us.ibm.com>
diff --git a/src/mpi/romio/adio/common/ad_fstype.c b/src/mpi/romio/adio/common/ad_fstype.c
index e492b9f..f3f59e2 100644
--- a/src/mpi/romio/adio/common/ad_fstype.c
+++ b/src/mpi/romio/adio/common/ad_fstype.c
@@ -351,9 +351,10 @@ static void ADIO_FileSysType_fncall(const char *filename, int *fstype, int *erro
#ifdef ROMIO_GPFS
-
- *fstype = ADIO_GPFS;
- return;
+ if (fsbuf.f_type == GPFS_SUPER_MAGIC) {
+ *fstype = ADIO_GPFS;
+ return;
+ }
#endif
/* FPRINTF(stderr, "%d\n", fsbuf.f_type);*/
http://git.mpich.org/mpich.git/commitdiff/c0b1427748378f0469f42232cdcf58b32db11c2b
commit c0b1427748378f0469f42232cdcf58b32db11c2b
Author: Rob Latham <robl at mcs.anl.gov>
Date: Mon Apr 14 13:38:50 2014 +0000
more comments for crazy ROMIO multi-platform stat
20 years of portability workarounds make for quite a tangle. Only one
of the four methods is ever used in practice now. Provide comments
about the older approaches and indicate which one we expect to be the
common case.
Signed-off-by: Paul Coffman <pkcoff at us.ibm.com>
diff --git a/src/mpi/romio/adio/common/ad_fstype.c b/src/mpi/romio/adio/common/ad_fstype.c
index cabf82d..e492b9f 100644
--- a/src/mpi/romio/adio/common/ad_fstype.c
+++ b/src/mpi/romio/adio/common/ad_fstype.c
@@ -253,6 +253,7 @@ static void ADIO_FileSysType_fncall(const char *filename, int *fstype, int *erro
*error_code = MPI_SUCCESS;
#ifdef ROMIO_HAVE_STRUCT_STATVFS_WITH_F_BASETYPE
+ /* rare: old solaris machines */
retry_cnt=0;
do {
err = statvfs(filename, &vfsbuf);
@@ -311,6 +312,8 @@ static void ADIO_FileSysType_fncall(const char *filename, int *fstype, int *erro
#endif /* STATVFS APPROACH */
#if defined(HAVE_STRUCT_STATFS) && defined(HAVE_STATFS)
+ /* common automagic fs-detection logic for any modern POSX-compliant
+ * environment */
retry_cnt = 0;
do {
err = statfs(filename, &fsbuf);
@@ -339,6 +342,7 @@ static void ADIO_FileSysType_fncall(const char *filename, int *fstype, int *erro
/* --END ERROR HANDLING-- */
# ifdef ROMIO_HAVE_STRUCT_STATFS_WITH_F_FSTYPENAME
+ /* uncommon: maybe only on Darwin ? */
if ( !strncmp("nfs",fsbuf.f_fstypename,3) ) {
*fstype = ADIO_NFS;
return;
@@ -425,6 +429,7 @@ static void ADIO_FileSysType_fncall(const char *filename, int *fstype, int *erro
#endif /* STATFS APPROACH */
#ifdef ROMIO_HAVE_STRUCT_STAT_WITH_ST_FSTYPE
+ /* rare: maybe old NEC SX or SGI IRIX machines */
retry_cnt = 0;
do {
err = stat(filename, &sbuf);
http://git.mpich.org/mpich.git/commitdiff/74a3e759e004e87a00212fbefa2d3d7455174ebf
commit 74a3e759e004e87a00212fbefa2d3d7455174ebf
Author: Rob Latham <robl at mcs.anl.gov>
Date: Mon Apr 14 13:36:56 2014 +0000
clean up stray declrations of GPFS_SUPER_MAGIC
only ad_fstype.c uses GPFS_SUPER_MAGIC now. Also, GPFS_SUPER_MAGIC is
properly provided by gpfs.h, but we can fall back to old way of
declaring it ourselves if gpfs.h is not around.
Signed-off-by: Paul Coffman <pkcoff at us.ibm.com>
diff --git a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_aggrs.h b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_aggrs.h
index e5b666e..4d0b0da 100644
--- a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_aggrs.h
+++ b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_aggrs.h
@@ -19,9 +19,6 @@
#include "adio.h"
#include <sys/stat.h>
-#if !defined(GPFS_SUPER_MAGIC)
- #define GPFS_SUPER_MAGIC (0x47504653)
-#endif
/* overriding ADIOI_Calc_file_domains() to apply 'aligned file domain partitioning'. */
void ADIOI_GPFS_Calc_file_domains(ADIO_File fd,
diff --git a/src/mpi/romio/adio/ad_gpfs/bg/ad_bg_aggrs.h b/src/mpi/romio/adio/ad_gpfs/bg/ad_bg_aggrs.h
index cdd0497..d6baaed 100644
--- a/src/mpi/romio/adio/ad_gpfs/bg/ad_bg_aggrs.h
+++ b/src/mpi/romio/adio/ad_gpfs/bg/ad_bg_aggrs.h
@@ -20,9 +20,6 @@
#include "adio.h"
#include <sys/stat.h>
-#if !defined(GPFS_SUPER_MAGIC)
- #define GPFS_SUPER_MAGIC (0x47504653)
-#endif
/* generate a list of I/O aggregators that utilizes BG-PSET orginization. */
int ADIOI_BG_gen_agg_ranklist(ADIO_File fd, int n_aggrs_per_pset);
diff --git a/src/mpi/romio/adio/common/ad_fstype.c b/src/mpi/romio/adio/common/ad_fstype.c
index 26ad614..cabf82d 100644
--- a/src/mpi/romio/adio/common/ad_fstype.c
+++ b/src/mpi/romio/adio/common/ad_fstype.c
@@ -30,6 +30,10 @@
#include "zoidfs.h"
#endif
+#ifdef HAVE_GPFS_H
+#include "gpfs.h"
+#endif
+
/* Notes on detection process:
*
* There are three more "general" mechanisms that we use for detecting
@@ -74,6 +78,10 @@
#define PVFS2_SUPER_MAGIC (0x20030528)
#endif
+#if defined(ROMIO_GPFS) && !defined(GPFS_SUPER_MAGIC)
+# define GPFS_SUPER_MAGIC 0x47504653
+#endif
+
#ifdef ROMIO_HAVE_STRUCT_STATVFS_WITH_F_BASETYPE
# ifdef HAVE_SYS_STATVFS_H
# include <sys/statvfs.h>
-----------------------------------------------------------------------
Summary of changes:
src/mpi/romio/adio/ad_gpfs/ad_gpfs_aggrs.h | 3 ---
src/mpi/romio/adio/ad_gpfs/bg/ad_bg_aggrs.h | 3 ---
src/mpi/romio/adio/common/ad_fstype.c | 20 +++++++++++++++++---
3 files changed, 17 insertions(+), 9 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list